Merge pull request #504 from lonvia/parameter-parser-class

[nominatim.git] / lib / Geocode.php
diff --git a/lib/Geocode.php b/lib/Geocode.php

index de178431b98ba9f28b388a17a57e16c086bc54c4..b102c4b210ddd1b1eb7dd56a5a4d9f2f724feb4c 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1,5 +1,6 @@
  <?php
         require_once(CONST_BasePath.'/lib/PlaceLookup.php');
  <?php
         require_once(CONST_BasePath.'/lib/PlaceLookup.php');
+       require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
  
         class Geocode
         {
  
         class Geocode
         {
@@ -32,9 +33,9 @@
  
                 protected $bBoundedSearch = false;
                 protected $aViewBox = false;
  
                 protected $bBoundedSearch = false;
                 protected $aViewBox = false;
+               protected $sViewboxCentreSQL = false;
                 protected $sViewboxSmallSQL = false;
                 protected $sViewboxLargeSQL = false;
                 protected $sViewboxSmallSQL = false;
                 protected $sViewboxLargeSQL = false;
-               protected $aRoutePoints = false;
  
                 protected $iMaxRank = 20;
                 protected $iMinAddressRank = 0;
  
                 protected $iMaxRank = 20;
                 protected $iMinAddressRank = 0;
@@ -62,11 +63,6 @@
                         $this->aLangPrefOrder = $aLangPref;
                 }
  
                         $this->aLangPrefOrder = $aLangPref;
                 }
  
-               function setIncludeAddressDetails($bAddressDetails = true)
-               {
-                       $this->bIncludeAddressDetails = (bool)$bAddressDetails;
-               }
-
                 function getIncludeAddressDetails()
                 {
                         return $this->bIncludeAddressDetails;
                 function getIncludeAddressDetails()
                 {
                         return $this->bIncludeAddressDetails;
@@ -87,21 +83,11 @@
                         $this->bIncludePolygonAsPoints = $b;
                 }
  
                         $this->bIncludePolygonAsPoints = $b;
                 }
  
-               function getIncludePolygonAsPoints()
-               {
-                       return $this->bIncludePolygonAsPoints;
-               }
-
                 function setIncludePolygonAsText($b = true)
                 {
                         $this->bIncludePolygonAsText = $b;
                 }
  
                 function setIncludePolygonAsText($b = true)
                 {
                         $this->bIncludePolygonAsText = $b;
                 }
  
-               function getIncludePolygonAsText()
-               {
-                       return $this->bIncludePolygonAsText;
-               }
-
                 function setIncludePolygonAsGeoJSON($b = true)
                 {
                         $this->bIncludePolygonAsGeoJSON = $b;
                 function setIncludePolygonAsGeoJSON($b = true)
                 {
                         $this->bIncludePolygonAsGeoJSON = $b;
@@ -122,34 +108,13 @@
                         $this->fPolygonSimplificationThreshold = $f;
                 }
  
                         $this->fPolygonSimplificationThreshold = $f;
                 }
  
-               function setDeDupe($bDeDupe = true)
-               {
-                       $this->bDeDupe = (bool)$bDeDupe;
-               }
-
                 function setLimit($iLimit = 10)
                 {
                         if ($iLimit > 50) $iLimit = 50;
                         if ($iLimit < 1) $iLimit = 1;
  
                         $this->iFinalLimit = $iLimit;
                 function setLimit($iLimit = 10)
                 {
                         if ($iLimit > 50) $iLimit = 50;
                         if ($iLimit < 1) $iLimit = 1;
  
                         $this->iFinalLimit = $iLimit;
-                       $this->iLimit = $this->iFinalLimit + min($this->iFinalLimit, 10);
-               }
-
-               function setOffset($iOffset = 0)
-               {
-                       $this->iOffset = $iOffset;
-               }
-
-               function setFallback($bFallback = true)
-               {
-                       $this->bFallback = (bool)$bFallback;
-               }
-
-               function setExcludedPlaceIDs($a)
-               {
-                       // TODO: force to int
-                       $this->aExcludePlaceIDs = $a;
+                       $this->iLimit = $iLimit + min($iLimit, 10);
                 }
  
                 function getExcludedPlaceIDs()
                 }
  
                 function getExcludedPlaceIDs()
@@ -157,27 +122,12 @@
                         return $this->aExcludePlaceIDs;
                 }
  
                         return $this->aExcludePlaceIDs;
                 }
  
-               function setBounded($bBoundedSearch = true)
-               {
-                       $this->bBoundedSearch = (bool)$bBoundedSearch;
-               }
-
-               function setViewBox($fLeft, $fBottom, $fRight, $fTop)
-               {
-                       $this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop);
-               }
-
                 function getViewBoxString()
                 {
                         if (!$this->aViewBox) return null;
                         return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1];
                 }
  
                 function getViewBoxString()
                 {
                         if (!$this->aViewBox) return null;
                         return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1];
                 }
  
-               function setRoute($aRoutePoints)
-               {
-                       $this->aRoutePoints = $aRoutePoints;
-               }
-
                 function setFeatureType($sFeatureType)
                 {
                         switch($sFeatureType)
                 function setFeatureType($sFeatureType)
                 {
                         switch($sFeatureType)
@@ -199,18 +149,50 @@
  
                 function setRankRange($iMin, $iMax)
                 {
  
                 function setRankRange($iMin, $iMax)
                 {
-                       $this->iMinAddressRank = (int)$iMin;
-                       $this->iMaxAddressRank = (int)$iMax;
+                       $this->iMinAddressRank = $iMin;
+                       $this->iMaxAddressRank = $iMax;
                 }
  
                 }
  
-               function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)
+               function setRoute($aRoutePoints, $fRouteWidth)
                 {
                 {
-                       $this->aNearPoint = array((float)$aNearPoint[0], (float)$aNearPoint[1], (float)$fRadiusDeg);
+                       $this->aViewBox = false;
+
+                       $this->sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
+                       $sSep = '';
+                       foreach($this->aRoutePoints as $aPoint)
+                       {
+                               $fPoint = (float)$aPoint;
+                               $this->sViewboxCentreSQL .= $sSep.$fPoint;
+                               $sSep = ($sSep == ' ') ? ',' : ' ';
+                       }
+                       $this->sViewboxCentreSQL .= ")'::geometry,4326)";
+
+                       $this->sViewboxSmallSQL = 'st_buffer('.$this->sViewboxCentreSQL;
+                       $this->sViewboxSmallSQL .= ','.($fRouteWidth/69).')';
+
+                       $this->sViewboxLargeSQL = 'st_buffer('.$this->sViewboxCentreSQL;
+                       $this->sViewboxLargeSQL .= ','.($fRouteWidth/30).')';
                 }
  
                 }
  
-               function setCountryCodesList($aCountryCodes)
+               function setViewbox($aViewbox)
                 {
                 {
-                       $this->aCountryCodes = $aCountryCodes;
+                       $this->aViewBox = array_map('floatval', $aViewbox);
+
+                       $fHeight = $this->aViewBox[0] - $this->aViewBox[2];
+                       $fWidth = $this->aViewBox[1] - $this->aViewBox[3];
+                       $aBigViewBox[0] = $this->aViewBox[0] + $fHeight;
+                       $aBigViewBox[2] = $this->aViewBox[2] - $fHeight;
+                       $aBigViewBox[1] = $this->aViewBox[1] + $fWidth;
+                       $aBigViewBox[3] = $this->aViewBox[3] - $fWidth;
+
+                       $this->sViewboxCentreSQL = false;
+                       $this->sViewboxSmallSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".$this->aViewBox[0].",".$this->aViewBox[1]."),ST_Point(".$this->aViewBox[2].",".$this->aViewBox[3].")),4326)";
+                       $this->sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".$aBigViewBox[0].",".$aBigViewBox[1]."),ST_Point(".$aBigViewBox[2].",".$aBigViewBox[3].")),4326)";
+               }
+
+               function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)
+               {
+                       $this->aNearPoint = array((float)$aNearPoint[0], (float)$aNearPoint[1], (float)$fRadiusDeg);
                 }
  
                 function setQuery($sQueryString)
                 }
  
                 function setQuery($sQueryString)
@@ -225,24 +207,28 @@
                 }
  
  
                 }
  
  
-               function loadParamArray($aParams)
+               function loadParamArray($oParams)
                 {
                 {
-                       if (isset($aParams['addressdetails'])) $this->bIncludeAddressDetails = (bool)$aParams['addressdetails'];
-                       if (isset($aParams['extratags'])) $this->bIncludeExtraTags = (bool)$aParams['extratags'];
-                       if (isset($aParams['namedetails'])) $this->bIncludeNameDetails = (bool)$aParams['namedetails'];
+                       $this->bIncludeAddressDetails = $oParams->getBool('addressdetails',
+                                                                         $this->bIncludeAddressDetails);
+                       $this->bIncludeExtraTags = $oParams->getBool('extratags',
+                                                                    $this->bIncludeExtraTags);
+                       $this->bIncludeNameDetails = $oParams->getBool('namedetails',
+                                                                      $this->bIncludeNameDetails);
  
  
-                       if (isset($aParams['bounded'])) $this->bBoundedSearch = (bool)$aParams['bounded'];
-                       if (isset($aParams['dedupe'])) $this->bDeDupe = (bool)$aParams['dedupe'];
+                       $this->bBoundedSearch = $oParams->getBool('bounded', $this->bBoundedSearch);
+                       $this->bDeDupe = $oParams->getBool('dedupe', $this->bDeDupe);
  
  
-                       if (isset($aParams['limit'])) $this->setLimit((int)$aParams['limit']);
-                       if (isset($aParams['offset'])) $this->iOffset = (int)$aParams['offset'];
+                       $this->setLimit($oParams->getInt('limit', $this->iFinalLimit));
+                       $this->iOffset = $oParams->getInt('offset', $this->iOffset);
  
  
-                       if (isset($aParams['fallback'])) $this->bFallback = (bool)$aParams['fallback'];
+                       $this->bFallback = $oParams->getBool('fallback', $this->bFallback);
  
                         // List of excluded Place IDs - used for more acurate pageing
  
                         // List of excluded Place IDs - used for more acurate pageing
-                       if (isset($aParams['exclude_place_ids']) && $aParams['exclude_place_ids'])
+                       $sExcluded = $oParams->getStringList('exclude_place_ids');
+                       if ($sExcluded)
                         {
                         {
-                               foreach(explode(',',$aParams['exclude_place_ids']) as $iExcludedPlaceID)
+                               foreach($sExcluded as $iExcludedPlaceID)
                                 {
                                         $iExcludedPlaceID = (int)$iExcludedPlaceID;
                                         if ($iExcludedPlaceID)
                                 {
                                         $iExcludedPlaceID = (int)$iExcludedPlaceID;
                                         if ($iExcludedPlaceID)
@@ -254,66 +240,63 @@
                         }
  
                         // Only certain ranks of feature
                         }
  
                         // Only certain ranks of feature
-                       if (isset($aParams['featureType'])) $this->setFeatureType($aParams['featureType']);
-                       if (isset($aParams['featuretype'])) $this->setFeatureType($aParams['featuretype']);
+                       $sFeatureType = $oParams->getString('featureType');
+                       if (!$sFeatureType) $sFeatureType = $oParams->getString('featuretype');
+                       if ($sFeatureType) $this->setFeatureType($sFeatureType);
  
                         // Country code list
  
                         // Country code list
-                       if (isset($aParams['countrycodes']))
+                       $sCountries = $oParams->getStringList('countrycodes');
+                       if ($sCountries)
                         {
                         {
-                               $aCountryCodes = array();
-                               foreach(explode(',',$aParams['countrycodes']) as $sCountryCode)
+                               foreach($sCountries as $sCountryCode)
                                 {
                                         if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode))
                                         {
                                 {
                                         if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode))
                                         {
-                                               $aCountryCodes[] = strtolower($sCountryCode);
+                                               $aCountries[] = strtolower($sCountryCode);
                                         }
                                 }
                                         }
                                 }
-                               $this->aCountryCodes = $aCountryCodes;
+                               if (isset($aCountryCodes))
+                                       $this->aCountryCodes = $aCountries;
                         }
  
                         }
  
-                       if (isset($aParams['viewboxlbrt']) && $aParams['viewboxlbrt'])
-                       {
-                               $aCoOrdinatesLBRT = explode(',',$aParams['viewboxlbrt']);
-                               $this->setViewBox($aCoOrdinatesLBRT[0], $aCoOrdinatesLBRT[1], $aCoOrdinatesLBRT[2], $aCoOrdinatesLBRT[3]);
-                       }
-                       else if (isset($aParams['viewbox']) && $aParams['viewbox'])
+                       $aViewbox = $oParams->getStringList('viewboxlbrt');
+                       if ($aViewbox)
                         {
                         {
-                               $aCoOrdinatesLTRB = explode(',',$aParams['viewbox']);
-                               $this->setViewBox($aCoOrdinatesLTRB[0], $aCoOrdinatesLTRB[3], $aCoOrdinatesLTRB[2], $aCoOrdinatesLTRB[1]);
+                               $this->setViewbox($aViewbox);
                         }
                         }
-
-                       if (isset($aParams['route']) && $aParams['route'] && isset($aParams['routewidth']) && $aParams['routewidth'])
+                       else
                         {
                         {
-                               $aPoints = explode(',',$aParams['route']);
-                               if (sizeof($aPoints) % 2 != 0)
+                               $aViewbox = $oParams->getStringList('viewbox');
+                               if ($aViewbox)
                                 {
                                 {
-                                       userError("Uneven number of points");
-                                       exit;
+                                       $this->setViewBox(array($aViewbox[0], $aViewbox[3],
+                                                               $aViewbox[2], $aViewbox[1]));
                                 }
                                 }
-                               $fPrevCoord = false;
-                               $aRoute = array();
-                               foreach($aPoints as $i => $fPoint)
+                               else
                                 {
                                 {
-                                       if ($i%2)
-                                       {
-                                               $aRoute[] = array((float)$fPoint, $fPrevCoord);
-                                       }
-                                       else
+                                       $aRoute = $oParams->getStringList('route');
+                                       $fRouteWidth = $oParams->getFloat('routewidth');
+                                       if ($aRoute && $fRouteWidth)
                                         {
                                         {
-                                               $fPrevCoord = (float)$fPoint;
+                                               $this->setRoute($aRoute, $fRouteWidth);
                                         }
                                 }
                                         }
                                 }
-                               $this->aRoutePoints = $aRoute;
                         }
                 }
  
                         }
                 }
  
-               function setQueryFromParams($aParams)
+               function setQueryFromParams($oParams)
                 {
                         // Search query
                 {
                         // Search query
-                       $sQuery = (isset($aParams['q'])?trim($aParams['q']):'');
+                       $sQuery = $oParams->getString('q');
                         if (!$sQuery)
                         {
                         if (!$sQuery)
                         {
-                               $this->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
+                               $this->setStructuredQuery($oParams->getString('amenity'),
+                                                         $oParams->getString('street'),
+                                                         $oParams->getString('city'),
+                                                         $oParams->getString('county'),
+                                                         $oParams->getString('state'),
+                                                         $oParams->getString('country'),
+                                                         $oParams->getString('postalcode'));
                                 $this->setReverseInPlan(false);
                         }
                         else
                                 $this->setReverseInPlan(false);
                         }
                         else
@@ -431,24 +414,23 @@
  
                         if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
                         {
  
                         if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
                         {
+                               //only Tiger housenumbers and interpolation lines need to be interpolated, because they are saved as lines 
+                               // with start- and endnumber, the common osm housenumbers are usually saved as points
+                               $sHousenumbers = "";
+                               $i = 0;
+                               $length = count($aPlaceIDs);
+                               foreach($aPlaceIDs as $placeID => $housenumber)
+                               {
+                                       $i++;
+                                       $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
+                                       if($i<$length)
+                                               $sHousenumbers .= ", ";
+                               }
                                 if (CONST_Use_US_Tiger_Data)
                                 {
                                 if (CONST_Use_US_Tiger_Data)
                                 {
-                                       //query also location_property_tiger and location_property_aux
                                         //Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
                                         //Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
-                                       //only Tiger housenumbers 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);
-                                       foreach($aPlaceIDs as $placeID => $housenumber)
-                                       {
-                                               $i++;
-                                               $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
-                                               if($i<$length)
-                                                       $sHousenumbers .= ", ";
-                                       }
-
-                                       $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 .= " union";
+                                       $sSQL .= " select 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, 'us' as country_code";
                                         $sSQL .= ", get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress ";
                                         $sSQL .= ", null as placename";
                                         $sSQL .= ", null as ref";
                                         $sSQL .= ", get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress ";
                                         $sSQL .= ", null as placename";
                                         $sSQL .= ", null as ref";
@@ -460,16 +442,17 @@
                                         $sSQL .= ", null as extra_place ";
                                         $sSQL .= " from (select place_id";
                                         //interpolate the Tiger housenumbers here
                                         $sSQL .= ", null as extra_place ";
                                         $sSQL .= " from (select place_id";
                                         //interpolate the Tiger housenumbers here
-                                       $sSQL .= ", ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) as centroid, parent_place_id, housenumber_for_place ";
-                                       $sSQL .= "from (location_property_tiger ";
+                                       $sSQL .= ", ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) as centroid, parent_place_id, housenumber_for_place";
+                                       $sSQL .= " from (location_property_tiger ";
                                         $sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) ";
                                         $sSQL .= " where housenumber_for_place>=0 and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here
                                         $sSQL .= " group by place_id, housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
                                         if (!$this->bDeDupe) $sSQL .= ", place_id ";
                                 }
                                         $sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) ";
                                         $sSQL .= " where housenumber_for_place>=0 and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here
                                         $sSQL .= " group by place_id, housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
                                         if (!$this->bDeDupe) $sSQL .= ", place_id ";
                                 }
-                               // osmline, osm_type is 'I' for Interpolation Line
+                               // osmline
+                               // interpolation line search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
                                 $sSQL .= " union ";
                                 $sSQL .= " union ";
-                               $sSQL .= "select 'I' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code, ";
+                               $sSQL .= "select 'W' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code, ";
                                 $sSQL .= "get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress, ";
                                 $sSQL .= "null as placename, ";
                                 $sSQL .= "null as ref, ";
                                 $sSQL .= "get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress, ";
                                 $sSQL .= "null as placename, ";
                                 $sSQL .= "null as ref, ";
@@ -477,7 +460,8 @@
                                 if ($this->bIncludeNameDetails) $sSQL .= "null as names, ";
                                 $sSQL .= " avg(st_x(centroid)) as lon, avg(st_y(centroid)) as lat,";
                                 $sSQL .= $sImportanceSQL."-0.1 as importance, ";  // slightly smaller than the importance for normal houses with rank 30, which is 0
                                 if ($this->bIncludeNameDetails) $sSQL .= "null as names, ";
                                 $sSQL .= " avg(st_x(centroid)) as lon, avg(st_y(centroid)) as lat,";
                                 $sSQL .= $sImportanceSQL."-0.1 as importance, ";  // slightly smaller than the importance for normal houses with rank 30, which is 0
-                               $sSQL .= " (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p 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 .= " (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p";
+                               $sSQL .= " where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance,";
                                 $sSQL .= " null as extra_place ";
                                 $sSQL .= " from (select place_id, calculated_country_code ";
                                 //interpolate the housenumbers here
                                 $sSQL .= " null as extra_place ";
                                 $sSQL .= " from (select place_id, calculated_country_code ";
                                 //interpolate the housenumbers here
@@ -513,12 +497,8 @@
  
                         $sSQL .= " order by importance desc";
                         if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
  
                         $sSQL .= " order by importance desc";
                         if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
-                       $aSearchResults = $this->oDB->getAll($sSQL);
-
-                       if (PEAR::IsError($aSearchResults))
-                       {
-                               failInternalError("Could not get details for place.", $sSQL, $aSearchResults);
-                       }
+                       $aSearchResults = chksql($this->oDB->getAll($sSQL),
+                                                "Could not get details for place.");
  
                         return $aSearchResults;
                 }
  
                         return $aSearchResults;
                 }
@@ -836,7 +816,7 @@
  
                         $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
                         $sCountryCodesSQL = false;
  
                         $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
                         $sCountryCodesSQL = false;
-                       if ($this->aCountryCodes && sizeof($this->aCountryCodes))
+                       if ($this->aCountryCodes)
                         {
                                 $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
                         }
                         {
                                 $sCountryCodesSQL = join(',', array_map('addQuotes', $this->aCountryCodes));
                         }
@@ -851,52 +831,17 @@
                                 $sQuery = preg_replace('/(^|,)\s*la\s*(,|$)/','\1louisiana\2', $sQuery);
                         }
  
                                 $sQuery = preg_replace('/(^|,)\s*la\s*(,|$)/','\1louisiana\2', $sQuery);
                         }
  
-                       // View Box SQL
-                       $sViewboxCentreSQL = false;
-                       $bBoundingBoxSearch = false;
-                       if ($this->aViewBox)
+                       $bBoundingBoxSearch = $this->bBoundedSearch && $this->sViewboxSmallSQL;
+                       if ($this->sViewboxCentreSQL)
                         {
                         {
-                               $fHeight = $this->aViewBox[0]-$this->aViewBox[2];
-                               $fWidth = $this->aViewBox[1]-$this->aViewBox[3];
-                               $aBigViewBox[0] = $this->aViewBox[0] + $fHeight;
-                               $aBigViewBox[2] = $this->aViewBox[2] - $fHeight;
-                               $aBigViewBox[1] = $this->aViewBox[1] + $fWidth;
-                               $aBigViewBox[3] = $this->aViewBox[3] - $fWidth;
-
-                               $this->sViewboxSmallSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$this->aViewBox[0].",".(float)$this->aViewBox[1]."),ST_Point(".(float)$this->aViewBox[2].",".(float)$this->aViewBox[3].")),4326)";
-                               $this->sViewboxLargeSQL = "ST_SetSRID(ST_MakeBox2D(ST_Point(".(float)$aBigViewBox[0].",".(float)$aBigViewBox[1]."),ST_Point(".(float)$aBigViewBox[2].",".(float)$aBigViewBox[3].")),4326)";
-                               $bBoundingBoxSearch = $this->bBoundedSearch;
-                       }
-
-                       // Route SQL
-                       if ($this->aRoutePoints)
-                       {
-                               $sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
-                               $bFirst = true;
-                               foreach($this->aRoutePoints as $aPoint)
-                               {
-                                       if (!$bFirst) $sViewboxCentreSQL .= ",";
-                                       $sViewboxCentreSQL .= $aPoint[0].' '.$aPoint[1];
-                                       $bFirst = false;
-                               }
-                               $sViewboxCentreSQL .= ")'::geometry,4326)";
-
-                               $sSQL = "select st_buffer(".$sViewboxCentreSQL.",".(float)($_GET['routewidth']/69).")";
-                               $this->sViewboxSmallSQL = $this->oDB->getOne($sSQL);
-                               if (PEAR::isError($this->sViewboxSmallSQL))
-                               {
-                                       failInternalError("Could not get small viewbox.", $sSQL, $this->sViewboxSmallSQL);
-                               }
-                               $this->sViewboxSmallSQL = "'".$this->sViewboxSmallSQL."'::geometry";
-
-                               $sSQL = "select st_buffer(".$sViewboxCentreSQL.",".(float)($_GET['routewidth']/30).")";
-                               $this->sViewboxLargeSQL = $this->oDB->getOne($sSQL);
-                               if (PEAR::isError($this->sViewboxLargeSQL))
-                               {
-                                       failInternalError("Could not get large viewbox.", $sSQL, $this->sViewboxLargeSQL);
-                               }
-                               $this->sViewboxLargeSQL = "'".$this->sViewboxLargeSQL."'::geometry";
-                               $bBoundingBoxSearch = $this->bBoundedSearch;
+                               // For complex viewboxes (routes) precompute the bounding geometry
+                               $sGeom = chksql($this->oDB->getOne("select ".$this->sViewboxSmallSQL),
+                                               "Could not get small viewbox");
+                               $this->sViewboxSmallSQL = "'".$sGeom."'::geometry";
+
+                               $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?
                         }
  
                         // Do we have anything that looks like a lat/lon pair?
@@ -960,11 +905,11 @@
                                 foreach($aSpecialTermsRaw as $aSpecialTerm)
                                 {
                                         $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
                                 foreach($aSpecialTermsRaw as $aSpecialTerm)
                                 {
                                         $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
-                                       $sToken = $this->oDB->getOne("select make_standard_name('".$aSpecialTerm[1]."') as string");
+                                       $sToken = chksql($this->oDB->getOne("select make_standard_name('".$aSpecialTerm[1]."') as string"));
                                         $sSQL = 'select * from (select word_id,word_token, word, class, type, country_code, operator';
                                         $sSQL .= ' from word where word_token in (\' '.$sToken.'\')) as x where (class is not null and class not in (\'place\')) or country_code is not null';
                                         if (CONST_Debug) var_Dump($sSQL);
                                         $sSQL = 'select * from (select word_id,word_token, word, class, type, country_code, operator';
                                         $sSQL .= ' from word where word_token in (\' '.$sToken.'\')) as x where (class is not null and class not in (\'place\')) or country_code is not null';
                                         if (CONST_Debug) var_Dump($sSQL);
-                                       $aSearchWords = $this->oDB->getAll($sSQL);
+                                       $aSearchWords = chksql($this->oDB->getAll($sSQL));
                                         $aNewSearches = array();
                                         foreach($aSearches as $aSearch)
                                         {
                                         $aNewSearches = array();
                                         foreach($aSearches as $aSearch)
                                         {
@@ -1009,13 +954,8 @@
                                 $aTokens = array();
                                 foreach($aPhrases as $iPhrase => $sPhrase)
                                 {
                                 $aTokens = array();
                                 foreach($aPhrases as $iPhrase => $sPhrase)
                                 {
-                                       $aPhrase = $this->oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string");
-                                       if (PEAR::isError($aPhrase))
-                                       {
-                                               userError("Illegal query string (not an UTF-8 string): ".$sPhrase);
-                                               if (CONST_Debug) var_dump($aPhrase);
-                                               exit;
-                                       }
+                                       $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;
                                         if (trim($aPhrase['string']))
                                         {
                                                 $aPhrases[$iPhrase] = $aPhrase;
@@ -1042,11 +982,14 @@
                                         if (CONST_Debug) var_Dump($sSQL);
  
                                         $aValidTokens = array();
                                         if (CONST_Debug) var_Dump($sSQL);
  
                                         $aValidTokens = array();
-                                       if (sizeof($aTokens)) $aDatabaseWords = $this->oDB->getAll($sSQL);
-                                       else $aDatabaseWords = array();
-                                       if (PEAR::IsError($aDatabaseWords))
+                                       if (sizeof($aTokens))
+                                       {
+                                               $aDatabaseWords = chksql($this->oDB->getAll($sSQL),
+                                                                        "Could not get word tokens.");
+                                       }
+                                       else
                                         {
                                         {
-                                               failInternalError("Could not get word tokens.", $sSQL, $aDatabaseWords);
+                                               $aDatabaseWords = array();
                                         }
                                         $aPossibleMainWordIDs = array();
                                         $aWordFrequencyScores = array();
                                         }
                                         $aPossibleMainWordIDs = array();
                                         $aWordFrequencyScores = array();
@@ -1263,7 +1206,7 @@
                                                                                 $sSQL .= " and _st_intersects($this->sViewboxSmallSQL, geometry)";
                                                                         $sSQL .= " order by st_area(geometry) desc limit 1";
                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                                 $sSQL .= " and _st_intersects($this->sViewboxSmallSQL, geometry)";
                                                                         $sSQL .= " order by st_area(geometry) desc limit 1";
                                                                         if (CONST_Debug) var_dump($sSQL);
-                                                                       $aPlaceIDs = $this->oDB->getCol($sSQL);
+                                                                       $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                                                 }
                                                                 else
                                                                 {
                                                                 }
                                                                 else
                                                                 {
@@ -1275,7 +1218,7 @@
                                                                 if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue;
                                                                 if (!$aSearch['sClass']) continue;
                                                                 $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
                                                                 if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue;
                                                                 if (!$aSearch['sClass']) continue;
                                                                 $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
-                                                               if ($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 = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
                                                                         if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
@@ -1285,10 +1228,10 @@
                                                                         {
                                                                                 $sSQL .= " and place_id not in (".join(',',$this->aExcludePlaceIDs).")";
                                                                         }
                                                                         {
                                                                                 $sSQL .= " and place_id not in (".join(',',$this->aExcludePlaceIDs).")";
                                                                         }
-                                                                       if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
+                                                                       if ($this->sViewboxCentreSQL) $sSQL .= " order by st_distance($this->sViewboxCentreSQL, ct.centroid) asc";
                                                                         $sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                         $sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
-                                                                       $aPlaceIDs = $this->oDB->getCol($sSQL);
+                                                                       $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
  
                                                                         // If excluded place IDs are given, it is fair to assume that
                                                                         // there have been results in the small box, so no further
  
                                                                         // If excluded place IDs are given, it is fair to assume that
                                                                         // there have been results in the small box, so no further
@@ -1300,10 +1243,10 @@
                                                                                 if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
                                                                                 $sSQL .= " where st_contains($this->sViewboxLargeSQL, ct.centroid)";
                                                                                 if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
                                                                                 if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
                                                                                 $sSQL .= " where st_contains($this->sViewboxLargeSQL, ct.centroid)";
                                                                                 if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
-                                                                               if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
+                                                                               if ($this->sViewboxCentreSQL) $sSQL .= " order by st_distance($this->sViewboxCentreSQL, ct.centroid) asc";
                                                                                 $sSQL .= " limit $this->iLimit";
                                                                                 if (CONST_Debug) var_dump($sSQL);
                                                                                 $sSQL .= " limit $this->iLimit";
                                                                                 if (CONST_Debug) var_dump($sSQL);
-                                                                               $aPlaceIDs = $this->oDB->getCol($sSQL);
+                                                                               $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                                                         }
                                                                 }
                                                                 else
                                                                         }
                                                                 }
                                                                 else
@@ -1311,13 +1254,19 @@
                                                                         $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)";
-                                                                       if ($sViewboxCentreSQL) $sSQL .= " order by st_distance($sViewboxCentreSQL, centroid) asc";
+                                                                       if ($this->sViewboxCentreSQL)   $sSQL .= " order by st_distance($this->sViewboxCentreSQL, centroid) asc";
                                                                         $sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                         $sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
-                                                                       $aPlaceIDs = $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'])
+                                               {
+                                                       $aPlaceIDs = array();
+                                               }
                                                 else
                                                 {
                                                         $aPlaceIDs = array();
                                                 else
                                                 {
                                                         $aPlaceIDs = array();
@@ -1330,9 +1279,11 @@
                                                         {
                                                                 $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                                  $aOrder[] = "";
                                                         {
                                                                 $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                                  $aOrder[] = "";
-                                                               $aOrder[0] = "exists(select place_id from placex where parent_place_id = search_name.place_id and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) ";
+                                                               $aOrder[0] = " (exists(select place_id from placex where parent_place_id = search_name.place_id";
+                                $aOrder[0] .= " and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) ";
                                                                 // also housenumbers from interpolation lines table are needed
                                                                 // also housenumbers from interpolation lines table are needed
-                                                               $aOrder[0] .= " or exists(select place_id from location_property_osmline where parent_place_id = search_name.place_id and ".$aSearch['sHouseNumber'].">=startnumber and ".$aSearch['sHouseNumber']."<=endnumber limit 1)";
+                                                               $aOrder[0] .= " or exists(select place_id from location_property_osmline where parent_place_id = search_name.place_id";
+                                $aOrder[0] .= " and ".intval($aSearch['sHouseNumber']).">=startnumber and ".intval($aSearch['sHouseNumber'])."<=endnumber limit 1))";
                                                                 $aOrder[0] .= " desc";
                                                         }
  
                                                                 $aOrder[0] .= " desc";
                                                         }
  
@@ -1423,11 +1374,8 @@
                                                                         $sSQL .= " limit ".$this->iLimit;
  
                                                                 if (CONST_Debug) { var_dump($sSQL); }
                                                                         $sSQL .= " limit ".$this->iLimit;
  
                                                                 if (CONST_Debug) { var_dump($sSQL); }
-                                                               $aViewBoxPlaceIDs = $this->oDB->getAll($sSQL);
-                                                               if (PEAR::IsError($aViewBoxPlaceIDs))
-                                                               {
-                                                                       failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs);
-                                                               }
+                                                               $aViewBoxPlaceIDs = chksql($this->oDB->getAll($sSQL),
+                                                                                          "Could not get places for search terms.");
                                                                 //var_dump($aViewBoxPlaceIDs);
                                                                 // Did we have an viewbox matches?
                                                                 $aPlaceIDs = array();
                                                                 //var_dump($aViewBoxPlaceIDs);
                                                                 // Did we have an viewbox matches?
                                                                 $aPlaceIDs = array();
@@ -1452,7 +1400,7 @@
                                                                 $aRoadPlaceIDs = $aPlaceIDs;
                                                                 $sPlaceIDs = join(',',$aPlaceIDs);
  
                                                                 $aRoadPlaceIDs = $aPlaceIDs;
                                                                 $sPlaceIDs = join(',',$aPlaceIDs);
  
-                                                               // Now they are indexed look for a house attached to a street we found
+                                                               // 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))
                                                                 $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))
@@ -1461,7 +1409,7 @@
                                                                 }
                                                                 $sSQL .= " limit $this->iLimit";
                                                                 if (CONST_Debug) var_dump($sSQL);
                                                                 }
                                                                 $sSQL .= " limit $this->iLimit";
                                                                 if (CONST_Debug) var_dump($sSQL);
-                                                               $aPlaceIDs = $this->oDB->getCol($sSQL);
+                                                               $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                                                 
                                                                 // if nothing found, search in the interpolation line table
                                                                 if(!sizeof($aPlaceIDs))
                                                                 
                                                                 // if nothing found, search in the interpolation line table
                                                                 if(!sizeof($aPlaceIDs))
@@ -1478,12 +1426,12 @@
  
                                                                         if (sizeof($this->aExcludePlaceIDs))
                                                                         {
  
                                                                         if (sizeof($this->aExcludePlaceIDs))
                                                                         {
-                                                                               $sSQL .= " and parent_place_id not in (".join(',', $this->aExcludePlaceIDs).")";
+                                                                               $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
                                                                         }
                                                                         //$sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                         //get place IDs
                                                                         }
                                                                         //$sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                         //get place IDs
-                                                                       $aPlaceIDs = $this->oDB->getCol($sSQL, 0);
+                                                                       $aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0));
                                                                 }
                                                                         
                                                                 // If nothing found try the aux fallback table
                                                                 }
                                                                         
                                                                 // If nothing found try the aux fallback table
@@ -1496,11 +1444,10 @@
                                                                         }
                                                                         //$sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                         }
                                                                         //$sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
-                                                                       $aPlaceIDs = $this->oDB->getCol($sSQL);
+                                                                       $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                                                 }
  
                                                                 //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)
-                                                               $searchedHousenumber = intval($aSearch['sHouseNumber']);
                                                                 if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs))
                                                                 {
                                                                         //new query for lines, not housenumbers anymore
                                                                 if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs))
                                                                 {
                                                                         //new query for lines, not housenumbers anymore
@@ -1519,7 +1466,7 @@
                                                                         //$sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                         //get place IDs
                                                                         //$sSQL .= " limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                         //get place IDs
-                                                                       $aPlaceIDs = $this->oDB->getCol($sSQL, 0);
+                                                                       $aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0));
                                                                 }
  
                                                                 // Fallback to the road (if no housenumber was found)
                                                                 }
  
                                                                 // Fallback to the road (if no housenumber was found)
@@ -1529,7 +1476,7 @@
                                                                         //set to -1, if no housenumbers were found
                                                                         $searchedHousenumber = -1;
                                                                 }
                                                                         //set to -1, if no housenumbers were found
                                                                         $searchedHousenumber = -1;
                                                                 }
-                                //else: housenumber was found, remains saved in searchedHousenumber
+                                                               //else: housenumber was found, remains saved in searchedHousenumber
                                                         }
  
  
                                                         }
  
  
@@ -1546,18 +1493,18 @@
                                                                         if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
                                                                         $sSQL .= " order by rank_search asc limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                         if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
                                                                         $sSQL .= " order by rank_search asc limit $this->iLimit";
                                                                         if (CONST_Debug) var_dump($sSQL);
-                                                                       $aClassPlaceIDs = $this->oDB->getCol($sSQL);
+                                                                       $aClassPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                                                 }
  
                                                                 if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in
                                                                 {
                                                                         $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
                                                                 }
  
                                                                 if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in
                                                                 {
                                                                         $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
-                                                                       $bCacheTable = $this->oDB->getOne($sSQL);
+                                                                       $bCacheTable = chksql($this->oDB->getOne($sSQL));
  
                                                                         $sSQL = "select min(rank_search) from placex where place_id in ($sPlaceIDs)";
  
                                                                         if (CONST_Debug) var_dump($sSQL);
  
                                                                         $sSQL = "select min(rank_search) from placex where place_id in ($sPlaceIDs)";
  
                                                                         if (CONST_Debug) var_dump($sSQL);
-                                                                       $this->iMaxRank = ((int)$this->oDB->getOne($sSQL));
+                                                                       $this->iMaxRank = ((int)chksql($this->oDB->getOne($sSQL)));
  
                                                                         // 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;
@@ -1566,7 +1513,7 @@
                                                                                 // 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);
                                                                                 // 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 = $this->oDB->getOne($sSQL);
+                                                                               $sPlaceGeom = chksql($this->oDB->getOne($sSQL));
                                                                         }
  
                                                                         if ($sPlaceGeom)
                                                                         }
  
                                                                         if ($sPlaceGeom)
@@ -1578,7 +1525,7 @@
                                                                                 $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);
                                                                                 $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 = $this->oDB->getCol($sSQL);
+                                                                               $aPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                                                                 $sPlaceIDs = join(',',$aPlaceIDs);
                                                                         }
  
                                                                                 $sPlaceIDs = join(',',$aPlaceIDs);
                                                                         }
  
@@ -1617,7 +1564,7 @@
                                                                                         if ($this->iOffset) $sSQL .= " offset $this->iOffset";
                                                                                         $sSQL .= " limit $this->iLimit";
                                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                                         if ($this->iOffset) $sSQL .= " offset $this->iOffset";
                                                                                         $sSQL .= " limit $this->iLimit";
                                                                                         if (CONST_Debug) var_dump($sSQL);
-                                                                                       $aClassPlaceIDs = array_merge($aClassPlaceIDs, $this->oDB->getCol($sSQL));
+                                                                                       $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL)));
                                                                                 }
                                                                                 else
                                                                                 {
                                                                                 }
                                                                                 else
                                                                                 {
@@ -1639,7 +1586,7 @@
                                                                                         if ($this->iOffset) $sSQL .= " offset $this->iOffset";
                                                                                         $sSQL .= " limit $this->iLimit";
                                                                                         if (CONST_Debug) var_dump($sSQL);
                                                                                         if ($this->iOffset) $sSQL .= " offset $this->iOffset";
                                                                                         $sSQL .= " limit $this->iLimit";
                                                                                         if (CONST_Debug) var_dump($sSQL);
-                                                                                       $aClassPlaceIDs = array_merge($aClassPlaceIDs, $this->oDB->getCol($sSQL));
+                                                                                       $aClassPlaceIDs = array_merge($aClassPlaceIDs, chksql($this->oDB->getCol($sSQL)));
                                                                                 }
                                                                         }
                                                                 }
                                                                                 }
                                                                         }
                                                                 }
@@ -1650,11 +1597,6 @@
  
                                                 }
  
  
                                                 }
  
-                                               if (PEAR::IsError($aPlaceIDs))
-                                               {
-                                                       failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs);
-                                               }
-
                                                 if (CONST_Debug) { echo "<br><b>Place IDs:</b> "; var_Dump($aPlaceIDs); }
  
                                                 foreach($aPlaceIDs as $iPlaceID)
                                                 if (CONST_Debug) { echo "<br><b>Place IDs:</b> "; var_Dump($aPlaceIDs); }
  
                                                 foreach($aPlaceIDs as $iPlaceID)
@@ -1680,12 +1622,13 @@
                                                         $sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                         if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";
                                                 }
                                                         $sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                         if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";
                                                 }
-                                               $sSQL .= ")";
+                                               $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);
                                                 if (CONST_Debug) var_dump($sSQL);
-                                               $aFilteredPlaceIDs = $this->oDB->getCol($sSQL);
+                                               $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
                                                 $tempIDs = array();
                                                 foreach($aFilteredPlaceIDs as $placeID)
                                                 $tempIDs = array();
                                                 foreach($aFilteredPlaceIDs as $placeID)
-                        {
+                                               {
                                                         $tempIDs[$placeID] = $aResultPlaceIDs[$placeID];  //assign housenumber to placeID
                                                 }
                                                 $aResultPlaceIDs = $tempIDs;
                                                         $tempIDs[$placeID] = $aResultPlaceIDs[$placeID];  //assign housenumber to placeID
                                                 }
                                                 $aResultPlaceIDs = $tempIDs;
@@ -1707,9 +1650,17 @@
                         else
                         {
                                 // Just interpret as a reverse geocode
                         else
                         {
                                 // Just interpret as a reverse geocode
-                               $iPlaceID = geocodeReverse((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]);
-                               if ($iPlaceID)
-                                       $aSearchResults = $this->getDetails(array($iPlaceID));
+                               $oReverse = new ReverseGeocode($this->oDB);
+                               $oReverse->setZoom(18);
+
+                               $aLookup = $oReverse->lookup((float)$this->aNearPoint[0],
+                                                            (float)$this->aNearPoint[1],
+                                                            false);
+
+                               if (CONST_Debug) var_dump("Reverse search", $aLookup);
+
+                               if ($aLookup['place_id'])
+                                       $aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));
                                 else
                                         $aSearchResults = array();
                         }
                                 else
                                         $aSearchResults = array();
                         }
@@ -1737,19 +1688,19 @@
  
                         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->setIncludePolygonAsText($this->bIncludePolygonAsText);
+                       $oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON);
+                       $oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML);
+                       $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
+                       $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
+
                         foreach($aSearchResults as $iResNum => $aResult)
                         {
                                 // Default
                                 $fDiameter = getResultDiameter($aResult);
  
                         foreach($aSearchResults as $iResNum => $aResult)
                         {
                                 // Default
                                 $fDiameter = getResultDiameter($aResult);
  
-                               $oPlaceLookup = new PlaceLookup($this->oDB);
-                               $oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints);
-                               $oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText);
-                               $oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON);
-                               $oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML);
-                               $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
-                               $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
-
                                 $aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
                                 if ($aOutlineResult)
                                 {
                                 $aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
                                 if ($aOutlineResult)
                                 {