X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1c175e3a67fbfb94f29c47bdcd02fb28136e591b..a2edbbf78a9612193d7751806d310de385549dee:/nominatim/tools/postcodes.py?ds=sidebyside diff --git a/nominatim/tools/postcodes.py b/nominatim/tools/postcodes.py index 2be3ced6..cfd242e2 100644 --- a/nominatim/tools/postcodes.py +++ b/nominatim/tools/postcodes.py @@ -165,15 +165,13 @@ def update_postcodes(dsn, project_dir, tokenizer): with conn.cursor(name="placex_postcodes") as cur: cur.execute(""" SELECT cc as country_code, pc, ST_X(centroid), ST_Y(centroid) - FROM ( - SELECT + FROM (SELECT COALESCE(plx.country_code, get_country_code(ST_Centroid(pl.geometry))) as cc, token_normalized_postcode(pl.address->'postcode') as pc, - COALESCE(ST_Centroid(ST_Collect(plx.centroid)), 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 + ST_Centroid(ST_Collect(COALESCE(plx.centroid, 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 + GROUP BY cc, pc) xx WHERE pc IS NOT null AND cc IS NOT null ORDER BY country_code, pc""")