X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/d6b70c9b731b396f6d3baa49d3740fc52f4c3ede..8c89b65082ae9b0aab029bc9aa17562eef24c860:/lib/PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 3f1bdda8..f013fe17 100644
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -41,11 +41,13 @@
 
 			$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]";
 
-			$sSQL = "select placex.*,";
+			$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 .= " (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);
 
@@ -53,7 +55,7 @@
 
 			if ($this->bAddressDetails)
 			{
-				$aAddress = getAddressDetails($this->oDB, $sLanguagePrefArraySQL, $this->iPlaceID, $aPlace['calculated_country_code']);
+				$aAddress = $this->getAddressNames();
 				$aPlace['aAddress'] = $aAddress;
 			}
 
@@ -76,5 +78,62 @@
 
 			return $aPlace;
 		}
+
+		function getAddressDetails($bAll = false)
+		{
+			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.")";
+			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;
+		}
+
+		function getAddressNames()
+		{
+			$aAddressLines = $this->getAddressDetails(false);;
+
+			$aAddress = array();
+			$aFallback = array();
+			$aClassType = getClassTypes();
+			foreach($aAddressLines as $aLine)
+			{
+				$bFallback = false;
+				$aTypeLabel = false;
+				if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']];
+				elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']];
+				elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))]))
+				{
+					$aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))];
+					$bFallback = true;
+				}
+				else
+				{
+					$aTypeLabel = array('simplelabel'=>'address'.$aLine['rank_address']);
+					$bFallback = true;
+				}
+				if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber'])))
+				{
+					$sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
+					$sTypeLabel = str_replace(' ','_',$sTypeLabel);
+					if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place')
+					{
+						$aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
+					}
+					$aFallback[$sTypeLabel] = $bFallback;
+				}
+			}
+			return $aAddress;
+		}
+
 	}
 ?>