X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a4ecd9d73e93a56aeee336c7fa7e18aa42bd9e03..7cc33a839cbd8b42955a9e8d059b67afa22eab59:/utils/warm.php diff --git a/utils/warm.php b/utils/warm.php old mode 100755 new mode 100644 index 72eac27a..5476eae0 --- a/utils/warm.php +++ b/utils/warm.php @@ -1,64 +1,75 @@ -#!/usr/bin/php -Cq connect(); - $bVerbose = $aResult['verbose']; +$bVerbose = $aResult['verbose']; - if (!$aResult['search-only']) { +function print_results($aResults, $bVerbose) +{ + if ($bVerbose) { + if ($aResults && count($aResults)) { + echo $aResults[0]['langaddress']."\n"; + } else { + echo "\n"; + } + } else { + echo '.'; + } +} - $oReverseGeocode = new ReverseGeocode($oDB); - $oReverseGeocode->setIncludeAddressDetails(true); +if (!$aResult['search-only']) { + $oReverseGeocode = new Nominatim\ReverseGeocode($oDB); + $oReverseGeocode->setZoom(20); + $oPlaceLookup = new Nominatim\PlaceLookup($oDB); + $oPlaceLookup->setIncludeAddressDetails(true); + $oPlaceLookup->setLanguagePreference(array('en')); - echo "Warm reverse: "; - if ($bVerbose) echo "\n"; - for($i = 0; $i < 1000; $i++) { - $fLat = rand(-9000, 9000) / 100; - $fLon = rand(-18000, 18000) / 100; - if ($bVerbose) echo "$fLat, $fLon = "; - $oReverseGeocode->setLanguagePreference(array('en')); - $oReverseGeocode->setLatLon($fLat, $fLon); - $oReverseGeocode->setZoom(20); - $aDetails = $oReverseGeocode->lookup(); - if ($bVerbose) echo $aDetails['langaddress']."\n"; - else echo "."; - } - echo "\n"; - } + echo 'Warm reverse: '; + if ($bVerbose) echo "\n"; + for ($i = 0; $i < 1000; $i++) { + $fLat = rand(-9000, 9000) / 100; + $fLon = rand(-18000, 18000) / 100; + if ($bVerbose) echo "$fLat, $fLon = "; - if (!$aResult['reverse-only']) { + $oLookup = $oReverseGeocode->lookup($fLat, $fLon); + $aSearchResults = $oLookup ? $oPlaceLookup->lookup(array($oLookup->iId => $oLookup)) : null; + print_results($aSearchResults, $bVerbose); + } + echo "\n"; +} - $oGeocode =& new Geocode($oDB); +if (!$aResult['reverse-only']) { + $oGeocode = new Nominatim\Geocode($oDB); - echo "Warm search: "; - if ($bVerbose) echo "\n"; - $sSQL = 'select word from word where word is not null order by search_name_count desc limit 1000'; - foreach($oDB->getCol($sSQL) as $sWord) { - if ($bVerbose) echo "$sWord = "; - $oGeocode->setLanguagePreference(array('en')); - $oGeocode->setQuery($sWord); - $aSearchResults = $oGeocode->lookup(); - if ($bVerbose) echo $aSearchResults[0]['langaddress']."\n"; - else echo "."; - } - } + echo 'Warm search: '; + if ($bVerbose) echo "\n"; + $sSQL = 'SELECT word FROM word WHERE word is not null ORDER BY search_name_count DESC LIMIT 1000'; + foreach ($oDB->getCol($sSQL) as $sWord) { + if ($bVerbose) echo "$sWord = "; + $oGeocode->setLanguagePreference(array('en')); + $oGeocode->setQuery($sWord); + $aSearchResults = $oGeocode->lookup(); + print_results($aSearchResults, $bVerbose); + } + echo "\n"; +}