X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fb0d219c7bc624693821cee87fd489798fe86e0a..40588482a245902c844631a50befeffa95c03dcb:/website/details.php

diff --git a/website/details.php b/website/details.php
index ceba8581..ad753a82 100755
--- a/website/details.php
+++ b/website/details.php
@@ -25,6 +25,7 @@
 		$_GET['place_id'] = $oDB->getOne("select place_id from placex where osm_type = '".$_GET['osmtype']."' and osm_id = ".(int)$_GET['osmid']." order by type = 'postcode' asc");
 
 		// Be nice about our error messages for broken geometry
+
 		if (!$_GET['place_id'])
 		{
 			$aPointDetails = $oDB->getRow("select osm_type, osm_id, errormessage, class, type, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ST_AsText(prevgeometry) as prevgeom, ST_AsText(newgeometry) as newgeom from import_polygon_error where osm_type = '".$_GET['osmtype']."' and osm_id = ".(int)$_GET['osmid']." order by updated desc limit 1");
@@ -34,12 +35,18 @@
 					$aPointDetails['error_x'] = $aMatches[1];
 					$aPointDetails['error_y'] = $aMatches[2];
 				}
+				else
+				{
+					$aPointDetails['error_x'] = 0;
+					$aPointDetails['error_y'] = 0;
+				}
 				include(CONST_BasePath.'/lib/template/details-error-'.$sOutputFormat.'.php');
 				exit;
 			}
 		}
 	}
 
+
 	if (!isset($_GET['place_id']))
 	{
 		echo "Please select a place id";
@@ -81,30 +88,46 @@
 	// Get all alternative names (languages, etc)
 	$sSQL = "select (each(name)).key,(each(name)).value from placex where place_id = $iPlaceID order by (each(name)).key";
 	$aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
+	if (PEAR::isError($aPointDetails['aNames'])) // possible timeout
+	{
+		$aPointDetails['aNames'] = [];
+	}
 
 	// Extra tags
 	$sSQL = "select (each(extratags)).key,(each(extratags)).value from placex where place_id = $iPlaceID order by (each(extratags)).key";
 	$aPointDetails['aExtraTags'] = $oDB->getAssoc($sSQL);
+	if (PEAR::isError($aPointDetails['aExtraTags'])) // possible timeout
+	{
+		$aPointDetails['aExtraTags'] = [];
+	}
 
 	// Address
 	$aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true);
 
 	// Linked places
-	$sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_distance(geometry, placegeometry) as distance, ";
+	$sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, ST_Distance_Spheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') as distance, ";
 	$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
-	$sSQL .= " from placex, (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
+	$sSQL .= " from placex, (select centroid as placegeometry from placex where place_id = $iPlaceID) as x";
 	$sSQL .= " where linked_place_id = $iPlaceID";
 	$sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";
 	$aLinkedLines = $oDB->getAll($sSQL);
+	if (PEAR::isError($aLinkedLines)) // possible timeout
+	{
+		$aLinkedLines = [];
+	}
 
 	// All places this is an imediate parent of
-	$sSQL = "select obj.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_distance(geometry, placegeometry) as distance, ";
+	$sSQL = "select obj.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, ST_Distance_Spheroid(geometry, placegeometry, 'SPHEROID[\"WGS 84\",6378137,298.257223563, AUTHORITY[\"EPSG\",\"7030\"]]') as distance, ";
 	$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
 	$sSQL .= " from (select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, geometry, name from placex ";
 	$sSQL .= " where parent_place_id = $iPlaceID order by rank_address asc,rank_search asc limit 500) as obj,";
-	$sSQL .= " (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
+	$sSQL .= " (select centroid as placegeometry from placex where place_id = $iPlaceID) as x";
 	$sSQL .= " order by rank_address asc,rank_search asc,localname,housenumber";
 	$aParentOfLines = $oDB->getAll($sSQL);
+	if (PEAR::isError($aParentOfLines)) // possible timeout
+	{
+		$aParentOfLines = [];
+	}
 
 	$aPlaceSearchNameKeywords = false;
 	$aPlaceSearchAddressKeywords = false;
@@ -112,12 +135,31 @@
 	{
 		$sSQL = "select * from search_name where place_id = $iPlaceID";
 		$aPlaceSearchName = $oDB->getRow($sSQL);
+		if (PEAR::isError($aPlaceSearchName)) // possible timeout
+		{
+			$aPlaceSearchName = [];
+		}
+
 		$sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'],1,-1).")";
 		$aPlaceSearchNameKeywords = $oDB->getAll($sSQL);
+		if (PEAR::isError($aPlaceSearchNameKeywords)) // possible timeout
+		{
+			$aPlaceSearchNameKeywords = [];
+		}
+
+
 		$sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'],1,-1).")";
 		$aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);
+		if (PEAR::isError($aPlaceSearchAddressKeywords)) // possible timeout
+		{
+			$aPlaceSearchAddressKeywords = [];
+		}
+
 	}
 
 	logEnd($oDB, $hLog, 1);
 
+	$sTileURL = CONST_Map_Tile_URL;
+	$sTileAttribution = CONST_Map_Tile_Attribution;
+	
 	include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');