From 42f6be7434debe017582385f3901dbe849478cde Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 25 Jul 2015 14:19:38 -0400 Subject: [PATCH] [fix] county road --- resources/dictionaries/en/street_types.txt | 2 +- src/address_expansion_data.c | 97 +++++++++++----------- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/resources/dictionaries/en/street_types.txt b/resources/dictionaries/en/street_types.txt index f81b28ac..a4a04afd 100644 --- a/resources/dictionaries/en/street_types.txt +++ b/resources/dictionaries/en/street_types.txt @@ -69,7 +69,7 @@ corner|cnr|crn|cor corners|cnrs|crns|cors corseo|cseo corso|cso -country road|cr +county road|cr|c.r.|c.r|c r course|crse court|ct|crt courts|crts|cts diff --git a/src/address_expansion_data.c b/src/address_expansion_data.c index 590fc11d..14bbb51e 100644 --- a/src/address_expansion_data.c +++ b/src/address_expansion_data.c @@ -843,7 +843,7 @@ char *canonical_strings[] = { "corners", "corseo", "corso", - "country road", + "county road", "course", "court", "courts", @@ -63901,6 +63901,7 @@ address_expansion_rule_t expansion_rules[] = { {"views", 1, {DICTIONARY_STREET_TYPE}, 1079}, {"fare", 1, {DICTIONARY_STREET_TYPE}, -1}, {"theaters", 1, {DICTIONARY_PLACE_NAME}, -1}, + {"c.r.", 1, {DICTIONARY_STREET_TYPE}, 843}, {"bachelor of sciences", 1, {DICTIONARY_ACADEMIC_DEGREE}, 485}, {"swy", 1, {DICTIONARY_STREET_TYPE}, 1027}, {"norhwstrn", 1, {DICTIONARY_DIRECTIONAL}, 586}, @@ -64369,6 +64370,7 @@ address_expansion_rule_t expansion_rules[] = { {"s estrn", 1, {DICTIONARY_DIRECTIONAL}, 589}, {"sth", 1, {DICTIONARY_DIRECTIONAL}, 587}, {"profs", 1, {DICTIONARY_PERSONAL_TITLE}, 647}, + {"county road", 1, {DICTIONARY_STREET_TYPE}, 843}, {"rosebowl", 1, {DICTIONARY_STREET_TYPE}, 1023}, {"offc", 1, {DICTIONARY_UNIT}, 739}, {"mls", 1, {DICTIONARY_STREET_TYPE}, 957}, @@ -64979,7 +64981,6 @@ address_expansion_rule_t expansion_rules[] = { {"lieut governor", 1, {DICTIONARY_PERSONAL_TITLE}, 631}, {"cruiseway", 1, {DICTIONARY_STREET_TYPE}, 857}, {"return", 1, {DICTIONARY_STREET_TYPE}, 1010}, - {"country road", 1, {DICTIONARY_STREET_TYPE}, 843}, {"mse", 1, {DICTIONARY_ACADEMIC_DEGREE}, 502}, {"swstn", 1, {DICTIONARY_DIRECTIONAL}, 591}, {"plms", 1, {DICTIONARY_STREET_TYPE}, 968}, @@ -65789,7 +65790,7 @@ address_expansion_rule_t expansion_rules[] = { {"villages", 1, {DICTIONARY_STREET_TYPE}, 1080}, {"and", 1, {DICTIONARY_STOPWORD}, -1}, {"btm", 1, {DICTIONARY_STREET_TYPE}, 800}, - {"trace", 1, {DICTIONARY_STREET_TYPE}, 1061}, + {"c.r", 1, {DICTIONARY_STREET_TYPE}, 843}, {"dutchess", 1, {DICTIONARY_PERSONAL_TITLE}, -1}, {"lt", 1, {DICTIONARY_PERSONAL_TITLE}, 630}, {"esq", 1, {DICTIONARY_ACADEMIC_DEGREE}, 486}, @@ -65870,6 +65871,7 @@ address_expansion_rule_t expansion_rules[] = { {"rks", 1, {DICTIONARY_STREET_TYPE}, 1022}, {"road", 1, {DICTIONARY_STREET_TYPE}, 1018}, {"knolls", 1, {DICTIONARY_STREET_TYPE}, 935}, + {"trace", 1, {DICTIONARY_STREET_TYPE}, 1061}, {"nort w", 1, {DICTIONARY_DIRECTIONAL}, 585}, {"jetty", 1, {DICTIONARY_PLACE_NAME}, 715}, {"library", 1, {DICTIONARY_PLACE_NAME}, -1}, @@ -66000,6 +66002,7 @@ address_expansion_rule_t expansion_rules[] = { {"centre for the arts", 1, {DICTIONARY_PLACE_NAME}, 681}, {"vws", 1, {DICTIONARY_STREET_TYPE}, 1079}, {"bsmt", 1, {DICTIONARY_LEVEL}, 595}, + {"c r", 1, {DICTIONARY_STREET_TYPE}, 843}, {"crcs", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 684}, {"comm", 1, {DICTIONARY_STREET_TYPE}, 831}, {"garage", 1, {DICTIONARY_PLACE_NAME}, -1}, @@ -74182,48 +74185,48 @@ address_language_index_t expansion_languages[] = { {"da", 59643, 106}, {"de", 59749, 592}, {"el", 60341, 25}, - {"en", 60366, 2507}, - {"es", 62873, 1597}, - {"et", 64470, 140}, - {"eu", 64610, 22}, - {"fa", 64632, 16}, - {"fi", 64648, 67}, - {"fil", 64715, 3}, - {"fr", 64718, 1191}, - {"ga", 65909, 180}, - {"gd", 66089, 104}, - {"gl", 66193, 104}, - {"he", 66297, 10}, - {"hi", 66307, 4}, - {"hr", 66311, 25}, - {"hu", 66336, 58}, - {"id", 66394, 92}, - {"is", 66486, 37}, - {"it", 66523, 1235}, - {"ja", 67758, 162}, - {"ka", 67920, 26}, - {"ko", 67946, 47}, - {"lt", 67993, 29}, - {"lv", 68022, 9}, - {"ms", 68031, 43}, - {"mt", 68074, 20}, - {"nb", 68094, 100}, - {"nl", 68194, 221}, - {"oc", 68415, 12}, - {"pap", 68427, 4}, - {"pl", 68431, 347}, - {"pt", 68778, 995}, - {"ro", 69773, 81}, - {"ru", 69854, 158}, - {"si", 70012, 15}, - {"sk", 70027, 161}, - {"sl", 70188, 44}, - {"sr", 70232, 26}, - {"sv", 70258, 96}, - {"th", 70354, 16}, - {"tr", 70370, 52}, - {"uk", 70422, 72}, - {"ur", 70494, 7}, - {"vi", 70501, 167}, - {"zh", 70668, 134} + {"en", 60366, 2510}, + {"es", 62876, 1597}, + {"et", 64473, 140}, + {"eu", 64613, 22}, + {"fa", 64635, 16}, + {"fi", 64651, 67}, + {"fil", 64718, 3}, + {"fr", 64721, 1191}, + {"ga", 65912, 180}, + {"gd", 66092, 104}, + {"gl", 66196, 104}, + {"he", 66300, 10}, + {"hi", 66310, 4}, + {"hr", 66314, 25}, + {"hu", 66339, 58}, + {"id", 66397, 92}, + {"is", 66489, 37}, + {"it", 66526, 1235}, + {"ja", 67761, 162}, + {"ka", 67923, 26}, + {"ko", 67949, 47}, + {"lt", 67996, 29}, + {"lv", 68025, 9}, + {"ms", 68034, 43}, + {"mt", 68077, 20}, + {"nb", 68097, 100}, + {"nl", 68197, 221}, + {"oc", 68418, 12}, + {"pap", 68430, 4}, + {"pl", 68434, 347}, + {"pt", 68781, 995}, + {"ro", 69776, 81}, + {"ru", 69857, 158}, + {"si", 70015, 15}, + {"sk", 70030, 161}, + {"sl", 70191, 44}, + {"sr", 70235, 26}, + {"sv", 70261, 96}, + {"th", 70357, 16}, + {"tr", 70373, 52}, + {"uk", 70425, 72}, + {"ur", 70497, 7}, + {"vi", 70504, 167}, + {"zh", 70671, 134} };