|
27 | 27 | sql10_regex = """regexp_replace(regexp_replace(regexp_replace(regexp_replace(regexp_replace(regexp_replace(regexp_replace(regexp_replace({0},
|
28 | 28 | '([0-9]+-[а-я]{{2}})( |$)', '_', 'g'), -- Bulgaria
|
29 | 29 | '[-\\[\\]\\{{\\}}\\(\\)\"\\\\/]', '', 'g'),
|
30 |
| -'(1st|2nd|3rd|[04-9]th)( |$)', '_', 'g'), |
31 |
| -'(1ra|2da|3ra|4ta|5ta|6ta|7ma|8va|9na|0ma|1er|2do|3ro|4to|5to|6to|7mo|8vo|9no|0mo)( |$)', '_', 'g'), |
| 30 | +'[0-9]*(1st|2nd|3rd|[04-9]th)( |$)', '_', 'g'), |
| 31 | +'[0-9]*(1ra|2da|3ra|4ta|5ta|6ta|7ma|8va|9na|0ma|1er|2do|3ro|4to|5to|6to|7mo|8vo|9no|0mo)( |$)', '_', 'g'), -- Spanish |
32 | 32 | '[/.0-9\u0660-\u0669\u06F0-\u06F9\u2160-\u2188]', ' ', 'g'), -- Numbers, Arabic numbers (u06**), Roman numbers (u21**)
|
33 | 33 | '(^| )[a-zA-Z](?= |$)', '\\1', 'g'),
|
34 | 34 | '(^| )[IVXLDCM]+(?= |$)', '\\1', 'g'),
|
@@ -79,7 +79,7 @@ class Analyser_Osmosis_Highway_Name_Close(Analyser_Osmosis):
|
79 | 79 | def __init__(self, config, logger = None):
|
80 | 80 | Analyser_Osmosis.__init__(self, config, logger)
|
81 | 81 |
|
82 |
| - # Check langues for country are writen with alphabets |
| 82 | + # Check that languages for countries are written with alphabets |
83 | 83 | self.alphabet = 'language' in config.options and languages.languages_are_alphabets(config.options['language'])
|
84 | 84 |
|
85 | 85 | if self.alphabet:
|
|
0 commit comments