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

move adding postcodes to word table to calculation step

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-07-16 20:32:21 +02:00
parent 5e54e78176
commit 3c9af7f151
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils/setup.php
View File

@@ -522,9 +522,6 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
$sSQL .= " WHERE country_code = 'us')";
if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
$sSQL = "SELECT count(getorcreate_postcode_id(postcode)) FROM us_postcode";
if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
}
// add missing postcodes for GB (if available)
@@ -536,8 +533,19 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
$sSQL .= " WHERE country_code = 'gb')";
if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
$sSQL = "SELECT count(getorcreate_postcode_id(postcode)) FROM gb_postcode";
if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
if (!$aCMDResult['all']) {
$sSQL = "DELETE FROM word WHERE class='place' and type='postcode'";
$sSQL .= "and word NOT IN (SELECT postcode FROM location_postcode)";
if (!pg_query($oDB->connection, $sSQL)) {
fail(pg_last_error($oDB->connection));
}
}
$sSQL = "SELECT count(getorcreate_postcode_id(v)) FROM ";
$sSQL .= "(SELECT distinct(postcode) FROM location_postcode) p";
if (!pg_query($oDB->connection, $sSQL)) {
fail(pg_last_error($oDB->connection));
}
}
if ($aCMDResult['osmosis-init']) {