From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 6 Jun 2017 18:42:13 +0000 (+0200)
Subject: adapt postcode centroid import to new address hstore
X-Git-Tag: v3.0.0~14
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/0628aa887fb8b0b367fa8aacb4d4473661b77fa5

adapt postcode centroid import to new address hstore

The postcode now needs to be saved in address->'postcode'
not in the postcode column which is derived only later while
indexing.

Fixes #746.

Thanks to @kkoop.
---

diff --git a/utils/setup.php b/utils/setup.php
index fe9926b6..eeba0a28 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -490,17 +490,20 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
     $bDidSomething = true;
     $oDB =& getDB();
     if (!pg_query($oDB->connection, 'DELETE from placex where osm_type=\'P\'')) fail(pg_last_error($oDB->connection));
-    $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,country_code,geometry) ";
-    $sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,country_code,";
-    $sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select country_code,postcode,";
+    $sSQL = "insert into placex (osm_type,osm_id,class,type,address,country_code,geometry) ";
+    $sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',";
+    $sSQL .= "hstore('postcode', pc),country_code,";
+    $sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select country_code,";
+    $sSQL .= "address->'postcode' as pc,";
     $sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y ";
-    $sSQL .= "from placex where postcode is not null group by country_code,postcode) as x ";
+    $sSQL .= "from placex where address ? 'postcode' group by country_code,pc) as x ";
     $sSQL .= "where ST_Point(x,y) is not null";
     if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
 
     if (CONST_Use_Extra_US_Postcodes) {
-        $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,country_code,geometry) ";
-        $sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,'us',";
+        $sSQL = "insert into placex (osm_type,osm_id,class,type,address,country_code,geometry) ";
+        $sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',";
+        $sSQL .= "hstore('postcode', postcode),'us',";
         $sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from us_postcode";
         if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
     }