X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/620100a5ac943e86e54f81f40dc52f1dd0d61330..d01d0c13f4d51ddcff2be065f330278516c0c458:/website/details.php

diff --git a/website/details.php b/website/details.php
index 54d8015e..5edef6f5 100755
--- a/website/details.php
+++ b/website/details.php
@@ -1,7 +1,8 @@
 <?php
 	@define('CONST_ConnectionBucket_PageType', 'Details');
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
 
 	$sOutputFormat = 'html';
@@ -55,10 +56,17 @@
 
 	$iPlaceID = (int)$_GET['place_id'];
 
-	$iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID);
-	if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
-	$iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID);
-	if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
+	if (CONST_Use_US_Tiger_Data)
+	{
+		$iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID);
+		if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
+	}
+
+	if (CONST_Use_Aux_Location_data)
+	{
+		$iParentPlaceID = $oDB->getOne('select parent_place_id from location_property_aux where place_id = '.$iPlaceID);
+		if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
+	}
 
 	$hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
@@ -88,30 +96,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);
+	$aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], -1, 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_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_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;
@@ -119,12 +143,36 @@
 	{
 		$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);
 
+	if ($sOutputFormat=='html')
+	{
+		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
+		$sTileURL = CONST_Map_Tile_URL;
+		$sTileAttribution = CONST_Map_Tile_Attribution;
+	}
+
+	
 	include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');