hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-10 12:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

correctly handle removing all postcodes for country

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-05-13 09:59:34 +02:00
parent bf864b2c54
commit 1ccd4360b4
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nominatim/tools/postcodes.py
View File

@@ -142,6 +142,13 @@ def update_postcodes(dsn, project_dir, tokenizer):
"""
with tokenizer.name_analyzer() as analyzer:
with connect(dsn) as conn:
# First get the list of countries that currently have postcodes.
# (Doing this before starting to insert, so it is fast on import.)
with conn.cursor() as cur:
cur.execute("SELECT DISTINCT country_code FROM location_postcode")
todo_countries = set((row[0] for row in cur))
# Recompute the list of valid postcodes from placex.
with conn.cursor(name="placex_postcodes") as cur:
cur.execute("""SELECT country_code, pc, ST_X(centroid), ST_Y(centroid)
FROM (
@@ -161,11 +168,16 @@ def update_postcodes(dsn, project_dir, tokenizer):
if collector is not None:
collector.commit(conn, analyzer, project_dir)
collector = _CountryPostcodesCollector(country)
todo_countries.discard(country)
collector.add(postcode, x, y)
if collector is not None:
collector.commit(conn, analyzer, project_dir)
# Now handle any countries that are only in the postcode table.
for country in todo_countries:
_CountryPostcodesCollector(country).commit(conn, analyzer, project_dir)
conn.commit()
analyzer.update_postcodes_from_db()