Merge branch 'ui-easy-switch-coords' of https://github.com/mtmail/Nominatim

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index b0fdb0f12d3f13c47c4baa4e6d8790366196f57c..7ea39e4954b4aa9e84a3da84060fdf02766c70b1 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1,4 +1,7 @@
 <?php
 <?php

+
+namespace Nominatim;
+

 require_once(CONST_BasePath.'/lib/PlaceLookup.php');
 require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 
 require_once(CONST_BasePath.'/lib/PlaceLookup.php');
 require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 


@@ -48,67 +51,68 @@ class Geocode
     protected $sQuery = false;
     protected $aStructuredQuery = false;
 
     protected $sQuery = false;
     protected $aStructuredQuery = false;
 

-    function Geocode(&$oDB)
+
+    public function __construct(&$oDB)

     {
         $this->oDB =& $oDB;
     }
 
     {
         $this->oDB =& $oDB;
     }
 

-    function setReverseInPlan($bReverse)
+    public function setReverseInPlan($bReverse)

     {
         $this->bReverseInPlan = $bReverse;
     }
 
     {
         $this->bReverseInPlan = $bReverse;
     }
 

-    function setLanguagePreference($aLangPref)
+    public function setLanguagePreference($aLangPref)

     {
         $this->aLangPrefOrder = $aLangPref;
     }
 
     {
         $this->aLangPrefOrder = $aLangPref;
     }
 

-    function getIncludeAddressDetails()
+    public function getIncludeAddressDetails()

     {
         return $this->bIncludeAddressDetails;
     }
 
     {
         return $this->bIncludeAddressDetails;
     }
 

-    function getIncludeExtraTags()
+    public function getIncludeExtraTags()

     {
         return $this->bIncludeExtraTags;
     }
 
     {
         return $this->bIncludeExtraTags;
     }
 

-    function getIncludeNameDetails()
+    public function getIncludeNameDetails()

     {
         return $this->bIncludeNameDetails;
     }
 
     {
         return $this->bIncludeNameDetails;
     }
 

-    function setIncludePolygonAsPoints($b = true)
+    public function setIncludePolygonAsPoints($b = true)

     {
         $this->bIncludePolygonAsPoints = $b;
     }
 
     {
         $this->bIncludePolygonAsPoints = $b;
     }
 

-    function setIncludePolygonAsText($b = true)
+    public function setIncludePolygonAsText($b = true)

     {
         $this->bIncludePolygonAsText = $b;
     }
 
     {
         $this->bIncludePolygonAsText = $b;
     }
 

-    function setIncludePolygonAsGeoJSON($b = true)
+    public function setIncludePolygonAsGeoJSON($b = true)

     {
         $this->bIncludePolygonAsGeoJSON = $b;
     }
 
     {
         $this->bIncludePolygonAsGeoJSON = $b;
     }
 

-    function setIncludePolygonAsKML($b = true)
+    public function setIncludePolygonAsKML($b = true)

     {
         $this->bIncludePolygonAsKML = $b;
     }
 
     {
         $this->bIncludePolygonAsKML = $b;
     }
 

-    function setIncludePolygonAsSVG($b = true)
+    public function setIncludePolygonAsSVG($b = true)

     {
         $this->bIncludePolygonAsSVG = $b;
     }
 
     {
         $this->bIncludePolygonAsSVG = $b;
     }
 

-    function setPolygonSimplificationThreshold($f)
+    public function setPolygonSimplificationThreshold($f)

     {
         $this->fPolygonSimplificationThreshold = $f;
     }
 
     {
         $this->fPolygonSimplificationThreshold = $f;
     }
 

-    function setLimit($iLimit = 10)
+    public function setLimit($iLimit = 10)

     {
         if ($iLimit > 50) $iLimit = 50;
         if ($iLimit < 1) $iLimit = 1;
     {
         if ($iLimit > 50) $iLimit = 50;
         if ($iLimit < 1) $iLimit = 1;


@@ -117,65 +121,76 @@ class Geocode
         $this->iLimit = $iLimit + min($iLimit, 10);
     }
 
         $this->iLimit = $iLimit + min($iLimit, 10);
     }
 

-    function getExcludedPlaceIDs()
+    public function getExcludedPlaceIDs()

     {
         return $this->aExcludePlaceIDs;
     }
 
     {
         return $this->aExcludePlaceIDs;
     }
 

-    function getViewBoxString()
+    public function getViewBoxString()

     {
         if (!$this->aViewBox) return null;
         return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1];
     }
 
     {
         if (!$this->aViewBox) return null;
         return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1];
     }
 

-    function setFeatureType($sFeatureType)
+    public function setFeatureType($sFeatureType)

     {
         switch ($sFeatureType) {
     {
         switch ($sFeatureType) {

-        case 'country':
-            $this->setRankRange(4, 4);
-            break;
-        case 'state':
-            $this->setRankRange(8, 8);
-            break;
-        case 'city':
-            $this->setRankRange(14, 16);
-            break;
-        case 'settlement':
-            $this->setRankRange(8, 20);
-            break;
+            case 'country':
+                $this->setRankRange(4, 4);
+                break;
+            case 'state':
+                $this->setRankRange(8, 8);
+                break;
+            case 'city':
+                $this->setRankRange(14, 16);
+                break;
+            case 'settlement':
+                $this->setRankRange(8, 20);
+                break;

         }
     }
 
         }
     }
 

-    function setRankRange($iMin, $iMax)
+    public function setRankRange($iMin, $iMax)

     {
         $this->iMinAddressRank = $iMin;
         $this->iMaxAddressRank = $iMax;
     }
 
     {
         $this->iMinAddressRank = $iMin;
         $this->iMaxAddressRank = $iMax;
     }
 

-    function setRoute($aRoutePoints, $fRouteWidth)
+    public function setRoute($aRoutePoints, $fRouteWidth)

     {
         $this->aViewBox = false;
 
         $this->sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
         $sSep = '';
     {
         $this->aViewBox = false;
 
         $this->sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
         $sSep = '';

-        foreach ($this->aRoutePoints as $aPoint) {
+        foreach ($aRoutePoints as $aPoint) {

             $fPoint = (float)$aPoint;
             $this->sViewboxCentreSQL .= $sSep.$fPoint;
             $sSep = ($sSep == ' ') ? ',' : ' ';
         }
         $this->sViewboxCentreSQL .= ")'::geometry,4326)";
 
             $fPoint = (float)$aPoint;
             $this->sViewboxCentreSQL .= $sSep.$fPoint;
             $sSep = ($sSep == ' ') ? ',' : ' ';
         }
         $this->sViewboxCentreSQL .= ")'::geometry,4326)";
 

-        $this->sViewboxSmallSQL = 'st_buffer('.$this->sViewboxCentreSQL;
+        $this->sViewboxSmallSQL = 'ST_BUFFER('.$this->sViewboxCentreSQL;

         $this->sViewboxSmallSQL .= ','.($fRouteWidth/69).')';
 
         $this->sViewboxSmallSQL .= ','.($fRouteWidth/69).')';
 

-        $this->sViewboxLargeSQL = 'st_buffer('.$this->sViewboxCentreSQL;
+        $this->sViewboxLargeSQL = 'ST_BUFFER('.$this->sViewboxCentreSQL;

         $this->sViewboxLargeSQL .= ','.($fRouteWidth/30).')';
     }
 
         $this->sViewboxLargeSQL .= ','.($fRouteWidth/30).')';
     }
 

-    function setViewbox($aViewbox)
+    public function setViewbox($aViewbox)

     {
         $this->aViewBox = array_map('floatval', $aViewbox);
 
     {
         $this->aViewBox = array_map('floatval', $aViewbox);
 

+        $this->aViewBox[0] = max(-180.0, min(180, $this->aViewBox[0]));
+        $this->aViewBox[1] = max(-90.0, min(90, $this->aViewBox[1]));
+        $this->aViewBox[2] = max(-180.0, min(180, $this->aViewBox[2]));
+        $this->aViewBox[3] = max(-90.0, min(90, $this->aViewBox[3]));
+
+        if (abs($this->aViewBox[0] - $this->aViewBox[2]) < 0.000000001
+            || abs($this->aViewBox[1] - $this->aViewBox[3]) < 0.000000001
+        ) {
+            userError("Bad parameter 'viewbox'. Not a box.");
+        }
+

         $fHeight = $this->aViewBox[0] - $this->aViewBox[2];
         $fWidth = $this->aViewBox[1] - $this->aViewBox[3];
         $aBigViewBox[0] = $this->aViewBox[0] + $fHeight;
         $fHeight = $this->aViewBox[0] - $this->aViewBox[2];
         $fWidth = $this->aViewBox[1] - $this->aViewBox[3];
         $aBigViewBox[0] = $this->aViewBox[0] + $fHeight;


@@ -184,35 +199,47 @@ class Geocode
         $aBigViewBox[3] = $this->aViewBox[3] - $fWidth;
 
         $this->sViewboxCentreSQL = false;
         $aBigViewBox[3] = $this->aViewBox[3] - $fWidth;
 
         $this->sViewboxCentreSQL = false;

-        $this->sViewboxSmallSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".$this->aViewBox[0].",".$this->aViewBox[1]."),ST_Point(".$this->aViewBox[2].",".$this->aViewBox[3].")),4326)";
-        $this->sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".$aBigViewBox[0].",".$aBigViewBox[1]."),ST_Point(".$aBigViewBox[2].",".$aBigViewBox[3].")),4326)";
+        $this->sViewboxSmallSQL = sprintf(
+            'ST_SetSRID(ST_MakeBox2D(ST_Point(%F,%F),ST_Point(%F,%F)),4326)',
+            $this->aViewBox[0],
+            $this->aViewBox[1],
+            $this->aViewBox[2],
+            $this->aViewBox[3]
+        );
+        $this->sViewboxLargeSQL = sprintf(
+            'ST_SetSRID(ST_MakeBox2D(ST_Point(%F,%F),ST_Point(%F,%F)),4326)',
+            $aBigViewBox[0],
+            $aBigViewBox[1],
+            $aBigViewBox[2],
+            $aBigViewBox[3]
+        );

     }
 
     }
 

-    function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)
+    public function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)

     {
         $this->aNearPoint = array((float)$aNearPoint[0], (float)$aNearPoint[1], (float)$fRadiusDeg);
     }
 
     {
         $this->aNearPoint = array((float)$aNearPoint[0], (float)$aNearPoint[1], (float)$fRadiusDeg);
     }
 

-    function setQuery($sQueryString)
+    public function setQuery($sQueryString)

     {
         $this->sQuery = $sQueryString;
         $this->aStructuredQuery = false;
     }
 
     {
         $this->sQuery = $sQueryString;
         $this->aStructuredQuery = false;
     }
 

-    function getQueryString()
+    public function getQueryString()

     {
         return $this->sQuery;
     }
 
 
     {
         return $this->sQuery;
     }
 
 

-    function loadParamArray($oParams)
+    public function loadParamArray($oParams)

     {
     {

-        $this->bIncludeAddressDetails = $oParams->getBool('addressdetails',
-                                                          $this->bIncludeAddressDetails);
-        $this->bIncludeExtraTags = $oParams->getBool('extratags',
-                                                     $this->bIncludeExtraTags);
-        $this->bIncludeNameDetails = $oParams->getBool('namedetails',
-                                                       $this->bIncludeNameDetails);
+        $this->bIncludeAddressDetails
+         = $oParams->getBool('addressdetails', $this->bIncludeAddressDetails);
+        $this->bIncludeExtraTags
+         = $oParams->getBool('extratags', $this->bIncludeExtraTags);
+        $this->bIncludeNameDetails
+         = $oParams->getBool('namedetails', $this->bIncludeNameDetails);

 
         $this->bBoundedSearch = $oParams->getBool('bounded', $this->bBoundedSearch);
         $this->bDeDupe = $oParams->getBool('dedupe', $this->bDeDupe);
 
         $this->bBoundedSearch = $oParams->getBool('bounded', $this->bBoundedSearch);
         $this->bDeDupe = $oParams->getBool('dedupe', $this->bDeDupe);


@@ -248,16 +275,22 @@ class Geocode
                     $aCountries[] = strtolower($sCountryCode);
                 }
             }
                     $aCountries[] = strtolower($sCountryCode);
                 }
             }

-            if (isset($aCountryCodes))
+            if (isset($aCountries))

                 $this->aCountryCodes = $aCountries;
         }
 
         $aViewbox = $oParams->getStringList('viewboxlbrt');
         if ($aViewbox) {
                 $this->aCountryCodes = $aCountries;
         }
 
         $aViewbox = $oParams->getStringList('viewboxlbrt');
         if ($aViewbox) {

+            if (count($aViewbox) != 4) {
+                userError("Bad parmater 'viewbox'. Expected 4 coordinates.");
+            }

             $this->setViewbox($aViewbox);
         } else {
             $aViewbox = $oParams->getStringList('viewbox');
             if ($aViewbox) {
             $this->setViewbox($aViewbox);
         } else {
             $aViewbox = $oParams->getStringList('viewbox');
             if ($aViewbox) {

+                if (count($aViewbox) != 4) {
+                    userError("Bad parmater 'viewbox'. Expected 4 coordinates.");
+                }

                 $this->setViewBox(array(
                                    $aViewbox[0],
                                    $aViewbox[3],
                 $this->setViewBox(array(
                                    $aViewbox[0],
                                    $aViewbox[3],


@@ -274,25 +307,27 @@ class Geocode
         }
     }
 
         }
     }
 

-    function setQueryFromParams($oParams)
+    public function setQueryFromParams($oParams)

     {
         // Search query
         $sQuery = $oParams->getString('q');
         if (!$sQuery) {
     {
         // Search query
         $sQuery = $oParams->getString('q');
         if (!$sQuery) {

-            $this->setStructuredQuery($oParams->getString('amenity'),
-                                      $oParams->getString('street'),
-                                      $oParams->getString('city'),
-                                      $oParams->getString('county'),
-                                      $oParams->getString('state'),
-                                      $oParams->getString('country'),
-                                      $oParams->getString('postalcode'));
+            $this->setStructuredQuery(
+                $oParams->getString('amenity'),
+                $oParams->getString('street'),
+                $oParams->getString('city'),
+                $oParams->getString('county'),
+                $oParams->getString('state'),
+                $oParams->getString('country'),
+                $oParams->getString('postalcode')
+            );

             $this->setReverseInPlan(false);
         } else {
             $this->setQuery($sQuery);
         }
     }
 
             $this->setReverseInPlan(false);
         } else {
             $this->setQuery($sQuery);
         }
     }
 

-    function loadStructuredAddressElement($sValue, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues)
+    public function loadStructuredAddressElement($sValue, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues)

     {
         $sValue = trim($sValue);
         if (!$sValue) return false;
     {
         $sValue = trim($sValue);
         if (!$sValue) return false;


@@ -305,7 +340,7 @@ class Geocode
         return true;
     }
 
         return true;
     }
 

-    function setStructuredQuery($sAmentiy = false, $sStreet = false, $sCity = false, $sCounty = false, $sState = false, $sCountry = false, $sPostalCode = false)
+    public function setStructuredQuery($sAmentiy = false, $sStreet = false, $sCity = false, $sCounty = false, $sState = false, $sCountry = false, $sPostalCode = false)

     {
         $this->sQuery = false;
 
     {
         $this->sQuery = false;
 


@@ -322,7 +357,7 @@ class Geocode
         $this->loadStructuredAddressElement($sCity, 'city', 14, 24, false);
         $this->loadStructuredAddressElement($sCounty, 'county', 9, 13, false);
         $this->loadStructuredAddressElement($sState, 'state', 8, 8, false);
         $this->loadStructuredAddressElement($sCity, 'city', 14, 24, false);
         $this->loadStructuredAddressElement($sCounty, 'county', 9, 13, false);
         $this->loadStructuredAddressElement($sState, 'state', 8, 8, false);

-        $this->loadStructuredAddressElement($sPostalCode, 'postalcode' , 5, 11, array(5, 11));
+        $this->loadStructuredAddressElement($sPostalCode, 'postalcode', 5, 11, array(5, 11));

         $this->loadStructuredAddressElement($sCountry, 'country', 4, 4, false);
 
         if (sizeof($this->aStructuredQuery) > 0) {
         $this->loadStructuredAddressElement($sCountry, 'country', 4, 4, false);
 
         if (sizeof($this->aStructuredQuery) > 0) {


@@ -333,7 +368,7 @@ class Geocode
         }
     }
 
         }
     }
 

-    function fallbackStructuredQuery()
+    public function fallbackStructuredQuery()

     {
         if (!$this->aStructuredQuery) return false;
 
     {
         if (!$this->aStructuredQuery) return false;
 


@@ -354,48 +389,85 @@ class Geocode
         return false;
     }
 
         return false;
     }
 

-    function getDetails($aPlaceIDs)
+    public function getDetails($aPlaceIDs)

     {
         //$aPlaceIDs is an array with key: placeID and value: tiger-housenumber, if found, else -1
         if (sizeof($aPlaceIDs) == 0) return array();
 
     {
         //$aPlaceIDs is an array with key: placeID and value: tiger-housenumber, if found, else -1
         if (sizeof($aPlaceIDs) == 0) return array();
 

-        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
+        $sLanguagePrefArraySQL = "ARRAY[".join(',', array_map("getDBQuoted", $this->aLangPrefOrder))."]";

 
         // Get the details for display (is this a redundant extra step?)
         $sPlaceIDs = join(',', array_keys($aPlaceIDs));
 
         $sImportanceSQL = '';
 
         // Get the details for display (is this a redundant extra step?)
         $sPlaceIDs = join(',', array_keys($aPlaceIDs));
 
         $sImportanceSQL = '';

-        if ($this->sViewboxSmallSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
-        if ($this->sViewboxLargeSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
-
-        $sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code,";
-        $sSQL .= "get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) as langaddress,";
-        $sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
-        $sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
-        if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text as extra,";
-        if ($this->bIncludeNameDetails) $sSQL .= "hstore_to_json(name)::text as names,";
-        $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-        $sSQL .= $sImportanceSQL."coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
-        $sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-        $sSQL .= "(extratags->'place') as extra_place ";
-        $sSQL .= "from placex where place_id in ($sPlaceIDs) ";
-        $sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
-        if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
-        if ($this->aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$this->aAddressRankList).")";
-        $sSQL .= ") ";
-        if ($this->sAllowedTypesSQLList) $sSQL .= "and placex.class in $this->sAllowedTypesSQLList ";
-        $sSQL .= "and linked_place_id is null ";
-        $sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,calculated_country_code,importance";
-        if (!$this->bDeDupe) $sSQL .= ",place_id";
-        $sSQL .= ",langaddress ";
-        $sSQL .= ",placename ";
-        $sSQL .= ",ref ";
-        if ($this->bIncludeExtraTags) $sSQL .= ",extratags";
-        if ($this->bIncludeNameDetails) $sSQL .= ",name";
-        $sSQL .= ",extratags->'place' ";
+        if ($this->sViewboxSmallSQL) $sImportanceSQL .= " CASE WHEN ST_Contains($this->sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
+        if ($this->sViewboxLargeSQL) $sImportanceSQL .= " CASE WHEN ST_Contains($this->sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
+
+        $sSQL  = "SELECT ";
+        $sSQL .= "    osm_type,";
+        $sSQL .= "    osm_id,";
+        $sSQL .= "    class,";
+        $sSQL .= "    type,";
+        $sSQL .= "    admin_level,";
+        $sSQL .= "    rank_search,";
+        $sSQL .= "    rank_address,";
+        $sSQL .= "    min(place_id) AS place_id, ";
+        $sSQL .= "    min(parent_place_id) AS parent_place_id, ";
+        $sSQL .= "    calculated_country_code AS country_code, ";
+        $sSQL .= "    get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress,";
+        $sSQL .= "    get_name_by_language(name, $sLanguagePrefArraySQL) AS placename,";
+        $sSQL .= "    get_name_by_language(name, ARRAY['ref']) AS ref,";
+        if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text AS extra,";
+        if ($this->bIncludeNameDetails) $sSQL .= "hstore_to_json(name)::text AS names,";
+        $sSQL .= "    avg(ST_X(centroid)) AS lon, ";
+        $sSQL .= "    avg(ST_Y(centroid)) AS lat, ";
+        $sSQL .= "    ".$sImportanceSQL."COALESCE(importance,0.75-(rank_search::float/40)) AS importance, ";
+        $sSQL .= "    ( ";
+        $sSQL .= "       SELECT max(p.importance*(p.rank_address+2))";
+        $sSQL .= "       FROM ";
+        $sSQL .= "         place_addressline s, ";
+        $sSQL .= "         placex p";
+        $sSQL .= "       WHERE s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)";
+        $sSQL .= "         AND p.place_id = s.address_place_id ";
+        $sSQL .= "         AND s.isaddress ";
+        $sSQL .= "         AND p.importance is not null ";
+        $sSQL .= "    ) AS addressimportance, ";
+        $sSQL .= "    (extratags->'place') AS extra_place ";
+        $sSQL .= " FROM placex";
+        $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
+        $sSQL .= "   AND (";
+        $sSQL .= "            placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
+        if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
+            $sSQL .= "        OR (extratags->'place') = 'city'";
+        }
+        if ($this->aAddressRankList) {
+            $sSQL .= "        OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
+        }
+        $sSQL .= "       ) ";
+        if ($this->sAllowedTypesSQLList) {
+            $sSQL .= "AND placex.class in $this->sAllowedTypesSQLList ";
+        }
+        $sSQL .= "    AND linked_place_id is null ";
+        $sSQL .= " GROUP BY ";
+        $sSQL .= "     osm_type, ";
+        $sSQL .= "     osm_id, ";
+        $sSQL .= "     class, ";
+        $sSQL .= "     type, ";
+        $sSQL .= "     admin_level, ";
+        $sSQL .= "     rank_search, ";
+        $sSQL .= "     rank_address, ";
+        $sSQL .= "     calculated_country_code, ";
+        $sSQL .= "     importance, ";
+        if (!$this->bDeDupe) $sSQL .= "place_id,";
+        $sSQL .= "     langaddress, ";
+        $sSQL .= "     placename, ";
+        $sSQL .= "     ref, ";
+        if ($this->bIncludeExtraTags) $sSQL .= "extratags, ";
+        if ($this->bIncludeNameDetails) $sSQL .= "name, ";
+        $sSQL .= "     extratags->'place' ";

 
         if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank) {
 
         if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank) {

-            //only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines 
+            // only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines

             // with start- and endnumber, the common osm housenumbers are usually saved as points
             $sHousenumbers = "";
             $i = 0;
             // with start- and endnumber, the common osm housenumbers are usually saved as points
             $sHousenumbers = "";
             $i = 0;


@@ -405,84 +477,173 @@ class Geocode
                 $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
                 if ($i<$length) $sHousenumbers .= ", ";
             }
                 $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
                 if ($i<$length) $sHousenumbers .= ", ";
             }

+

             if (CONST_Use_US_Tiger_Data) {
             if (CONST_Use_US_Tiger_Data) {

-                //Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
+                // Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)

                 $sSQL .= " union";
                 $sSQL .= " union";

-                $sSQL .= " select 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, 'us' as country_code";
-                $sSQL .= ", get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress ";
-                $sSQL .= ", null as placename";
-                $sSQL .= ", null as ref";
-                if ($this->bIncludeExtraTags) $sSQL .= ", null as extra";
-                if ($this->bIncludeNameDetails) $sSQL .= ", null as names";
-                $sSQL .= ", avg(st_x(centroid)) as lon, avg(st_y(centroid)) as lat,";
-                $sSQL .= $sImportanceSQL."-1.15 as importance ";
-                $sSQL .= ", (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance ";
-                $sSQL .= ", null as extra_place ";
-                $sSQL .= " from (select place_id";
-                //interpolate the Tiger housenumbers here
-                $sSQL .= ", ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) as centroid, parent_place_id, housenumber_for_place";
-                $sSQL .= " from (location_property_tiger ";
-                $sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) ";
-                $sSQL .= " where housenumber_for_place>=0 and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here
-                $sSQL .= " group by place_id, housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
+                $sSQL .= " SELECT ";
+                $sSQL .= "     'T' AS osm_type, ";
+                $sSQL .= "     (SELECT osm_id from placex p WHERE p.place_id=min(blub.parent_place_id)) as osm_id, ";
+                $sSQL .= "     'place' AS class, ";
+                $sSQL .= "     'house' AS type, ";
+                $sSQL .= "     null AS admin_level, ";
+                $sSQL .= "     30 AS rank_search, ";
+                $sSQL .= "     30 AS rank_address, ";
+                $sSQL .= "     min(place_id) AS place_id, ";
+                $sSQL .= "     min(parent_place_id) AS parent_place_id, ";
+                $sSQL .= "     'us' AS country_code, ";
+                $sSQL .= "     get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress,";
+                $sSQL .= "     null AS placename, ";
+                $sSQL .= "     null AS ref, ";
+                if ($this->bIncludeExtraTags) $sSQL .= "null AS extra,";
+                if ($this->bIncludeNameDetails) $sSQL .= "null AS names,";
+                $sSQL .= "     avg(st_x(centroid)) AS lon, ";
+                $sSQL .= "     avg(st_y(centroid)) AS lat,";
+                $sSQL .= "     ".$sImportanceSQL."-1.15 AS importance, ";
+                $sSQL .= "     (";
+                $sSQL .= "        SELECT max(p.importance*(p.rank_address+2))";
+                $sSQL .= "        FROM ";
+                $sSQL .= "          place_addressline s, ";
+                $sSQL .= "          placex p";
+                $sSQL .= "        WHERE s.place_id = min(blub.parent_place_id)";
+                $sSQL .= "          AND p.place_id = s.address_place_id ";
+                $sSQL .= "          AND s.isaddress";
+                $sSQL .= "          AND p.importance is not null";
+                $sSQL .= "     ) AS addressimportance, ";
+                $sSQL .= "     null AS extra_place ";
+                $sSQL .= " FROM (";
+                $sSQL .= "     SELECT place_id, ";    // interpolate the Tiger housenumbers here
+                $sSQL .= "         ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) AS centroid, ";
+                $sSQL .= "         parent_place_id, ";
+                $sSQL .= "         housenumber_for_place";
+                $sSQL .= "     FROM (";
+                $sSQL .= "            location_property_tiger ";
+                $sSQL .= "            JOIN (values ".$sHousenumbers.") AS housenumbers(place_id, housenumber_for_place) USING(place_id)) ";
+                $sSQL .= "     WHERE ";
+                $sSQL .= "         housenumber_for_place>=0";
+                $sSQL .= "         AND 30 between $this->iMinAddressRank AND $this->iMaxAddressRank";
+                $sSQL .= " ) AS blub"; //postgres wants an alias here
+                $sSQL .= " GROUP BY";
+                $sSQL .= "      place_id, ";
+                $sSQL .= "      housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique

                 if (!$this->bDeDupe) $sSQL .= ", place_id ";
             }
             // osmline
             // interpolation line search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
                 if (!$this->bDeDupe) $sSQL .= ", place_id ";
             }
             // osmline
             // interpolation line search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)

-            $sSQL .= " union ";
-            $sSQL .= "select 'W' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code, ";
-            $sSQL .= "get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress, ";
-            $sSQL .= "null as placename, ";
-            $sSQL .= "null as ref, ";
-            if ($this->bIncludeExtraTags) $sSQL .= "null as extra, ";
-            if ($this->bIncludeNameDetails) $sSQL .= "null as names, ";
-            $sSQL .= " avg(st_x(centroid)) as lon, avg(st_y(centroid)) as lat,";
-            $sSQL .= $sImportanceSQL."-0.1 as importance, ";  // slightly smaller than the importance for normal houses with rank 30, which is 0
-            $sSQL .= " (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p";
-            $sSQL .= " where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance,";
-            $sSQL .= " null as extra_place ";
-            $sSQL .= " from (select place_id, calculated_country_code ";
-            //interpolate the housenumbers here
-            $sSQL .= ", CASE WHEN startnumber != endnumber THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) ";
-            $sSQL .= " ELSE ST_LineInterpolatePoint(linegeo, 0.5) END as centroid";
-            $sSQL .= ", parent_place_id, housenumber_for_place ";
-            $sSQL .= " from (location_property_osmline ";
-            $sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) ";
-            $sSQL .= " where housenumber_for_place>=0 and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here
-            $sSQL .= " group by place_id, housenumber_for_place, calculated_country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique
+            $sSQL .= " UNION ";
+            $sSQL .= "SELECT ";
+            $sSQL .= "  'W' AS osm_type, ";
+            $sSQL .= "  osm_id, ";
+            $sSQL .= "  'place' AS class, ";
+            $sSQL .= "  'house' AS type, ";
+            $sSQL .= "  null AS admin_level, ";
+            $sSQL .= "  30 AS rank_search, ";
+            $sSQL .= "  30 AS rank_address, ";
+            $sSQL .= "  min(place_id) as place_id, ";
+            $sSQL .= "  min(parent_place_id) AS parent_place_id, ";
+            $sSQL .= "  calculated_country_code AS country_code, ";
+            $sSQL .= "  get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) AS langaddress, ";
+            $sSQL .= "  null AS placename, ";
+            $sSQL .= "  null AS ref, ";
+            if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
+            if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
+            $sSQL .= "  AVG(st_x(centroid)) AS lon, ";
+            $sSQL .= "  AVG(st_y(centroid)) AS lat, ";
+            $sSQL .= "  ".$sImportanceSQL."-0.1 AS importance, ";  // slightly smaller than the importance for normal houses with rank 30, which is 0
+            $sSQL .= "  (";
+            $sSQL .= "     SELECT ";
+            $sSQL .= "       MAX(p.importance*(p.rank_address+2)) ";
+            $sSQL .= "     FROM";
+            $sSQL .= "       place_addressline s, ";
+            $sSQL .= "       placex p";
+            $sSQL .= "     WHERE s.place_id = min(blub.parent_place_id) ";
+            $sSQL .= "       AND p.place_id = s.address_place_id ";
+            $sSQL .= "       AND s.isaddress ";
+            $sSQL .= "       AND p.importance is not null";
+            $sSQL .= "  ) AS addressimportance,";
+            $sSQL .= "  null AS extra_place ";
+            $sSQL .= "  FROM (";
+            $sSQL .= "     SELECT ";
+            $sSQL .= "         osm_id, ";
+            $sSQL .= "         place_id, ";
+            $sSQL .= "         calculated_country_code, ";
+            $sSQL .= "         CASE ";             // interpolate the housenumbers here
+            $sSQL .= "           WHEN startnumber != endnumber ";
+            $sSQL .= "           THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) ";
+            $sSQL .= "           ELSE ST_LineInterpolatePoint(linegeo, 0.5) ";
+            $sSQL .= "         END as centroid, ";
+            $sSQL .= "         parent_place_id, ";
+            $sSQL .= "         housenumber_for_place ";
+            $sSQL .= "     FROM (";
+            $sSQL .= "            location_property_osmline ";
+            $sSQL .= "            JOIN (values ".$sHousenumbers.") AS housenumbers(place_id, housenumber_for_place) USING(place_id)";
+            $sSQL .= "          ) ";
+            $sSQL .= "     WHERE housenumber_for_place>=0 ";
+            $sSQL .= "       AND 30 between $this->iMinAddressRank AND $this->iMaxAddressRank";
+            $sSQL .= "  ) as blub"; //postgres wants an alias here
+            $sSQL .= "  GROUP BY ";
+            $sSQL .= "    osm_id, ";
+            $sSQL .= "    place_id, ";
+            $sSQL .= "    housenumber_for_place, ";
+            $sSQL .= "    calculated_country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique

             if (!$this->bDeDupe) $sSQL .= ", place_id ";
 
             if (CONST_Use_Aux_Location_data) {
             if (!$this->bDeDupe) $sSQL .= ", place_id ";
 
             if (CONST_Use_Aux_Location_data) {

-                $sSQL .= " union ";
-                $sSQL .= "select 'L' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 0 as rank_search, 0 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, 'us' as country_code, ";
-                $sSQL .= "get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) as langaddress, ";
-                $sSQL .= "null as placename, ";
-                $sSQL .= "null as ref, ";
-                if ($this->bIncludeExtraTags) $sSQL .= "null as extra, ";
-                if ($this->bIncludeNameDetails) $sSQL .= "null as names, ";
-                $sSQL .= "avg(ST_X(centroid)) as lon, avg(ST_Y(centroid)) as lat, ";
-                $sSQL .= $sImportanceSQL."-1.10 as importance, ";
-                $sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-                $sSQL .= "null as extra_place ";
-                $sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
-                $sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
-                $sSQL .= "group by place_id";
-                if (!$this->bDeDupe) $sSQL .= ", place_id";
-                $sSQL .= ", get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) ";
+                $sSQL .= " UNION ";
+                $sSQL .= "  SELECT ";
+                $sSQL .= "     'L' AS osm_type, ";
+                $sSQL .= "     place_id AS osm_id, ";
+                $sSQL .= "     'place' AS class,";
+                $sSQL .= "     'house' AS type, ";
+                $sSQL .= "     null AS admin_level, ";
+                $sSQL .= "     0 AS rank_search,";
+                $sSQL .= "     0 AS rank_address, ";
+                $sSQL .= "     min(place_id) AS place_id,";
+                $sSQL .= "     min(parent_place_id) AS parent_place_id, ";
+                $sSQL .= "     'us' AS country_code, ";
+                $sSQL .= "     get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) AS langaddress, ";
+                $sSQL .= "     null AS placename, ";
+                $sSQL .= "     null AS ref, ";
+                if ($this->bIncludeExtraTags) $sSQL .= "null AS extra, ";
+                if ($this->bIncludeNameDetails) $sSQL .= "null AS names, ";
+                $sSQL .= "     avg(ST_X(centroid)) AS lon, ";
+                $sSQL .= "     avg(ST_Y(centroid)) AS lat, ";
+                $sSQL .= "     ".$sImportanceSQL."-1.10 AS importance, ";
+                $sSQL .= "     ( ";
+                $sSQL .= "       SELECT max(p.importance*(p.rank_address+2))";
+                $sSQL .= "       FROM ";
+                $sSQL .= "          place_addressline s, ";
+                $sSQL .= "          placex p";
+                $sSQL .= "       WHERE s.place_id = min(location_property_aux.parent_place_id)";
+                $sSQL .= "         AND p.place_id = s.address_place_id ";
+                $sSQL .= "         AND s.isaddress";
+                $sSQL .= "         AND p.importance is not null";
+                $sSQL .= "     ) AS addressimportance, ";
+                $sSQL .= "     null AS extra_place ";
+                $sSQL .= "  FROM location_property_aux ";
+                $sSQL .= "  WHERE place_id in ($sPlaceIDs) ";
+                $sSQL .= "    AND 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
+                $sSQL .= "  GROUP BY ";
+                $sSQL .= "     place_id, ";
+                if (!$this->bDeDupe) $sSQL .= "place_id, ";
+                $sSQL .= "     get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) ";

             }
         }
 
         $sSQL .= " order by importance desc";
         if (CONST_Debug) {
             }
         }
 
         $sSQL .= " order by importance desc";
         if (CONST_Debug) {

-            echo "<hr>"; var_dump($sSQL);
+            echo "<hr>";
+            var_dump($sSQL);

         }
         }

-        $aSearchResults = chksql($this->oDB->getAll($sSQL),
-                                 "Could not get details for place.");
+        $aSearchResults = chksql(
+            $this->oDB->getAll($sSQL),
+            "Could not get details for place."
+        );

 
         return $aSearchResults;
     }
 
 
         return $aSearchResults;
     }
 

-    function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
+    public function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)

     {
         /*
              Calculate all searches using aValidTokens i.e.
     {
         /*
              Calculate all searches using aValidTokens i.e.


@@ -624,8 +785,8 @@ class Geocode
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                             foreach ($aValidTokens[' '.$sToken] as $aSearchTermToken) {
                                                 if (empty($aSearchTermToken['country_code'])
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                             foreach ($aValidTokens[' '.$sToken] as $aSearchTermToken) {
                                                 if (empty($aSearchTermToken['country_code'])

-                                                        && empty($aSearchTermToken['lat'])
-                                                        && empty($aSearchTermToken['class'])
+                                                    && empty($aSearchTermToken['lat'])
+                                                    && empty($aSearchTermToken['class'])

                                                 ) {
                                                     $aSearch = $aCurrentSearch;
                                                     $aSearch['iSearchRank'] += 1;
                                                 ) {
                                                     $aSearch = $aCurrentSearch;
                                                     $aSearch['iSearchRank'] += 1;


@@ -734,11 +895,13 @@ class Geocode
             name: full name (currently the same as langaddress)
             foundorder: secondary ordering for places with same importance
     */
             name: full name (currently the same as langaddress)
             foundorder: secondary ordering for places with same importance
     */

-    function lookup()
+
+
+    public function lookup()

     {
         if (!$this->sQuery && !$this->aStructuredQuery) return false;
 
     {
         if (!$this->sQuery && !$this->aStructuredQuery) return false;
 

-        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
+        $sLanguagePrefArraySQL = "ARRAY[".join(',', array_map("getDBQuoted", $this->aLangPrefOrder))."]";

         $sCountryCodesSQL = false;
         if ($this->aCountryCodes) {
             $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
         $sCountryCodesSQL = false;
         if ($this->aCountryCodes) {
             $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));


@@ -748,20 +911,24 @@ class Geocode
 
         // Conflicts between US state abreviations and various words for 'the' in different languages
         if (isset($this->aLangPrefOrder['name:en'])) {
 
         // Conflicts between US state abreviations and various words for 'the' in different languages
         if (isset($this->aLangPrefOrder['name:en'])) {

-            $sQuery = preg_replace('/(^|,)\s*il\s*(,|$)/','\1illinois\2', $sQuery);
-            $sQuery = preg_replace('/(^|,)\s*al\s*(,|$)/','\1alabama\2', $sQuery);
-            $sQuery = preg_replace('/(^|,)\s*la\s*(,|$)/','\1louisiana\2', $sQuery);
+            $sQuery = preg_replace('/(^|,)\s*il\s*(,|$)/', '\1illinois\2', $sQuery);
+            $sQuery = preg_replace('/(^|,)\s*al\s*(,|$)/', '\1alabama\2', $sQuery);
+            $sQuery = preg_replace('/(^|,)\s*la\s*(,|$)/', '\1louisiana\2', $sQuery);

         }
 
         $bBoundingBoxSearch = $this->bBoundedSearch && $this->sViewboxSmallSQL;
         if ($this->sViewboxCentreSQL) {
             // For complex viewboxes (routes) precompute the bounding geometry
         }
 
         $bBoundingBoxSearch = $this->bBoundedSearch && $this->sViewboxSmallSQL;
         if ($this->sViewboxCentreSQL) {
             // For complex viewboxes (routes) precompute the bounding geometry

-            $sGeom = chksql($this->oDB->getOne("select ".$this->sViewboxSmallSQL),
-                            "Could not get small viewbox");
+            $sGeom = chksql(
+                $this->oDB->getOne("select ".$this->sViewboxSmallSQL),
+                "Could not get small viewbox"
+            );

             $this->sViewboxSmallSQL = "'".$sGeom."'::geometry";
 
             $this->sViewboxSmallSQL = "'".$sGeom."'::geometry";
 

-            $sGeom = chksql($this->oDB->getOne("select ".$this->sViewboxLargeSQL),
-                            "Could not get large viewbox");
+            $sGeom = chksql(
+                $this->oDB->getOne("select ".$this->sViewboxLargeSQL),
+                "Could not get large viewbox"
+            );

             $this->sViewboxLargeSQL = "'".$sGeom."'::geometry";
         }
 
             $this->sViewboxLargeSQL = "'".$sGeom."'::geometry";
         }
 


@@ -822,9 +989,15 @@ class Geocode
 
             foreach ($aSpecialTermsRaw as $aSpecialTerm) {
                 $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
 
             foreach ($aSpecialTermsRaw as $aSpecialTerm) {
                 $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);

-                $sToken = chksql($this->oDB->getOne("select make_standard_name('".$aSpecialTerm[1]."') as string"));
-                $sSQL = 'select * from (select word_id,word_token, word, class, type, country_code, operator';
-                $sSQL .= ' from word where word_token in (\' '.$sToken.'\')) as x where (class is not null and class not in (\'place\')) or country_code is not null';
+                $sToken = chksql($this->oDB->getOne("SELECT make_standard_name('".$aSpecialTerm[1]."') AS string"));
+                $sSQL = 'SELECT * ';
+                $sSQL .= 'FROM ( ';
+                $sSQL .= '   SELECT word_id, word_token, word, class, type, country_code, operator';
+                $sSQL .= '   FROM word ';
+                $sSQL .= '   WHERE word_token in (\' '.$sToken.'\')';
+                $sSQL .= ') AS x ';
+                $sSQL .= ' WHERE (class is not null AND class not in (\'place\')) ';
+                $sSQL .= ' OR country_code is not null';

                 if (CONST_Debug) var_Dump($sSQL);
                 $aSearchWords = chksql($this->oDB->getAll($sSQL));
                 $aNewSearches = array();
                 if (CONST_Debug) var_Dump($sSQL);
                 $aSearchWords = chksql($this->oDB->getAll($sSQL));
                 $aNewSearches = array();


@@ -853,7 +1026,7 @@ class Geocode
                 $aPhrases = $this->aStructuredQuery;
                 $bStructuredPhrases = true;
             } else {
                 $aPhrases = $this->aStructuredQuery;
                 $bStructuredPhrases = true;
             } else {

-                $aPhrases = explode(',',$sQuery);
+                $aPhrases = explode(',', $sQuery);

                 $bStructuredPhrases = false;
             }
 
                 $bStructuredPhrases = false;
             }
 


@@ -863,11 +1036,13 @@ class Geocode
             // Generate a complete list of all
             $aTokens = array();
             foreach ($aPhrases as $iPhrase => $sPhrase) {
             // Generate a complete list of all
             $aTokens = array();
             foreach ($aPhrases as $iPhrase => $sPhrase) {

-                $aPhrase = chksql($this->oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string"),
-                                  "Cannot nomralize query string (is it an UTF-8 string?)");
+                $aPhrase = chksql(
+                    $this->oDB->getRow("SELECT make_standard_name('".pg_escape_string($sPhrase)."') as string"),
+                    "Cannot normalize query string (is it a UTF-8 string?)"
+                );

                 if (trim($aPhrase['string'])) {
                     $aPhrases[$iPhrase] = $aPhrase;
                 if (trim($aPhrase['string'])) {
                     $aPhrases[$iPhrase] = $aPhrase;

-                    $aPhrases[$iPhrase]['words'] = explode(' ',$aPhrases[$iPhrase]['string']);
+                    $aPhrases[$iPhrase]['words'] = explode(' ', $aPhrases[$iPhrase]['string']);

                     $aPhrases[$iPhrase]['wordsets'] = getWordSets($aPhrases[$iPhrase]['words'], 0);
                     $aTokens = array_merge($aTokens, getTokensFromSets($aPhrases[$iPhrase]['wordsets']));
                 } else {
                     $aPhrases[$iPhrase]['wordsets'] = getWordSets($aPhrases[$iPhrase]['words'], 0);
                     $aTokens = array_merge($aTokens, getTokensFromSets($aPhrases[$iPhrase]['wordsets']));
                 } else {


@@ -881,15 +1056,18 @@ class Geocode
 
             if (sizeof($aTokens)) {
                 // Check which tokens we have, get the ID numbers
 
             if (sizeof($aTokens)) {
                 // Check which tokens we have, get the ID numbers

-                $sSQL = 'select word_id,word_token, word, class, type, country_code, operator, search_name_count';
-                $sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$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(',', array_map("getDBQuoted", $aTokens)).')';

 
                 if (CONST_Debug) var_Dump($sSQL);
 
                 $aValidTokens = array();
                 if (sizeof($aTokens)) {
 
                 if (CONST_Debug) var_Dump($sSQL);
 
                 $aValidTokens = array();
                 if (sizeof($aTokens)) {

-                    $aDatabaseWords = chksql($this->oDB->getAll($sSQL),
-                                             "Could not get word tokens.");
+                    $aDatabaseWords = chksql(
+                        $this->oDB->getAll($sSQL),
+                        "Could not get word tokens."
+                    );

                 } else {
                     $aDatabaseWords = array();
                 }
                 } else {
                     $aDatabaseWords = array();
                 }


@@ -917,17 +1095,17 @@ class Geocode
                 foreach ($aTokens as $sToken) {
                     // Source of gb postcodes is now definitive - always use
                     if (preg_match('/^([A-Z][A-Z]?[0-9][0-9A-Z]? ?[0-9])([A-Z][A-Z])$/', strtoupper(trim($sToken)), $aData)) {
                 foreach ($aTokens as $sToken) {
                     // Source of gb postcodes is now definitive - always use
                     if (preg_match('/^([A-Z][A-Z]?[0-9][0-9A-Z]? ?[0-9])([A-Z][A-Z])$/', strtoupper(trim($sToken)), $aData)) {

-                        if (substr($aData[1],-2,1) != ' ') {
-                            $aData[0] = substr($aData[0],0,strlen($aData[1])-1).' '.substr($aData[0],strlen($aData[1])-1);
-                            $aData[1] = substr($aData[1],0,-1).' '.substr($aData[1],-1,1);
+                        if (substr($aData[1], -2, 1) != ' ') {
+                            $aData[0] = substr($aData[0], 0, strlen($aData[1])-1).' '.substr($aData[0], strlen($aData[1])-1);
+                            $aData[1] = substr($aData[1], 0, -1).' '.substr($aData[1], -1, 1);

                         }
                         $aGBPostcodeLocation = gbPostcodeCalculate($aData[0], $aData[1], $aData[2], $this->oDB);
                         if ($aGBPostcodeLocation) {
                             $aValidTokens[$sToken] = $aGBPostcodeLocation;
                         }
                         }
                         $aGBPostcodeLocation = gbPostcodeCalculate($aData[0], $aData[1], $aData[2], $this->oDB);
                         if ($aGBPostcodeLocation) {
                             $aValidTokens[$sToken] = $aGBPostcodeLocation;
                         }

-                    } else if (!isset($aValidTokens[$sToken]) && preg_match('/^([0-9]{5}) [0-9]{4}$/', $sToken, $aData)) {
+                    } elseif (!isset($aValidTokens[$sToken]) && preg_match('/^([0-9]{5}) [0-9]{4}$/', $sToken, $aData)) {

                         // US ZIP+4 codes - if there is no token,
                         // US ZIP+4 codes - if there is no token,

-                        //  merge in the 5-digit ZIP code
+                        // merge in the 5-digit ZIP code

                         if (isset($aValidTokens[$aData[1]])) {
                             foreach ($aValidTokens[$aData[1]] as $aToken) {
                                 if (!$aToken['class']) {
                         if (isset($aValidTokens[$aData[1]])) {
                             foreach ($aValidTokens[$aData[1]] as $aToken) {
                                 if (!$aToken['class']) {


@@ -944,7 +1122,7 @@ class Geocode
 
                 foreach ($aTokens as $sToken) {
                     // Unknown single word token with a number - assume it is a house number
 
                 foreach ($aTokens as $sToken) {
                     // Unknown single word token with a number - assume it is a house number

-                    if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken,' ') === false && preg_match('/[0-9]/', $sToken)) {
+                    if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken, ' ') === false && preg_match('/[0-9]/', $sToken)) {

                         $aValidTokens[' '.$sToken] = array(array('class' => 'place', 'type' => 'house'));
                     }
                 }
                         $aValidTokens[' '.$sToken] = array(array('class' => 'place', 'type' => 'house'));
                     }
                 }


@@ -1056,11 +1234,11 @@ class Geocode
                         if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) {
                             // Just looking for a country by code - look it up
                             if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank) {
                         if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) {
                             // Just looking for a country by code - look it up
                             if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank) {

-                                $sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
-                                if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
+                                $sSQL = "SELECT place_id FROM placex WHERE calculated_country_code='".$aSearch['sCountryCode']."' AND rank_search = 4";
+                                if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";

                                 if ($bBoundingBoxSearch)
                                 if ($bBoundingBoxSearch)

-                                    $sSQL .= " and _st_intersects($this->sViewboxSmallSQL, geometry)";
-                                $sSQL .= " order by st_area(geometry) desc limit 1";
+                                    $sSQL .= " AND _st_intersects($this->sViewboxSmallSQL, geometry)";
+                                $sSQL .= " ORDER BY st_area(geometry) DESC LIMIT 1";

                                 if (CONST_Debug) var_dump($sSQL);
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             } else {
                                 if (CONST_Debug) var_dump($sSQL);
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             } else {


@@ -1070,16 +1248,16 @@ class Geocode
                             if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue;
                             if (!$aSearch['sClass']) continue;
 
                             if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue;
                             if (!$aSearch['sClass']) continue;
 

-                            $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
+                            $sSQL = "SELECT COUNT(*) FROM pg_tables WHERE tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";

                             if (chksql($this->oDB->getOne($sSQL))) {
                             if (chksql($this->oDB->getOne($sSQL))) {

-                                $sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
-                                if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
-                                $sSQL .= " where st_contains($this->sViewboxSmallSQL, ct.centroid)";
-                                if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
+                                $sSQL = "SELECT place_id FROM place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
+                                if ($sCountryCodesSQL) $sSQL .= " JOIN placex USING (place_id)";
+                                $sSQL .= " WHERE st_contains($this->sViewboxSmallSQL, ct.centroid)";
+                                if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";

                                 if (sizeof($this->aExcludePlaceIDs)) {
                                 if (sizeof($this->aExcludePlaceIDs)) {

-                                    $sSQL .= " and place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                    $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                                 }
                                 }

-                                if ($this->sViewboxCentreSQL) $sSQL .= " order by st_distance($this->sViewboxCentreSQL, ct.centroid) asc";
+                                if ($this->sViewboxCentreSQL) $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, ct.centroid) ASC";

                                 $sSQL .= " limit $this->iLimit";
                                 if (CONST_Debug) var_dump($sSQL);
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                 $sSQL .= " limit $this->iLimit";
                                 if (CONST_Debug) var_dump($sSQL);
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));


@@ -1089,26 +1267,30 @@ class Geocode
                                 // expansion in that case.
                                 // Also don't expand if bounded results were requested.
                                 if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch) {
                                 // expansion in that case.
                                 // Also don't expand if bounded results were requested.
                                 if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch) {

-                                    $sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
+                                    $sSQL = "SELECT place_id FROM place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";

                                     if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
                                     if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";

-                                    $sSQL .= " where st_contains($this->sViewboxLargeSQL, ct.centroid)";
-                                    if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-                                    if ($this->sViewboxCentreSQL) $sSQL .= " order by st_distance($this->sViewboxCentreSQL, ct.centroid) asc";
-                                    $sSQL .= " limit $this->iLimit";
+                                    $sSQL .= " WHERE ST_Contains($this->sViewboxLargeSQL, ct.centroid)";
+                                    if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";
+                                    if ($this->sViewboxCentreSQL) $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, ct.centroid) ASC";
+                                    $sSQL .= " LIMIT $this->iLimit";

                                     if (CONST_Debug) var_dump($sSQL);
                                     $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                 }
                             } else {
                                     if (CONST_Debug) var_dump($sSQL);
                                     $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                 }
                             } else {

-                                $sSQL = "select place_id from placex where class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
-                                $sSQL .= " and st_contains($this->sViewboxSmallSQL, geometry) and linked_place_id is null";
-                                if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-                                if ($this->sViewboxCentreSQL)   $sSQL .= " order by st_distance($this->sViewboxCentreSQL, centroid) asc";
-                                $sSQL .= " limit $this->iLimit";
+                                $sSQL = "SELECT place_id ";
+                                $sSQL .= "FROM placex ";
+                                $sSQL .= "WHERE class='".$aSearch['sClass']."' ";
+                                $sSQL .= "  AND type='".$aSearch['sType']."'";
+                                $sSQL .= "  AND ST_Contains($this->sViewboxSmallSQL, geometry) ";
+                                $sSQL .= "  AND linked_place_id is null";
+                                if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";
+                                if ($this->sViewboxCentreSQL)   $sSQL .= " ORDER BY ST_Distance($this->sViewboxCentreSQL, centroid) ASC";
+                                $sSQL .= " LIMIT $this->iLimit";

                                 if (CONST_Debug) var_dump($sSQL);
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             }
                         }
                                 if (CONST_Debug) var_dump($sSQL);
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             }
                         }

-                    } else if ($aSearch['fLon'] && !sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['sClass']) {
+                    } elseif ($aSearch['fLon'] && !sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['sClass']) {

                         // If a coordinate is given, the search must either
                         // be for a name or a special search. Ignore everythin else.
                         $aPlaceIDs = array();
                         // If a coordinate is given, the search must either
                         // be for a name or a special search. Ignore everythin else.
                         $aPlaceIDs = array();


@@ -1122,29 +1304,42 @@ class Geocode
                         if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress'])) {
                             $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                             $aOrder[] = "";
                         if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress'])) {
                             $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                             $aOrder[] = "";

-                            $aOrder[0] = " (exists(select place_id from placex where parent_place_id = search_name.place_id";
-                            $aOrder[0] .= " and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) ";
+                            $aOrder[0] = "  (";
+                            $aOrder[0] .= "   EXISTS(";
+                            $aOrder[0] .= "     SELECT place_id ";
+                            $aOrder[0] .= "     FROM placex ";
+                            $aOrder[0] .= "     WHERE parent_place_id = search_name.place_id";
+                            $aOrder[0] .= "       AND transliteration(housenumber) ~* E'".$sHouseNumberRegex."' ";
+                            $aOrder[0] .= "     LIMIT 1";
+                            $aOrder[0] .= "   ) ";

                             // also housenumbers from interpolation lines table are needed
                             // also housenumbers from interpolation lines table are needed

-                            $aOrder[0] .= " or exists(select place_id from location_property_osmline where parent_place_id = search_name.place_id";
-                            $aOrder[0] .= " and ".intval($aSearch['sHouseNumber']).">=startnumber and ".intval($aSearch['sHouseNumber'])."<=endnumber limit 1))";
-                            $aOrder[0] .= " desc";
+                            $aOrder[0] .= "   OR EXISTS(";
+                            $aOrder[0] .= "     SELECT place_id ";
+                            $aOrder[0] .= "     FROM location_property_osmline ";
+                            $aOrder[0] .= "     WHERE parent_place_id = search_name.place_id";
+                            $aOrder[0] .= "       AND ".intval($aSearch['sHouseNumber']).">=startnumber ";
+                            $aOrder[0] .= "       AND ".intval($aSearch['sHouseNumber'])."<=endnumber ";
+                            $aOrder[0] .= "     LIMIT 1";
+                            $aOrder[0] .= "   )";
+                            $aOrder[0] .= " )";
+                            $aOrder[0] .= " DESC";

                         }
 
                         // TODO: filter out the pointless search terms (2 letter name tokens and less)
                         // they might be right - but they are just too darned expensive to run
                         }
 
                         // TODO: filter out the pointless search terms (2 letter name tokens and less)
                         // they might be right - but they are just too darned expensive to run

-                        if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'],",")."]";
-                        if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'],",")."]";
+                        if (sizeof($aSearch['aName'])) $aTerms[] = "name_vector @> ARRAY[".join($aSearch['aName'], ",")."]";
+                        if (sizeof($aSearch['aNameNonSearch'])) $aTerms[] = "array_cat(name_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aNameNonSearch'], ",")."]";

                         if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress']) {
                             // For infrequent name terms disable index usage for address
                         if (sizeof($aSearch['aAddress']) && $aSearch['aName'] != $aSearch['aAddress']) {
                             // For infrequent name terms disable index usage for address

-                            if (CONST_Search_NameOnlySearchFrequencyThreshold &&
-                                    sizeof($aSearch['aName']) == 1 &&
-                                    $aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold
+                            if (CONST_Search_NameOnlySearchFrequencyThreshold
+                                && sizeof($aSearch['aName']) == 1
+                                && $aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold

                             ) {
                             ) {

-                                $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]";
+                                $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'], $aSearch['aAddressNonSearch']), ",")."]";

                             } else {
                             } else {

-                                $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'],",")."]";
+                                $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'], ",")."]";

                                 if (sizeof($aSearch['aAddressNonSearch'])) {
                                 if (sizeof($aSearch['aAddressNonSearch'])) {

-                                    $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]";
+                                    $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'], ",")."]";

                                 }
                             }
                         }
                                 }
                             }
                         }


@@ -1160,52 +1355,66 @@ class Geocode
                             }
                         }
                         if ($aSearch['fLon'] && $aSearch['fLat']) {
                             }
                         }
                         if ($aSearch['fLon'] && $aSearch['fLat']) {

-                            $aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";
+                            $aTerms[] = sprintf(
+                                'ST_DWithin(centroid, ST_SetSRID(ST_Point(%F,%F),4326), %F)',
+                                $aSearch['fLon'],
+                                $aSearch['fLat'],
+                                $aSearch['fRadius']
+                            );
+

                             $aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC";
                         }
                         if (sizeof($this->aExcludePlaceIDs)) {
                             $aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC";
                         }
                         if (sizeof($this->aExcludePlaceIDs)) {

-                            $aTerms[] = "place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                            $aTerms[] = "place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                         }
                         if ($sCountryCodesSQL) {
                             $aTerms[] = "country_code in ($sCountryCodesSQL)";
                         }
 
                         if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL";
                         }
                         if ($sCountryCodesSQL) {
                             $aTerms[] = "country_code in ($sCountryCodesSQL)";
                         }
 
                         if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL";

-                        if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
+                        if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) ASC";

 
                         if ($aSearch['sHouseNumber']) {
                             $sImportanceSQL = '- abs(26 - address_rank) + 3';
                         } else {
 
                         if ($aSearch['sHouseNumber']) {
                             $sImportanceSQL = '- abs(26 - address_rank) + 3';
                         } else {

-                            $sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+                            $sImportanceSQL = '(CASE WHEN importance = 0 OR importance IS NULL THEN 0.75-(search_rank::float/40) ELSE importance END)';

                         }
                         }

-                        if ($this->sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
-                        if ($this->sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($this->sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
+                        if ($this->sViewboxSmallSQL) $sImportanceSQL .= " * CASE WHEN ST_Contains($this->sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
+                        if ($this->sViewboxLargeSQL) $sImportanceSQL .= " * CASE WHEN ST_Contains($this->sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";

 
                         $aOrder[] = "$sImportanceSQL DESC";
                         if (sizeof($aSearch['aFullNameAddress'])) {
 
                         $aOrder[] = "$sImportanceSQL DESC";
                         if (sizeof($aSearch['aFullNameAddress'])) {

-                            $sExactMatchSQL = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'],",").']) INTERSECT select unnest(nameaddress_vector))s) as exactmatch';
+                            $sExactMatchSQL = ' ( ';
+                            $sExactMatchSQL .= '   SELECT count(*) FROM ( ';
+                            $sExactMatchSQL .= '      SELECT unnest(ARRAY['.join($aSearch['aFullNameAddress'], ",").']) ';
+                            $sExactMatchSQL .= '      INTERSECT ';
+                            $sExactMatchSQL .= '      SELECT unnest(nameaddress_vector)';
+                            $sExactMatchSQL .= '   ) s';
+                            $sExactMatchSQL .= ') as exactmatch';

                             $aOrder[] = 'exactmatch DESC';
                         } else {
                             $sExactMatchSQL = '0::int as exactmatch';
                         }
 
                         if (sizeof($aTerms)) {
                             $aOrder[] = 'exactmatch DESC';
                         } else {
                             $sExactMatchSQL = '0::int as exactmatch';
                         }
 
                         if (sizeof($aTerms)) {

-                            $sSQL = "select place_id, ";
+                            $sSQL = "SELECT place_id, ";

                             $sSQL .= $sExactMatchSQL;
                             $sSQL .= $sExactMatchSQL;

-                            $sSQL .= " from search_name";
-                            $sSQL .= " where ".join(' and ',$aTerms);
-                            $sSQL .= " order by ".join(', ',$aOrder);
+                            $sSQL .= " FROM search_name";
+                            $sSQL .= " WHERE ".join(' and ', $aTerms);
+                            $sSQL .= " ORDER BY ".join(', ', $aOrder);

                             if ($aSearch['sHouseNumber'] || $aSearch['sClass']) {
                             if ($aSearch['sHouseNumber'] || $aSearch['sClass']) {

-                                $sSQL .= " limit 20";
+                                $sSQL .= " LIMIT 20";

                             } elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass']) {
                             } elseif (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && $aSearch['sClass']) {

-                                $sSQL .= " limit 1";
+                                $sSQL .= " LIMIT 1";

                             } else {
                             } else {

-                                $sSQL .= " limit ".$this->iLimit;
+                                $sSQL .= " LIMIT ".$this->iLimit;

                             }
 
                             if (CONST_Debug) var_dump($sSQL);
                             }
 
                             if (CONST_Debug) var_dump($sSQL);

-                            $aViewBoxPlaceIDs = chksql($this->oDB->getAll($sSQL),
-                                                       "Could not get places for search terms.");
+                            $aViewBoxPlaceIDs = chksql(
+                                $this->oDB->getAll($sSQL),
+                                "Could not get places for search terms."
+                            );

                             //var_dump($aViewBoxPlaceIDs);
                             // Did we have an viewbox matches?
                             $aPlaceIDs = array();
                             //var_dump($aViewBoxPlaceIDs);
                             // Did we have an viewbox matches?
                             $aPlaceIDs = array();


@@ -1226,44 +1435,52 @@ class Geocode
                         if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs)) {
                             $searchedHousenumber = intval($aSearch['sHouseNumber']);
                             $aRoadPlaceIDs = $aPlaceIDs;
                         if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs)) {
                             $searchedHousenumber = intval($aSearch['sHouseNumber']);
                             $aRoadPlaceIDs = $aPlaceIDs;

-                            $sPlaceIDs = join(',',$aPlaceIDs);
+                            $sPlaceIDs = join(',', $aPlaceIDs);

 
                             // Now they are indexed, look for a house attached to a street we found
                             $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
 
                             // Now they are indexed, look for a house attached to a street we found
                             $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';

-                            $sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and transliteration(housenumber) ~* E'".$sHouseNumberRegex."'";
+                            $sSQL = "SELECT place_id FROM placex ";
+                            $sSQL .= "WHERE parent_place_id in (".$sPlaceIDs.") and transliteration(housenumber) ~* E'".$sHouseNumberRegex."'";

                             if (sizeof($this->aExcludePlaceIDs)) {
                             if (sizeof($this->aExcludePlaceIDs)) {

-                                $sSQL .= " and place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                             }
                             }

-                            $sSQL .= " limit $this->iLimit";
+                            $sSQL .= " LIMIT $this->iLimit";

                             if (CONST_Debug) var_dump($sSQL);
                             $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             if (CONST_Debug) var_dump($sSQL);
                             $aPlaceIDs = chksql($this->oDB->getCol($sSQL));

-                            
+

                             // if nothing found, search in the interpolation line table
                             if (!sizeof($aPlaceIDs)) {
                                 // do we need to use transliteration and the regex for housenumbers???
                                 //new query for lines, not housenumbers anymore
                             // if nothing found, search in the interpolation line table
                             if (!sizeof($aPlaceIDs)) {
                                 // do we need to use transliteration and the regex for housenumbers???
                                 //new query for lines, not housenumbers anymore

+                                $sSQL = "SELECT distinct place_id FROM location_property_osmline";
+                                $sSQL .= " WHERE parent_place_id in (".$sPlaceIDs.") and (";

                                 if ($searchedHousenumber%2 == 0) {
                                     //if housenumber is even, look for housenumber in streets with interpolationtype even or all
                                 if ($searchedHousenumber%2 == 0) {
                                     //if housenumber is even, look for housenumber in streets with interpolationtype even or all

-                                    $sSQL = "select distinct place_id from location_property_osmline where parent_place_id in (".$sPlaceIDs.") and (interpolationtype='even' or interpolationtype='all') and ".$searchedHousenumber.">=startnumber and ".$searchedHousenumber."<=endnumber";
+                                    $sSQL .= "interpolationtype='even'";

                                 } else {
                                     //look for housenumber in streets with interpolationtype odd or all
                                 } else {
                                     //look for housenumber in streets with interpolationtype odd or all

-                                    $sSQL = "select distinct place_id from location_property_osmline where parent_place_id in (".$sPlaceIDs.") and (interpolationtype='odd' or interpolationtype='all') and ".$searchedHousenumber.">=startnumber and ".$searchedHousenumber."<=endnumber";
+                                    $sSQL .= "interpolationtype='odd'";

                                 }
                                 }

+                                $sSQL .= " or interpolationtype='all') and ";
+                                $sSQL .= $searchedHousenumber.">=startnumber and ";
+                                $sSQL .= $searchedHousenumber."<=endnumber";

 
                                 if (sizeof($this->aExcludePlaceIDs)) {
 
                                 if (sizeof($this->aExcludePlaceIDs)) {

-                                    $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
+                                    $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                                 }
                                 //$sSQL .= " limit $this->iLimit";
                                 if (CONST_Debug) var_dump($sSQL);
                                 //get place IDs
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0));
                             }
                                 }
                                 //$sSQL .= " limit $this->iLimit";
                                 if (CONST_Debug) var_dump($sSQL);
                                 //get place IDs
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0));
                             }

-                                
+

                             // If nothing found try the aux fallback table
                             if (CONST_Use_Aux_Location_data && !sizeof($aPlaceIDs)) {
                             // If nothing found try the aux fallback table
                             if (CONST_Use_Aux_Location_data && !sizeof($aPlaceIDs)) {

-                                $sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
+                                $sSQL = "SELECT place_id FROM location_property_aux ";
+                                $sSQL .= " WHERE parent_place_id in (".$sPlaceIDs.") ";
+                                $sSQL .= " AND housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";

                                 if (sizeof($this->aExcludePlaceIDs)) {
                                 if (sizeof($this->aExcludePlaceIDs)) {

-                                    $sSQL .= " and parent_place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                    $sSQL .= " AND parent_place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                                 }
                                 //$sSQL .= " limit $this->iLimit";
                                 if (CONST_Debug) var_dump($sSQL);
                                 }
                                 //$sSQL .= " limit $this->iLimit";
                                 if (CONST_Debug) var_dump($sSQL);


@@ -1272,17 +1489,19 @@ class Geocode
 
                             //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)
                             if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs)) {
 
                             //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)
                             if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs)) {

-                                //new query for lines, not housenumbers anymore
+                                $sSQL = "SELECT distinct place_id FROM location_property_tiger";
+                                $sSQL .= " WHERE parent_place_id in (".$sPlaceIDs.") and (";

                                 if ($searchedHousenumber%2 == 0) {
                                 if ($searchedHousenumber%2 == 0) {

-                                    //if housenumber is even, look for housenumber in streets with interpolationtype even or all
-                                    $sSQL = "select distinct place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and (interpolationtype='even' or interpolationtype='all') and ".$searchedHousenumber.">=startnumber and ".$searchedHousenumber."<=endnumber";
+                                    $sSQL .= "interpolationtype='even'";

                                 } else {
                                 } else {

-                                    //look for housenumber in streets with interpolationtype odd or all
-                                    $sSQL = "select distinct place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and (interpolationtype='odd' or interpolationtype='all') and ".$searchedHousenumber.">=startnumber and ".$searchedHousenumber."<=endnumber";
+                                    $sSQL .= "interpolationtype='odd'";

                                 }
                                 }

+                                $sSQL .= " or interpolationtype='all') and ";
+                                $sSQL .= $searchedHousenumber.">=startnumber and ";
+                                $sSQL .= $searchedHousenumber."<=endnumber";

 
                                 if (sizeof($this->aExcludePlaceIDs)) {
 
                                 if (sizeof($this->aExcludePlaceIDs)) {

-                                    $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
+                                    $sSQL .= " AND place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                                 }
                                 //$sSQL .= " limit $this->iLimit";
                                 if (CONST_Debug) var_dump($sSQL);
                                 }
                                 //$sSQL .= " limit $this->iLimit";
                                 if (CONST_Debug) var_dump($sSQL);


@@ -1306,19 +1525,25 @@ class Geocode
 
                             if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name') {
                                 // If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match
 
                             if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name') {
                                 // If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match

-                                $sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
-                                $sSQL .= " and linked_place_id is null";
-                                if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-                                $sSQL .= " order by rank_search asc limit $this->iLimit";
+                                $sSQL = "SELECT place_id ";
+                                $sSQL .= " FROM placex ";
+                                $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
+                                $sSQL .= "   AND class='".$aSearch['sClass']."' ";
+                                $sSQL .= "   AND type='".$aSearch['sType']."'";
+                                $sSQL .= "   AND linked_place_id is null";
+                                if ($sCountryCodesSQL) $sSQL .= " AND calculated_country_code in ($sCountryCodesSQL)";
+                                $sSQL .= " ORDER BY rank_search ASC ";
+                                $sSQL .= " LIMIT $this->iLimit";

                                 if (CONST_Debug) var_dump($sSQL);
                                 $aClassPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             }
 
                             if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') { // & in
                                 if (CONST_Debug) var_dump($sSQL);
                                 $aClassPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             }
 
                             if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') { // & in

-                                $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
+                                $sSQL = "SELECT count(*) FROM pg_tables ";
+                                $sSQL .= "WHERE tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";

                                 $bCacheTable = chksql($this->oDB->getOne($sSQL));
 
                                 $bCacheTable = chksql($this->oDB->getOne($sSQL));
 

-                                $sSQL = "select min(rank_search) from placex where place_id in ($sPlaceIDs)";
+                                $sSQL = "SELECT min(rank_search) FROM placex WHERE place_id in ($sPlaceIDs)";

 
                                 if (CONST_Debug) var_dump($sSQL);
                                 $this->iMaxRank = ((int)chksql($this->oDB->getOne($sSQL)));
 
                                 if (CONST_Debug) var_dump($sSQL);
                                 $this->iMaxRank = ((int)chksql($this->oDB->getOne($sSQL)));


@@ -1327,7 +1552,13 @@ class Geocode
                                 $sPlaceGeom = false;
                                 if ($this->iMaxRank < 9 && $bCacheTable) {
                                     // Try and get a polygon to search in instead
                                 $sPlaceGeom = false;
                                 if ($this->iMaxRank < 9 && $bCacheTable) {
                                     // Try and get a polygon to search in instead

-                                    $sSQL = "select geometry from placex where place_id in ($sPlaceIDs) and rank_search < $this->iMaxRank + 5 and st_geometrytype(geometry) in ('ST_Polygon','ST_MultiPolygon') order by rank_search asc limit 1";
+                                    $sSQL = "SELECT geometry ";
+                                    $sSQL .= " FROM placex";
+                                    $sSQL .= " WHERE place_id in ($sPlaceIDs)";
+                                    $sSQL .= "   AND rank_search < $this->iMaxRank + 5";
+                                    $sSQL .= "   AND ST_Geometrytype(geometry) in ('ST_Polygon','ST_MultiPolygon')";
+                                    $sSQL .= " ORDER BY rank_search ASC ";
+                                    $sSQL .= " LIMIT 1";

                                     if (CONST_Debug) var_dump($sSQL);
                                     $sPlaceGeom = chksql($this->oDB->getOne($sSQL));
                                 }
                                     if (CONST_Debug) var_dump($sSQL);
                                     $sPlaceGeom = chksql($this->oDB->getOne($sSQL));
                                 }


@@ -1336,10 +1567,10 @@ class Geocode
                                     $sPlaceIDs = false;
                                 } else {
                                     $this->iMaxRank += 5;
                                     $sPlaceIDs = false;
                                 } else {
                                     $this->iMaxRank += 5;

-                                    $sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and rank_search < $this->iMaxRank";
+                                    $sSQL = "SELECT place_id FROM placex WHERE place_id in ($sPlaceIDs) and rank_search < $this->iMaxRank";

                                     if (CONST_Debug) var_dump($sSQL);
                                     $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                     if (CONST_Debug) var_dump($sSQL);
                                     $aPlaceIDs = chksql($this->oDB->getCol($sSQL));

-                                    $sPlaceIDs = join(',',$aPlaceIDs);
+                                    $sPlaceIDs = join(',', $aPlaceIDs);

                                 }
 
                                 if ($sPlaceIDs || $sPlaceGeom) {
                                 }
 
                                 if ($sPlaceIDs || $sPlaceGeom) {


@@ -1350,8 +1581,8 @@ class Geocode
 
                                         $sOrderBySQL = '';
                                         if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.centroid)";
 
                                         $sOrderBySQL = '';
                                         if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.centroid)";

-                                        else if ($sPlaceIDs) $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
-                                        else if ($sPlaceGeom) $sOrderBysSQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
+                                        elseif ($sPlaceIDs) $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
+                                        elseif ($sPlaceGeom) $sOrderBysSQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";

 
                                         $sSQL = "select distinct l.place_id".($sOrderBySQL?','.$sOrderBySQL:'')." from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l";
                                         if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)";
 
                                         $sSQL = "select distinct l.place_id".($sOrderBySQL?','.$sOrderBySQL:'')." from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l";
                                         if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)";


@@ -1364,7 +1595,7 @@ class Geocode
                                             $sSQL .= "ST_Contains('".$sPlaceGeom."', l.centroid) ";
                                         }
                                         if (sizeof($this->aExcludePlaceIDs)) {
                                             $sSQL .= "ST_Contains('".$sPlaceGeom."', l.centroid) ";
                                         }
                                         if (sizeof($this->aExcludePlaceIDs)) {

-                                            $sSQL .= " and l.place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                            $sSQL .= " and l.place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                                         }
                                         if ($sCountryCodesSQL) $sSQL .= " and lp.calculated_country_code in ($sCountryCodesSQL)";
                                         if ($sOrderBySQL) $sSQL .= "order by ".$sOrderBySQL." asc";
                                         }
                                         if ($sCountryCodesSQL) $sSQL .= " and lp.calculated_country_code in ($sCountryCodesSQL)";
                                         if ($sOrderBySQL) $sSQL .= "order by ".$sOrderBySQL." asc";


@@ -1379,15 +1610,18 @@ class Geocode
                                         if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.geometry)";
                                         else $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)";
 
                                         if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.geometry)";
                                         else $sOrderBySQL = "ST_Distance(l.geometry, f.geometry)";
 

-                                        $sSQL = "select distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'')." from placex as l,placex as f where ";
-                                        $sSQL .= "f.place_id in ( $sPlaceIDs) and ST_DWithin(l.geometry, f.centroid, $fRange) ";
-                                        $sSQL .= "and l.class='".$aSearch['sClass']."' and l.type='".$aSearch['sType']."' ";
+                                        $sSQL = "SELECT distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'');
+                                        $sSQL .= " FROM placex as l, placex as f ";
+                                        $sSQL .= " WHERE f.place_id in ($sPlaceIDs) ";
+                                        $sSQL .= "  AND ST_DWithin(l.geometry, f.centroid, $fRange) ";
+                                        $sSQL .= "  AND l.class='".$aSearch['sClass']."' ";
+                                        $sSQL .= "  AND l.type='".$aSearch['sType']."' ";

                                         if (sizeof($this->aExcludePlaceIDs)) {
                                         if (sizeof($this->aExcludePlaceIDs)) {

-                                            $sSQL .= " and l.place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                            $sSQL .= " AND l.place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                                         }
                                         }

-                                        if ($sCountryCodesSQL) $sSQL .= " and l.calculated_country_code in ($sCountryCodesSQL)";
-                                        if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc";
-                                        if ($this->iOffset) $sSQL .= " offset $this->iOffset";
+                                        if ($sCountryCodesSQL) $sSQL .= " AND l.calculated_country_code in ($sCountryCodesSQL)";
+                                        if ($sOrderBy) $sSQL .= "ORDER BY ".$OrderBysSQL." ASC";
+                                        if ($this->iOffset) $sSQL .= " OFFSET $this->iOffset";

                                         $sSQL .= " limit $this->iLimit";
                                         if (CONST_Debug) var_dump($sSQL);
                                         $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL)));
                                         $sSQL .= " limit $this->iLimit";
                                         if (CONST_Debug) var_dump($sSQL);
                                         $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL)));


@@ -1399,7 +1633,8 @@ class Geocode
                     }
 
                     if (CONST_Debug) {
                     }
 
                     if (CONST_Debug) {

-                        echo "<br><b>Place IDs:</b> "; var_Dump($aPlaceIDs);
+                        echo "<br><b>Place IDs:</b> ";
+                        var_Dump($aPlaceIDs);

                     }
 
                     foreach ($aPlaceIDs as $iPlaceID) {
                     }
 
                     foreach ($aPlaceIDs as $iPlaceID) {


@@ -1413,17 +1648,31 @@ class Geocode
                     // Need to verify passes rank limits before dropping out of the loop (yuk!)
                     // reduces the number of place ids, like a filter
                     // rank_address is 30 for interpolated housenumbers
                     // Need to verify passes rank limits before dropping out of the loop (yuk!)
                     // reduces the number of place ids, like a filter
                     // rank_address is 30 for interpolated housenumbers

-                    $sSQL = "select place_id from placex where place_id in (".join(',',array_keys($aResultPlaceIDs)).") ";
-                    $sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
-                    if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
-                    if ($this->aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$this->aAddressRankList).")";
+                    $sSQL = "SELECT place_id ";
+                    $sSQL .= "FROM placex ";
+                    $sSQL .= "WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).") ";
+                    $sSQL .= "  AND (";
+                    $sSQL .= "         placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
+                    if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) {
+                        $sSQL .= "     OR (extratags->'place') = 'city'";
+                    }
+                    if ($this->aAddressRankList) {
+                        $sSQL .= "     OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
+                    }

                     if (CONST_Use_US_Tiger_Data) {
                     if (CONST_Use_US_Tiger_Data) {

-                        $sSQL .= ") UNION select place_id from location_property_tiger where place_id in (".join(',',array_keys($aResultPlaceIDs)).") ";
-                        $sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
-                        if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";
+                        $sSQL .= "  ) ";
+                        $sSQL .= "UNION ";
+                        $sSQL .= "  SELECT place_id ";
+                        $sSQL .= "  FROM location_property_tiger ";
+                        $sSQL .= "  WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).") ";
+                        $sSQL .= "    AND (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
+                        if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',', $this->aAddressRankList).")";

                     }
                     }

-                    $sSQL .= ") UNION select place_id from location_property_osmline where place_id in (".join(',',array_keys($aResultPlaceIDs)).")";
-                    $sSQL .= " and (30 between $this->iMinAddressRank and $this->iMaxAddressRank)";
+                    $sSQL .= ") UNION ";
+                    $sSQL .= "  SELECT place_id ";
+                    $sSQL .= "  FROM location_property_osmline ";
+                    $sSQL .= "  WHERE place_id in (".join(',', array_keys($aResultPlaceIDs)).")";
+                    $sSQL .= "    AND (30 between $this->iMinAddressRank and $this->iMaxAddressRank)";

                     if (CONST_Debug) var_dump($sSQL);
                     $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
                     $tempIDs = array();
                     if (CONST_Debug) var_dump($sSQL);
                     $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
                     $tempIDs = array();


@@ -1448,14 +1697,17 @@ class Geocode
             $oReverse = new ReverseGeocode($this->oDB);
             $oReverse->setZoom(18);
 
             $oReverse = new ReverseGeocode($this->oDB);
             $oReverse->setZoom(18);
 

-            $aLookup = $oReverse->lookup((float)$this->aNearPoint[0],
-                                         (float)$this->aNearPoint[1],
-                                         false);
+            $aLookup = $oReverse->lookup(
+                (float)$this->aNearPoint[0],
+                (float)$this->aNearPoint[1],
+                false
+            );

 
             if (CONST_Debug) var_dump("Reverse search", $aLookup);
 
             if ($aLookup['place_id']) {
                 $aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));
 
             if (CONST_Debug) var_dump("Reverse search", $aLookup);
 
             if ($aLookup['place_id']) {
                 $aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));

+                $aResultPlaceIDs[$aLookup['place_id']] = -1;

             } else {
                 $aSearchResults = array();
             }
             } else {
                 $aSearchResults = array();
             }


@@ -1473,13 +1725,14 @@ class Geocode
         }
 
         $aClassType = getClassTypesWithImportance();
         }
 
         $aClassType = getClassTypesWithImportance();

-        $aRecheckWords = preg_split('/\b[\s,\\-]*/u',$sQuery);
+        $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);

         foreach ($aRecheckWords as $i => $sWord) {
             if (!preg_match('/\pL/', $sWord)) unset($aRecheckWords[$i]);
         }
 
         if (CONST_Debug) {
         foreach ($aRecheckWords as $i => $sWord) {
             if (!preg_match('/\pL/', $sWord)) unset($aRecheckWords[$i]);
         }
 
         if (CONST_Debug) {

-            echo '<i>Recheck words:<\i>'; var_dump($aRecheckWords);
+            echo '<i>Recheck words:<\i>';
+            var_dump($aRecheckWords);

         }
 
         $oPlaceLookup = new PlaceLookup($this->oDB);
         }
 
         $oPlaceLookup = new PlaceLookup($this->oDB);


@@ -1507,17 +1760,17 @@ class Geocode
 
             // Is there an icon set for this type of result?
             if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon'])
 
             // Is there an icon set for this type of result?
             if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon'])

-                    && $aClassType[$aResult['class'].':'.$aResult['type']]['icon']
+                && $aClassType[$aResult['class'].':'.$aResult['type']]['icon']

             ) {
                 $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png';
             }
 
             if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'])
             ) {
                 $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png';
             }
 
             if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'])

-                    && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label']
+                && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label']

             ) {
                 $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'];
             } elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label'])
             ) {
                 $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'];
             } elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label'])

-                    && $aClassType[$aResult['class'].':'.$aResult['type']]['label']
+                && $aClassType[$aResult['class'].':'.$aResult['type']]['label']

             ) {
                 $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
             }
             ) {
                 $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
             }


@@ -1526,7 +1779,7 @@ class Geocode
                 // getAddressDetails() is defined in lib.php and uses the SQL function get_addressdata in functions.sql
                 $aResult['address'] = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code'], $aResultPlaceIDs[$aResult['place_id']]);
                 if ($aResult['extra_place'] == 'city' && !isset($aResult['address']['city'])) {
                 // getAddressDetails() is defined in lib.php and uses the SQL function get_addressdata in functions.sql
                 $aResult['address'] = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code'], $aResultPlaceIDs[$aResult['place_id']]);
                 if ($aResult['extra_place'] == 'city' && !isset($aResult['address']['city'])) {

-                    $aResult['address'] = array_merge(array('city' => array_shift(array_values($aResult['address']))), $aResult['address']);
+                    $aResult['address'] = array_merge(array('city' => array_values($aResult['address'])[0]), $aResult['address']);

                 }
             }
 
                 }
             }
 


@@ -1547,7 +1800,7 @@ class Geocode
             }
 
             // Adjust importance for the number of exact string matches in the result
             }
 
             // Adjust importance for the number of exact string matches in the result

-            $aResult['importance'] = max(0.001,$aResult['importance']);
+            $aResult['importance'] = max(0.001, $aResult['importance']);

             $iCountWords = 0;
             $sAddress = $aResult['langaddress'];
             foreach ($aRecheckWords as $i => $sWord) {
             $iCountWords = 0;
             $sAddress = $aResult['langaddress'];
             foreach ($aRecheckWords as $i => $sWord) {


@@ -1561,15 +1814,15 @@ class Geocode
 
             $aResult['name'] = $aResult['langaddress'];
             // secondary ordering (for results with same importance (the smaller the better):
 
             $aResult['name'] = $aResult['langaddress'];
             // secondary ordering (for results with same importance (the smaller the better):

-            //   - approximate importance of address parts
+            // - approximate importance of address parts

             $aResult['foundorder'] = -$aResult['addressimportance']/10;
             $aResult['foundorder'] = -$aResult['addressimportance']/10;

-            //   - number of exact matches from the query
+            // - number of exact matches from the query

             if (isset($this->exactMatchCache[$aResult['place_id']])) {
                 $aResult['foundorder'] -= $this->exactMatchCache[$aResult['place_id']];
             if (isset($this->exactMatchCache[$aResult['place_id']])) {
                 $aResult['foundorder'] -= $this->exactMatchCache[$aResult['place_id']];

-            } else if (isset($this->exactMatchCache[$aResult['parent_place_id']])) {
+            } elseif (isset($this->exactMatchCache[$aResult['parent_place_id']])) {

                 $aResult['foundorder'] -= $this->exactMatchCache[$aResult['parent_place_id']];
             }
                 $aResult['foundorder'] -= $this->exactMatchCache[$aResult['parent_place_id']];
             }

-            //  - importance of the class/type
+            // - importance of the class/type

             if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
                 && $aClassType[$aResult['class'].':'.$aResult['type']]['importance']
             ) {
             if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
                 && $aClassType[$aResult['class'].':'.$aResult['type']]['importance']
             ) {


@@ -1597,7 +1850,7 @@ class Geocode
                 $bFirst = false;
             }
             if (!$this->bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
                 $bFirst = false;
             }
             if (!$this->bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])

-                        && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']]))
+                && !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']]))

             ) {
                 $aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
                 $aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']] = true;
             ) {
                 $aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
                 $aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']] = true;


@@ -1609,9 +1862,5 @@ class Geocode
         }
 
         return $aSearchResults;
         }
 
         return $aSearchResults;

-

     } // end lookup()
     } // end lookup()

-
-

 } // end class
 } // end class

-