Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / tools / postcodes.py

diff --git a/nominatim/tools/postcodes.py b/nominatim/tools/postcodes.py
index 3ab59d59f8dcbee540bd5ed1e74eaf10e5cfdd46..cfd242e24d8d358cf48f77f2930e8a1a7171ef03 100644 (file)
--- a/nominatim/tools/postcodes.py
+++ b/nominatim/tools/postcodes.py
@@ -9,7 +9,7 @@ from math import isfinite
 
 from psycopg2.extras import execute_values
 
 
 from psycopg2.extras import execute_values
 

-from nominatim.db.connection import _Connection, connect
+from nominatim.db.connection import connect

 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 


@@ -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)
             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(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
+                        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
                     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""")
 
                 WHERE pc IS NOT null AND cc IS NOT null
                 ORDER BY country_code, pc""")
 


@@ -203,5 +201,5 @@ def can_compute(dsn):
         Check that the place table exists so that
         postcodes can be computed.
     """
         Check that the place table exists so that
         postcodes can be computed.
     """

-    with _Connection(dsn) as conn:
+    with connect(dsn) as conn:

         return conn.table_exists('place')
         return conn.table_exists('place')