hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

postcodes: introduce a default pattern for countries without postcodes

Browse Source
This commit is contained in:
Sarah Hoffmann
2022-05-24 18:25:37 +02:00
parent 5ba75df507
commit 18864afa8a
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nominatim/tokenizer/sanitizers/clean_postcodes.py
View File

@@ -75,6 +75,12 @@ class _PostcodeSanitizer:
else:
raise UsageError(f"Invalid entry 'postcode' for country '{ccode}'")
default_pattern = config.get('default-pattern')
if default_pattern is not None and isinstance(default_pattern, str):
self.default_matcher = _PostcodeMatcher('', {'pattern': default_pattern})
else:
self.default_matcher = None
def __call__(self, obj):
if not obj.address:
@@ -103,14 +109,16 @@ class _PostcodeSanitizer:
if country in self.country_without_postcode:
return None
matcher = self.country_matcher.get(country)
if matcher is not None:
match = matcher.match(postcode)
if match is None:
return None
return matcher.normalize(match), ' '.join(match.groups())
matcher = self.country_matcher.get(country, self.default_matcher)
if matcher is None:
return postcode.upper(), ''
match = matcher.match(postcode)
if match is None:
return None
return matcher.normalize(match), ' '.join(match.groups())
return postcode.upper(), ''