factor out parameter parsing into its own class

[nominatim.git] / lib / Geocode.php

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

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

        class Geocode
        {
                protected $oDB;
        class Geocode
        {
                protected $oDB;


@@ -30,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;


@@ -60,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;


@@ -85,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;


@@ -120,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()


@@ -155,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)


@@ -197,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 setViewbox($aViewbox)
+               {
+                       $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 setCountryCodesList($aCountryCodes)
+               function setNearPoint($aNearPoint, $fRadiusDeg = 0.1)

                {
                {

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

                }
 
                function setQuery($sQueryString)
                }
 
                function setQuery($sQueryString)


@@ -223,23 +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'];
-                       if (isset($aParams['bounded'])) $this->bBoundedSearch = (bool)$aParams['bounded'];
-                       if (isset($aParams['dedupe'])) $this->bDeDupe = (bool)$aParams['dedupe'];
+                       $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);

 
 

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


@@ -251,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'])
+                       $aViewbox = $oParams->getStringList('viewboxlbrt');
+                       if ($aViewbox)

                        {
                        {

-                               $aCoOrdinatesLBRT = explode(',',$aParams['viewboxlbrt']);
-                               $this->setViewBox($aCoOrdinatesLBRT[0], $aCoOrdinatesLBRT[1], $aCoOrdinatesLBRT[2], $aCoOrdinatesLBRT[3]);
+                               $this->setViewbox($aViewbox);

                        }
                        }

-                       else if (isset($aParams['viewbox']) && $aParams['viewbox'])
-                       {
-                               $aCoOrdinatesLTRB = explode(',',$aParams['viewbox']);
-                               $this->setViewBox($aCoOrdinatesLTRB[0], $aCoOrdinatesLTRB[3], $aCoOrdinatesLTRB[2], $aCoOrdinatesLTRB[1]);
-                       }
-
-                       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


@@ -353,7 +339,7 @@
                        $this->loadStructuredAddressElement($sPostalCode, 'postalcode' , 5, 11, array(5, 11));
                        $this->loadStructuredAddressElement($sCountry, 'country', 4, 4, false);
 
                        $this->loadStructuredAddressElement($sPostalCode, 'postalcode' , 5, 11, array(5, 11));
                        $this->loadStructuredAddressElement($sCountry, 'country', 4, 4, false);
 

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

                        {
                                $this->sQuery = join(', ', $this->aStructuredQuery);
                                if ($this->iMaxAddressRank < 30)
                        {
                                $this->sQuery = join(', ', $this->aStructuredQuery);
                                if ($this->iMaxAddressRank < 30)


@@ -388,19 +374,20 @@
 
                function getDetails($aPlaceIDs)
                {
 
                function getDetails($aPlaceIDs)
                {

+                       //$aPlaceIDs is an array with key: placeID and value: tiger-housenumber, if found, else -1

                        if (sizeof($aPlaceIDs) == 0)  return array();
 
                        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
 
                        // Get the details for display (is this a redundant extra step?)
                        if (sizeof($aPlaceIDs) == 0)  return array();
 
                        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
 
                        // Get the details for display (is this a redundant extra step?)

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

 
                        $sImportanceSQL = '';
                        if ($this->sViewboxSmallSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
                        if ($this->sViewboxLargeSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
 
                        $sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code,";
 
                        $sImportanceSQL = '';
                        if ($this->sViewboxSmallSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxSmallSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
                        if ($this->sViewboxLargeSQL) $sImportanceSQL .= " case when ST_Contains($this->sViewboxLargeSQL, ST_Collect(centroid)) THEN 1 ELSE 0.75 END * ";
 
                        $sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code,";

-                       $sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+                       $sSQL .= "get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) as langaddress,";

                        $sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
                        $sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
                        if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text as extra,";
                        $sSQL .= "get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
                        $sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
                        if ($this->bIncludeExtraTags) $sSQL .= "hstore_to_json(extratags)::text as extra,";


@@ -427,47 +414,91 @@
 
                        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)
+                               {
+                                       //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 .= ", null as placename";
+                                       $sSQL .= ", null as ref";
+                                       if ($this->bIncludeExtraTags) $sSQL .= ", null as extra";
+                                       if ($this->bIncludeNameDetails) $sSQL .= ", null as names";
+                                       $sSQL .= ", avg(st_x(centroid)) as lon, avg(st_y(centroid)) as lat,";
+                                       $sSQL .= $sImportanceSQL."-1.15 as importance ";
+                                       $sSQL .= ", (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance ";
+                                       $sSQL .= ", null as extra_place ";
+                                       $sSQL .= " from (select place_id";
+                                       //interpolate the Tiger housenumbers here
+                                       $sSQL .= ", ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) as centroid, parent_place_id, housenumber_for_place";
+                                       $sSQL .= " from (location_property_tiger ";
+                                       $sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) ";
+                                       $sSQL .= " where housenumber_for_place>=0 and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here
+                                       $sSQL .= " group by place_id, housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
+                                       if (!$this->bDeDupe) $sSQL .= ", place_id ";
+                               }
+                               // osmline
+                               // interpolation line search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)

                                $sSQL .= " union ";
                                $sSQL .= " 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, $sLanguagePrefArraySQL) as langaddress,";
-                               $sSQL .= "null as placename,";
-                               $sSQL .= "null as ref,";
-                               if ($this->bIncludeExtraTags) $sSQL .= "null as extra,";
-                               if ($this->bIncludeNameDetails) $sSQL .= "null as names,";
-                               $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-                               $sSQL .= $sImportanceSQL."-1.15 as importance, ";
-                               $sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_tiger.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-                               $sSQL .= "null as extra_place ";
-                               $sSQL .= "from location_property_tiger where place_id in ($sPlaceIDs) ";
-                               $sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
-                               $sSQL .= "group by place_id";
-                               if (!$this->bDeDupe) $sSQL .= ",place_id ";
-                               $sSQL .= " union ";
-                               $sSQL .= "select 'L' 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, $sLanguagePrefArraySQL) as langaddress,";
-                               $sSQL .= "null as placename,";
-                               $sSQL .= "null as ref,";
-                               if ($this->bIncludeExtraTags) $sSQL .= "null as extra,";
-                               if ($this->bIncludeNameDetails) $sSQL .= "null as names,";
-                               $sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
-                               $sSQL .= $sImportanceSQL."-1.10 as importance, ";
-                               $sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
-                               $sSQL .= "null as extra_place ";
-                               $sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
-                               $sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
-                               $sSQL .= "group by place_id";
-                               if (!$this->bDeDupe) $sSQL .= ",place_id";
-                               $sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
+                               $sSQL .= "select 'W' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code, ";
+                               $sSQL .= "get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress, ";
+                               $sSQL .= "null as placename, ";
+                               $sSQL .= "null as ref, ";
+                               if ($this->bIncludeExtraTags) $sSQL .= "null as extra, ";
+                               if ($this->bIncludeNameDetails) $sSQL .= "null as names, ";
+                               $sSQL .= " avg(st_x(centroid)) as lon, avg(st_y(centroid)) as lat,";
+                               $sSQL .= $sImportanceSQL."-0.1 as importance, ";  // slightly smaller than the importance for normal houses with rank 30, which is 0
+                               $sSQL .= " (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p";
+                               $sSQL .= " where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance,";
+                               $sSQL .= " null as extra_place ";
+                               $sSQL .= " from (select place_id, calculated_country_code ";
+                               //interpolate the housenumbers here
+                               $sSQL .= ", CASE WHEN startnumber != endnumber THEN ST_LineInterpolatePoint(linegeo, (housenumber_for_place-startnumber::float)/(endnumber-startnumber)::float) ";
+                               $sSQL .= " ELSE ST_LineInterpolatePoint(linegeo, 0.5) END as centroid";
+                               $sSQL .= ", parent_place_id, housenumber_for_place ";
+                               $sSQL .= " from (location_property_osmline ";
+                               $sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) ";
+                               $sSQL .= " where housenumber_for_place>=0 and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here
+                               $sSQL .= " group by place_id, housenumber_for_place, calculated_country_code "; //is this group by really needed?, place_id + housenumber (in combination) are unique
+                               if (!$this->bDeDupe) $sSQL .= ", place_id ";
+
+                               if (CONST_Use_Aux_Location_data)
+                               {
+                                       $sSQL .= " union ";
+                                       $sSQL .= "select 'L' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 0 as rank_search, 0 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, 'us' as country_code, ";
+                                       $sSQL .= "get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) as langaddress, ";
+                                       $sSQL .= "null as placename, ";
+                                       $sSQL .= "null as ref, ";
+                                       if ($this->bIncludeExtraTags) $sSQL .= "null as extra, ";
+                                       if ($this->bIncludeNameDetails) $sSQL .= "null as names, ";
+                                       $sSQL .= "avg(ST_X(centroid)) as lon, avg(ST_Y(centroid)) as lat, ";
+                                       $sSQL .= $sImportanceSQL."-1.10 as importance, ";
+                                       $sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(location_property_aux.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
+                                       $sSQL .= "null as extra_place ";
+                                       $sSQL .= "from location_property_aux where place_id in ($sPlaceIDs) ";
+                                       $sSQL .= "and 30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
+                                       $sSQL .= "group by place_id";
+                                       if (!$this->bDeDupe) $sSQL .= ", place_id";
+                                       $sSQL .= ", get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) ";
+                               }

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


@@ -475,15 +506,15 @@
                function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
                {
                        /*
                function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
                {
                        /*

-                          Calculate all searches using aValidTokens i.e.
-                          'Wodsworth Road, Sheffield' =>
+                                Calculate all searches using aValidTokens i.e.
+                                'Wodsworth Road, Sheffield' =>

 
 

-                          Phrase Wordset
-                          0      0       (wodsworth road)
-                          0      1       (wodsworth)(road)
-                          1      0       (sheffield)
+                                Phrase Wordset
+                                0      0       (wodsworth road)
+                                0      1       (wodsworth)(road)
+                                1      0       (sheffield)

 
 

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


@@ -752,32 +783,32 @@
                /* Perform the actual query lookup.
 
                        Returns an ordered list of results, each with the following fields:
                /* Perform the actual query lookup.
 
                        Returns an ordered list of results, each with the following fields:

-                         osm_type: type of corresponding OSM object
+                               osm_type: type of corresponding OSM object

                                                        N - node
                                                        W - way
                                                        R - relation
                                                        P - postcode (internally computed)
                                                        N - node
                                                        W - way
                                                        R - relation
                                                        P - postcode (internally computed)

-                         osm_id: id of corresponding OSM object
-                         class: general object class (corresponds to tag key of primary OSM tag)
-                         type: subclass of object (corresponds to tag value of primary OSM tag)
-                         admin_level: see http://wiki.openstreetmap.org/wiki/Admin_level
-                         rank_search: rank in search hierarchy
+                               osm_id: id of corresponding OSM object
+                               class: general object class (corresponds to tag key of primary OSM tag)
+                               type: subclass of object (corresponds to tag value of primary OSM tag)
+                               admin_level: see http://wiki.openstreetmap.org/wiki/Admin_level
+                               rank_search: rank in search hierarchy

                                                        (see also http://wiki.openstreetmap.org/wiki/Nominatim/Development_overview#Country_to_street_level)
                                                        (see also http://wiki.openstreetmap.org/wiki/Nominatim/Development_overview#Country_to_street_level)

-                         rank_address: rank in address hierarchy (determines orer in address)
-                         place_id: internal key (may differ between different instances)
-                         country_code: ISO country code
-                         langaddress: localized full address
-                         placename: localized name of object
-                         ref: content of ref tag (if available)
-                         lon: longitude
-                         lat: latitude
-                         importance: importance of place based on Wikipedia link count
-                         addressimportance: cumulated importance of address elements
-                         extra_place: type of place (for admin boundaries, if there is a place tag)
-                         aBoundingBox: bounding Box
-                         label: short description of the object class/type (English only) 
-                         name: full name (currently the same as langaddress)
-                         foundorder: secondary ordering for places with same importance
+                               rank_address: rank in address hierarchy (determines orer in address)
+                               place_id: internal key (may differ between different instances)
+                               country_code: ISO country code
+                               langaddress: localized full address
+                               placename: localized name of object
+                               ref: content of ref tag (if available)
+                               lon: longitude
+                               lat: latitude
+                               importance: importance of place based on Wikipedia link count
+                               addressimportance: cumulated importance of address elements
+                               extra_place: type of place (for admin boundaries, if there is a place tag)
+                               aBoundingBox: bounding Box
+                               label: short description of the object class/type (English only)
+                               name: full name (currently the same as langaddress)
+                               foundorder: secondary ordering for places with same importance

                */
                function lookup()
                {
                */
                function lookup()
                {


@@ -785,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));
                        }


@@ -800,58 +831,24 @@
                                $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?

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

                                $this->setNearPoint(array($aLooksLike['lat'], $aLooksLike['lon']));
                                $this->setNearPoint(array($aLooksLike['lat'], $aLooksLike['lon']));

-                               $sQuery = $aLooksLike['query'];                 
+                               $sQuery = $aLooksLike['query'];

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


@@ -859,9 +856,23 @@
                        {
                                // 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?
                                );
 
                                // Do we have a radius search?


@@ -894,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)
                                        {


@@ -943,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;


@@ -976,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))

                                        {
                                        {

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

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


@@ -1060,6 +1069,7 @@
                                        // TODO: suggestions
 
                                        // Start the search process
                                        // TODO: suggestions
 
                                        // Start the search process

+                                       // array with: placeid => -1 | tiger-housenumber

                                        $aResultPlaceIDs = array();
 
                                        $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases);
                                        $aResultPlaceIDs = array();
 
                                        $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases);


@@ -1177,6 +1187,7 @@
                                        foreach($aSearches as $aSearch)
                                        {
                                                $iQueryLoop++;
                                        foreach($aSearches as $aSearch)
                                        {
                                                $iQueryLoop++;

+                                               $searchedHousenumber = -1;

 
                                                if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
                                                if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
 
                                                if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
                                                if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);


@@ -1191,11 +1202,11 @@
                                                                {
                                                                        $sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
                                                                        if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";
                                                                {
                                                                        $sSQL = "select place_id from placex where calculated_country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
                                                                        if ($sCountryCodesSQL) $sSQL .= " and calculated_country_code in ($sCountryCodesSQL)";

-                                    if ($bBoundingBoxSearch)
-                                        $sSQL .= " and _st_intersects($this->sViewboxSmallSQL, geometry)";
+                                                                       if ($bBoundingBoxSearch)
+                                                                               $sSQL .= " and _st_intersects($this->sViewboxSmallSQL, geometry)";

                                                                        $sSQL .= " order by st_area(geometry) desc limit 1";
                                                                        if (CONST_Debug) var_dump($sSQL);
                                                                        $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
                                                                {


@@ -1207,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)";


@@ -1217,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


@@ -1232,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


@@ -1243,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();


@@ -1261,7 +1278,13 @@
                                                        if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress']))
                                                        {
                                                                $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                                                        if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress']))
                                                        {
                                                                $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';

-                                                               $aOrder[] = "exists(select place_id from placex where parent_place_id = search_name.place_id and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) desc";
+                                $aOrder[] = "";
+                                                               $aOrder[0] = " (exists(select place_id from placex where parent_place_id = search_name.place_id";
+                                $aOrder[0] .= " and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) ";
+                                                               // also housenumbers from interpolation lines table are needed
+                                                               $aOrder[0] .= " or exists(select place_id from location_property_osmline where parent_place_id = search_name.place_id";
+                                $aOrder[0] .= " and ".intval($aSearch['sHouseNumber']).">=startnumber and ".intval($aSearch['sHouseNumber'])."<=endnumber limit 1))";
+                                                               $aOrder[0] .= " desc";

                                                        }
 
                                                        // TODO: filter out the pointless search terms (2 letter name tokens and less)
                                                        }
 
                                                        // TODO: filter out the pointless search terms (2 letter name tokens and less)


@@ -1351,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();


@@ -1373,12 +1393,14 @@
                                                        //var_Dump($aPlaceIDs);
                                                        //exit;
 
                                                        //var_Dump($aPlaceIDs);
                                                        //exit;
 

+                                                       //now search for housenumber, if housenumber provided

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

+                                                               $searchedHousenumber = intval($aSearch['sHouseNumber']);

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


@@ -1387,44 +1409,80 @@
                                                                }
                                                                $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))
+                                                               {
+                                                                       // do we need to use transliteration and the regex for housenumbers???
+                                                                       //new query for lines, not housenumbers anymore
+                                                                       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";
+                                                                       }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";
+                                                                       }

 
 

-                                                               // If not try the aux fallback table
-                                                               if (!sizeof($aPlaceIDs))
+                                                                       if (sizeof($this->aExcludePlaceIDs))
+                                                                       {
+                                                                               $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
+                                                                       }
+                                                                       //$sSQL .= " limit $this->iLimit";
+                                                                       if (CONST_Debug) var_dump($sSQL);
+                                                                       //get place IDs
+                                                                       $aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0));
+                                                               }
+                                                                       
+                                                               // If nothing found try the aux fallback table
+                                                               if (CONST_Use_Aux_Location_data && !sizeof($aPlaceIDs))

                                                                {
                                                                        $sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
                                                                        if (sizeof($this->aExcludePlaceIDs))
                                                                        {
                                                                {
                                                                        $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 place_id not in (".join(',',$this->aExcludePlaceIDs).")";
+                                                                               $sSQL .= " and parent_place_id not in (".join(',',$this->aExcludePlaceIDs).")";

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

-                                                                       $aPlaceIDs = $this->oDB->getCol($sSQL);
+                                                                       $aPlaceIDs = chksql($this->oDB->getCol($sSQL));

                                                                }
 
                                                                }
 

-                                                               if (!sizeof($aPlaceIDs))
+                                                               //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)
+                                                               if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs))

                                                                {
                                                                {

-                                                                       $sSQL = "select place_id from location_property_tiger where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
+                                                                       //new query for lines, not housenumbers anymore
+                                                                       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";
+                                                                       }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";
+                                                                       }
+

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

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

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

-                                                                       $aPlaceIDs = $this->oDB->getCol($sSQL);
+                                                                       //get place IDs
+                                                                       $aPlaceIDs = chksql($this->oDB->getCol($sSQL, 0));

                                                                }
 
                                                                }
 

-                                                               // Fallback to the road
+                                                               // Fallback to the road (if no housenumber was found)

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

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

                                                                }
                                                                }

-
+                                                               //else: housenumber was found, remains saved in searchedHousenumber

                                                        }
 
                                                        }
 

+

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

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

                                                                $aClassPlaceIDs = array();
 
                                                                if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name')
                                                                $aClassPlaceIDs = array();
 
                                                                if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name')


@@ -1435,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;


@@ -1455,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)


@@ -1467,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);
                                                                        }
 


@@ -1506,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
                                                                                {


@@ -1528,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)));

                                                                                }
                                                                        }
                                                                }
                                                                                }
                                                                        }
                                                                }


@@ -1539,16 +1597,12 @@
 
                                                }
 
 
                                                }
 

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

-                                                       $aResultPlaceIDs[$iPlaceID] = $iPlaceID;
+                                                       // array for placeID => -1 | Tiger housenumber
+                                                       $aResultPlaceIDs[$iPlaceID] = $searchedHousenumber;

                                                }
                                                if ($iQueryLoop > 20) break;
                                        }
                                                }
                                                if ($iQueryLoop > 20) break;
                                        }


@@ -1556,16 +1610,28 @@
                                        if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30))
                                        {
                                                // Need to verify passes rank limits before dropping out of the loop (yuk!)
                                        if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30))
                                        {
                                                // Need to verify passes rank limits before dropping out of the loop (yuk!)

-                                               $sSQL = "select place_id from placex where place_id in (".join(',',$aResultPlaceIDs).") ";
+                                               // reduces the number of place ids, like a filter
+                                               // rank_address is 30 for interpolated housenumbers
+                                               $sSQL = "select place_id from placex where place_id in (".join(',',array_keys($aResultPlaceIDs)).") ";

                                                $sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
                                                if ($this->aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$this->aAddressRankList).")";
                                                $sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
                                                if ($this->aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$this->aAddressRankList).")";

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

-                                               $aResultPlaceIDs = $this->oDB->getCol($sSQL);
+                                               $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
+                                               $tempIDs = array();
+                                               foreach($aFilteredPlaceIDs as $placeID)
+                                               {
+                                                       $tempIDs[$placeID] = $aResultPlaceIDs[$placeID];  //assign housenumber to placeID
+                                               }
+                                               $aResultPlaceIDs = $tempIDs;

                                        }
 
                                        //exit;
                                        }
 
                                        //exit;


@@ -1584,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();
                        }


@@ -1612,112 +1686,27 @@
                                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->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
 
                        foreach($aSearchResults as $iResNum => $aResult)
                        {
                                // Default

-                               $fDiameter = 0.0001;
+                               $fDiameter = getResultDiameter($aResult);

 
 

-                               if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
-                                               && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
-                               {
-                                       $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'];
-                               }
-                               elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
-                                               && $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
+                               $aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
+                               if ($aOutlineResult)

                                {
                                {

-                                       $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'];
+                                       $aResult = array_merge($aResult, $aOutlineResult);

                                }
                                }

-                               $fRadius = $fDiameter / 2;
-
-                               if (CONST_Search_AreaPolygons)
-                               {
-                                       // Get the bounding box and outline polygon
-                                       $sSQL = "select place_id,0 as numfeatures,st_area(geometry) as area,";
-                                       $sSQL .= "ST_Y(centroid) as centrelat,ST_X(centroid) as centrelon,";
-                                       $sSQL .= "ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,";
-                                       $sSQL .= "ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon";
-                                       if ($this->bIncludePolygonAsGeoJSON) $sSQL .= ",ST_AsGeoJSON(geometry) as asgeojson";
-                                       if ($this->bIncludePolygonAsKML) $sSQL .= ",ST_AsKML(geometry) as askml";
-                                       if ($this->bIncludePolygonAsSVG) $sSQL .= ",ST_AsSVG(geometry) as assvg";
-                                       if ($this->bIncludePolygonAsText || $this->bIncludePolygonAsPoints) $sSQL .= ",ST_AsText(geometry) as astext";
-                                       $sFrom = " from placex where place_id = ".$aResult['place_id'];
-                                       if ($this->fPolygonSimplificationThreshold > 0)
-                                       {
-                                               $sSQL .= " from (select place_id,centroid,ST_SimplifyPreserveTopology(geometry,".$this->fPolygonSimplificationThreshold.") as geometry".$sFrom.") as plx";
-                                       }
-                                       else
-                                       {
-                                               $sSQL .= $sFrom;
-                                       }
-
-                                       $aPointPolygon = $this->oDB->getRow($sSQL);
-                                       if (PEAR::IsError($aPointPolygon))
-                                       {
-                                               failInternalError("Could not get outline.", $sSQL, $aPointPolygon);
-                                       }
-
-                                       if ($aPointPolygon['place_id'])
-                                       {
-                                               if ($this->bIncludePolygonAsGeoJSON) $aResult['asgeojson'] = $aPointPolygon['asgeojson'];
-                                               if ($this->bIncludePolygonAsKML) $aResult['askml'] = $aPointPolygon['askml'];
-                                               if ($this->bIncludePolygonAsSVG) $aResult['assvg'] = $aPointPolygon['assvg'];
-                                               if ($this->bIncludePolygonAsText) $aResult['astext'] = $aPointPolygon['astext'];
-
-                                               if ($aPointPolygon['centrelon'] !== null && $aPointPolygon['centrelat'] !== null )
-                                               {
-                                                       $aResult['lat'] = $aPointPolygon['centrelat'];
-                                                       $aResult['lon'] = $aPointPolygon['centrelon'];
-                                               }
-
-                                               if ($this->bIncludePolygonAsPoints)
-                                               {
-                                                       // Translate geometry string to point array
-                                                       if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
-                                                       {
-                                                               preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
-                                                       }
-                                                       elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['astext'],$aMatch))
-                                                       {
-                                                               preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
-                                                       }
-                                                       elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
-                                                       {
-                                                               $iSteps = max(8, min(100, ($fRadius * 40000)^2));
-                                                               $fStepSize = (2*pi())/$iSteps;
-                                                               $aPolyPoints = array();
-                                                               for($f = 0; $f < 2*pi(); $f += $fStepSize)
-                                                               {
-                                                                       $aPolyPoints[] = array('',$aMatch[1]+($fRadius*sin($f)),$aMatch[2]+($fRadius*cos($f)));
-                                                               }
-                                                       }
-                                               }
-
-                                               // Output data suitable for display (points and a bounding box)
-                                               if ($this->bIncludePolygonAsPoints && isset($aPolyPoints))
-                                               {
-                                                       $aResult['aPolyPoints'] = array();
-                                                       foreach($aPolyPoints as $aPoint)
-                                                       {
-                                                               $aResult['aPolyPoints'][] = array($aPoint[1], $aPoint[2]);
-                                                       }
-                                               }
-
-                                               if (abs($aPointPolygon['minlat'] - $aPointPolygon['maxlat']) < 0.0000001)
-                                               {
-                                                       $aPointPolygon['minlat'] = $aPointPolygon['minlat'] - $fRadius;
-                                                       $aPointPolygon['maxlat'] = $aPointPolygon['maxlat'] + $fRadius;
-                                               }
-                                               if (abs($aPointPolygon['minlon'] - $aPointPolygon['maxlon']) < 0.0000001)
-                                               {
-                                                       $aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius;
-                                                       $aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
-                                               }
-                                               $aResult['aBoundingBox'] = array((string)$aPointPolygon['minlat'],(string)$aPointPolygon['maxlat'],(string)$aPointPolygon['minlon'],(string)$aPointPolygon['maxlon']);
-                                       }
-                               }
-
+                               

                                if ($aResult['extra_place'] == 'city')
                                {
                                        $aResult['class'] = 'place';
                                if ($aResult['extra_place'] == 'city')
                                {
                                        $aResult['class'] = 'place';


@@ -1725,32 +1714,6 @@
                                        $aResult['rank_search'] = 16;
                                }
 
                                        $aResult['rank_search'] = 16;
                                }
 

-                               if (!isset($aResult['aBoundingBox']))
-                               {
-                                       $iSteps = max(8,min(100,$fRadius * 3.14 * 100000));
-                                       $fStepSize = (2*pi())/$iSteps;
-                                       $aPointPolygon['minlat'] = $aResult['lat'] - $fRadius;
-                                       $aPointPolygon['maxlat'] = $aResult['lat'] + $fRadius;
-                                       $aPointPolygon['minlon'] = $aResult['lon'] - $fRadius;
-                                       $aPointPolygon['maxlon'] = $aResult['lon'] + $fRadius;
-
-                                       // Output data suitable for display (points and a bounding box)
-                                       if ($this->bIncludePolygonAsPoints)
-                                       {
-                                               $aPolyPoints = array();
-                                               for($f = 0; $f < 2*pi(); $f += $fStepSize)
-                                               {
-                                                       $aPolyPoints[] = array('',$aResult['lon']+($fRadius*sin($f)),$aResult['lat']+($fRadius*cos($f)));
-                                               }
-                                               $aResult['aPolyPoints'] = array();
-                                               foreach($aPolyPoints as $aPoint)
-                                               {
-                                                       $aResult['aPolyPoints'][] = array($aPoint[1], $aPoint[2]);
-                                               }
-                                       }
-                                       $aResult['aBoundingBox'] = array((string)$aPointPolygon['minlat'],(string)$aPointPolygon['maxlat'],(string)$aPointPolygon['minlon'],(string)$aPointPolygon['maxlon']);
-                               }
-

                                // Is there an icon set for this type of result?
                                if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon'])
                                                && $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'])


@@ -1768,16 +1731,16 @@
                                {
                                        $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
                                }
                                {
                                        $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label'];
                                }

-
+                               // if tag '&addressdetails=1' is set in query

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

-                                       $aResult['address'] = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $aResult['place_id'], $aResult['country_code']);
+                                       // 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_shift(array_values($aResult['address']))), $aResult['address']);
                                        }
                                }

-

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


@@ -1786,7 +1749,7 @@
                                        }
                                        else
                                        {
                                        }
                                        else
                                        {

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

                                        }
                                }
 
                                        }
                                }
 


@@ -1798,7 +1761,7 @@
                                        }
                                        else
                                        {
                                        }
                                        else
                                        {

-                                               $aResult['sNameDetails'] = array();
+                                               $aResult['sNameDetails'] = (object) array();

                                        }
                                }
 
                                        }
                                }