Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / warm.php

diff --git a/utils/warm.php b/utils/warm.php
index a7a6ada649bab21f36a797a5e04df7b29610fa6d..68fa751ca6d1d10a01a6ce646eaa30ea2692b3d8 100755 (executable)
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -11,7 +11,7 @@ $aCMDOptions = array(
                 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('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,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'));
 


@@ -53,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";


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

-