Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / warm.php

diff --git a/utils/warm.php b/utils/warm.php
old mode 100755 (executable)
new mode 100644 (file)
index 653bcf1..8ba746a
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -1,7 +1,5 @@
-#!@PHP_BIN@ -Cq

 <?php
 
 <?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');
 


@@ -20,7 +18,8 @@ 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/PlaceLookup.php');
 require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 

-$oDB =& getDB();
+$oDB = new Nominatim\DB();
+$oDB->connect();

 
 $bVerbose = $aResult['verbose'];
 
 
 $bVerbose = $aResult['verbose'];
 


@@ -37,13 +36,9 @@ if (!$aResult['search-only']) {
         $fLat = rand(-9000, 9000) / 100;
         $fLon = rand(-18000, 18000) / 100;
         if ($bVerbose) echo "$fLat, $fLon = ";
         $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']
-            );
+        $oLookup = $oReverseGeocode->lookup($fLat, $fLon);
+        if ($oLookup) {
+            $aDetails = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup));

             if ($bVerbose) echo $aDetails['langaddress']."\n";
         } else {
             echo '.';
             if ($bVerbose) echo $aDetails['langaddress']."\n";
         } else {
             echo '.';