Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 253b9798950d2cda202c86fdda1636a28aca049c..3d6838b6d4045075fcf8f692c75547aff45be59e 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;


@@ -903,9 +903,9 @@ class Geocode
             }
 
             // Is there an icon set for this type of result?
             }
 
             // Is there an icon set for this type of result?

-            $sIcon = ClassTypes\getIcon($aResult);
+            $sIcon = ClassTypes\getIconFile($aResult);

             if (isset($sIcon)) {
             if (isset($sIcon)) {

-                $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$sIcon.'.p.20.png';
+                $aResult['icon'] = $sIcon;

             }
 
             $sLabel = ClassTypes\getLabel($aResult);
             }
 
             $sLabel = ClassTypes\getLabel($aResult);