X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/edc5733715a65158919c1abc4d765b754f5dc659..5c187e131a372d0cbdbba3372668862e3f1c47f9:/utils/warm.php

diff --git a/utils/warm.php b/utils/warm.php
index 923e2aba..18121eb6 100755
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -1,8 +1,9 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
+	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
 		"Tools to warm nominatim db",
@@ -26,7 +27,10 @@
 	if (!$aResult['search-only']) {
 
 		$oReverseGeocode = new ReverseGeocode($oDB);
-		$oReverseGeocode->setIncludeAddressDetails(true);
+		$oReverseGeocode->setZoom(20);
+		$oPlaceLookup = new PlaceLookup($oDB);
+		$oPlaceLookup->setIncludeAddressDetails(true);
+		$oPlaceLookup->setLanguagePreference(array('en'));
 
 		echo "Warm reverse: ";
 		if ($bVerbose) echo "\n";
@@ -34,11 +38,13 @@
 			$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";
+			$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 ".";
 		}
 		echo "\n";