X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cf39e07dba72373302e2d1a48de3083339d0decb..c2629bc08d081262a7fd1cbd9d52acb5f44bd8ec:/utils/warm.php diff --git a/utils/warm.php b/utils/warm.php index 89225426..68fa751c 100755 --- a/utils/warm.php +++ b/utils/warm.php @@ -11,7 +11,7 @@ $aCMDOptions = array( array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'), array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'), array('reverse-only', '', 0, 1, 0, 0, 'bool', 'Warm reverse only'), - array('search-only', '', 0, 1, 0, 0, 'bool', 'Warm reverse only'), + array('search-only', '', 0, 1, 0, 0, 'bool', 'Warm search only'), ); getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true); @@ -25,9 +25,9 @@ $oDB =& getDB(); $bVerbose = $aResult['verbose']; if (!$aResult['search-only']) { - $oReverseGeocode = new ReverseGeocode($oDB); + $oReverseGeocode = new Nominatim\ReverseGeocode($oDB); $oReverseGeocode->setZoom(20); - $oPlaceLookup = new PlaceLookup($oDB); + $oPlaceLookup = new Nominatim\PlaceLookup($oDB); $oPlaceLookup->setIncludeAddressDetails(true); $oPlaceLookup->setLanguagePreference(array('en')); @@ -39,8 +39,11 @@ if (!$aResult['search-only']) { if ($bVerbose) echo "$fLat, $fLon = "; $aLookup = $oReverseGeocode->lookup($fLat, $fLon); if ($aLookup && $aLookup['place_id']) { - $aDetails = $oPlaceLookup->lookup((int)$aLookup['place_id'], - $aLookup['type'], $aLookup['fraction']); + $aDetails = $oPlaceLookup->lookup( + (int)$aLookup['place_id'], + $aLookup['type'], + $aLookup['fraction'] + ); if ($bVerbose) echo $aDetails['langaddress']."\n"; } else { echo "."; @@ -50,7 +53,7 @@ if (!$aResult['search-only']) { } if (!$aResult['reverse-only']) { - $oGeocode =& new Geocode($oDB); + $oGeocode = new Nominatim\Geocode($oDB); echo "Warm search: "; if ($bVerbose) echo "\n"; @@ -64,4 +67,3 @@ if (!$aResult['reverse-only']) { else echo "."; } } -