X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1faa0f4d41da125dfb35d20dc2449e87f2497e20..8a8e23ef3cb3e7ffb937c75ab1bdeee9ef5b3bf0:/lib/Geocode.php diff --git a/lib/Geocode.php b/lib/Geocode.php index 9bb4d46a..3d6838b6 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -18,7 +18,7 @@ class Geocode protected $aLangPrefOrder = array(); protected $aExcludePlaceIDs = array(); - protected $bReverseInPlan = false; + protected $bReverseInPlan = true; protected $iLimit = 20; protected $iFinalLimit = 10; @@ -897,15 +897,15 @@ class Geocode foreach ($aSearchResults as $iIdx => $aResult) { $fRadius = ClassTypes\getDefRadius($aResult); - $aOutlineResult = $this->oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter); + $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? - $sIcon = ClassTypes\getIcon($aResult); + $sIcon = ClassTypes\getIconFile($aResult); if (isset($sIcon)) { - $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aIcon.'.p.20.png'; + $aResult['icon'] = $sIcon; } $sLabel = ClassTypes\getLabel($aResult); @@ -941,7 +941,7 @@ class Geocode // - number of exact matches from the query $aResult['foundorder'] -= $aResults[$aResult['place_id']]->iExactMatches; // - importance of the class/type - $iClassImportance = ClassTypes/getImportance($aResult); + $iClassImportance = ClassTypes\getImportance($aResult); if (isset($iClassImportance)) { $aResult['foundorder'] += 0.0001 * $iClassImportance; } else {