X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1b33999f105a0d2499b880f77fefae29346bab2d..7cc33a839cbd8b42955a9e8d059b67afa22eab59:/utils/warm.php

diff --git a/utils/warm.php b/utils/warm.php
old mode 100755
new mode 100644
index b034fa8c..5476eae0
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -1,68 +1,75 @@
-#!/usr/bin/php -Cq
 <?php
 
-	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
-	require_once(CONST_BasePath.'/lib/init-cmd.php');
-	ini_set('memory_limit', '800M');
+require_once(CONST_BasePath.'/lib/init-cmd.php');
+ini_set('memory_limit', '800M');
 
-	$aCMDOptions = array(
-		"Tools to warm nominatim db",
-		array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
-		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'),
-	);
-	getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
+$aCMDOptions = array(
+                'Tools to warm nominatim db',
+                array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
+                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 search only'),
+               );
+getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 
-	require_once(CONST_BasePath.'/lib/log.php');
-	require_once(CONST_BasePath.'/lib/Geocode.php');
-	require_once(CONST_BasePath.'/lib/PlaceLookup.php');
-	require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
+require_once(CONST_BasePath.'/lib/log.php');
+require_once(CONST_BasePath.'/lib/Geocode.php');
+require_once(CONST_BasePath.'/lib/PlaceLookup.php');
+require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 
-	$oDB =& getDB();
+$oDB = new Nominatim\DB();
+$oDB->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 "<not found>\n";
+        }
+    } else {
+        echo '.';
+    }
+}
 
-		$oReverseGeocode = new ReverseGeocode($oDB);
-		$oReverseGeocode->setZoom(20);
-		$oPlaceLookup = new PlaceLookup($oDB);
-		$oPlaceLookup->setIncludeAddressDetails(true);
-		$oPlaceLookup->setLanguagePreference(array('en'));
+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 = ";
-			$aLookup = $oReverseGeocode->lookup($fLat, $fLon);
-			if ($aLookup && $aLookup['place_id'])
-			{
-				$aDetails = $oPlaceLookup->lookupPlace($aLookup);
-				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";
+}