X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9746629fd39c7f8de93b60716673cbcc4e75d231..5c187e131a372d0cbdbba3372668862e3f1c47f9:/lib/PlaceLookup.php?ds=sidebyside

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 2169983a..7ba192d7 100644
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -3,13 +3,19 @@
 	{
 		protected $oDB;
 
-		protected $iPlaceID;
-
-		protected $bIsTiger = false;
-
 		protected $aLangPrefOrder = array();
 
 		protected $bAddressDetails = false;
+		protected $bExtraTags = false;
+		protected $bNameDetails = false;
+
+		protected $bIncludePolygonAsPoints = false;
+		protected $bIncludePolygonAsText = false;
+		protected $bIncludePolygonAsGeoJSON = false;
+		protected $bIncludePolygonAsKML = false;
+		protected $bIncludePolygonAsSVG = false;
+		protected $fPolygonSimplificationThreshold = 0.0;
+
 
 		function PlaceLookup(&$oDB)
 		{
@@ -26,67 +32,161 @@
 			$this->bAddressDetails = $bAddressDetails;
 		}
 
-		function setPlaceID($iPlaceID)
+		function setIncludeExtraTags($bExtraTags = false)
 		{
-			$this->iPlaceID = $iPlaceID;
+			$this->bExtraTags = $bExtraTags;
 		}
 
-		function setOSMID($sType, $iID)
+		function setIncludeNameDetails($bNameDetails = false)
 		{
-			$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->bNameDetails = $bNameDetails;
+		}
+
+
+		function setIncludePolygonAsPoints($b = true)
+		{
+			$this->bIncludePolygonAsPoints = $b;
 		}
 
-		function setIsTiger($b = false)
+		function getIncludePolygonAsPoints()
 		{
-			$this->bIsTiger = $b;
+			return $this->bIncludePolygonAsPoints;
 		}
 
-		function lookup()
+		function setIncludePolygonAsText($b = true)
 		{
-			if (!$this->iPlaceID) return null;
+			$this->bIncludePolygonAsText = $b;
+		}
 
-			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
+		function getIncludePolygonAsText()
+		{
+			return $this->bIncludePolygonAsText;
+		}
+
+		function setIncludePolygonAsGeoJSON($b = true)
+		{
+			$this->bIncludePolygonAsGeoJSON = $b;
+		}
+
+		function setIncludePolygonAsKML($b = true)
+		{
+			$this->bIncludePolygonAsKML = $b;
+		}
 
-			$sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, extratags, parent_place_id, linked_place_id, rank_address, rank_search, ";
-			$sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_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 .= " (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;
+		function setIncludePolygonAsSVG($b = true)
+		{
+			$this->bIncludePolygonAsSVG = $b;
+		}
 
+		function setPolygonSimplificationThreshold($f)
+		{
+			$this->fPolygonSimplificationThreshold = $f;
+		}
 
-			if ($this->bIsTiger)
+		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";
+			$iPlaceID = chksql($this->oDB->getOne($sSQL));
+
+			return $this->lookup((int)$iPlaceID);
+		}
+
+		function lookup($iPlaceID, $sType = '', $fInterpolFraction = 0.0)
+		{
+			if (!$iPlaceID) return null;
+
+			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
+			$bIsTiger = CONST_Use_US_Tiger_Data && $sType == 'tiger';
+			$bIsInterpolation = $sType == 'interpolation';
+
+			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, null as extratags, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
-				$sSQL .= " coalesce(0,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as calculated_country_code, ";
-				$sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= " 'us' as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,";
+				$sSQL .= " coalesce(null,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as calculated_country_code, ";
+				$sSQL .= " get_address_by_language(place_id, housenumber, $sLanguagePrefArraySQL) as langaddress,";
 				$sSQL .= " null as placename,";
 				$sSQL .= " null as ref,";
-				$sSQL .= " st_y(centroid) as lat,";
-				$sSQL .= " st_x(centroid) as lon";
-				$sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID;
+				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 = ".$iPlaceID.") as blub1) as blub2";
 			}
-
-			$aPlace = $this->oDB->getRow($sSQL);
-
-
-			if (PEAR::IsError($aPlace))
+			else if ($bIsInterpolation)
 			{
-				failInternalError("Could not lookup place.", $sSQL, $aPlace);
+				$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_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
+			{
+				$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, ";
+				$sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_country_code, ";
+				$sSQL .= " get_address_by_language(place_id, -1, $sLanguagePrefArraySQL) as langaddress,";
+				$sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,";
+				$sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,";
+				if ($this->bExtraTags) $sSQL .= " hstore_to_json(extratags) as extra,";
+				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 = ".$iPlaceID;
 			}
 
+			$aPlace = chksql($this->oDB->getRow($sSQL), "Could not lookup place");
+
 			if (!$aPlace['place_id']) return null;
 
 			if ($this->bAddressDetails)
 			{
-				$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)
+			{
+				if ($aPlace['extra'])
+				{
+					$aPlace['sExtraTags'] = json_decode($aPlace['extra']);
+				}
+				else
+				{
+					$aPlace['sExtraTags'] = (object) array();
+				}
+			}
+
+			if ($this->bNameDetails)
+			{
+				if ($aPlace['names'])
+				{
+					$aPlace['sNameDetails'] = json_decode($aPlace['names']);
+				}
+				else
+				{
+					$aPlace['sNameDetails'] = (object) array();
+				}
+			}
 
 			$aClassType = getClassTypes();
 			$sAddressType = '';
@@ -108,28 +208,20 @@
 			return $aPlace;
 		}
 
-		function getAddressDetails($bAll = false)
+		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.")";
+			$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()
+		function getAddressNames($iPlaceID, $housenumber = -1)
 		{
-			$aAddressLines = $this->getAddressDetails(false);;
+			$aAddressLines = $this->getAddressDetails($iPlaceID, false, $housenumber);
 
 			$aAddress = array();
 			$aFallback = array();
@@ -164,5 +256,106 @@
 			return $aAddress;
 		}
 
+
+
+		// returns an array which will contain the keys
+		//   aBoundingBox
+		// and may also contain one or more of the keys
+		//   asgeojson
+		//   askml
+		//   assvg
+		//   astext
+		//   lat
+		//   lon
+		function getOutlines($iPlaceID, $fLon=null, $fLat=null, $fRadius=null)
+		{
+
+			$aOutlineResult = array();
+			if (!$iPlaceID) return $aOutlineResult;
+
+			if (CONST_Search_AreaPolygons)
+			{
+				// Get the bounding box and outline polygon
+				$sSQL  = "select place_id,0 as numfeatures,st_area(geometry) as area,";
+				$sSQL .= "ST_Y(centroid) as centrelat,ST_X(centroid) as centrelon,";
+				$sSQL .= "ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,";
+				$sSQL .= "ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon";
+				if ($this->bIncludePolygonAsGeoJSON) $sSQL .= ",ST_AsGeoJSON(geometry) as asgeojson";
+				if ($this->bIncludePolygonAsKML) $sSQL .= ",ST_AsKML(geometry) as askml";
+				if ($this->bIncludePolygonAsSVG) $sSQL .= ",ST_AsSVG(geometry) as assvg";
+				if ($this->bIncludePolygonAsText || $this->bIncludePolygonAsPoints) $sSQL .= ",ST_AsText(geometry) as astext";
+				$sFrom = " from placex where place_id = ".$iPlaceID;
+				if ($this->fPolygonSimplificationThreshold > 0)
+				{
+					$sSQL .= " from (select place_id,centroid,ST_SimplifyPreserveTopology(geometry,".$this->fPolygonSimplificationThreshold.") as geometry".$sFrom.") as plx";
+				}
+				else
+				{
+					$sSQL .= $sFrom;
+				}
+
+				$aPointPolygon = chksql($this->oDB->getRow($sSQL),
+				                        "Could not get outline");
+
+				if ($aPointPolygon['place_id'])
+				{
+					if ($aPointPolygon['centrelon'] !== null && $aPointPolygon['centrelat'] !== null )
+					{
+						$aOutlineResult['lat'] = $aPointPolygon['centrelat'];
+						$aOutlineResult['lon'] = $aPointPolygon['centrelon'];
+					}
+
+					if ($this->bIncludePolygonAsGeoJSON) $aOutlineResult['asgeojson'] = $aPointPolygon['asgeojson'];
+					if ($this->bIncludePolygonAsKML) $aOutlineResult['askml'] = $aPointPolygon['askml'];
+					if ($this->bIncludePolygonAsSVG) $aOutlineResult['assvg'] = $aPointPolygon['assvg'];
+					if ($this->bIncludePolygonAsText) $aOutlineResult['astext'] = $aPointPolygon['astext'];
+					if ($this->bIncludePolygonAsPoints) $aOutlineResult['aPolyPoints'] = geometryText2Points($aPointPolygon['astext'], $fRadius);
+
+
+					if (abs($aPointPolygon['minlat'] - $aPointPolygon['maxlat']) < 0.0000001)
+					{
+						$aPointPolygon['minlat'] = $aPointPolygon['minlat'] - $fRadius;
+						$aPointPolygon['maxlat'] = $aPointPolygon['maxlat'] + $fRadius;
+					}
+					if (abs($aPointPolygon['minlon'] - $aPointPolygon['maxlon']) < 0.0000001)
+					{
+						$aPointPolygon['minlon'] = $aPointPolygon['minlon'] - $fRadius;
+						$aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
+					}
+
+					$aOutlineResult['aBoundingBox'] = array(
+					                                  (string)$aPointPolygon['minlat'],
+					                                  (string)$aPointPolygon['maxlat'],
+					                                  (string)$aPointPolygon['minlon'],
+					                                  (string)$aPointPolygon['maxlon']
+					                                 );
+				}
+			} // CONST_Search_AreaPolygons
+
+			// as a fallback we generate a bounding box without knowing the size of the geometry
+			if ( (!isset($aOutlineResult['aBoundingBox'])) && isset($fLon) )
+			{
+
+				if ($this->bIncludePolygonAsPoints)
+				{
+					$sGeometryText = 'POINT('.$fLon.','.$fLat.')';
+					$aOutlineResult['aPolyPoints'] = geometryText2Points($sGeometryText, $fRadius);
+				}
+
+				$aBounds = array();
+				$aBounds['minlat'] = $fLat - $fRadius;
+				$aBounds['maxlat'] = $fLat + $fRadius;
+				$aBounds['minlon'] = $fLon - $fRadius;
+				$aBounds['maxlon'] = $fLon + $fRadius;
+
+				$aOutlineResult['aBoundingBox'] = array(
+				                                  (string)$aBounds['minlat'],
+				                                  (string)$aBounds['maxlat'],
+				                                  (string)$aBounds['minlon'],
+				                                  (string)$aBounds['maxlon']
+				                                 );
+			}
+			return $aOutlineResult;
+		}
 	}
 ?>