X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a4b30fc64962565469765521586b6736db99c0f0..cca646a19e8013f39911a5c4faaaa15b89ce083f:/utils/update.php diff --git a/utils/update.php b/utils/update.php index f0b45b42..135bf193 100644 --- a/utils/update.php +++ b/utils/update.php @@ -70,6 +70,8 @@ $oOsm2pgsqlCmd = (new \Nominatim\Shell(CONST_Osm2pgsql_Binary)) ->addParams('--latlong') ->addParams('--append') ->addParams('--slim') + ->addParams('--with-forward-dependencies', 'false') + ->addParams('--log-progress', 'true') ->addParams('--number-processes', 1) ->addParams('--cache', $iCacheMemory) ->addParams('--output', 'gazetteer') @@ -241,15 +243,15 @@ if (isset($aResult['import-way']) && $aResult['import-way']) { if ($bUseOSMApi) { $sContentURL = 'https://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full'; } else { - $sContentURL = 'https://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;'; + $sContentURL = 'https://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');%3E;);out%20meta;'; } } if (isset($aResult['import-relation']) && $aResult['import-relation']) { if ($bUseOSMApi) { - $sContentURLsModifyXMLstr = 'https://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full'; + $sContentURL = 'https://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full'; } else { - $sContentURL = 'https://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;'; + $sContentURL = 'https://overpass-api.de/api/interpreter?data=(rel(id:'.$aResult['import-relation'].');%3E;);out%20meta;'; } }