X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a4ecd9d73e93a56aeee336c7fa7e18aa42bd9e03..10c5d7f6f6f6ea321fea870e1ec984fa5e4af135:/lib/PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 985ed224..831f6ef6 100644
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -7,7 +7,7 @@
 
 		protected $sType = false;
 
-		protected $fTigerFraction =-1;
+		protected $fTigerFraction = -1;
 
 		protected $aLangPrefOrder = array();
 
@@ -42,18 +42,12 @@
 
 		function setIncludeExtraTags($bExtraTags = false)
 		{
-			if ((float) CONST_Postgresql_Version > 9.2)
-			{
-				$this->bExtraTags = $bExtraTags;
-			}
+			$this->bExtraTags = $bExtraTags;
 		}
 
 		function setIncludeNameDetails($bNameDetails = false)
 		{
-			if ((float) CONST_Postgresql_Version > 9.2)
-			{
-				$this->bNameDetails = $bNameDetails;
-			}
+			$this->bNameDetails = $bNameDetails;
 		}
 
 
@@ -106,7 +100,7 @@
 		function setOSMID($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);
+			$this->iPlaceID = chksql($this->oDB->getOne($sSQL));
 		}
 
 		function lookupPlace($details)
@@ -117,7 +111,7 @@
 			{
 				$this->setOSMID($details['osm_type'], $details['osm_id']);
 			}
-			if (isset($details['fraction'])) $this->fTigerFraction = $details['fraction'];
+			if (isset($details['fraction'])) $this->fInterpolFraction = $details['fraction'];
 
 			return $this->lookup();
 		}
@@ -128,7 +122,7 @@
 
 			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 
-			if ($this->sType == 'tiger')
+			if (CONST_Use_US_Tiger_Data && $this->sType == 'tiger')
 			{
 				$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,";
@@ -140,12 +134,33 @@
 				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((".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1";
+				$sSQL .= " WHEN interpolationtype='even' THEN ((".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2";
+				$sSQL .= " WHEN interpolationtype='all' THEN (".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)::int";
 				$sSQL .= " END as housenumber";
 				$sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID.") as blub1) as blub2";
 			}
+			else if ($this->sType == 'interpolation')
+			{
+				$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((".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1";
+				$sSQL .= " WHEN interpolationtype='even' THEN ((".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2";
+				$sSQL .= " WHEN interpolationtype='all' THEN (".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)::int";
+				$sSQL .= " END as housenumber";
+				$sSQL .= " from location_property_osmline where place_id = ".(int)$this->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
 			{
 				$sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, parent_place_id, linked_place_id, rank_address, rank_search, ";
@@ -160,19 +175,13 @@
 				$sSQL .= " from placex where place_id = ".(int)$this->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
+				if(CONST_Use_US_Tiger_Data && $this->sType == 'tiger' || $this->sType == 'interpolation') // to get addressdetails for tiger data, the housenumber is needed
 					$aAddress = $this->getAddressNames($aPlace['housenumber']);
 				else
 					$aAddress = $this->getAddressNames();
@@ -233,13 +242,7 @@
 			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)
@@ -317,12 +320,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'])
 				{