osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-23 05:35:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

* use osm2pgsql from $PATH if none present locally

Browse Source 
* do not display usage() on successful postcode generation
This commit is contained in:
Frederik Ramm 2011-02-18 09:18:37 +00:00
parent 4255f5a0d0
commit a4c63c094f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/setup.php
View File

@ -96,8 +96,10 @@
echo "Import\n"; echo "Import\n";
$bDidSomething = true; $bDidSomething = true;
if (!file_exists(CONST_BasePath.'/osm2pgsql/osm2pgsql')) fail("please download and build osm2pgsql"); $osm2pgsql = CONST_BasePath.'/osm2pgsql/osm2pgsql';
passthru(CONST_BasePath.'/osm2pgsql/osm2pgsql -lsc -O gazetteer -C 10000 --hstore -d nominatim '.$aCMDResult['osm-file']); if (!file_exists($osm2pgsql)) $osm2pgsql = trim(`which osm2pgsql`);
if (!file_exists($osm2pgsql)) fail("please download and build osm2pgsql");
passthru($osm2pgsql.' -lsc -O gazetteer -C 10000 --hstore -d nominatim '.$aCMDResult['osm-file']);
$oDB =& getDB(); $oDB =& getDB();
$x = $oDB->getRow('select * from place limit 1'); $x = $oDB->getRow('select * from place limit 1');
@ -288,6 +290,7 @@
if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all'])
{ {
$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, '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 = "insert into placex (osm_type,osm_id,class,type,postcode,country_code,geometry) ";