X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9c413533401ffa0b306765b84a5e4af4a5d8f4eb..bfe51197429c9436034bb4d25931ad4d687d09c8:/website/reverse.php?ds=sidebyside

diff --git a/website/reverse.php b/website/reverse.php
index 116cddd1..d9ecc09e 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -25,6 +25,10 @@
                 $sOutputFormat = $_GET['format'];
         }
 
+	// Show address breakdown
+	$bShowAddressDetails = true;
+	if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
+
         // Prefered language
         $aLangPrefOrder = getPrefferedLangauges();
         $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
@@ -101,30 +105,29 @@
 			$iPlaceID = $aPlace['place_id'];
 			if (PEAR::IsError($iPlaceID))
 			{
-				var_Dump($sSQL, $iPlaceID); 
-				exit;
+				failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); 
 			}
 		}
 
 		// The point we found might be too small - use the address to find what it is a child of
 		if ($iPlaceID)
 		{
-			$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = $iPlaceID order by cached_rank_address desc,isaddress desc,distance desc";
+			$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = $iPlaceID order by cached_rank_address desc,isaddress desc,distance desc limit 1";
+//var_dump($sSQL);
 			$iPlaceID = $oDB->getOne($sSQL);
 			if (PEAR::IsError($iPlaceID))
 			{
-				var_Dump($sSQL, $iPlaceID); 
-				exit;
+				failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); 
 			}
 
 			if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
 			{
 				$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = ".$aPlace['place_id']." order by cached_rank_address desc,isaddress desc,distance desc";
+//var_dump($sSQL);
 				$iPlaceID = $oDB->getOne($sSQL);
 				if (PEAR::IsError($iPlaceID))
 				{
-					var_Dump($sSQL, $iPlaceID); 
-					exit;
+					failInternalError("Could not get larger parent for place.", $sSQL, $iPlaceID); 
 				}
 			}
 			if (!$iPlaceID)
@@ -139,12 +142,16 @@
 		$sSQL = "select placex.*,";
         	$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 .= " get_name_by_language(name, ARRAY['ref']) as ref,";
+        	$sSQL .= " st_y(st_centroid(geometry)) as lat, st_x(st_centroid(geometry)) as lon";
 	        $sSQL .= " from placex where place_id = $iPlaceID ";
+//var_dump($sSQL);
 		$aPlace = $oDB->getRow($sSQL);
 
-		$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
-
+		if ($bShowAddressDetails)
+		{
+			$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
+		}
 		$aClassType = getClassTypes();
                 $sAddressType = '';
                 if (isset($aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]))