hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use place instead of placex to compute postcodes

Browse Source
This commit is contained in:
AntoJvlt
2021-06-04 21:26:13 +02:00
committed by root
parent 38fbc4fcbb
commit a4733eed90
4 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
nominatim/tools/postcodes.py
View File

@@ -163,17 +163,19 @@ def update_postcodes(dsn, project_dir, tokenizer):
# 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 (
SELECT country_code,
token_normalized_postcode(address->'postcode') as pc,
ST_Centroid(ST_Collect(ST_Centroid(geometry))) as centroid
FROM placex
WHERE address ? 'postcode' and geometry IS NOT null
and country_code is not null
GROUP BY country_code, pc) xx
WHERE pc is not null
ORDER BY country_code, pc""")
cur.execute("""
SELECT cc as country_code, pc, ST_X(centroid), ST_Y(centroid)
FROM (
SELECT
COALESCE(plx.country_code, get_country_code(ST_Centroid(pl.geometry))) as cc,
token_normalized_postcode(pl.address->'postcode') as pc,
ST_Centroid(ST_Collect(ST_Centroid(pl.geometry))) as centroid
FROM place AS pl LEFT OUTER JOIN placex AS plx ON pl.osm_id = plx.osm_id AND pl.osm_type = plx.osm_type
WHERE pl.address ? 'postcode' AND pl.geometry IS NOT null
GROUP BY cc, pc
) xx
WHERE pc IS NOT null AND cc IS NOT null
ORDER BY country_code, pc""")
collector = None
@@ -195,3 +197,15 @@ def update_postcodes(dsn, project_dir, tokenizer):
conn.commit()
analyzer.update_postcodes_from_db()
def can_compute(dsn):
"""
Check that the place table exists so that
postcodes can be computed.
"""
with connect(dsn) as conn:
with conn.cursor() as cur:
cur.execute("""
select exists(select 1 from information_schema.tables where table_name='place')
""")
return cur.fetchone()[0]