safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Properly validate postcodes with country code

Browse Source 
Include postcode pattern in postcode normalisation regex, instead of
removing it from postcode pattern in config.

It properly handles postcode validation and normalization when country code
is part of the postcode, e.g. for Isle of Man, Jersey, Anguilla, Andorra,
Cayman Islands and more.

Fixes #3227.
This commit is contained in:
Paweł Wroniszewski
2023-10-17 00:44:24 +02:00
committed by Paweł Wroniszewski
parent 95c3181a35
commit fbe40e005d
3 changed files with 146 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nominatim/data/postcode_format.py
View File

@@ -25,7 +25,7 @@ class CountryPostcodeMatcher:
pc_pattern = config['pattern'].replace('d', '[0-9]').replace('l', '[A-Z]')
self.norm_pattern = re.compile(f'\\s*(?:{country_code.upper()}[ -]?)?(.*)\\s*')
self.norm_pattern = re.compile(f'\\s*(?:{country_code.upper()}[ -]?)?({pc_pattern})\\s*')
self.pattern = re.compile(pc_pattern)
self.output = config.get('output', r'\g<0>')