X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cb40aa41d5b0efefdb2b9263e87ed016cce96277..a038582e34d73ac2575572c9dec0e890557fb0f5:/website/details.php

diff --git a/website/details.php b/website/details.php
index 6eaa4adb..110fdc07 100755
--- a/website/details.php
+++ b/website/details.php
@@ -2,13 +2,15 @@
         require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
         require_once(CONST_BasePath.'/lib/log.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();
@@ -26,6 +28,11 @@
 
 	$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;
+
 	$aLangPrefOrder = getPrefferedLangauges();
 	$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
@@ -36,7 +43,7 @@
 	//$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, country_code, ";
+	$sSQL = "select place_id, osm_type, osm_id, class, type, name, admin_level, housenumber, street, isin, postcode, country_code, importance,";
 	$sSQL .= " parent_place_id, rank_address, rank_search, get_searchrank_label(rank_search) as rank_search_label, get_name_by_language(name,$sLanguagePrefArraySQL) as localname, ";
 	$sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea,ST_GeometryType(geometry) as geotype, ST_Y(ST_Centroid(geometry)) as lat,ST_X(ST_Centroid(geometry)) as lon ";
 	$sSQL .= " from placex where place_id = $iPlaceID";
@@ -55,18 +62,18 @@
 	$aPointDetails['icon'] = $aClassType[$aPointDetails['class'].':'.$aPointDetails['type']]['icon'];
 
 	// Get all alternative names (languages, etc)
-	$aPointDetails['aNames'] = array();
-/*
-	for($i = 1; $i <= $aPointDetails['numnames']; $i++)
-	{
-		$sSQL = "select name[$i].key, name[$i].value from placex where place_id = $iPlaceID limit 1";
-		$aNameItem = $oDB->getRow($sSQL);
-		if (substr($aNameItem['key'],0,5) == 'name:') $aNameItem['key'] = substr($aNameItem['key'],5);
-		$aPointDetails['aNames'][$aNameItem['key']] = $aNameItem['value'];
-	}
-*/
+	$sSQL = "select (each(name)).key,(each(name)).value from placex where place_id = $iPlaceID order by (each(name)).key";
+	$aPointDetails['aNames'] = $oDB->getAssoc($sSQL);
+
+	// 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);
+
 	// Get the bounding box and outline polygon
-	$sSQL = "select *,ST_AsText(outline) as outlinestring from get_place_boundingbox($iPlaceID)";
+	$sSQL = "select ST_AsText(geometry) as outlinestring,";
+	$sSQL .= "ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),4)) as minlat,ST_Y(ST_PointN(ExteriorRing(ST_Box2D(geometry)),2)) as maxlat,";
+	$sSQL .= "ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),1)) as minlon,ST_X(ST_PointN(ExteriorRing(ST_Box2D(geometry)),3)) as maxlon";
+	$sSQL .= " from placex where place_id = $iPlaceID";
 	$aPointPolygon = $oDB->getRow($sSQL);
 	IF (PEAR::IsError($aPointPolygon))
 	{
@@ -77,10 +84,16 @@
 	{
 		preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
 	}
+	elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#',$aPointPolygon['outlinestring'],$aMatch))
+	{
+		// TODO: this just takes the first ring
+		preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
+	}
 	elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['outlinestring'],$aMatch))
 	{
 		$fRadius = 0.01;
-		$iSteps = ($fRadius * 40000)^2;
+		if ($aPointDetails['rank_search'] > 20) $fRadius = 0.0001;
+		$iSteps = min(max(($fRadius * 40000)^2,16),100);
 		$fStepSize = (2*pi())/$iSteps;
 		$aPolyPoints = array();
 		for($f = 0; $f < 2*pi(); $f += $fStepSize)
@@ -94,45 +107,30 @@
 		$aPointPolygon['maxlon'] = $aPointPolygon['maxlon'] + $fRadius;
 	}
 
-	// If it is a road then force all nearby buildings to be indexed (so we can show then in the list)
-/*
-	if ($aPointDetails['rank_address'] == 26)
-	{
-		$sSQL = "UPDATE placex set indexed = true from placex as srcplace where placex.indexed = false";
-		$sSQL .= " and ST_DWithin(placex.geometry, srcplace.geometry, 0.0005) and srcplace.place_id = $iPlaceID";
-		$oDB->query($sSQL);
-	}
-*/
 	// Address
 	$aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true);
-/*
-	$sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, rank_search, ";
-	$sSQL .= "get_searchrank_label(rank_search) as rank_search_label, fromarea, distance, ";
+
+	// All places this is an imediate parent of
+	$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 .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
-	$sSQL .= " from place_addressline join placex on (address_place_id = placex.place_id)";
-	$sSQL .= " where place_addressline.place_id = $iPlaceID and ((rank_address > 0 AND rank_address < ".$aPointDetails['rank_address'].") OR address_place_id = $iPlaceID) and placex.place_id != $iPlaceID";
-	if ($aPointDetails['country_code'])
-	{
-		$sSQL .= " and (placex.country_code IS NULL OR placex.country_code = '".$aPointDetails['country_code']."' OR rank_address < 4)";
-	}
-	$sSQL .= " order by cached_rank_address desc,rank_search desc,fromarea desc,distance asc,namelength desc";
-	$aAddressLines = $oDB->getAll($sSQL);
-	IF (PEAR::IsError($aAddressLines))
+	$sSQL .= " from placex, (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
+	$sSQL .= " where parent_place_id = $iPlaceID";
+//	$sSQL .= " and type != 'postcode'";
+	$sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";
+	$aParentOfLines = $oDB->getAll($sSQL);
+
+	$aPlaceSearchNameKeywords = false;
+	$aPlaceSearchAddressKeywords = false;
+	if (isset($_GET['keywords']) && $_GET['keywords'])
 	{
-		var_dump($aAddressLines);
-		exit;
+		$sSQL = "select * from search_name where place_id = $iPlaceID";
+		$aPlaceSearchName = $oDB->getRow($sSQL);
+		$sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['name_vector'],1,-1).")";
+		$aPlaceSearchNameKeywords = $oDB->getAll($sSQL);
+		$sSQL = "select * from word where word_id in (".substr($aPlaceSearchName['nameaddress_vector'],1,-1).")";
+		$aPlaceSearchAddressKeywords = $oDB->getAll($sSQL);
 	}
-*/
-	// All places this is a parent of
-	$iMaxRankAddress = $aPointDetails['rank_address']+13;
-	$sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, cached_rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, distance, ";
-	$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
-	$sSQL .= " from (select * from place_addressline where address_place_id = $iPlaceID and cached_rank_address < $iMaxRankAddress) as place_addressline join placex on (place_addressline.place_id = placex.place_id)";
-	$sSQL .= " where place_addressline.address_place_id = $iPlaceID and placex.rank_address < $iMaxRankAddress and cached_rank_address > 0 and placex.place_id != $iPlaceID";
-	$sSQL .= " and type != 'postcode'";
-	$sSQL .= " order by cached_rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber limit 1000";
-	$aParentOfLines = $oDB->getAll($sSQL);
 
 	logEnd($oDB, $hLog, 1);
 
-	include('.htlib/output/details-html.php');
+	include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');