X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/224836ce9af04c440b70f501c7a4ed72e869985c..fa7730d4af7c330d5443c6ae32f5ab73c48bf7a3:/lib/PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index ed2f494d..04e45d5a 100644
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -5,10 +5,24 @@
 
 		protected $iPlaceID;
 
+		protected $sType = 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)
 		{
 			$this->oDB =& $oDB;
@@ -24,6 +38,64 @@
 			$this->bAddressDetails = $bAddressDetails;
 		}
 
+		function setIncludeExtraTags($bExtraTags = false)
+		{
+			if ((float) CONST_Postgresql_Version > 9.2)
+			{
+				$this->bExtraTags = $bExtraTags;
+			}
+		}
+
+		function setIncludeNameDetails($bNameDetails = false)
+		{
+			if ((float) CONST_Postgresql_Version > 9.2)
+			{
+				$this->bNameDetails = $bNameDetails;
+			}
+		}
+
+
+		function setIncludePolygonAsPoints($b = true)
+		{
+			$this->bIncludePolygonAsPoints = $b;
+		}
+
+		function getIncludePolygonAsPoints()
+		{
+			return $this->bIncludePolygonAsPoints;
+		}
+
+		function setIncludePolygonAsText($b = true)
+		{
+			$this->bIncludePolygonAsText = $b;
+		}
+
+		function getIncludePolygonAsText()
+		{
+			return $this->bIncludePolygonAsText;
+		}
+
+		function setIncludePolygonAsGeoJSON($b = true)
+		{
+			$this->bIncludePolygonAsGeoJSON = $b;
+		}
+
+		function setIncludePolygonAsKML($b = true)
+		{
+			$this->bIncludePolygonAsKML = $b;
+		}
+
+		function setIncludePolygonAsSVG($b = true)
+		{
+			$this->bIncludePolygonAsSVG = $b;
+		}
+
+		function setPolygonSimplificationThreshold($f)
+		{
+			$this->fPolygonSimplificationThreshold = $f;
+		}
+
+
 		function setPlaceID($iPlaceID)
 		{
 			$this->iPlaceID = $iPlaceID;
@@ -35,21 +107,60 @@
 			$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']);
+			}
+
+			return $this->lookup();
+		}
+
 		function lookup()
 		{
 			if (!$this->iPlaceID) return null;
 
 			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 
-			$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 .= " st_y(centroid) as lat, st_x(centroid) as lon";
-			$sSQL .= " from placex where place_id = ".(int)$this->iPlaceID;
+			if ($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,";
+				$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, $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_y(centroid) as lat,";
+				$sSQL .= " st_x(centroid) as lon";
+				$sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID;
+			}
+			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, $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 = ".(int)$this->iPlaceID;
+			}
+
 			$aPlace = $this->oDB->getRow($sSQL);
 
+
+			if (PEAR::IsError($aPlace))
+			{
+				failInternalError("Could not lookup place.", $sSQL, $aPlace);
+			}
+
 			if (!$aPlace['place_id']) return null;
 
 			if ($this->bAddressDetails)
@@ -58,6 +169,30 @@
 				$aPlace['aAddress'] = $aAddress;
 			}
 
+			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 = '';
 			$sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
@@ -99,7 +234,7 @@
 
 		function getAddressNames()
 		{
-			$aAddressLines = $this->getAddressDetails(false);;
+			$aAddressLines = $this->getAddressDetails(false);
 
 			$aAddress = array();
 			$aFallback = array();
@@ -124,7 +259,7 @@
 				{
 					$sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
 					$sTypeLabel = str_replace(' ','_',$sTypeLabel);
-					if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]))
+					if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place')
 					{
 						$aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
 					}
@@ -134,5 +269,110 @@
 			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 = $this->oDB->getRow($sSQL);
+				if (PEAR::IsError($aPointPolygon))
+				{
+					echo var_dump($aPointPolygon);
+					failInternalError("Could not get outline.", $sSQL, $aPointPolygon);
+				}
+
+				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;
+		}
 	}
 ?>