Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index f228bf7f1f3ec48c5e8d1261db122e06de5cb57c..83618113ad00e74fcf50640c9384c4f8a9eefc95 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');
 


@@ -21,7 +24,7 @@ class Geocode
 
     protected $aExcludePlaceIDs = array();
     protected $bDeDupe = true;
 
     protected $aExcludePlaceIDs = array();
     protected $bDeDupe = true;

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

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


@@ -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,50 +121,48 @@ 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)
-        {
-        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;
+        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;

         }
     }
 
         }
     }
 

-    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 == ' ') ? ',' : ' ';
             $fPoint = (float)$aPoint;
             $this->sViewboxCentreSQL .= $sSep.$fPoint;
             $sSep = ($sSep == ' ') ? ',' : ' ';


@@ -174,7 +176,7 @@ class Geocode
         $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);
 


@@ -190,31 +192,31 @@ class Geocode
         $this->sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".$aBigViewBox[0].",".$aBigViewBox[1]."),ST_Point(".$aBigViewBox[2].",".$aBigViewBox[3].")),4326)";
     }
 
         $this->sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".$aBigViewBox[0].",".$aBigViewBox[1]."),ST_Point(".$aBigViewBox[2].",".$aBigViewBox[3].")),4326)";
     }
 

-    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);


@@ -226,10 +228,8 @@ class Geocode
 
         // List of excluded Place IDs - used for more acurate pageing
         $sExcluded = $oParams->getStringList('exclude_place_ids');
 
         // List of excluded Place IDs - used for more acurate pageing
         $sExcluded = $oParams->getStringList('exclude_place_ids');

-        if ($sExcluded)
-        {
-            foreach($sExcluded as $iExcludedPlaceID)
-            {
+        if ($sExcluded) {
+            foreach ($sExcluded as $iExcludedPlaceID) {

                 $iExcludedPlaceID = (int)$iExcludedPlaceID;
                 if ($iExcludedPlaceID)
                     $aExcludePlaceIDs[$iExcludedPlaceID] = $iExcludedPlaceID;
                 $iExcludedPlaceID = (int)$iExcludedPlaceID;
                 if ($iExcludedPlaceID)
                     $aExcludePlaceIDs[$iExcludedPlaceID] = $iExcludedPlaceID;


@@ -246,72 +246,64 @@ class Geocode
 
         // Country code list
         $sCountries = $oParams->getStringList('countrycodes');
 
         // Country code list
         $sCountries = $oParams->getStringList('countrycodes');

-        if ($sCountries)
-        {
-            foreach($sCountries as $sCountryCode)
-            {
-                if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode))
-                {
+        if ($sCountries) {
+            foreach ($sCountries as $sCountryCode) {
+                if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode)) {

                     $aCountries[] = strtolower($sCountryCode);
                 }
             }
                     $aCountries[] = strtolower($sCountryCode);
                 }
             }

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

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

-        if ($aViewbox)
-        {
+        if ($aViewbox) {

             $this->setViewbox($aViewbox);
             $this->setViewbox($aViewbox);

-        }
-        else
-        {
+        } else {

             $aViewbox = $oParams->getStringList('viewbox');
             $aViewbox = $oParams->getStringList('viewbox');

-            if ($aViewbox)
-            {
-                $this->setViewBox(array($aViewbox[0], $aViewbox[3],
-                                        $aViewbox[2], $aViewbox[1]));
-            }
-            else
-            {
+            if ($aViewbox) {
+                $this->setViewBox(array(
+                                   $aViewbox[0],
+                                   $aViewbox[3],
+                                   $aViewbox[2],
+                                   $aViewbox[1]
+                                  ));
+            } else {

                 $aRoute = $oParams->getStringList('route');
                 $fRouteWidth = $oParams->getFloat('routewidth');
                 $aRoute = $oParams->getStringList('route');
                 $fRouteWidth = $oParams->getFloat('routewidth');

-                if ($aRoute && $fRouteWidth)
-                {
+                if ($aRoute && $fRouteWidth) {

                     $this->setRoute($aRoute, $fRouteWidth);
                 }
             }
         }
     }
 
                     $this->setRoute($aRoute, $fRouteWidth);
                 }
             }
         }
     }
 

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

     {
         // Search query
         $sQuery = $oParams->getString('q');
     {
         // 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'));
+        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->setReverseInPlan(false);
             $this->setReverseInPlan(false);

-        }
-        else
-        {
+        } else {

             $this->setQuery($sQuery);
         }
     }
 
             $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;
         $this->aStructuredQuery[$sKey] = $sValue;
     {
         $sValue = trim($sValue);
         if (!$sValue) return false;
         $this->aStructuredQuery[$sKey] = $sValue;

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

             $this->iMinAddressRank = $iNewMinAddressRank;
             $this->iMaxAddressRank = $iNewMaxAddressRank;
         }
             $this->iMinAddressRank = $iNewMinAddressRank;
             $this->iMaxAddressRank = $iNewMaxAddressRank;
         }


@@ -319,7 +311,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;
 


@@ -336,20 +328,18 @@ 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);
 
         $this->loadStructuredAddressElement($sCountry, 'country', 4, 4, false);
 

-        if (sizeof($this->aStructuredQuery) > 0)
-        {
+        if (sizeof($this->aStructuredQuery) > 0) {

             $this->sQuery = join(', ', $this->aStructuredQuery);
             $this->sQuery = join(', ', $this->aStructuredQuery);

-            if ($this->iMaxAddressRank < 30)
-            {
+            if ($this->iMaxAddressRank < 30) {

                 $sAllowedTypesSQLList = '(\'place\',\'boundary\')';
             }
         }
     }
 
                 $sAllowedTypesSQLList = '(\'place\',\'boundary\')';
             }
         }
     }
 

-    function fallbackStructuredQuery()
+    public function fallbackStructuredQuery()

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


@@ -359,10 +349,8 @@ class Geocode
 
         $aOrderToFallback = array('postalcode', 'street', 'city', 'county', 'state');
 
 
         $aOrderToFallback = array('postalcode', 'street', 'city', 'county', 'state');
 

-        foreach($aOrderToFallback as $sType)
-        {
-            if (isset($aParams[$sType]))
-            {
+        foreach ($aOrderToFallback as $sType) {
+            if (isset($aParams[$sType])) {

                 unset($aParams[$sType]);
                 $this->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
                 return true;
                 unset($aParams[$sType]);
                 $this->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
                 return true;


@@ -372,12 +360,12 @@ 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
     {
         //$aPlaceIDs is an array with key: placeID and value: tiger-housenumber, if found, else -1

-        if (sizeof($aPlaceIDs) == 0)  return array();
+        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));
 
         // Get the details for display (is this a redundant extra step?)
         $sPlaceIDs = join(',', array_keys($aPlaceIDs));


@@ -399,7 +387,7 @@ class Geocode
         $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'";
         $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).")";
+        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 .= ") ";
         if ($this->sAllowedTypesSQLList) $sSQL .= "and placex.class in $this->sAllowedTypesSQLList ";
         $sSQL .= "and linked_place_id is null ";


@@ -412,23 +400,19 @@ class Geocode
         if ($this->bIncludeNameDetails) $sSQL .= ",name";
         $sSQL .= ",extratags->'place' ";
 
         if ($this->bIncludeNameDetails) $sSQL .= ",name";
         $sSQL .= ",extratags->'place' ";
 

-        if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
-        {
-            //only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines 
+        if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank) {
+            // 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;
             $length = count($aPlaceIDs);
             // with start- and endnumber, the common osm housenumbers are usually saved as points
             $sHousenumbers = "";
             $i = 0;
             $length = count($aPlaceIDs);

-            foreach($aPlaceIDs as $placeID => $housenumber)
-            {
+            foreach ($aPlaceIDs as $placeID => $housenumber) {

                 $i++;
                 $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
                 $i++;
                 $sHousenumbers .= "(".$placeID.", ".$housenumber.")";

-                if($i<$length)
-                    $sHousenumbers .= ", ";
+                if ($i<$length) $sHousenumbers .= ", ";

             }
             }

-            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)
+            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)

                 $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 .= " 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 ";


@@ -441,7 +425,7 @@ class Geocode
                 $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";
                 $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
+                // 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 .= ", 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)) ";


@@ -464,7 +448,7 @@ class Geocode
             $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 ";
             $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
+            // 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 .= ", 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 ";


@@ -474,8 +458,7 @@ class Geocode
             $sSQL .= " group by place_id, housenumber_for_place, calculated_country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique
             if (!$this->bDeDupe) $sSQL .= ", place_id ";
 
             $sSQL .= " group by place_id, housenumber_for_place, 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 (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 .= " 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, ";


@@ -496,14 +479,19 @@ class Geocode
         }
 
         $sSQL .= " order by importance desc";
         }
 
         $sSQL .= " order by importance desc";

-        if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
-        $aSearchResults = chksql($this->oDB->getAll($sSQL),
-                                 "Could not get details for place.");
+        if (CONST_Debug) {
+            echo "<hr>";
+            var_dump($sSQL);
+        }
+        $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.


@@ -516,69 +504,53 @@ class Geocode
 
              Score how good the search is so they can be ordered
          */
 
              Score how good the search is so they can be ordered
          */

-        foreach($aPhrases as $iPhrase => $sPhrase)
-        {
+        foreach ($aPhrases as $iPhrase => $sPhrase) {

             $aNewPhraseSearches = array();
             if ($bStructuredPhrases) $sPhraseType = $aPhraseTypes[$iPhrase];
             else $sPhraseType = '';
 
             $aNewPhraseSearches = array();
             if ($bStructuredPhrases) $sPhraseType = $aPhraseTypes[$iPhrase];
             else $sPhraseType = '';
 

-            foreach($aPhrases[$iPhrase]['wordsets'] as $iWordSet => $aWordset)
-            {
+            foreach ($aPhrases[$iPhrase]['wordsets'] as $iWordSet => $aWordset) {

                 // Too many permutations - too expensive
                 if ($iWordSet > 120) break;
 
                 $aWordsetSearches = $aSearches;
 
                 // Add all words from this wordset
                 // Too many permutations - too expensive
                 if ($iWordSet > 120) break;
 
                 $aWordsetSearches = $aSearches;
 
                 // Add all words from this wordset

-                foreach($aWordset as $iToken => $sToken)
-                {
+                foreach ($aWordset as $iToken => $sToken) {

                     //echo "<br><b>$sToken</b>";
                     $aNewWordsetSearches = array();
 
                     //echo "<br><b>$sToken</b>";
                     $aNewWordsetSearches = array();
 

-                    foreach($aWordsetSearches as $aCurrentSearch)
-                    {
+                    foreach ($aWordsetSearches as $aCurrentSearch) {

                         //echo "<i>";
                         //var_dump($aCurrentSearch);
                         //echo "</i>";
 
                         // If the token is valid
                         //echo "<i>";
                         //var_dump($aCurrentSearch);
                         //echo "</i>";
 
                         // If the token is valid

-                        if (isset($aValidTokens[' '.$sToken]))
-                        {
-                            foreach($aValidTokens[' '.$sToken] as $aSearchTerm)
-                            {
+                        if (isset($aValidTokens[' '.$sToken])) {
+                            foreach ($aValidTokens[' '.$sToken] as $aSearchTerm) {

                                 $aSearch = $aCurrentSearch;
                                 $aSearch['iSearchRank']++;
                                 $aSearch = $aCurrentSearch;
                                 $aSearch['iSearchRank']++;

-                                if (($sPhraseType == '' || $sPhraseType == 'country') && !empty($aSearchTerm['country_code']) && $aSearchTerm['country_code'] != '0')
-                                {
-                                    if ($aSearch['sCountryCode'] === false)
-                                    {
+                                if (($sPhraseType == '' || $sPhraseType == 'country') && !empty($aSearchTerm['country_code']) && $aSearchTerm['country_code'] != '0') {
+                                    if ($aSearch['sCountryCode'] === false) {

                                         $aSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
                                         // Country is almost always at the end of the string - increase score for finding it anywhere else (optimisation)
                                         $aSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
                                         // Country is almost always at the end of the string - increase score for finding it anywhere else (optimisation)

-                                        if (($iToken+1 != sizeof($aWordset) || $iPhrase+1 != sizeof($aPhrases)))
-                                        {
+                                        if (($iToken+1 != sizeof($aWordset) || $iPhrase+1 != sizeof($aPhrases))) {

                                             $aSearch['iSearchRank'] += 5;
                                         }
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }
                                             $aSearch['iSearchRank'] += 5;
                                         }
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }

-                                }
-                                elseif (isset($aSearchTerm['lat']) && $aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null)
-                                {
-                                    if ($aSearch['fLat'] === '')
-                                    {
+                                } elseif (isset($aSearchTerm['lat']) && $aSearchTerm['lat'] !== '' && $aSearchTerm['lat'] !== null) {
+                                    if ($aSearch['fLat'] === '') {

                                         $aSearch['fLat'] = $aSearchTerm['lat'];
                                         $aSearch['fLon'] = $aSearchTerm['lon'];
                                         $aSearch['fRadius'] = $aSearchTerm['radius'];
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }
                                         $aSearch['fLat'] = $aSearchTerm['lat'];
                                         $aSearch['fLon'] = $aSearchTerm['lon'];
                                         $aSearch['fRadius'] = $aSearchTerm['radius'];
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }

-                                }
-                                elseif ($sPhraseType == 'postalcode')
-                                {
+                                } elseif ($sPhraseType == 'postalcode') {

                                     // We need to try the case where the postal code is the primary element (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode) so try both
                                     // We need to try the case where the postal code is the primary element (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode) so try both

-                                    if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])
-                                    {
+                                    if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id']) {

                                         // If we already have a name try putting the postcode first
                                         // If we already have a name try putting the postcode first

-                                        if (sizeof($aSearch['aName']))
-                                        {
+                                        if (sizeof($aSearch['aName'])) {

                                             $aNewSearch = $aSearch;
                                             $aNewSearch['aAddress'] = array_merge($aNewSearch['aAddress'], $aNewSearch['aName']);
                                             $aNewSearch['aName'] = array();
                                             $aNewSearch = $aSearch;
                                             $aNewSearch['aAddress'] = array_merge($aNewSearch['aAddress'], $aNewSearch['aName']);
                                             $aNewSearch['aName'] = array();


@@ -586,31 +558,21 @@ class Geocode
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aNewSearch;
                                         }
 
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aNewSearch;
                                         }
 

-                                        if (sizeof($aSearch['aName']))
-                                        {
-                                            if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strpos($sToken, ' ') !== false))
-                                            {
+                                        if (sizeof($aSearch['aName'])) {
+                                            if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strpos($sToken, ' ') !== false)) {

                                                 $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                                 $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];

-                                            }
-                                            else
-                                            {
+                                            } else {

                                                 $aCurrentSearch['aFullNameAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                                 $aSearch['iSearchRank'] += 1000; // skip;
                                             }
                                                 $aCurrentSearch['aFullNameAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                                 $aSearch['iSearchRank'] += 1000; // skip;
                                             }

-                                        }
-                                        else
-                                        {
+                                        } else {

                                             $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             //$aSearch['iNamePhrase'] = $iPhrase;
                                         }
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }
                                             $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             //$aSearch['iNamePhrase'] = $iPhrase;
                                         }
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }

-
-                                }
-                                elseif (($sPhraseType == '' || $sPhraseType == 'street') && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'house')
-                                {
-                                    if ($aSearch['sHouseNumber'] === '')
-                                    {
+                                } elseif (($sPhraseType == '' || $sPhraseType == 'street') && $aSearchTerm['class'] == 'place' && $aSearchTerm['type'] == 'house') {
+                                    if ($aSearch['sHouseNumber'] === '') {

                                         $aSearch['sHouseNumber'] = $sToken;
                                         // sanity check: if the housenumber is not mainly made
                                         // up of numbers, add a penalty
                                         $aSearch['sHouseNumber'] = $sToken;
                                         // sanity check: if the housenumber is not mainly made
                                         // up of numbers, add a penalty


@@ -625,11 +587,8 @@ class Geocode
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                          */
                                     }
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                          */
                                     }

-                                }
-                                elseif ($sPhraseType == '' && $aSearchTerm['class'] !== '' && $aSearchTerm['class'] !== null)
-                                {
-                                    if ($aSearch['sClass'] === '')
-                                    {
+                                } elseif ($sPhraseType == '' && $aSearchTerm['class'] !== '' && $aSearchTerm['class'] !== null) {
+                                    if ($aSearch['sClass'] === '') {

                                         $aSearch['sOperator'] = $aSearchTerm['operator'];
                                         $aSearch['sClass'] = $aSearchTerm['class'];
                                         $aSearch['sType'] = $aSearchTerm['type'];
                                         $aSearch['sOperator'] = $aSearchTerm['operator'];
                                         $aSearch['sClass'] = $aSearchTerm['class'];
                                         $aSearch['sType'] = $aSearchTerm['type'];


@@ -639,23 +598,15 @@ class Geocode
 
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }
 
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }

-                                }
-                                elseif (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])
-                                {
-                                    if (sizeof($aSearch['aName']))
-                                    {
-                                        if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strpos($sToken, ' ') !== false))
-                                        {
+                                } elseif (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id']) {
+                                    if (sizeof($aSearch['aName'])) {
+                                        if ((!$bStructuredPhrases || $iPhrase > 0) && $sPhraseType != 'country' && (!isset($aValidTokens[$sToken]) || strpos($sToken, ' ') !== false)) {

                                             $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];

-                                        }
-                                        else
-                                        {
+                                        } else {

                                             $aCurrentSearch['aFullNameAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             $aSearch['iSearchRank'] += 1000; // skip;
                                         }
                                             $aCurrentSearch['aFullNameAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             $aSearch['iSearchRank'] += 1000; // skip;
                                         }

-                                    }
-                                    else
-                                    {
+                                    } else {

                                         $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                         //$aSearch['iNamePhrase'] = $iPhrase;
                                     }
                                         $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                         //$aSearch['iNamePhrase'] = $iPhrase;
                                     }


@@ -666,66 +617,54 @@ class Geocode
                         // Look for partial matches.
                         // Note that there is no point in adding country terms here
                         // because country are omitted in the address.
                         // Look for partial matches.
                         // Note that there is no point in adding country terms here
                         // because country are omitted in the address.

-                        if (isset($aValidTokens[$sToken]) && $sPhraseType != 'country')
-                        {
+                        if (isset($aValidTokens[$sToken]) && $sPhraseType != 'country') {

                             // Allow searching for a word - but at extra cost
                             // Allow searching for a word - but at extra cost

-                            foreach($aValidTokens[$sToken] as $aSearchTerm)
-                            {
-                                if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id'])
-                                {
-                                    if ((!$bStructuredPhrases || $iPhrase > 0) && sizeof($aCurrentSearch['aName']) && strpos($sToken, ' ') === false)
-                                    {
+                            foreach ($aValidTokens[$sToken] as $aSearchTerm) {
+                                if (isset($aSearchTerm['word_id']) && $aSearchTerm['word_id']) {
+                                    if ((!$bStructuredPhrases || $iPhrase > 0) && sizeof($aCurrentSearch['aName']) && strpos($sToken, ' ') === false) {

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

-                                        if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency)
-                                        {
+                                        if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency) {

                                             $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                             $aSearch['aAddress'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;

-                                        }
-                                        elseif (isset($aValidTokens[' '.$sToken])) // revert to the token version?
-                                        {
+                                        } elseif (isset($aValidTokens[' '.$sToken])) { // revert to the token version?

                                             $aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             $aSearch['iSearchRank'] += 1;
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                             $aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             $aSearch['iSearchRank'] += 1;
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;

-                                            foreach($aValidTokens[' '.$sToken] as $aSearchTermToken)
-                                            {
+                                            foreach ($aValidTokens[' '.$sToken] as $aSearchTermToken) {

                                                 if (empty($aSearchTermToken['country_code'])
                                                 if (empty($aSearchTermToken['country_code'])

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

                                                     $aSearch = $aCurrentSearch;
                                                     $aSearch['iSearchRank'] += 1;
                                                     $aSearch['aAddress'][$aSearchTermToken['word_id']] = $aSearchTermToken['word_id'];
                                                     if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                                 }
                                             }
                                                     $aSearch = $aCurrentSearch;
                                                     $aSearch['iSearchRank'] += 1;
                                                     $aSearch['aAddress'][$aSearchTermToken['word_id']] = $aSearchTermToken['word_id'];
                                                     if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                                 }
                                             }

-                                        }
-                                        else
-                                        {
+                                        } else {

                                             $aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                         }
                                     }
 
                                             $aSearch['aAddressNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;
                                             if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                         }
                                     }
 

-                                    if (!sizeof($aCurrentSearch['aName']) || $aCurrentSearch['iNamePhrase'] == $iPhrase)
-                                    {
+                                    if (!sizeof($aCurrentSearch['aName']) || $aCurrentSearch['iNamePhrase'] == $iPhrase) {

                                         $aSearch = $aCurrentSearch;
                                         $aSearch['iSearchRank'] += 1;
                                         if (!sizeof($aCurrentSearch['aName'])) $aSearch['iSearchRank'] += 1;
                                         if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;
                                         $aSearch = $aCurrentSearch;
                                         $aSearch['iSearchRank'] += 1;
                                         if (!sizeof($aCurrentSearch['aName'])) $aSearch['iSearchRank'] += 1;
                                         if (preg_match('#^[0-9]+$#', $sToken)) $aSearch['iSearchRank'] += 2;

-                                        if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency)
+                                        if ($aWordFrequencyScores[$aSearchTerm['word_id']] < CONST_Max_Word_Frequency) {

                                             $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             $aSearch['aName'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];

-                                        else
+                                        } else {

                                             $aSearch['aNameNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];
                                             $aSearch['aNameNonSearch'][$aSearchTerm['word_id']] = $aSearchTerm['word_id'];

+                                        }

                                         $aSearch['iNamePhrase'] = $iPhrase;
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }
                                 }
                             }
                                         $aSearch['iNamePhrase'] = $iPhrase;
                                         if ($aSearch['iSearchRank'] < $this->iMaxRank) $aNewWordsetSearches[] = $aSearch;
                                     }
                                 }
                             }

-                        }
-                        else
-                        {
+                        } else {

                             // Allow skipping a word - but at EXTREAM cost
                             //$aSearch = $aCurrentSearch;
                             //$aSearch['iSearchRank']+=100;
                             // Allow skipping a word - but at EXTREAM cost
                             //$aSearch = $aCurrentSearch;
                             //$aSearch['iSearchRank']+=100;


@@ -742,8 +681,7 @@ class Geocode
                 usort($aNewPhraseSearches, 'bySearchRank');
 
                 $aSearchHash = array();
                 usort($aNewPhraseSearches, 'bySearchRank');
 
                 $aSearchHash = array();

-                foreach($aNewPhraseSearches as $iSearch => $aSearch)
-                {
+                foreach ($aNewPhraseSearches as $iSearch => $aSearch) {

                     $sHash = serialize($aSearch);
                     if (isset($aSearchHash[$sHash])) unset($aNewPhraseSearches[$iSearch]);
                     else $aSearchHash[$sHash] = 1;
                     $sHash = serialize($aSearch);
                     if (isset($aSearchHash[$sHash])) unset($aNewPhraseSearches[$iSearch]);
                     else $aSearchHash[$sHash] = 1;


@@ -754,10 +692,8 @@ class Geocode
 
             // Re-group the searches by their score, junk anything over 20 as just not worth trying
             $aGroupedSearches = array();
 
             // Re-group the searches by their score, junk anything over 20 as just not worth trying
             $aGroupedSearches = array();

-            foreach($aNewPhraseSearches as $aSearch)
-            {
-                if ($aSearch['iSearchRank'] < $this->iMaxRank)
-                {
+            foreach ($aNewPhraseSearches as $aSearch) {
+                if ($aSearch['iSearchRank'] < $this->iMaxRank) {

                     if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
                     $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
                 }
                     if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
                     $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
                 }


@@ -766,18 +702,15 @@ class Geocode
 
             $iSearchCount = 0;
             $aSearches = array();
 
             $iSearchCount = 0;
             $aSearches = array();

-            foreach($aGroupedSearches as $iScore => $aNewSearches)
-            {
+            foreach ($aGroupedSearches as $iScore => $aNewSearches) {

                 $iSearchCount += sizeof($aNewSearches);
                 $aSearches = array_merge($aSearches, $aNewSearches);
                 if ($iSearchCount > 50) break;
             }
 
             //if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
                 $iSearchCount += sizeof($aNewSearches);
                 $aSearches = array_merge($aSearches, $aNewSearches);
                 if ($iSearchCount > 50) break;
             }
 
             //if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);

-

         }
         return $aGroupedSearches;
         }
         return $aGroupedSearches;

-

     }
 
     /* Perform the actual query lookup.
     }
 
     /* Perform the actual query lookup.


@@ -810,75 +743,76 @@ 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;
         $sCountryCodesSQL = false;

-        if ($this->aCountryCodes)
-        {
+        if ($this->aCountryCodes) {

             $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
         }
 
         $sQuery = $this->sQuery;
 
         // Conflicts between US state abreviations and various words for 'the' in different languages
             $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
         }
 
         $sQuery = $this->sQuery;
 
         // 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);
+        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);

         }
 
         $bBoundingBoxSearch = $this->bBoundedSearch && $this->sViewboxSmallSQL;
         }
 
         $bBoundingBoxSearch = $this->bBoundedSearch && $this->sViewboxSmallSQL;

-        if ($this->sViewboxCentreSQL)
-        {
+        if ($this->sViewboxCentreSQL) {

             // For complex viewboxes (routes) precompute the bounding geometry
             // 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";
         }
 
         // Do we have anything that looks like a lat/lon pair?
             $this->sViewboxLargeSQL = "'".$sGeom."'::geometry";
         }
 
         // Do we have anything that looks like a lat/lon pair?

-        if ( $aLooksLike = looksLikeLatLonPair($sQuery) )
-        {
+        if ($aLooksLike = looksLikeLatLonPair($sQuery)) {

             $this->setNearPoint(array($aLooksLike['lat'], $aLooksLike['lon']));
             $sQuery = $aLooksLike['query'];
         }
 
         $aSearchResults = array();
             $this->setNearPoint(array($aLooksLike['lat'], $aLooksLike['lon']));
             $sQuery = $aLooksLike['query'];
         }
 
         $aSearchResults = array();

-        if ($sQuery || $this->aStructuredQuery)
-        {
+        if ($sQuery || $this->aStructuredQuery) {

             // Start with a blank search
             $aSearches = array(
             // Start with a blank search
             $aSearches = array(

-                array('iSearchRank' => 0,
-                            'iNamePhrase' => -1,
-                            'sCountryCode' => false,
-                            'aName' => array(),
-                            'aAddress' => array(),
-                            'aFullNameAddress' => array(),
-                            'aNameNonSearch' => array(),
-                            'aAddressNonSearch' => array(),
-                            'sOperator' => '',
-                            'aFeatureName' => array(),
-                            'sClass' => '',
-                            'sType' => '',
-                            'sHouseNumber' => '',
-                            'fLat' => '',
-                            'fLon' => '',
-                            'fRadius' => ''
-                        )
-            );
+                          array(
+                           'iSearchRank' => 0,
+                           'iNamePhrase' => -1,
+                           'sCountryCode' => false,
+                           'aName' => array(),
+                           'aAddress' => array(),
+                           'aFullNameAddress' => array(),
+                           'aNameNonSearch' => array(),
+                           'aAddressNonSearch' => array(),
+                           'sOperator' => '',
+                           'aFeatureName' => array(),
+                           'sClass' => '',
+                           'sType' => '',
+                           'sHouseNumber' => '',
+                           'fLat' => '',
+                           'fLon' => '',
+                           'fRadius' => ''
+                          )
+                         );

 
             // Do we have a radius search?
             $sNearPointSQL = false;
 
             // Do we have a radius search?
             $sNearPointSQL = false;

-            if ($this->aNearPoint)
-            {
+            if ($this->aNearPoint) {

                 $sNearPointSQL = "ST_SetSRID(ST_Point(".(float)$this->aNearPoint[1].",".(float)$this->aNearPoint[0]."),4326)";
                 $aSearches[0]['fLat'] = (float)$this->aNearPoint[0];
                 $aSearches[0]['fLon'] = (float)$this->aNearPoint[1];
                 $sNearPointSQL = "ST_SetSRID(ST_Point(".(float)$this->aNearPoint[1].",".(float)$this->aNearPoint[0]."),4326)";
                 $aSearches[0]['fLat'] = (float)$this->aNearPoint[0];
                 $aSearches[0]['fLon'] = (float)$this->aNearPoint[1];


@@ -889,21 +823,19 @@ class Geocode
             $bSpecialTerms = false;
             preg_match_all('/\\[(.*)=(.*)\\]/', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
             $aSpecialTerms = array();
             $bSpecialTerms = false;
             preg_match_all('/\\[(.*)=(.*)\\]/', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
             $aSpecialTerms = array();

-            foreach($aSpecialTermsRaw as $aSpecialTerm)
-            {
+            foreach ($aSpecialTermsRaw as $aSpecialTerm) {

                 $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
                 $aSpecialTerms[strtolower($aSpecialTerm[1])] = $aSpecialTerm[2];
             }
 
             preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
             $aSpecialTerms = array();
                 $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
                 $aSpecialTerms[strtolower($aSpecialTerm[1])] = $aSpecialTerm[2];
             }
 
             preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
             $aSpecialTerms = array();

-            if (isset($this->aStructuredQuery['amenity']) && $this->aStructuredQuery['amenity'])
-            {
+            if (isset($this->aStructuredQuery['amenity']) && $this->aStructuredQuery['amenity']) {

                 $aSpecialTermsRaw[] = array('['.$this->aStructuredQuery['amenity'].']', $this->aStructuredQuery['amenity']);
                 unset($this->aStructuredQuery['amenity']);
             }
                 $aSpecialTermsRaw[] = array('['.$this->aStructuredQuery['amenity'].']', $this->aStructuredQuery['amenity']);
                 unset($this->aStructuredQuery['amenity']);
             }

-            foreach($aSpecialTermsRaw as $aSpecialTerm)
-            {
+
+            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';
                 $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';


@@ -911,19 +843,15 @@ class Geocode
                 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();

-                foreach($aSearches as $aSearch)
-                {
-                    foreach($aSearchWords as $aSearchTerm)
-                    {
+                foreach ($aSearches as $aSearch) {
+                    foreach ($aSearchWords as $aSearchTerm) {

                         $aNewSearch = $aSearch;
                         $aNewSearch = $aSearch;

-                        if ($aSearchTerm['country_code'])
-                        {
+                        if ($aSearchTerm['country_code']) {

                             $aNewSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
                             $aNewSearches[] = $aNewSearch;
                             $bSpecialTerms = true;
                         }
                             $aNewSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
                             $aNewSearches[] = $aNewSearch;
                             $bSpecialTerms = true;
                         }

-                        if ($aSearchTerm['class'])
-                        {
+                        if ($aSearchTerm['class']) {

                             $aNewSearch['sClass'] = $aSearchTerm['class'];
                             $aNewSearch['sType'] = $aSearchTerm['type'];
                             $aNewSearches[] = $aNewSearch;
                             $aNewSearch['sClass'] = $aSearchTerm['class'];
                             $aNewSearch['sType'] = $aSearchTerm['type'];
                             $aNewSearches[] = $aNewSearch;


@@ -936,14 +864,11 @@ class Geocode
 
             // Split query into phrases
             // Commas are used to reduce the search space by indicating where phrases split
 
             // Split query into phrases
             // Commas are used to reduce the search space by indicating where phrases split

-            if ($this->aStructuredQuery)
-            {
+            if ($this->aStructuredQuery) {

                 $aPhrases = $this->aStructuredQuery;
                 $bStructuredPhrases = true;
                 $aPhrases = $this->aStructuredQuery;
                 $bStructuredPhrases = true;

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

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


@@ -952,19 +877,17 @@ class Geocode
             // Get all 'sets' of words
             // Generate a complete list of all
             $aTokens = array();
             // Get all 'sets' of words
             // 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?)");
-                if (trim($aPhrase['string']))
-                {
+            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?)"
+                );
+                if (trim($aPhrase['string'])) {

                     $aPhrases[$iPhrase] = $aPhrase;
                     $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']));
                     $aPhrases[$iPhrase]['wordsets'] = getWordSets($aPhrases[$iPhrase]['words'], 0);
                     $aTokens = array_merge($aTokens, getTokensFromSets($aPhrases[$iPhrase]['wordsets']));

-                }
-                else
-                {
+                } else {

                     unset($aPhrases[$iPhrase]);
                 }
             }
                     unset($aPhrases[$iPhrase]);
                 }
             }


@@ -973,41 +896,35 @@ class Geocode
             $aPhraseTypes = array_keys($aPhrases);
             $aPhrases = array_values($aPhrases);
 
             $aPhraseTypes = array_keys($aPhrases);
             $aPhrases = array_values($aPhrases);
 

-            if (sizeof($aTokens))
-            {
+            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';
                 // 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 .= ' from word where word_token in ('.join(',', array_map("getDBQuoted", $aTokens)).')';

 
                 if (CONST_Debug) var_Dump($sSQL);
 
                 $aValidTokens = array();
 
                 if (CONST_Debug) var_Dump($sSQL);
 
                 $aValidTokens = array();

-                if (sizeof($aTokens))
-                {
-                    $aDatabaseWords = chksql($this->oDB->getAll($sSQL),
-                                             "Could not get word tokens.");
-                }
-                else
-                {
+                if (sizeof($aTokens)) {
+                    $aDatabaseWords = chksql(
+                        $this->oDB->getAll($sSQL),
+                        "Could not get word tokens."
+                    );
+                } else {

                     $aDatabaseWords = array();
                 }
                 $aPossibleMainWordIDs = array();
                 $aWordFrequencyScores = array();
                     $aDatabaseWords = array();
                 }
                 $aPossibleMainWordIDs = array();
                 $aWordFrequencyScores = array();

-                foreach($aDatabaseWords as $aToken)
-                {
+                foreach ($aDatabaseWords as $aToken) {

                     // Very special case - require 2 letter country param to match the country code found
                     if ($bStructuredPhrases && $aToken['country_code'] && !empty($this->aStructuredQuery['country'])
                     // Very special case - require 2 letter country param to match the country code found
                     if ($bStructuredPhrases && $aToken['country_code'] && !empty($this->aStructuredQuery['country'])

-                            && strlen($this->aStructuredQuery['country']) == 2 && strtolower($this->aStructuredQuery['country']) != $aToken['country_code'])
-                    {
+                        && strlen($this->aStructuredQuery['country']) == 2 && strtolower($this->aStructuredQuery['country']) != $aToken['country_code']
+                    ) {

                         continue;
                     }
 
                         continue;
                     }
 

-                    if (isset($aValidTokens[$aToken['word_token']]))
-                    {
+                    if (isset($aValidTokens[$aToken['word_token']])) {

                         $aValidTokens[$aToken['word_token']][] = $aToken;
                         $aValidTokens[$aToken['word_token']][] = $aToken;

-                    }
-                    else
-                    {
+                    } else {

                         $aValidTokens[$aToken['word_token']] = array($aToken);
                     }
                     if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
                         $aValidTokens[$aToken['word_token']] = array($aToken);
                     }
                     if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;


@@ -1016,38 +933,26 @@ class Geocode
                 if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
 
                 // Try and calculate GB postcodes we might be missing
                 if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
 
                 // Try and calculate GB postcodes we might be missing

-                foreach($aTokens as $sToken)
-                {
+                foreach ($aTokens as $sToken) {

                     // Source of gb postcodes is now definitive - always use
                     // 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 (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);

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

-                        if ($aGBPostcodeLocation)
-                        {
+                        if ($aGBPostcodeLocation) {

                             $aValidTokens[$sToken] = $aGBPostcodeLocation;
                         }
                             $aValidTokens[$sToken] = $aGBPostcodeLocation;
                         }

-                    }
-                    // US ZIP+4 codes - if there is no token,
-                    //  merge in the 5-digit ZIP code
-                    else if (!isset($aValidTokens[$sToken]) && preg_match('/^([0-9]{5}) [0-9]{4}$/', $sToken, $aData))
-                    {
-                        if (isset($aValidTokens[$aData[1]]))
-                        {
-                            foreach($aValidTokens[$aData[1]] as $aToken)
-                            {
-                                if (!$aToken['class'])
-                                {
-                                    if (isset($aValidTokens[$sToken]))
-                                    {
+                    } elseif (!isset($aValidTokens[$sToken]) && preg_match('/^([0-9]{5}) [0-9]{4}$/', $sToken, $aData)) {
+                        // US ZIP+4 codes - if there is no token,
+                        // merge in the 5-digit ZIP code
+                        if (isset($aValidTokens[$aData[1]])) {
+                            foreach ($aValidTokens[$aData[1]] as $aToken) {
+                                if (!$aToken['class']) {
+                                    if (isset($aValidTokens[$sToken])) {

                                         $aValidTokens[$sToken][] = $aToken;
                                         $aValidTokens[$sToken][] = $aToken;

-                                    }
-                                    else
-                                    {
+                                    } else {

                                         $aValidTokens[$sToken] = array($aToken);
                                     }
                                 }
                                         $aValidTokens[$sToken] = array($aToken);
                                     }
                                 }


@@ -1056,12 +961,10 @@ class Geocode
                     }
                 }
 
                     }
                 }
 

-                foreach($aTokens as $sToken)
-                {
+                foreach ($aTokens as $sToken) {

                     // Unknown single word token with a number - assume it is a house number
                     // 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))
-                    {
-                        $aValidTokens[' '.$sToken] = array(array('class'=>'place','type'=>'house'));
+                    if (!isset($aValidTokens[' '.$sToken]) && strpos($sToken, ' ') === false && preg_match('/[0-9]/', $sToken)) {
+                        $aValidTokens[' '.$sToken] = array(array('class' => 'place', 'type' => 'house'));

                     }
                 }
 
                     }
                 }
 


@@ -1074,45 +977,35 @@ class Geocode
 
                 $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases);
 
 
                 $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases);
 

-                if ($this->bReverseInPlan)
-                {
+                if ($this->bReverseInPlan) {

                     // Reverse phrase array and also reverse the order of the wordsets in
                     // the first and final phrase. Don't bother about phrases in the middle
                     // because order in the address doesn't matter.
                     $aPhrases = array_reverse($aPhrases);
                     $aPhrases[0]['wordsets'] = getInverseWordSets($aPhrases[0]['words'], 0);
                     // Reverse phrase array and also reverse the order of the wordsets in
                     // the first and final phrase. Don't bother about phrases in the middle
                     // because order in the address doesn't matter.
                     $aPhrases = array_reverse($aPhrases);
                     $aPhrases[0]['wordsets'] = getInverseWordSets($aPhrases[0]['words'], 0);

-                    if (sizeof($aPhrases) > 1)
-                    {
+                    if (sizeof($aPhrases) > 1) {

                         $aFinalPhrase = end($aPhrases);
                         $aPhrases[sizeof($aPhrases)-1]['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
                     }
                     $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, null, $aPhrases, $aValidTokens, $aWordFrequencyScores, false);
 
                         $aFinalPhrase = end($aPhrases);
                         $aPhrases[sizeof($aPhrases)-1]['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
                     }
                     $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, null, $aPhrases, $aValidTokens, $aWordFrequencyScores, false);
 

-                    foreach($aGroupedSearches as $aSearches)
-                    {
-                        foreach($aSearches as $aSearch)
-                        {
-                            if ($aSearch['iSearchRank'] < $this->iMaxRank)
-                            {
+                    foreach ($aGroupedSearches as $aSearches) {
+                        foreach ($aSearches as $aSearch) {
+                            if ($aSearch['iSearchRank'] < $this->iMaxRank) {

                                 if (!isset($aReverseGroupedSearches[$aSearch['iSearchRank']])) $aReverseGroupedSearches[$aSearch['iSearchRank']] = array();
                                 $aReverseGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
                             }
                                 if (!isset($aReverseGroupedSearches[$aSearch['iSearchRank']])) $aReverseGroupedSearches[$aSearch['iSearchRank']] = array();
                                 $aReverseGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
                             }

-

                         }
                     }
 
                     $aGroupedSearches = $aReverseGroupedSearches;
                     ksort($aGroupedSearches);
                 }
                         }
                     }
 
                     $aGroupedSearches = $aReverseGroupedSearches;
                     ksort($aGroupedSearches);
                 }

-            }
-            else
-            {
+            } else {

                 // Re-group the searches by their score, junk anything over 20 as just not worth trying
                 $aGroupedSearches = array();
                 // Re-group the searches by their score, junk anything over 20 as just not worth trying
                 $aGroupedSearches = array();

-                foreach($aSearches as $aSearch)
-                {
-                    if ($aSearch['iSearchRank'] < $this->iMaxRank)
-                    {
+                foreach ($aSearches as $aSearch) {
+                    if ($aSearch['iSearchRank'] < $this->iMaxRank) {

                         if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
                         $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
                     }
                         if (!isset($aGroupedSearches[$aSearch['iSearchRank']])) $aGroupedSearches[$aSearch['iSearchRank']] = array();
                         $aGroupedSearches[$aSearch['iSearchRank']][] = $aSearch;
                     }


@@ -1121,32 +1014,24 @@ class Geocode
             }
 
             if (CONST_Debug) var_Dump($aGroupedSearches);
             }
 
             if (CONST_Debug) var_Dump($aGroupedSearches);

-
-            if (CONST_Search_TryDroppedAddressTerms && sizeof($this->aStructuredQuery) > 0)
-            {
+            if (CONST_Search_TryDroppedAddressTerms && sizeof($this->aStructuredQuery) > 0) {

                 $aCopyGroupedSearches = $aGroupedSearches;
                 $aCopyGroupedSearches = $aGroupedSearches;

-                foreach($aCopyGroupedSearches as $iGroup => $aSearches)
-                {
-                    foreach($aSearches as $iSearch => $aSearch)
-                    {
+                foreach ($aCopyGroupedSearches as $iGroup => $aSearches) {
+                    foreach ($aSearches as $iSearch => $aSearch) {

                         $aReductionsList = array($aSearch['aAddress']);
                         $iSearchRank = $aSearch['iSearchRank'];
                         $aReductionsList = array($aSearch['aAddress']);
                         $iSearchRank = $aSearch['iSearchRank'];

-                        while(sizeof($aReductionsList) > 0)
-                        {
+                        while (sizeof($aReductionsList) > 0) {

                             $iSearchRank += 5;
                             if ($iSearchRank > iMaxRank) break 3;
                             $aNewReductionsList = array();
                             $iSearchRank += 5;
                             if ($iSearchRank > iMaxRank) break 3;
                             $aNewReductionsList = array();

-                            foreach($aReductionsList as $aReductionsWordList)
-                            {
-                                for ($iReductionWord = 0; $iReductionWord < sizeof($aReductionsWordList); $iReductionWord++)
-                                {
+                            foreach ($aReductionsList as $aReductionsWordList) {
+                                for ($iReductionWord = 0; $iReductionWord < sizeof($aReductionsWordList); $iReductionWord++) {

                                     $aReductionsWordListResult = array_merge(array_slice($aReductionsWordList, 0, $iReductionWord), array_slice($aReductionsWordList, $iReductionWord+1));
                                     $aReverseSearch = $aSearch;
                                     $aSearch['aAddress'] = $aReductionsWordListResult;
                                     $aSearch['iSearchRank'] = $iSearchRank;
                                     $aGroupedSearches[$iSearchRank][] = $aReverseSearch;
                                     $aReductionsWordListResult = array_merge(array_slice($aReductionsWordList, 0, $iReductionWord), array_slice($aReductionsWordList, $iReductionWord+1));
                                     $aReverseSearch = $aSearch;
                                     $aSearch['aAddress'] = $aReductionsWordListResult;
                                     $aSearch['iSearchRank'] = $iSearchRank;
                                     $aGroupedSearches[$iSearchRank][] = $aReverseSearch;

-                                    if (sizeof($aReductionsWordListResult) > 0)
-                                    {
+                                    if (sizeof($aReductionsWordListResult) > 0) {

                                         $aNewReductionsList[] = $aReductionsWordListResult;
                                     }
                                 }
                                         $aNewReductionsList[] = $aReductionsWordListResult;
                                     }
                                 }


@@ -1160,18 +1045,13 @@ class Geocode
 
             // Filter out duplicate searches
             $aSearchHash = array();
 
             // Filter out duplicate searches
             $aSearchHash = array();

-            foreach($aGroupedSearches as $iGroup => $aSearches)
-            {
-                foreach($aSearches as $iSearch => $aSearch)
-                {
+            foreach ($aGroupedSearches as $iGroup => $aSearches) {
+                foreach ($aSearches as $iSearch => $aSearch) {

                     $sHash = serialize($aSearch);
                     $sHash = serialize($aSearch);

-                    if (isset($aSearchHash[$sHash]))
-                    {
+                    if (isset($aSearchHash[$sHash])) {

                         unset($aGroupedSearches[$iGroup][$iSearch]);
                         if (sizeof($aGroupedSearches[$iGroup]) == 0) unset($aGroupedSearches[$iGroup]);
                         unset($aGroupedSearches[$iGroup][$iSearch]);
                         if (sizeof($aGroupedSearches[$iGroup]) == 0) unset($aGroupedSearches[$iGroup]);

-                    }
-                    else
-                    {
+                    } else {

                         $aSearchHash[$sHash] = 1;
                     }
                 }
                         $aSearchHash[$sHash] = 1;
                     }
                 }


@@ -1181,25 +1061,20 @@ class Geocode
 
             $iGroupLoop = 0;
             $iQueryLoop = 0;
 
             $iGroupLoop = 0;
             $iQueryLoop = 0;

-            foreach($aGroupedSearches as $iGroupedRank => $aSearches)
-            {
+            foreach ($aGroupedSearches as $iGroupedRank => $aSearches) {

                 $iGroupLoop++;
                 $iGroupLoop++;

-                foreach($aSearches as $aSearch)
-                {
+                foreach ($aSearches as $aSearch) {

                     $iQueryLoop++;
                     $searchedHousenumber = -1;
 
                     $iQueryLoop++;
                     $searchedHousenumber = -1;
 

-                    if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
+                    if (CONST_Debug) echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>";

                     if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
 
                     // No location term?
                     if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
 
                     // No location term?

-                    if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon'])
-                    {
-                        if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber'])
-                        {
+                    if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon']) {
+                        if ($aSearch['sCountryCode'] && !$aSearch['sClass'] && !$aSearch['sHouseNumber']) {

                             // Just looking for a country by code - look it up
                             // Just looking for a country by code - look it up

-                            if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank)
-                            {
+                            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)";
                                 if ($bBoundingBoxSearch)
                                 $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)


@@ -1207,26 +1082,21 @@ class Geocode
                                 $sSQL .= " order by st_area(geometry) desc limit 1";
                                 if (CONST_Debug) var_dump($sSQL);
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                 $sSQL .= " order by st_area(geometry) desc limit 1";
                                 if (CONST_Debug) var_dump($sSQL);
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));

-                            }
-                            else
-                            {
+                            } else {

                                 $aPlaceIDs = array();
                             }
                                 $aPlaceIDs = array();
                             }

-                        }
-                        else
-                        {
+                        } else {

                             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))
-                                {
-                                    $sSQL .= " and place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                if (sizeof($this->aExcludePlaceIDs)) {
+                                    $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                                 }
                                 if ($this->sViewboxCentreSQL) $sSQL .= " order by st_distance($this->sViewboxCentreSQL, ct.centroid) asc";
                                 $sSQL .= " limit $this->iLimit";
                                 }
                                 if ($this->sViewboxCentreSQL) $sSQL .= " order by st_distance($this->sViewboxCentreSQL, ct.centroid) asc";
                                 $sSQL .= " limit $this->iLimit";


@@ -1237,8 +1107,7 @@ class Geocode
                                 // there have been results in the small box, so no further
                                 // expansion in that case.
                                 // Also don't expand if bounded results were requested.
                                 // there have been results in the small box, so no further
                                 // expansion in that case.
                                 // Also don't expand if bounded results were requested.

-                                if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch)
-                                {
+                                if (!sizeof($aPlaceIDs) && !sizeof($this->aExcludePlaceIDs) && !$this->bBoundedSearch) {

                                     $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->sViewboxLargeSQL, ct.centroid)";
                                     $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->sViewboxLargeSQL, ct.centroid)";


@@ -1248,9 +1117,7 @@ class Geocode
                                     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
-                            {
+                            } 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)";
                                 $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)";


@@ -1260,23 +1127,18 @@ class Geocode
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             }
                         }
                                 $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             }
                         }

-                    }
-                    // If a coordinate is given, the search must either
-                    // be for a name or a special search. Ignore everythin else.
-                    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();
                         $aPlaceIDs = array();

-                    }
-                    else
-                    {
+                    } else {

                         $aPlaceIDs = array();
 
                         // First we need a position, either aName or fLat or both
                         $aTerms = array();
                         $aOrder = array();
 
                         $aPlaceIDs = array();
 
                         // First we need a position, either aName or fLat or both
                         $aTerms = array();
                         $aOrder = array();
 

-                        if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress']))
-                        {
+                        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";
                             $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                             $aOrder[] = "";
                             $aOrder[0] = " (exists(select place_id from placex where parent_place_id = search_name.place_id";


@@ -1289,99 +1151,88 @@ class Geocode
 
                         // 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['aAddress']) && $aSearch['aName'] != $aSearch['aAddress'])
-                        {
+                        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
                             // 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)
-                            {
-                                $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'],$aSearch['aAddressNonSearch']),",")."]";
-                            }
-                            else
-                            {
-                                $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'],",")."]";
-                                if (sizeof($aSearch['aAddressNonSearch'])) $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'],",")."]";
+                            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($aSearch['aAddress'],",")."]";
+                            } else {
+                                $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'], ",")."]";
+                                /*if (sizeof($aSearch['aAddressNonSearch'])) {
+                                    $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddressNonSearch'], ",")."]";
+                                }*/

                             }
                         }
                         if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";
                             }
                         }
                         if ($aSearch['sCountryCode']) $aTerms[] = "country_code = '".pg_escape_string($aSearch['sCountryCode'])."'";

-                        if ($aSearch['sHouseNumber'])
-                        {
+                        if ($aSearch['sHouseNumber']) {

                             $aTerms[] = "address_rank between 16 and 27";
                             $aTerms[] = "address_rank between 16 and 27";

-                        }
-                        else
-                        {
-                            if ($this->iMinAddressRank > 0)
-                            {
+                        } else {
+                            if ($this->iMinAddressRank > 0) {

                                 $aTerms[] = "address_rank >= ".$this->iMinAddressRank;
                             }
                                 $aTerms[] = "address_rank >= ".$this->iMinAddressRank;
                             }

-                            if ($this->iMaxAddressRank < 30)
-                            {
+                            if ($this->iMaxAddressRank < 30) {

                                 $aTerms[] = "address_rank <= ".$this->iMaxAddressRank;
                             }
                         }
                                 $aTerms[] = "address_rank <= ".$this->iMaxAddressRank;
                             }
                         }

-                        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'].")";
                             $aOrder[] = "ST_Distance(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326)) ASC";
                         }
                             $aTerms[] = "ST_DWithin(centroid, ST_SetSRID(ST_Point(".$aSearch['fLon'].",".$aSearch['fLat']."),4326), ".$aSearch['fRadius'].")";
                             $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).")";
+                        if (sizeof($this->aExcludePlaceIDs)) {
+                            $aTerms[] = "place_id not in (".join(',', $this->aExcludePlaceIDs).")";

                         }
                         }

-                        if ($sCountryCodesSQL)
-                        {
+                        if ($sCountryCodesSQL) {

                             $aTerms[] = "country_code in ($sCountryCodesSQL)";
                         }
 
                         if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL";
                         if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
 
                             $aTerms[] = "country_code in ($sCountryCodesSQL)";
                         }
 
                         if ($bBoundingBoxSearch) $aTerms[] = "centroid && $this->sViewboxSmallSQL";
                         if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
 

-                        if ($aSearch['sHouseNumber'])
-                        {
+                        if ($aSearch['sHouseNumber']) {

                             $sImportanceSQL = '- abs(26 - address_rank) + 3';
                             $sImportanceSQL = '- abs(26 - address_rank) + 3';

-                        }
-                        else
-                        {
+                        } else {

                             $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";
 
                         $aOrder[] = "$sImportanceSQL DESC";
                             $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";
 
                         $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';
+                        if (sizeof($aSearch['aFullNameAddress'])) {
+                            $sExactMatchSQL = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'], ",").']) INTERSECT select unnest(nameaddress_vector))s) as exactmatch';

                             $aOrder[] = 'exactmatch DESC';
                         } else {
                             $sExactMatchSQL = '0::int as exactmatch';
                         }
 
                             $aOrder[] = 'exactmatch DESC';
                         } else {
                             $sExactMatchSQL = '0::int as exactmatch';
                         }
 

-                        if (sizeof($aTerms))
-                        {
+                        if (sizeof($aTerms)) {

                             $sSQL = "select place_id, ";
                             $sSQL .= $sExactMatchSQL;
                             $sSQL .= " from search_name";
                             $sSQL = "select place_id, ";
                             $sSQL .= $sExactMatchSQL;
                             $sSQL .= " from search_name";

-                            $sSQL .= " where ".join(' and ',$aTerms);
-                            $sSQL .= " order by ".join(', ',$aOrder);
-                            if ($aSearch['sHouseNumber'] || $aSearch['sClass'])
+                            $sSQL .= " where ".join(' and ', $aTerms);
+                            $sSQL .= " order by ".join(', ', $aOrder);
+                            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); }
-                            $aViewBoxPlaceIDs = chksql($this->oDB->getAll($sSQL),
-                                                       "Could not get places for search terms.");
+                            if (CONST_Debug) var_dump($sSQL);
+                            $aViewBoxPlaceIDs = chksql(
+                                $this->oDB->getAll($sSQL),
+                                "Could not get places for search terms."
+                            );

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

-                            foreach($aViewBoxPlaceIDs as $aViewBoxRow)
-                            {
+                            foreach ($aViewBoxPlaceIDs as $aViewBoxRow) {

                                 //if ($bViewBoxMatch == 1 && $aViewBoxRow['in_small'] == 'f') break;
                                 //if ($bViewBoxMatch == 2 && $aViewBoxRow['in_large'] == 'f') break;
                                 //if ($aViewBoxRow['in_small'] == 't') $bViewBoxMatch = 1;
                                 //if ($bViewBoxMatch == 1 && $aViewBoxRow['in_small'] == 'f') break;
                                 //if ($bViewBoxMatch == 2 && $aViewBoxRow['in_large'] == 'f') break;
                                 //if ($aViewBoxRow['in_small'] == 't') $bViewBoxMatch = 1;


@@ -1394,38 +1245,34 @@ class Geocode
                         //exit;
 
                         //now search for housenumber, if housenumber provided
                         //exit;
 
                         //now search for housenumber, if housenumber provided

-                        if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs))
-                        {
+                        if ($aSearch['sHouseNumber'] && sizeof($aPlaceIDs)) {

                             $searchedHousenumber = intval($aSearch['sHouseNumber']);
                             $aRoadPlaceIDs = $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';
                             $sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and transliteration(housenumber) ~* E'".$sHouseNumberRegex."'";
 
                             // 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."'";

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

                             }
                             $sSQL .= " limit $this->iLimit";
                             if (CONST_Debug) var_dump($sSQL);
                             $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             
                             // if nothing found, search in the interpolation line table
                             }
                             $sSQL .= " limit $this->iLimit";
                             if (CONST_Debug) var_dump($sSQL);
                             $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             
                             // if nothing found, search in the interpolation line table

-                            if(!sizeof($aPlaceIDs))
-                            {
+                            if (!sizeof($aPlaceIDs)) {

                                 // do we need to use transliteration and the regex for housenumbers???
                                 //new query for lines, not housenumbers anymore
                                 // do we need to use transliteration and the regex for housenumbers???
                                 //new query for lines, not housenumbers anymore

-                                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_osmline where parent_place_id in (".$sPlaceIDs.") and (interpolationtype='even' or interpolationtype='all') and ".$searchedHousenumber.">=startnumber and ".$searchedHousenumber."<=endnumber";
                                     //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";

-                                }else{
+                                } 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";
                                 }
 
                                     //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";
                                 }
 

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

                                     $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
                                 }
                                 //$sSQL .= " limit $this->iLimit";
                                     $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
                                 }
                                 //$sSQL .= " limit $this->iLimit";


@@ -1435,12 +1282,10 @@ class Geocode
                             }
                                 
                             // If nothing found try the aux fallback table
                             }
                                 
                             // If nothing found try the aux fallback table

-                            if (CONST_Use_Aux_Location_data && !sizeof($aPlaceIDs))
-                            {
+                            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 where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";

-                                if (sizeof($this->aExcludePlaceIDs))
-                                {
-                                    $sSQL .= " and parent_place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                if (sizeof($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);


@@ -1448,19 +1293,17 @@ class Geocode
                             }
 
                             //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)
                             }
 
                             //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 (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs)) {

                                 //new query for lines, not housenumbers anymore
                                 //new query for lines, not housenumbers anymore

-                                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";
                                     //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";

-                                }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";
                                 }
 
                                     //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";
                                 }
 

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

                                     $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
                                 }
                                 //$sSQL .= " limit $this->iLimit";
                                     $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
                                 }
                                 //$sSQL .= " limit $this->iLimit";


@@ -1470,8 +1313,7 @@ class Geocode
                             }
 
                             // Fallback to the road (if no housenumber was found)
                             }
 
                             // Fallback to the road (if no housenumber was found)

-                            if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber']))
-                            {
+                            if (!sizeof($aPlaceIDs) && preg_match('/[0-9]+/', $aSearch['sHouseNumber'])) {

                                 $aPlaceIDs = $aRoadPlaceIDs;
                                 //set to -1, if no housenumbers were found
                                 $searchedHousenumber = -1;
                                 $aPlaceIDs = $aRoadPlaceIDs;
                                 //set to -1, if no housenumbers were found
                                 $searchedHousenumber = -1;


@@ -1480,13 +1322,11 @@ class Geocode
                         }
 
 
                         }
 
 

-                        if ($aSearch['sClass'] && sizeof($aPlaceIDs))
-                        {
+                        if ($aSearch['sClass'] && sizeof($aPlaceIDs)) {

                             $sPlaceIDs = join(',', $aPlaceIDs);
                             $aClassPlaceIDs = array();
 
                             $sPlaceIDs = join(',', $aPlaceIDs);
                             $aClassPlaceIDs = array();
 

-                            if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name')
-                            {
+                            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 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";


@@ -1496,8 +1336,7 @@ class Geocode
                                 $aClassPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             }
 
                                 $aClassPlaceIDs = chksql($this->oDB->getCol($sSQL));
                             }
 

-                            if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in
-                            {
+                            if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') { // & in

                                 $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
                                 $bCacheTable = chksql($this->oDB->getOne($sSQL));
 
                                 $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
                                 $bCacheTable = chksql($this->oDB->getOne($sSQL));
 


@@ -1508,56 +1347,46 @@ class Geocode
 
                                 // For state / country level searches the normal radius search doesn't work very well
                                 $sPlaceGeom = false;
 
                                 // For state / country level searches the normal radius search doesn't work very well
                                 $sPlaceGeom = false;

-                                if ($this->iMaxRank < 9 && $bCacheTable)
-                                {
+                                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";
                                     if (CONST_Debug) var_dump($sSQL);
                                     $sPlaceGeom = chksql($this->oDB->getOne($sSQL));
                                 }
 
                                     // 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";
                                     if (CONST_Debug) var_dump($sSQL);
                                     $sPlaceGeom = chksql($this->oDB->getOne($sSQL));
                                 }
 

-                                if ($sPlaceGeom)
-                                {
+                                if ($sPlaceGeom) {

                                     $sPlaceIDs = false;
                                     $sPlaceIDs = false;

-                                }
-                                else
-                                {
+                                } else {

                                     $this->iMaxRank += 5;
                                     $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));
                                     $this->iMaxRank += 5;
                                     $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));

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

                                 }
 
                                 }
 

-                                if ($sPlaceIDs || $sPlaceGeom)
-                                {
-
+                                if ($sPlaceIDs || $sPlaceGeom) {

                                     $fRange = 0.01;
                                     $fRange = 0.01;

-                                    if ($bCacheTable)
-                                    {
+                                    if ($bCacheTable) {

                                         // More efficient - can make the range bigger
                                         $fRange = 0.05;
 
                                         $sOrderBySQL = '';
                                         if ($sNearPointSQL) $sOrderBySQL = "ST_Distance($sNearPointSQL, l.centroid)";
                                         // More efficient - can make the range bigger
                                         $fRange = 0.05;
 
                                         $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)";

-                                        if ($sPlaceIDs)
-                                        {
+                                        if ($sPlaceIDs) {

                                             $sSQL .= ",placex as f where ";
                                             $sSQL .= "f.place_id in ($sPlaceIDs) and ST_DWithin(l.centroid, f.centroid, $fRange) ";
                                         }
                                             $sSQL .= ",placex as f where ";
                                             $sSQL .= "f.place_id in ($sPlaceIDs) and ST_DWithin(l.centroid, f.centroid, $fRange) ";
                                         }

-                                        if ($sPlaceGeom)
-                                        {
+                                        if ($sPlaceGeom) {

                                             $sSQL .= " where ";
                                             $sSQL .= "ST_Contains('".$sPlaceGeom."', l.centroid) ";
                                         }
                                             $sSQL .= " where ";
                                             $sSQL .= "ST_Contains('".$sPlaceGeom."', l.centroid) ";
                                         }

-                                        if (sizeof($this->aExcludePlaceIDs))
-                                        {
-                                            $sSQL .= " and l.place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                        if (sizeof($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";


@@ -1565,9 +1394,7 @@ class Geocode
                                         $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)));

-                                    }
-                                    else
-                                    {
+                                    } else {

                                         if (isset($aSearch['fRadius']) && $aSearch['fRadius']) $fRange = $aSearch['fRadius'];
 
                                         $sOrderBySQL = '';
                                         if (isset($aSearch['fRadius']) && $aSearch['fRadius']) $fRange = $aSearch['fRadius'];
 
                                         $sOrderBySQL = '';


@@ -1577,9 +1404,8 @@ class Geocode
                                         $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:'')." 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']."' ";

-                                        if (sizeof($this->aExcludePlaceIDs))
-                                        {
-                                            $sSQL .= " and l.place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                        if (sizeof($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 ($sCountryCodesSQL) $sSQL .= " and l.calculated_country_code in ($sCountryCodesSQL)";
                                         if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc";


@@ -1590,45 +1416,41 @@ class Geocode
                                     }
                                 }
                             }
                                     }
                                 }
                             }

-

                             $aPlaceIDs = $aClassPlaceIDs;
                             $aPlaceIDs = $aClassPlaceIDs;

-

                         }
                         }

-

                     }
 
                     }
 

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

 
 

-                    foreach($aPlaceIDs as $iPlaceID)
-                    {
+                    foreach ($aPlaceIDs as $iPlaceID) {

                         // array for placeID => -1 | Tiger housenumber
                         $aResultPlaceIDs[$iPlaceID] = $searchedHousenumber;
                     }
                     if ($iQueryLoop > 20) break;
                 }
 
                         // array for placeID => -1 | Tiger housenumber
                         $aResultPlaceIDs[$iPlaceID] = $searchedHousenumber;
                     }
                     if ($iQueryLoop > 20) break;
                 }
 

-                if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30))
-                {
+                if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30)) {

                     // 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 = "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'";
                     $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).")";
-                    if (CONST_Use_US_Tiger_Data)
-                    {
-                        $sSQL .= ") UNION select place_id from location_property_tiger where place_id in (".join(',',array_keys($aResultPlaceIDs)).") ";
+                    if ($this->aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',', $this->aAddressRankList).")";
+                    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 ";
                         $sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";

-                        if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";
+                        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 .= ") 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)";
                     if (CONST_Debug) var_dump($sSQL);
                     $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
                     $tempIDs = array();
                     $sSQL .= " and (30 between $this->iMinAddressRank and $this->iMaxAddressRank)";
                     if (CONST_Debug) var_dump($sSQL);
                     $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
                     $tempIDs = array();

-                    foreach($aFilteredPlaceIDs as $placeID)
-                    {
+                    foreach ($aFilteredPlaceIDs as $placeID) {

                         $tempIDs[$placeID] = $aResultPlaceIDs[$placeID];  //assign housenumber to placeID
                     }
                     $aResultPlaceIDs = $tempIDs;
                         $tempIDs[$placeID] = $aResultPlaceIDs[$placeID];  //assign housenumber to placeID
                     }
                     $aResultPlaceIDs = $tempIDs;


@@ -1641,37 +1463,34 @@ class Geocode
             }
 
             // Did we find anything?
             }
 
             // Did we find anything?

-            if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs))
-            {
+            if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) {

                 $aSearchResults = $this->getDetails($aResultPlaceIDs);
             }
                 $aSearchResults = $this->getDetails($aResultPlaceIDs);
             }

-
-        }
-        else
-        {
+        } else {

             // Just interpret as a reverse geocode
             $oReverse = new ReverseGeocode($this->oDB);
             $oReverse->setZoom(18);
 
             // Just interpret as a reverse geocode
             $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 (CONST_Debug) var_dump("Reverse search", $aLookup);
 

-            if ($aLookup['place_id'])
+            if ($aLookup['place_id']) {

                 $aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));
                 $aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));

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

                 $aSearchResults = array();
                 $aSearchResults = array();

+            }

         }
 
         // No results? Done
         }
 
         // No results? Done

-        if (!sizeof($aSearchResults))
-        {
-            if ($this->bFallback)
-            {
-                if ($this->fallbackStructuredQuery())
-                {
+        if (!sizeof($aSearchResults)) {
+            if ($this->bFallback) {
+                if ($this->fallbackStructuredQuery()) {

                     return $this->lookup();
                 }
             }
                     return $this->lookup();
                 }
             }


@@ -1680,13 +1499,15 @@ class Geocode
         }
 
         $aClassType = getClassTypesWithImportance();
         }
 
         $aClassType = getClassTypesWithImportance();

-        $aRecheckWords = preg_split('/\b[\s,\\-]*/u',$sQuery);
-        foreach($aRecheckWords as $i => $sWord)
-        {
+        $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery);
+        foreach ($aRecheckWords as $i => $sWord) {

             if (!preg_match('/\pL/', $sWord)) unset($aRecheckWords[$i]);
         }
 
             if (!preg_match('/\pL/', $sWord)) unset($aRecheckWords[$i]);
         }
 

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

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


@@ -1696,19 +1517,16 @@ class Geocode
         $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
         $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
 
         $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
         $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
 

-        foreach($aSearchResults as $iResNum => $aResult)
-        {
+        foreach ($aSearchResults as $iResNum => $aResult) {

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

-            if ($aOutlineResult)
-            {
+            if ($aOutlineResult) {

                 $aResult = array_merge($aResult, $aOutlineResult);
             }
             
                 $aResult = array_merge($aResult, $aOutlineResult);
             }
             

-            if ($aResult['extra_place'] == 'city')
-            {
+            if ($aResult['extra_place'] == 'city') {

                 $aResult['class'] = 'place';
                 $aResult['type'] = 'city';
                 $aResult['rank_search'] = 16;
                 $aResult['class'] = 'place';
                 $aResult['type'] = 'city';
                 $aResult['rank_search'] = 16;


@@ -1716,63 +1534,51 @@ 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'];
                 $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'])
-            {
+            } elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label'])
+                && $aClassType[$aResult['class'].':'.$aResult['type']]['label']
+            ) {

                 $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
             }
             // if tag '&addressdetails=1' is set in query
                 $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
             }
             // if tag '&addressdetails=1' is set in query

-            if ($this->bIncludeAddressDetails)
-            {
+            if ($this->bIncludeAddressDetails) {

                 // 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']]);
                 // 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']);
+                if ($aResult['extra_place'] == 'city' && !isset($aResult['address']['city'])) {
+                    $aResult['address'] = array_merge(array('city' => array_values($aResult['address'])[0]), $aResult['address']);

                 }
             }
                 }
             }

-            if ($this->bIncludeExtraTags)
-            {
-                if ($aResult['extra'])
-                {
+
+            if ($this->bIncludeExtraTags) {
+                if ($aResult['extra']) {

                     $aResult['sExtraTags'] = json_decode($aResult['extra']);
                     $aResult['sExtraTags'] = json_decode($aResult['extra']);

-                }
-                else
-                {
+                } else {

                     $aResult['sExtraTags'] = (object) array();
                 }
             }
 
                     $aResult['sExtraTags'] = (object) array();
                 }
             }
 

-            if ($this->bIncludeNameDetails)
-            {
-                if ($aResult['names'])
-                {
+            if ($this->bIncludeNameDetails) {
+                if ($aResult['names']) {

                     $aResult['sNameDetails'] = json_decode($aResult['names']);
                     $aResult['sNameDetails'] = json_decode($aResult['names']);

-                }
-                else
-                {
+                } else {

                     $aResult['sNameDetails'] = (object) array();
                 }
             }
 
             // Adjust importance for the number of exact string matches in the result
                     $aResult['sNameDetails'] = (object) array();
                 }
             }
 
             // 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'];
             $iCountWords = 0;
             $sAddress = $aResult['langaddress'];

-            foreach($aRecheckWords as $i => $sWord)
-            {
-                if (stripos($sAddress, $sWord)!==false)
-                {
+            foreach ($aRecheckWords as $i => $sWord) {
+                if (stripos($sAddress, $sWord)!==false) {

                     $iCountWords++;
                     if (preg_match("/(^|,)\s*".preg_quote($sWord, '/')."\s*(,|$)/", $sAddress)) $iCountWords += 0.1;
                 }
                     $iCountWords++;
                     if (preg_match("/(^|,)\s*".preg_quote($sWord, '/')."\s*(,|$)/", $sAddress)) $iCountWords += 0.1;
                 }


@@ -1782,24 +1588,23 @@ 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
-            if (isset($this->exactMatchCache[$aResult['place_id']]))
+            // - number of exact matches from the query
+            if (isset($this->exactMatchCache[$aResult['place_id']])) {

                 $aResult['foundorder'] -= $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'])
             if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])

-                && $aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
-            {
+                && $aClassType[$aResult['class'].':'.$aResult['type']]['importance']
+            ) {

                 $aResult['foundorder'] += 0.0001 * $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];
                 $aResult['foundorder'] += 0.0001 * $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];

-            }
-            else
-            {
+            } else {

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

-            if (CONST_Debug) { var_dump($aResult); }
+            if (CONST_Debug) var_dump($aResult);

             $aSearchResults[$iResNum] = $aResult;
         }
         uasort($aSearchResults, 'byImportance');
             $aSearchResults[$iResNum] = $aResult;
         }
         uasort($aSearchResults, 'byImportance');


@@ -1810,19 +1615,17 @@ class Geocode
         $aSearchResults = array();
 
         $bFirst = true;
         $aSearchResults = array();
 
         $bFirst = true;

-        foreach($aToFilter as $iResNum => $aResult)
-        {
+        foreach ($aToFilter as $iResNum => $aResult) {

             $this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];
             $this->aExcludePlaceIDs[$aResult['place_id']] = $aResult['place_id'];

-            if ($bFirst)
-            {
+            if ($bFirst) {

                 $fLat = $aResult['lat'];
                 $fLon = $aResult['lon'];
                 if (isset($aResult['zoom'])) $iZoom = $aResult['zoom'];
                 $bFirst = false;
             }
             if (!$this->bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
                 $fLat = $aResult['lat'];
                 $fLon = $aResult['lon'];
                 if (isset($aResult['zoom'])) $iZoom = $aResult['zoom'];
                 $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;
                 $aSearchResults[] = $aResult;
                 $aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
                 $aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name'].$aResult['admin_level']] = true;
                 $aSearchResults[] = $aResult;


@@ -1833,9 +1636,5 @@ class Geocode
         }
 
         return $aSearchResults;
         }
 
         return $aSearchResults;

-

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

-
-

 } // end class
 } // end class

-