details page: differentiate between spheric distance and distance in meters

[nominatim.git] / utils / warm.php

diff --git a/utils/warm.php b/utils/warm.php
old mode 100755 (executable)
new mode 100644 (file)
index 55a5855..8ba746a
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -1,18 +1,16 @@
-#!/usr/bin/php -Cq

 <?php
 
 <?php
 

-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');

 require_once(CONST_BasePath.'/lib/init-cmd.php');
 ini_set('memory_limit', '800M');
 
 $aCMDOptions = array(
 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');
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 
 require_once(CONST_BasePath.'/lib/log.php');


@@ -20,50 +18,47 @@ 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'];
 
 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";
     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 = ";
         $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";
             if ($bVerbose) echo $aDetails['langaddress']."\n";

+        } else {
+            echo '.';

         }
         }

-        else echo ".";

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

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

 
 

-    $oGeocode =& new 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';
     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);
         $aSearchResults = $oGeocode->lookup();
         if ($bVerbose) echo $aSearchResults[0]['langaddress']."\n";
         if ($bVerbose) echo "$sWord = ";
         $oGeocode->setLanguagePreference(array('en'));
         $oGeocode->setQuery($sWord);
         $aSearchResults = $oGeocode->lookup();
         if ($bVerbose) echo $aSearchResults[0]['langaddress']."\n";

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

     }
 }
     }
 }

-