Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / warm.php

diff --git a/utils/warm.php b/utils/warm.php
index da2ff0c13801db7e88d4e28de00fabc16cf9e6be..0ac13c469d6918c936f97a219f0711fa11c2f453 100755 (executable)
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -6,12 +6,12 @@ require_once(CONST_BasePath.'/lib/init-cmd.php');
 ini_set('memory_limit', '800M');
 
 $aCMDOptions = array(
 ini_set('memory_limit', '800M');
 
 $aCMDOptions = array(

-                "Tools to warm nominatim db",
+                '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('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'),
+                array('search-only', '', 0, 1, 0, 0, 'bool', 'Warm search only'),

                );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 
                );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 


@@ -25,13 +25,13 @@ $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'));
 

-    echo "Warm reverse: ";
+    echo 'Warm reverse: ';

     if ($bVerbose) echo "\n";
     for ($i = 0; $i < 1000; $i++) {
         $fLat = rand(-9000, 9000) / 100;
     if ($bVerbose) echo "\n";
     for ($i = 0; $i < 1000; $i++) {
         $fLat = rand(-9000, 9000) / 100;


@@ -46,16 +46,16 @@ if (!$aResult['search-only']) {
             );
             if ($bVerbose) echo $aDetails['langaddress']."\n";
         } else {
             );
             if ($bVerbose) echo $aDetails['langaddress']."\n";
         } else {

-            echo ".";
+            echo '.';

         }
     }
     echo "\n";
 }
 
 if (!$aResult['reverse-only']) {
         }
     }
     echo "\n";
 }
 
 if (!$aResult['reverse-only']) {

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

 
 

-    echo "Warm search: ";
+    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 "\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) {


@@ -64,6 +64,6 @@ if (!$aResult['reverse-only']) {
         $oGeocode->setQuery($sWord);
         $aSearchResults = $oGeocode->lookup();
         if ($bVerbose) echo $aSearchResults[0]['langaddress']."\n";
         $oGeocode->setQuery($sWord);
         $aSearchResults = $oGeocode->lookup();
         if ($bVerbose) echo $aSearchResults[0]['langaddress']."\n";

-        else echo ".";
+        else echo '.';

     }
 }
     }
 }