Remove interpolation lines from placex and save them in an extra table.

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index ba1842c3c33a062acceff7ce966cd33960f8fafc..620e0e50e11039c5391fb9333daae429c57cc5c4 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1,4 +1,6 @@
 <?php
 <?php

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

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


@@ -356,7 +358,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)


@@ -391,19 +393,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,";


@@ -430,37 +433,82 @@
 
                        if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
                        {
 
                        if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
                        {

+                               //query also location_property_osmline and location_property_tiger and location_property_aux
+                               //Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
+                               //only Tiger housenumbers need to be interpolated, because they are saved as lines with start- and endnumber, the common osm housenumbers are usually saved as points
+                               $sHousenumbers = "";
+                               $i = 0;
+                               $length = count($aPlaceIDs);
+                               foreach($aPlaceIDs as $placeID => $housenumber)
+                               {
+                                       $i++;
+                                       $sHousenumbers .= "(".$placeID.", ".$housenumber.")";
+                                       if($i<$length)
+                                               $sHousenumbers .= ", ";
+                               }
+                               // osmline, osm_type is 'I' for Interpolation Line

                                $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 .= "select 'I' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code, ";
+                               $sSQL .= "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 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 ";
+
+                               // tiger
+                               $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 .= ", 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_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 ";
+
+                               // aux

                                $sSQL .= " union ";
                                $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 .= "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";
                                $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) ";
+                               if (!$this->bDeDupe) $sSQL .= ", place_id";
+                               $sSQL .= ", get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) ";

                        }
 
                        $sSQL .= " order by importance desc";
                        }
 
                        $sSQL .= " order by importance desc";


@@ -778,7 +826,7 @@
                                addressimportance: cumulated importance of address elements
                                extra_place: type of place (for admin boundaries, if there is a place tag)
                                aBoundingBox: bounding Box
                                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) 
+                               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
                */
                                name: full name (currently the same as langaddress)
                                foundorder: secondary ordering for places with same importance
                */


@@ -852,9 +900,10 @@
                        }
 
                        // 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();


@@ -862,9 +911,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?


@@ -1063,6 +1126,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);


@@ -1180,6 +1244,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);


@@ -1264,7 +1329,11 @@
                                                        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 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 and ".$aSearch['sHouseNumber'].">=startnumber and ".$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)


@@ -1376,8 +1445,10 @@
                                                        //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);
 


@@ -1391,43 +1462,78 @@
                                                                $sSQL .= " limit $this->iLimit";
                                                                if (CONST_Debug) var_dump($sSQL);
                                                                $aPlaceIDs = $this->oDB->getCol($sSQL);
                                                                $sSQL .= " limit $this->iLimit";
                                                                if (CONST_Debug) var_dump($sSQL);
                                                                $aPlaceIDs = $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($this->aExcludePlaceIDs))
+                                                                       {
+                                                                               $sSQL .= " and parent_place_id not in (".join(',', $this->aExcludePlaceIDs).")";
+                                                                       }
+                                                                       //$sSQL .= " limit $this->iLimit";
+                                                                       if (CONST_Debug) var_dump($sSQL);
+                                                                       //get place IDs
+                                                                       $aPlaceIDs = $this->oDB->getCol($sSQL, 0);
+                                                               }
+                                                                       
+                                                               // If nothing found try the aux fallback table

                                                                if (!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))
                                                                        {
                                                                if (!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 .= " 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);
                                                                        $aPlaceIDs = $this->oDB->getCol($sSQL);
                                                                }
                                                                        }
                                                                        //$sSQL .= " limit $this->iLimit";
                                                                        if (CONST_Debug) var_dump($sSQL);
                                                                        $aPlaceIDs = $this->oDB->getCol($sSQL);
                                                                }

-
+                                                               //if nothing found search in Tiger data for this housenumber(location_property_tiger)

                                                                if (!sizeof($aPlaceIDs))
                                                                {
                                                                if (!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 = $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')


@@ -1551,7 +1657,8 @@
 
                                                foreach($aPlaceIDs as $iPlaceID)
                                                {
 
                                                foreach($aPlaceIDs as $iPlaceID)
                                                {

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

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


@@ -1559,16 +1666,25 @@
                                        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 .= ") 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 .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";

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

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

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

                                        }
 
                                        //exit;
                                        }
 
                                        //exit;


@@ -1620,107 +1736,22 @@
                        foreach($aSearchResults as $iResNum => $aResult)
                        {
                                // Default
                        foreach($aSearchResults as $iResNum => $aResult)
                        {
                                // Default

-                               $fDiameter = 0.0001;
-
-                               if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
-                                               && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'])
+                               $fDiameter = getResultDiameter($aResult);
+
+                               $oPlaceLookup = new PlaceLookup($this->oDB);
+                               $oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints);
+                               $oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText);
+                               $oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON);
+                               $oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML);
+                               $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
+                               $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
+
+                               $aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
+                               if ($aOutlineResult)

                                {
                                {

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

                                }
                                }

-                               elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
-                                               && $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'])
-                               {
-                                       $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'];
-                               }
-                               $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';


@@ -1728,32 +1759,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'])


@@ -1771,16 +1776,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'])