X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b544a8c590a9a9b5e86ac95260831bfadd7ba1d7..f89f1a65b67b544de7b679fe9a17ea133f36c0df:/lib/Geocode.php?ds=sidebyside

diff --git a/lib/Geocode.php b/lib/Geocode.php
index bcc69c75..132be9a5 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -20,6 +20,7 @@
 		protected $iLimit = 20;
 		protected $iFinalLimit = 10;
 		protected $iOffset = 0;
+		protected $bFallback = false;
 
 		protected $aCountryCodes = false;
 		protected $aNearPoint = false;
@@ -32,6 +33,7 @@
 		protected $iMinAddressRank = 0;
 		protected $iMaxAddressRank = 30;
 		protected $aAddressRankList = array();
+		protected $exactMatchCache = array();
 
 		protected $sAllowedTypesSQLList = false;
 
@@ -117,6 +119,11 @@
 			$this->iOffset = $iOffset;
 		}
 
+		function setFallback($bFallback = true)
+		{
+			$this->bFallback = (bool)$bFallback;
+		}
+
 		function setExcludedPlaceIDs($a)
 		{
 			// TODO: force to int
@@ -213,6 +220,11 @@
 		{
 			$this->sQuery = false;
 
+			// Reset
+			$this->iMinAddressRank = 0;
+			$this->iMaxAddressRank = 30;
+			$this->aAddressRankList = array();
+
 			$this->aStructuredQuery = array();
 			$this->sAllowedTypesSQLList = '';
 
@@ -232,7 +244,29 @@
 					$sAllowedTypesSQLList = '(\'place\',\'boundary\')';
 				}
 			}
+		}
+
+		function fallbackStructuredQuery()
+		{
+			if (!$this->aStructuredQuery) return false;
+
+			$aParams = $this->aStructuredQuery;
+
+			if (sizeof($aParams) == 1) return false;
+
+			$aOrderToFallback = array('postalcode', 'street', 'city', 'county', 'state');
+
+			foreach($aOrderToFallback as $sType)
+			{
+				if (isset($aParams[$sType]))
+				{
+					unset($aParams[$sType]);
+					$this->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
+					return true;
+				}
+			}
 
+			return false;
 		}
 
 		function getDetails($aPlaceIDs)
@@ -244,13 +278,13 @@
 			// Get the details for display (is this a redundant extra step?)
 			$sPlaceIDs = join(',',$aPlaceIDs);
 
-			$sSQL = "select osm_type,osm_id,class,type,admin_level,rank_search,rank_address,min(place_id) as place_id,calculated_country_code as country_code,";
+			$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_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
 			$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
 			$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
 			$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance, ";
-			$sSQL .= "(select max(p.importance*(p.rank_address+2)) from place_addressline s, placex p where s.place_id = min(placex.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 where s.place_id = min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END) and p.place_id = s.address_place_id and s.isaddress and p.importance is not null) as addressimportance, ";
 			$sSQL .= "(extratags->'place') as extra_place ";
 			$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
 			$sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
@@ -269,26 +303,26 @@
 			if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
 			{
 				$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,'us' as country_code,";
+				$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,";
 				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
 				$sSQL .= "-0.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.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 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,'us' as country_code,";
+				$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,";
 				$sSQL .= "avg(ST_X(centroid)) as lon,avg(ST_Y(centroid)) as lat, ";
 				$sSQL .= "-0.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.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 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 ";
@@ -337,7 +371,7 @@
 			  aBoundingBox: bounding Box
 			  label: short description of the object class/type (English only) 
 			  name: full name (currently the same as langaddress)
-			  foundorder: further ordering value for places with same importance
+			  foundorder: secondary ordering for places with same importance
 		*/
 		function lookup()
 		{
@@ -383,11 +417,12 @@
 			if ($this->aRoutePoints)
 			{
 				$sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
-				$bFirst = false;
-				foreach($this->aRouteaPoints as $aPoint)
+				$bFirst = true;
+				foreach($this->aRoutePoints as $aPoint)
 				{
 					if (!$bFirst) $sViewboxCentreSQL .= ",";
 					$sViewboxCentreSQL .= $aPoint[1].' '.$aPoint[0];
+					$bFirst = false;
 				}
 				$sViewboxCentreSQL .= ")'::geometry,4326)";
 
@@ -1145,12 +1180,16 @@
 							$aOrder[] = "$sImportanceSQL DESC";
 							if (sizeof($aSearch['aFullNameAddress']))
 							{
-								$aOrder[] = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'],",").']) INTERSECT select unnest(nameaddress_vector))s) DESC';
+								$sExactMatchSQL = '(select count(*) from (select unnest(ARRAY['.join($aSearch['aFullNameAddress'],",").']) INTERSECT select unnest(nameaddress_vector))s) as exactmatch';
+								$aOrder[] = 'exactmatch DESC';
+							} else {
+								$sExactMatchSQL = '0::int as exactmatch';
 							}
 
 							if (sizeof($aTerms))
 							{
-								$sSQL = "select place_id";
+								$sSQL = "select place_id, ";
+								$sSQL .= $sExactMatchSQL;
 								$sSQL .= " from search_name";
 								$sSQL .= " where ".join(' and ',$aTerms);
 								$sSQL .= " order by ".join(', ',$aOrder);
@@ -1178,6 +1217,7 @@
 									//if ($aViewBoxRow['in_small'] == 't') $bViewBoxMatch = 1;
 									//else if ($aViewBoxRow['in_large'] == 't') $bViewBoxMatch = 2;
 									$aPlaceIDs[] = $aViewBoxRow['place_id'];
+									$this->exactMatchCache[$aViewBoxRow['place_id']] = $aViewBoxRow['exactmatch'];
 								}
 							}
 							//var_Dump($aPlaceIDs);
@@ -1404,6 +1444,14 @@
 			// No results? Done
 			if (!sizeof($aSearchResults))
 			{
+				if ($this->bFallback)
+				{
+					if ($this->fallbackStructuredQuery())
+					{
+						return $this->lookup();
+					}
+				}
+
 				return array();
 			}
 
@@ -1575,7 +1623,24 @@
 				$aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
 
 				$aResult['name'] = $aResult['langaddress'];
-				$aResult['foundorder'] = -$aResult['addressimportance'];
+				// secondary ordering (for results with same importance (the smaller the better):
+				//   - approximate importance of address parts
+				$aResult['foundorder'] = -$aResult['addressimportance']/10;
+				//   - number of exact matches from the query
+				if (isset($this->exactMatchCache[$aResult['place_id']]))
+					$aResult['foundorder'] -= $this->exactMatchCache[$aResult['place_id']];
+				else if (isset($this->exactMatchCache[$aResult['parent_place_id']]))
+					$aResult['foundorder'] -= $this->exactMatchCache[$aResult['parent_place_id']];
+				//  - importance of the class/type
+				if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
+					&& $aClassType[$aResult['class'].':'.$aResult['type']]['importance'])
+				{
+					$aResult['foundorder'] = $aResult['foundorder'] + 0.000001 * $aClassType[$aResult['class'].':'.$aResult['type']]['importance'];
+				}
+				else
+				{
+					$aResult['foundorder'] = $aResult['foundorder'] + 0.001;
+				}
 				$aSearchResults[$iResNum] = $aResult;
 			}
 			uasort($aSearchResults, 'byImportance');