safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests 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

1
data/words.sql
View File

@@ -29787,7 +29787,6 @@ st 5557484
-- prefill word table -- prefill word table
select count(make_keywords(v)) from (select distinct svals(name) as v from place) as w where v is not null; select count(make_keywords(v)) from (select distinct svals(name) as v from place) as w where v is not null;
select count(getorcreate_postcode_id(v)) from (select distinct address->'postcode' as v from place where address ? 'postcode' and address->'postcode' not similar to '%(,|;)%') as w where v is not null;
select count(getorcreate_housenumber_id(make_standard_name(v))) from (select distinct address->'housenumber' as v from place where address ? 'housenumber') as w; select count(getorcreate_housenumber_id(make_standard_name(v))) from (select distinct address->'housenumber' as v from place where address ? 'housenumber') as w;
-- copy the word frequencies -- copy the word frequencies

18
utils/setup.php
View File

@@ -522,9 +522,6 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
$sSQL .= " WHERE country_code = 'us')"; $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));
$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) // add missing postcodes for GB (if available)
@@ -536,8 +533,19 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
$sSQL .= " WHERE country_code = 'gb')"; $sSQL .= " WHERE country_code = 'gb')";
if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection)); if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
$sSQL = "SELECT count(getorcreate_postcode_id(postcode)) FROM gb_postcode"; if (!$aCMDResult['all']) {
if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection)); $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']) { if ($aCMDResult['osmosis-init']) {