X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/09935d41484d5e9ec450bb16170785849029f3da..30ead191463103fb4faceb52fc6fb4867bd41e18:/utils/warm.php diff --git a/utils/warm.php b/utils/warm.php old mode 100755 new mode 100644 index 653bcf10..5476eae0 --- a/utils/warm.php +++ b/utils/warm.php @@ -1,7 +1,5 @@ -#!@PHP_BIN@ -Cq connect(); $bVerbose = $aResult['verbose']; +function print_results($aResults, $bVerbose) +{ + if ($bVerbose) { + if ($aResults && count($aResults)) { + echo $aResults[0]['langaddress']."\n"; + } else { + echo "\n"; + } + } else { + echo '.'; + } +} + if (!$aResult['search-only']) { $oReverseGeocode = new Nominatim\ReverseGeocode($oDB); $oReverseGeocode->setZoom(20); @@ -37,17 +49,10 @@ if (!$aResult['search-only']) { $fLat = rand(-9000, 9000) / 100; $fLon = rand(-18000, 18000) / 100; 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'] - ); - if ($bVerbose) echo $aDetails['langaddress']."\n"; - } else { - echo '.'; - } + + $oLookup = $oReverseGeocode->lookup($fLat, $fLon); + $aSearchResults = $oLookup ? $oPlaceLookup->lookup(array($oLookup->iId => $oLookup)) : null; + print_results($aSearchResults, $bVerbose); } echo "\n"; } @@ -57,13 +62,14 @@ if (!$aResult['reverse-only']) { 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'; + $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 '.'; + print_results($aSearchResults, $bVerbose); } + echo "\n"; }