X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/002c94211724e5c47471ff2475b7226f3c87b353..1812c89c31b6e163a14144ae05fff34b97634367:/lib/PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index ed2f494d..6da82fd8 100644
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -46,10 +46,15 @@
 			$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);
 
+			if (PEAR::IsError($aPlace))
+			{
+				failInternalError("Could not lookup place.", $sSQL, $aPlace);
+			}
 			if (!$aPlace['place_id']) return null;
 
 			if ($this->bAddressDetails)
@@ -124,7 +129,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'];
 					}