add osm2pgsql update tests

[nominatim.git] / utils / warm.php

diff --git a/utils/warm.php b/utils/warm.php
index 89225426c90d5fb8049736363cedfcf393926f94..d707b9cbcfc92e6d0f5b0867e506226f9ee74113 100755 (executable)
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -25,9 +25,9 @@ $oDB =& getDB();
 $bVerbose = $aResult['verbose'];
 
 if (!$aResult['search-only']) {
 $bVerbose = $aResult['verbose'];
 
 if (!$aResult['search-only']) {

-    $oReverseGeocode = new ReverseGeocode($oDB);
+    $oReverseGeocode = new Nominatim\ReverseGeocode($oDB);

     $oReverseGeocode->setZoom(20);
     $oReverseGeocode->setZoom(20);

-    $oPlaceLookup = new PlaceLookup($oDB);
+    $oPlaceLookup = new Nominatim\PlaceLookup($oDB);

     $oPlaceLookup->setIncludeAddressDetails(true);
     $oPlaceLookup->setLanguagePreference(array('en'));
 
     $oPlaceLookup->setIncludeAddressDetails(true);
     $oPlaceLookup->setLanguagePreference(array('en'));
 


@@ -39,8 +39,11 @@ if (!$aResult['search-only']) {
         if ($bVerbose) echo "$fLat, $fLon = ";
         $aLookup = $oReverseGeocode->lookup($fLat, $fLon);
         if ($aLookup && $aLookup['place_id']) {
         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']);
+            $aDetails = $oPlaceLookup->lookup(
+                (int)$aLookup['place_id'],
+                $aLookup['type'],
+                $aLookup['fraction']
+            );

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


@@ -50,7 +53,7 @@ if (!$aResult['search-only']) {
 }
 
 if (!$aResult['reverse-only']) {
 }
 
 if (!$aResult['reverse-only']) {

-    $oGeocode =& new Geocode($oDB);
+    $oGeocode =& new Nominatim\Geocode($oDB);

 
     echo "Warm search: ";
     if ($bVerbose) echo "\n";
 
     echo "Warm search: ";
     if ($bVerbose) echo "\n";


@@ -64,4 +67,3 @@ if (!$aResult['reverse-only']) {
         else echo ".";
     }
 }
         else echo ".";
     }
 }

-