use place_id instead of parent_place_id for excluded place_ids in interpolation lines...

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a37455faf92c66ccc244b5142e0a32222eb8d07b..0c3c5f735c6bdbf43df1cabc49db8eaceb128d88 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -466,10 +466,10 @@
                                        $sSQL .= " group by place_id, housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
                                        if (!$this->bDeDupe) $sSQL .= ", place_id ";
                                }
-                               // osmline, osm_type is 'I' for Interpolation Line
+                               // osmline
                                // interpolation line search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
                                $sSQL .= " union ";
-                               $sSQL .= "select 'I' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code, ";
+                               $sSQL .= "select 'W' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, calculated_country_code as country_code, ";
                                $sSQL .= "get_address_by_language(place_id, housenumber_for_place, $sLanguagePrefArraySQL) as langaddress, ";
                                $sSQL .= "null as placename, ";
                                $sSQL .= "null as ref, ";
@@ -477,7 +477,8 @@
                                if ($this->bIncludeNameDetails) $sSQL .= "null as names, ";
                                $sSQL .= " avg(st_x(centroid)) as lon, avg(st_y(centroid)) as lat,";
                                $sSQL .= $sImportanceSQL."-0.1 as importance, ";  // slightly smaller than the importance for normal houses with rank 30, which is 0
-                               $sSQL .= " (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
+                               $sSQL .= " (select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p";
+                               $sSQL .= " where s.place_id = min(blub.parent_place_id) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance,";
                                $sSQL .= " null as extra_place ";
                                $sSQL .= " from (select place_id, calculated_country_code ";
                                //interpolate the housenumbers here
@@ -1330,11 +1331,11 @@
                                                        {
                                                                $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                                 $aOrder[] = "";
-                                                               $aOrder[0] = " exists(select place_id from placex where parent_place_id = search_name.place_id";
+                                                               $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 ".$aSearch['sHouseNumber'].">=startnumber and ".$aSearch['sHouseNumber']."<=endnumber limit 1)";
+                                $aOrder[0] .= " and ".intval($aSearch['sHouseNumber']).">=startnumber and ".intval($aSearch['sHouseNumber'])."<=endnumber limit 1))";
                                                                $aOrder[0] .= " desc";
                                                        }
 
@@ -1454,7 +1455,7 @@
                                                                $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))
@@ -1480,7 +1481,7 @@
 
                                                                        if (sizeof($this->aExcludePlaceIDs))
                                                                        {
-                                                                               $sSQL .= " and parent_place_id not in (".join(',', $this->aExcludePlaceIDs).")";
+                                                                               $sSQL .= " and place_id not in (".join(',', $this->aExcludePlaceIDs).")";
                                                                        }
                                                                        //$sSQL .= " limit $this->iLimit";
                                                                        if (CONST_Debug) var_dump($sSQL);
@@ -1502,7 +1503,6 @@
                                                                }
 
                                                                //if nothing was found in placex or location_property_aux, then search in Tiger data for this housenumber(location_property_tiger)
-                                                               $searchedHousenumber = intval($aSearch['sHouseNumber']);
                                                                if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs))
                                                                {
                                                                        //new query for lines, not housenumbers anymore
@@ -1682,7 +1682,8 @@
                                                        $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);
                                                $aFilteredPlaceIDs = $this->oDB->getCol($sSQL);
                                                $tempIDs = array();