X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/02bd322c1dc185a6eef072de7398c190fe7a2e0c..d594bb238b974afa638bcb8f92c069c97914f9b9:/lib/PlaceLookup.php?ds=sidebyside

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 94e414dc..7ba192d7 100644
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -3,18 +3,10 @@
 	{
 		protected $oDB;
 
-		protected $iPlaceID;
-
-		protected $sType = false;
-
-		protected $fTigerFraction = -1;
-
 		protected $aLangPrefOrder = array();
 
 		protected $bAddressDetails = false;
-
 		protected $bExtraTags = false;
-
 		protected $bNameDetails = false;
 
 		protected $bIncludePolygonAsPoints = false;
@@ -91,38 +83,23 @@
 			$this->fPolygonSimplificationThreshold = $f;
 		}
 
-
-		function setPlaceID($iPlaceID)
-		{
-			$this->iPlaceID = $iPlaceID;
-		}
-
-		function setOSMID($sType, $iID)
+		function lookupOSMID($sType, $iID)
 		{
 			$sSQL = "select place_id from placex where osm_type = '".pg_escape_string($sType)."' and osm_id = ".(int)$iID." order by type = 'postcode' asc";
-			$this->iPlaceID = $this->oDB->getOne($sSQL);
-		}
-
-		function lookupPlace($details)
-		{
-			if (isset($details['place_id'])) $this->iPlaceID = $details['place_id'];
-			if (isset($details['type'])) $this->sType = $details['type'];
-			if (isset($details['osm_type']) && isset($details['osm_id']))
-			{
-				$this->setOSMID($details['osm_type'], $details['osm_id']);
-			}
-			if (isset($details['fraction'])) $this->fTigerFraction = $details['fraction'];
+			$iPlaceID = chksql($this->oDB->getOne($sSQL));
 
-			return $this->lookup();
+			return $this->lookup((int)$iPlaceID);
 		}
 
-		function lookup()
+		function lookup($iPlaceID, $sType = '', $fInterpolFraction = 0.0)
 		{
-			if (!$this->iPlaceID) return null;
+			if (!$iPlaceID) return null;
 
 			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
+			$bIsTiger = CONST_Use_US_Tiger_Data && $sType == 'tiger';
+			$bIsInterpolation = $sType == 'interpolation';
 
-			if ($this->sType == 'tiger')
+			if ($bIsTiger)
 			{
 				$sSQL = "select place_id,partition, 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, housenumber, null as street, null as isin, postcode,";
 				$sSQL .= " 'us' as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
@@ -134,11 +111,32 @@
 				if ($this->bNameDetails) $sSQL .= " null as names,";
 				$sSQL .= " ST_X(point) as lon, ST_Y(point) as lat from (select *, ST_LineInterpolatePoint(linegeo, (housenumber-startnumber::float)/(endnumber-startnumber)::float) as point from ";
 				$sSQL .= " (select *, ";
-				$sSQL .= " CASE WHEN interpolationtype='odd' THEN floor((".$this->fTigerFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1";
-				$sSQL .= " WHEN interpolationtype='even' THEN ((".$this->fTigerFraction."*(endnumber-startnumber)+startnumber+1)/2)::int*2";
-				$sSQL .= " WHEN interpolationtype='all' THEN (".$this->fTigerFraction."*(endnumber-startnumber)+startnumber)::int";
+				$sSQL .= " CASE WHEN interpolationtype='odd' THEN floor((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1";
+				$sSQL .= " WHEN interpolationtype='even' THEN ((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2";
+				$sSQL .= " WHEN interpolationtype='all' THEN (".$fInterpolFraction."*(endnumber-startnumber)+startnumber)::int";
+				$sSQL .= " END as housenumber";
+				$sSQL .= " from location_property_tiger where place_id = ".$iPlaceID.") as blub1) as blub2";
+			}
+			else if ($bIsInterpolation)
+			{
+				$sSQL = "select place_id, partition, 'W' as osm_type, osm_id, 'place' as class, 'house' as type, null admin_level, housenumber, null as street, null as isin, postcode,";
+				$sSQL .= " calculated_country_code as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
+				$sSQL .= " (0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, calculated_country_code, ";
+				$sSQL .= " get_address_by_language(place_id, housenumber, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= " null as placename,";
+				$sSQL .= " null as ref,";
+				if ($this->bExtraTags) $sSQL .= " null as extra,";
+				if ($this->bNameDetails) $sSQL .= " null as names,";
+				$sSQL .= " ST_X(point) as lon, ST_Y(point) as lat from (select *, ST_LineInterpolatePoint(linegeo, (housenumber-startnumber::float)/(endnumber-startnumber)::float) as point from ";
+				$sSQL .= " (select *, ";
+				$sSQL .= " CASE WHEN interpolationtype='odd' THEN floor((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1";
+				$sSQL .= " WHEN interpolationtype='even' THEN ((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2";
+				$sSQL .= " WHEN interpolationtype='all' THEN (".$fInterpolFraction."*(endnumber-startnumber)+startnumber)::int";
 				$sSQL .= " END as housenumber";
-				$sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID.") as blub1) as blub2";
+				$sSQL .= " from location_property_osmline where place_id = ".$iPlaceID.") as blub1) as blub2";
+				// testcase: interpolationtype=odd, startnumber=1000, endnumber=1006, fInterpolFraction=1 => housenumber=1007 => error in st_lineinterpolatepoint
+				// but this will never happen, because if the searched point is that close to the endnumber, the endnumber house will be directly taken from placex (in ReverseGeocode.php line 220)
+				// and not interpolated
 			}
 			else
 			{
@@ -151,26 +149,19 @@
 				if ($this->bNameDetails) $sSQL .= " hstore_to_json(name) as names,";
 				$sSQL .= " (case when centroid is null then st_y(st_centroid(geometry)) else st_y(centroid) end) as lat,";
 				$sSQL .= " (case when centroid is null then st_x(st_centroid(geometry)) else st_x(centroid) end) as lon";
-				$sSQL .= " from placex where place_id = ".(int)$this->iPlaceID;
+				$sSQL .= " from placex where place_id = ".$iPlaceID;
 			}
 
-			$aPlace = $this->oDB->getRow($sSQL);
-
-
-			if (PEAR::IsError($aPlace))
-			{
-				failInternalError("Could not lookup place.", $sSQL, $aPlace);
-			}
+			$aPlace = chksql($this->oDB->getRow($sSQL), "Could not lookup place");
 
 			if (!$aPlace['place_id']) return null;
 
 			if ($this->bAddressDetails)
 			{
-				if($this->sType == 'tiger') // to get addressdetails for tiger data, the housenumber is needed
-					$aAddress = $this->getAddressNames($aPlace['housenumber']);
-				else
-					$aAddress = $this->getAddressNames();
-				$aPlace['aAddress'] = $aAddress;
+				// to get addressdetails for tiger data, the housenumber is needed
+				$iHousenumber = ($bIsTiger || $bIsInterpolation) ? $aPlace['housenumber'] : -1;
+				$aPlace['aAddress'] = $this->getAddressNames($aPlace['place_id'],
+				                                             $iHousenumber);
 			}
 
 			if ($this->bExtraTags)
@@ -217,28 +208,20 @@
 			return $aPlace;
 		}
 
-		function getAddressDetails($bAll = false, $housenumber = -1)
+		function getAddressDetails($iPlaceID, $bAll = false, $housenumber = -1)
 		{
-			if (!$this->iPlaceID) return null;
-
 			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 
-			$sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata(".$this->iPlaceID.",".$housenumber.")";
+			$sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata(".$iPlaceID.",".$housenumber.")";
 			if (!$bAll) $sSQL .= " WHERE isaddress OR type = 'country_code'";
 			$sSQL .= " order by rank_address desc,isaddress desc";
 
-			$aAddressLines = $this->oDB->getAll($sSQL);
-			if (PEAR::IsError($aAddressLines))
-			{
-				var_dump($aAddressLines);
-				exit;
-			}
-			return $aAddressLines;
+			return chksql($this->oDB->getAll($sSQL));
 		}
 
-		function getAddressNames($housenumber = -1)
+		function getAddressNames($iPlaceID, $housenumber = -1)
 		{
-			$aAddressLines = $this->getAddressDetails(false, $housenumber);
+			$aAddressLines = $this->getAddressDetails($iPlaceID, false, $housenumber);
 
 			$aAddress = array();
 			$aFallback = array();
@@ -311,12 +294,8 @@
 					$sSQL .= $sFrom;
 				}
 
-				$aPointPolygon = $this->oDB->getRow($sSQL);
-				if (PEAR::IsError($aPointPolygon))
-				{
-					echo var_dump($aPointPolygon);
-					failInternalError("Could not get outline.", $sSQL, $aPointPolygon);
-				}
+				$aPointPolygon = chksql($this->oDB->getRow($sSQL),
+				                        "Could not get outline");
 
 				if ($aPointPolygon['place_id'])
 				{