X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e94b667e16177916dc34d790df475a69fe01a7d9..4e0e0c179723674b72d8162b12440d50bcf89eed:/lib/Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 8eaa5402..611ca6de 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -228,11 +228,9 @@
 		function loadParamArray($aParams)
 		{
 			if (isset($aParams['addressdetails'])) $this->bIncludeAddressDetails = (bool)$aParams['addressdetails'];
-			if ((float) CONST_Postgresql_Version > 9.2)
-			{
-				if (isset($aParams['extratags'])) $this->bIncludeExtraTags = (bool)$aParams['extratags'];
-				if (isset($aParams['namedetails'])) $this->bIncludeNameDetails = (bool)$aParams['namedetails'];
-			}
+			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'];
 
@@ -399,7 +397,7 @@
 			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
 
 			// Get the details for display (is this a redundant extra step?)
-			$sPlaceIDs = join(',',array_keys($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 * ";
@@ -433,55 +431,62 @@
 
 			if (30 >= $this->iMinAddressRank && 30 <= $this->iMaxAddressRank)
 			{
-				//query also location_property_tiger and location_property_aux
-				//Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
-				//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 .= ", ";
+				if (CONST_Use_US_Tiger_Data)
+				{
+					//query also location_property_tiger and location_property_aux
+					//Tiger search only if a housenumber was searched and if it was found (i.e. aPlaceIDs[placeID] = housenumber != -1) (realized through a join)
+					//only Tiger housenumbers need to be interpolated, because they are saved as lines with start- and endnumber, the common osm housenumbers are usually saved as points
+					$sHousenumbers = "";
+					$i = 0;
+					$length = count($aPlaceIDs);
+					foreach($aPlaceIDs as $placeID => $housenumber)
+					{
+						$i++;
+						$sHousenumbers .= "(".$placeID.", ".$housenumber.")";
+						if($i<$length)
+							$sHousenumbers .= ", ";
+					}
+
+					$sSQL .= "union ";
+					$sSQL .= "select 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, 30 as rank_search, 30 as rank_address, min(place_id) as place_id, min(parent_place_id) as parent_place_id, 'us' as country_code";
+					$sSQL .= ", 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 ";
 				}
 
-				$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(point)) as lon, avg(st_y(point)) 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 point, parent_place_id, housenumber_for_place ";
-				$sSQL .= "from (location_property_tiger ";
-				$sSQL .= " join (values ".$sHousenumbers.") as housenumbers(place_id, housenumber_for_place) using(place_id)) ";
-				$sSQL .= " where housenumber_for_place>=0 and 30 between $this->iMinAddressRank and $this->iMaxAddressRank) as blub"; //postgres wants an alias here
-				$sSQL .= " group by place_id, housenumber_for_place"; //is this group by really needed?, place_id + housenumber (in combination) are unique
-				if (!$this->bDeDupe) $sSQL .= ", place_id ";
-
-				$sSQL .= " 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) ";
+				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";
@@ -873,7 +878,8 @@
 			}
 
 			// 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']));
 				$sQuery = $aLooksLike['query'];
 			}
@@ -1216,7 +1222,7 @@
 					foreach($aSearches as $aSearch)
 					{
 						$iQueryLoop++;
-						$searchedHousenumber=-1;
+						$searchedHousenumber = -1;
 
 						if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
 						if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);
@@ -1431,7 +1437,7 @@
 								$aPlaceIDs = $this->oDB->getCol($sSQL);
 
 								// If nothing found try the aux fallback table
-								if (!sizeof($aPlaceIDs))
+								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))
@@ -1444,10 +1450,10 @@
 								}
 								//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 (!sizeof($aPlaceIDs))
+								if (CONST_Use_US_Tiger_Data && !sizeof($aPlaceIDs))
 								{
 									//new query for lines, not housenumbers anymore
-									if($searchedHousenumber%2==0){
+									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{
@@ -1470,16 +1476,15 @@
 								{
 									$aPlaceIDs = $aRoadPlaceIDs;
 									//set to -1, if no housenumbers were found
-									$searchedHousenumber=-1;
-								}else{
-									//housenumber was found, remains saved in searchedHousenumber
+									$searchedHousenumber = -1;
 								}
+                                //else: housenumber was found, remains saved in searchedHousenumber
 							}
 
 
 							if ($aSearch['sClass'] && sizeof($aPlaceIDs))
 							{
-								$sPlaceIDs = join(',', aPlaceIDs);
+								$sPlaceIDs = join(',', $aPlaceIDs);
 								$aClassPlaceIDs = array();
 
 								if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name')
@@ -1617,17 +1622,21 @@
 						$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(',',array_keys($aResultPlaceIDs)).") ";
-						$sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
-						if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";
+						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 .= ")";
 						if (CONST_Debug) var_dump($sSQL);
 						$aFilteredPlaceIDs = $this->oDB->getCol($sSQL);
 						$tempIDs = array();
-						foreach($aFilteredPlaceIDs as $placeID){
-							$tempIDs[$placeID]= $aResultPlaceIDs[$placeID];  //assign housenumber to placeID
+						foreach($aFilteredPlaceIDs as $placeID)
+                        {
+							$tempIDs[$placeID] = $aResultPlaceIDs[$placeID];  //assign housenumber to placeID
 						}
-						$aResultPlaceIDs=$tempIDs;
+						$aResultPlaceIDs = $tempIDs;
 					}
 
 					//exit;