remove dead code

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 253b9798950d2cda202c86fdda1636a28aca049c..bc81bced6918eb204f3ef9563cc39a9e5408bfcb 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -642,12 +642,6 @@ class Geocode
             $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,
@@ -903,9 +897,9 @@ class Geocode
             }
 
             // 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/'.$sIcon.'.p.20.png';
+                $aResult['icon'] = $sIcon;
             }
 
             $sLabel = ClassTypes\getLabel($aResult);