X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/effd8e12af440586594a18a04beb33abed260d15..64185ff94c6087eb7046f509f748e7b4e270ae65:/utils/warm.php?ds=inline

diff --git a/utils/warm.php b/utils/warm.php
index 55a58559..68fa751c 100755
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -6,13 +6,13 @@ 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'),
-);
+                "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');
@@ -25,39 +25,40 @@ $oDB =& getDB();
 $bVerbose = $aResult['verbose'];
 
 if (!$aResult['search-only']) {
-
-    $oReverseGeocode = new ReverseGeocode($oDB);
+    $oReverseGeocode = new Nominatim\ReverseGeocode($oDB);
     $oReverseGeocode->setZoom(20);
-    $oPlaceLookup = new PlaceLookup($oDB);
+    $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++) {
+    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->lookup((int)$aLookup['place_id'],
-                                              $aLookup['type'], $aLookup['fraction']);
+        if ($aLookup && $aLookup['place_id']) {
+            $aDetails = $oPlaceLookup->lookup(
+                (int)$aLookup['place_id'],
+                $aLookup['type'],
+                $aLookup['fraction']
+            );
             if ($bVerbose) echo $aDetails['langaddress']."\n";
+        } else {
+            echo ".";
         }
-        else echo ".";
     }
     echo "\n";
 }
 
 if (!$aResult['reverse-only']) {
-
-    $oGeocode =& new Geocode($oDB);
+    $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) {
+    foreach ($oDB->getCol($sSQL) as $sWord) {
         if ($bVerbose) echo "$sWord = ";
         $oGeocode->setLanguagePreference(array('en'));
         $oGeocode->setQuery($sWord);
@@ -66,4 +67,3 @@ if (!$aResult['reverse-only']) {
         else echo ".";
     }
 }
-