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

add new location_postcode table

Browse Source 
Artifical postcode centroids are now saved in there.
This commit is contained in:
Sarah Hoffmann
2017-06-27 21:10:34 +02:00
parent 3e9fb0dc84
commit 15dbb6383c
2 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/tables.sql
View File

@@ -197,8 +197,17 @@ CREATE TRIGGER place_before_delete BEFORE DELETE ON place
CREATE TRIGGER place_before_insert BEFORE INSERT ON place CREATE TRIGGER place_before_insert BEFORE INSERT ON place
FOR EACH ROW EXECUTE PROCEDURE place_insert(); FOR EACH ROW EXECUTE PROCEDURE place_insert();
DROP SEQUENCE IF EXISTS seq_postcodes; DROP TABLE IF EXISTS location_postcode;
CREATE SEQUENCE seq_postcodes start 1; CREATE TABLE location_postcode (
place_id BIGINT,
parent_place_id BIGINT,
rank_address SMALLINT,
indexed_status SMALLINT,
indexed_date TIMESTAMP,
country_code varchar(2),
postcode TEXT,
geometry GEOMETRY(Geometry, 4326)
);
DROP TABLE IF EXISTS import_polygon_error; DROP TABLE IF EXISTS import_polygon_error;
CREATE TABLE import_polygon_error ( CREATE TABLE import_polygon_error (

40
utils/setup.php
View File

@@ -493,22 +493,34 @@ if ($aCMDResult['import-tiger-data']) {
if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) { if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$oDB =& getDB(); $oDB =& getDB();
if (!pg_query($oDB->connection, 'DELETE from placex where osm_type=\'P\'')) fail(pg_last_error($oDB->connection)); if (!pg_query($oDB->connection, 'TRUNCATE location_postcode')) {
$sSQL = "insert into placex (osm_type,osm_id,class,type,address,country_code,geometry) "; fail(pg_last_error($oDB->connection));
$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 = "INSERT INTO location_postcode";
$sSQL .= "address->'postcode' as pc,"; $sSQL .= " (place_id, indexed_status, country_code, postcode, geometry) ";
$sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y "; $sSQL .= "SELECT nextval('seq_place'), 1, country_code,";
$sSQL .= "from placex where address ? 'postcode' group by country_code,pc) as x "; $sSQL .= " lower(trim (both ' ' from address->'postcode')) as pc,";
$sSQL .= "where ST_Point(x,y) is not null"; $sSQL .= " ST_Centroid(ST_Collect(ST_Centroid(geometry)))";
if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection)); $sSQL .= " FROM placex";
$sSQL .= " WHERE address ? 'postcode' AND address->'postcode' NOT SIMILAR TO '%(,|;)%'";
$sSQL .= " AND geometry IS NOT null";
$sSQL .= " GROUP BY country_code, pc";
if (!pg_query($oDB->connection, $sSQL)) {
fail(pg_last_error($oDB->connection));
}
if (CONST_Use_Extra_US_Postcodes) { if (CONST_Use_Extra_US_Postcodes) {
$sSQL = "insert into placex (osm_type,osm_id,class,type,address,country_code,geometry) "; // only add postcodes that are not yet available in OSM
$sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',"; $sSQL = "INSERT INTO location_postcode";
$sSQL .= "hstore('postcode', postcode),'us',"; $sSQL .= " (place_id, indexed_status, country_code, postcode, geometry) ";
$sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from us_postcode"; $sSQL .= "SELECT nextval('seq_place'), 1, 'us', postcode,";
$sSQL .= " ST_SetSRID(ST_Point(x,y),4326)";
$sSQL .= " FROM us_postcode WHERE postcode NOT IN";
$sSQL .= " (SELECT postcode FROM location_postcode";
$sSQL .= " WHERE country_code = 'us')";
if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection)); if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
} }
} }