Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index ab9446e0ebd757837d819a706f250b5a3c1ac408..af3262f9e7e866780be904fa7b870aed52471b33 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -18,7 +18,7 @@ class Geocode
     protected $aLangPrefOrder = array();
 
     protected $aExcludePlaceIDs = array();
     protected $aLangPrefOrder = array();
 
     protected $aExcludePlaceIDs = array();

-    protected $bReverseInPlan = false;
+    protected $bReverseInPlan = true;

 
     protected $iLimit = 20;
     protected $iFinalLimit = 10;
 
     protected $iLimit = 20;
     protected $iFinalLimit = 10;


@@ -245,7 +245,6 @@ class Geocode
         }
 
         $this->oPlaceLookup->loadParamArray($oParams, $sForceGeometryType);
         }
 
         $this->oPlaceLookup->loadParamArray($oParams, $sForceGeometryType);

-        $this->oPlaceLookup->setIncludePolygonAsPoints($oParams->getBool('polygon'));

         $this->oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', false));
     }
 
         $this->oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', false));
     }
 


@@ -643,12 +642,6 @@ class Geocode
             $oValidTokens = new TokenList();
 
             if (!empty($aTokens)) {
             $oValidTokens = new TokenList();
 
             if (!empty($aTokens)) {

-                $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
-                $sSQL .= ' FROM word ';
-                $sSQL .= ' WHERE word_token in ('.join(',', $this->oDB->getDBQuotedList($aTokens)).')';
-
-                Debug::printSQL($sSQL);
-

                 $oValidTokens->addTokensFromDB(
                     $this->oDB,
                     $aTokens,
                 $oValidTokens->addTokensFromDB(
                     $this->oDB,
                     $aTokens,


@@ -777,7 +770,7 @@ class Geocode
                         }
                     }
 
                         }
                     }
 

-                    if ($iQueryLoop > 20) break;
+                    //if ($iQueryLoop > 20) break;

                 }
 
                 if (!empty($aResults)) {
                 }
 
                 if (!empty($aResults)) {


@@ -849,8 +842,8 @@ class Geocode
                 }
 
                 if (!empty($aResults)) break;
                 }
 
                 if (!empty($aResults)) break;

-                if ($iGroupLoop > 4) break;
-                if ($iQueryLoop > 30) break;
+                //if ($iGroupLoop > 4) break;
+                //if ($iQueryLoop > 30) break;

             }
         } else {
             // Just interpret as a reverse geocode
             }
         } else {
             // Just interpret as a reverse geocode


@@ -888,7 +881,6 @@ class Geocode
 
         $aSearchResults = $this->oPlaceLookup->lookup($aResults);
 
 
         $aSearchResults = $this->oPlaceLookup->lookup($aResults);
 

-        $aClassType = ClassTypes\getListWithImportance();

         $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);
         foreach ($aRecheckWords as $i => $sWord) {
             if (!preg_match('/[\pL\pN]/', $sWord)) unset($aRecheckWords[$i]);
         $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);
         foreach ($aRecheckWords as $i => $sWord) {
             if (!preg_match('/[\pL\pN]/', $sWord)) unset($aRecheckWords[$i]);


@@ -897,27 +889,23 @@ class Geocode
         Debug::printVar('Recheck words', $aRecheckWords);
 
         foreach ($aSearchResults as $iIdx => $aResult) {
         Debug::printVar('Recheck words', $aRecheckWords);
 
         foreach ($aSearchResults as $iIdx => $aResult) {

-            // Default
-            $fDiameter = ClassTypes\getProperty($aResult, 'defdiameter', 0.0001);
+            $fRadius = ClassTypes\getDefRadius($aResult);

 
 

-            $aOutlineResult = $this->oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
+            $aOutlineResult = $this->oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fRadius);

             if ($aOutlineResult) {
                 $aResult = array_merge($aResult, $aOutlineResult);
             }
 
             // Is there an icon set for this type of result?
             if ($aOutlineResult) {
                 $aResult = array_merge($aResult, $aOutlineResult);
             }
 
             // Is there an icon set for this type of result?

-            $aClassInfo = ClassTypes\getInfo($aResult);
-
-            if ($aClassInfo) {
-                if (isset($aClassInfo['icon'])) {
-                    $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassInfo['icon'].'.p.20.png';
-                }
-
-                if (isset($aClassInfo['label'])) {
-                    $aResult['label'] = $aClassInfo['label'];
-                }
+            $sIcon = ClassTypes\getIconFile($aResult);
+            if (isset($sIcon)) {
+                $aResult['icon'] = $sIcon;

             }
 
             }
 

+            $sLabel = ClassTypes\getLabel($aResult);
+            if (isset($sLabel)) {
+                $aResult['label'] = $sLabel;
+            }

             $aResult['name'] = $aResult['langaddress'];
 
             if ($oCtx->hasNearPoint()) {
             $aResult['name'] = $aResult['langaddress'];
 
             if ($oCtx->hasNearPoint()) {


@@ -947,10 +935,9 @@ class Geocode
                 // - number of exact matches from the query
                 $aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches;
                 // - importance of the class/type
                 // - number of exact matches from the query
                 $aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches;
                 // - importance of the class/type

-                if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
-                    && $aClassType[$aResult['class'].':'.$aResult['type']]['importance']
-                ) {
-                    $aResult['foundorder'] += 0.0001 * $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];
+                $iClassImportance = ClassTypes\getImportance($aResult);
+                if (isset($iClassImportance)) {
+                    $aResult['foundorder'] += 0.0001 * $iClassImportance;

                 } else {
                     $aResult['foundorder'] += 0.01;
                 }
                 } else {
                     $aResult['foundorder'] += 0.01;
                 }