Merge pull request #490 from lonvia/streamline-class-interfaces

[nominatim.git] / utils / warm.php

diff --git a/utils/warm.php b/utils/warm.php
index 923e2aba12bb572d7b4804598d614ebf9bcbf675..18121eb66fb470ca4ceb78bcc0024811fa38cd9a 100755 (executable)
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -1,8 +1,9 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
+       require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+       require_once(CONST_BasePath.'/lib/init-cmd.php');
+       ini_set('memory_limit', '800M');
 
        $aCMDOptions = array(
                "Tools to warm nominatim db",
@@ -26,7 +27,10 @@
        if (!$aResult['search-only']) {
 
                $oReverseGeocode = new ReverseGeocode($oDB);
-               $oReverseGeocode->setIncludeAddressDetails(true);
+               $oReverseGeocode->setZoom(20);
+               $oPlaceLookup = new PlaceLookup($oDB);
+               $oPlaceLookup->setIncludeAddressDetails(true);
+               $oPlaceLookup->setLanguagePreference(array('en'));
 
                echo "Warm reverse: ";
                if ($bVerbose) echo "\n";
@@ -34,11 +38,13 @@
                        $fLat = rand(-9000, 9000) / 100;
                        $fLon = rand(-18000, 18000) / 100;
                        if ($bVerbose) echo "$fLat, $fLon = ";
-                       $oReverseGeocode->setLanguagePreference(array('en'));
-                       $oReverseGeocode->setLatLon($fLat, $fLon);
-                       $oReverseGeocode->setZoom(20);
-                       $aDetails = $oReverseGeocode->lookup();
-                       if ($bVerbose) echo $aDetails['langaddress']."\n";
+                       $aLookup = $oReverseGeocode->lookup($fLat, $fLon);
+                       if ($aLookup && $aLookup['place_id'])
+                       {
+                               $aDetails = $oPlaceLookup->lookup((int)$aLookup['place_id'],
+                                                                 $aLookup['type'], $aLookup['fraction']);
+                               if ($bVerbose) echo $aDetails['langaddress']."\n";
+                       }
                        else echo ".";
                }
                echo "\n";