X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6fc32d9645f98ec39c8773d6bf01cc2f6d4969de..cb68a2cdd26d9c013a02dc4403991d3fb76dea7c:/website/details.php?ds=sidebyside

diff --git a/website/details.php b/website/details.php
index 4974717a..10cd07e1 100755
--- a/website/details.php
+++ b/website/details.php
@@ -4,16 +4,10 @@
 	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 	require_once(CONST_BasePath.'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
+	require_once(CONST_BasePath.'/lib/output.php');
 
 	$sOutputFormat = 'html';
-	/*
-	   $fLoadAvg = getLoadAverage();
-	   if ($fLoadAvg > 3)
-	   {
-	   echo "Page temporarily blocked due to high server load\n";
-	   exit;
-	   }
-	 */
+
 	ini_set('memory_limit', '200M');
 
 	$oDB =& getDB();
@@ -21,15 +15,18 @@
 	$aLangPrefOrder = getPreferredLanguages();
 	$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
-	if (isset($_GET['osmtype']) && isset($_GET['osmid']) && (int)$_GET['osmid'] && ($_GET['osmtype'] == 'N' || $_GET['osmtype'] == 'W' || $_GET['osmtype'] == 'R'))
+	$sPlaceId = getParamString('place_id');
+	$sOsmType = getParamSet('osmtype', array('N', 'W', 'R'));
+	$iOsmId = getParamInt('osmid', -1);
+	if ($sOsmType && $iOsmId > 0)
 	{
-		$_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");
+		$sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc"));
 
 		// Be nice about our error messages for broken geometry
 
-		if (!$_GET['place_id'])
+		if (!$sPlaceId)
 		{
-			$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");
+			$aPointDetails = chksql($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 = '".$sOsmType."' and osm_id = ".$iOsmId." order by updated desc limit 1"));
 			if (!PEAR::isError($aPointDetails) && $aPointDetails) {
 				if (preg_match('/\[(-?\d+\.\d+) (-?\d+\.\d+)\]/', $aPointDetails['errormessage'], $aMatches))
 				{
@@ -48,25 +45,24 @@
 	}
 
 
-	if (!isset($_GET['place_id']))
+	if (!$sPlaceId) userError("Please select a place id");
+
+	$iPlaceID = (int)$sPlaceId;
+
+	if (CONST_Use_US_Tiger_Data)
 	{
-		echo "Please select a place id";
-		exit;
+		$iParentPlaceID = chksql($oDB->getOne('select parent_place_id from location_property_tiger where place_id = '.$iPlaceID));
+		if ($iParentPlaceID) $iPlaceID = $iParentPlaceID;
 	}
 
-	$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_Aux_Location_data)
+	{
+		$iParentPlaceID = chksql($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);
 
-	// Make sure the point we are reporting on is fully indexed
-	//$sSQL = "UPDATE placex set indexed = true where indexed = false and place_id = $iPlaceID";
-	//$oDB->query($sSQL);
-
 	// Get the details for this point
 	$sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, calculated_country_code as country_code, importance, wikipedia,";
 	$sSQL .= " to_char(indexed_date, 'YYYY-MM-DD HH24:MI') as indexed_date, parent_place_id, rank_address, rank_search, get_searchrank_label(rank_search) as rank_search_label, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ";
@@ -76,11 +72,8 @@
 	$sSQL .= " case when importance = 0 OR importance IS NULL then 0.75-(rank_search::float/40) else importance end as calculated_importance, ";
 	$sSQL .= " ST_AsText(CASE WHEN ST_NPoints(geometry) > 5000 THEN ST_SimplifyPreserveTopology(geometry, 0.0001) ELSE geometry END) as outlinestring";
 	$sSQL .= " from placex where place_id = $iPlaceID";
-	$aPointDetails = $oDB->getRow($sSQL);
-	if (PEAR::IsError($aPointDetails))
-	{
-		failInternalError("Could not get details of place object.", $sSQL, $aPointDetails);
-	}
+	$aPointDetails = chksql($oDB->getRow($sSQL),
+	                        "Could not get details of place object.");
 	$aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
 
 	$aClassType = getClassTypesWithImportance();
@@ -103,7 +96,7 @@
 	}
 
 	// 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, ";
@@ -132,7 +125,7 @@
 
 	$aPlaceSearchNameKeywords = false;
 	$aPlaceSearchAddressKeywords = false;
-	if (isset($_GET['keywords']) && $_GET['keywords'])
+	if (getParamBool('keywords'))
 	{
 		$sSQL = "select * from search_name where place_id = $iPlaceID";
 		$aPlaceSearchName = $oDB->getRow($sSQL);
@@ -162,10 +155,9 @@
 
 	if ($sOutputFormat=='html')
 	{
-		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
+		$sDataDate = chksql($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');