X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7df80bbc6fe0a3769603fade7c124e2641dd0efb..a1670fa5a770d3589d8e75ef85b989586501eef3:/website/reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 9be7aba7..33e6cd5e 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,6 +1,8 @@
 <?php
+	@define('CONST_ConnectionBucket_PageType', 'Reverse');
 
-        require_once('.htlib/init.php');
+	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(CONST_BasePath.'/lib/log.php');
 
         if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
         {
@@ -14,24 +16,30 @@
                 }
         }
 
+        $oDB =& getDB();
         ini_set('memory_limit', '200M');
 
         // Format for output
-	$sOutputFormat = 'xml';
-        if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json'))
+        $sOutputFormat = 'xml';
+        if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
         {
                 $sOutputFormat = $_GET['format'];
         }
 
-        // Prefered language
-        $aLangPrefOrder = getPrefferedLangauges();
+	// Show address breakdown
+	$bShowAddressDetails = true;
+	if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
+
+        // Preferred language
+        $aLangPrefOrder = getPreferredLanguages();
         $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
 	$hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
         if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R'))
         {
-                $iPlaceID = $oDB->getOne("select place_id from placex where osm_type = '".$_GET['osm_type']."' and osm_id = ".(int)$_GET['osm_id']." order by type = 'postcode' asc");
+                $iPlaceID = $oDB->getOne($sSQL = ("select place_id from placex where osm_type = '".$_GET['osm_type']."' and osm_id = ".(int)$_GET['osm_id']." order by type = 'postcode' asc"));
+		if (CONST_Debug) var_dump($sSQL);
 		if (!$iPlaceID) $sError = 'OSM ID Not Found';
         }
 	else
@@ -50,27 +58,27 @@
 			4 => 4,
 			5 => 8, // State
 			6 => 10, // Region
-			7 => 10, 
+			7 => 10,
 			8 => 12, // County
-			9 => 12,  
+			9 => 12,
 			10 => 17, // City
-			11 => 17, 
+			11 => 17,
 			12 => 18, // Town / Village
-			13 => 18, 
+			13 => 18,
 			14 => 22, // Suburb
 			15 => 22,
 			16 => 26, // Street, TODO: major street?
-			17 => 26, 
-			18 => 28, // or >, Building
+			17 => 26,
+			18 => 30, // or >, Building
 			19 => 30, // or >, Building
 			);
-		$iMaxRank = isset($aZoomRank[$_GET['zoom']])?$aZoomRank[$_GET['zoom']]:28;
+		$iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28;
 
 		// Find the nearest point
-		$fSearchDiam = 0.0001;
+		$fSearchDiam = 0.0004;
 		$iPlaceID = null;
 		$aArea = false;
-		$fMaxAreaDistance = 10;
+		$fMaxAreaDistance = 1;
 		while(!$iPlaceID && $fSearchDiam < $fMaxAreaDistance)
 		{
 			$fSearchDiam = $fSearchDiam * 2;
@@ -83,68 +91,44 @@
 			if ($fSearchDiam > 0.6 && $iMaxRank > 12) $iMaxRank = 12;
 			if ($fSearchDiam > 0.2 && $iMaxRank > 17) $iMaxRank = 17;
 			if ($fSearchDiam > 0.1 && $iMaxRank > 18) $iMaxRank = 18;
-			if ($fSearchDiam > 0.01 && $iMaxRank > 22) $iMaxRank = 22;
+			if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
+			if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26;
 
-			if ($iMaxRank >= 26)
+			$sSQL = 'select place_id,parent_place_id,rank_search from placex';
+			$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
+			$sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank;
+			$sSQL .= ' and (name is not null or housenumber is not null)';
+			$sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\')';
+			$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
+			$sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
+			$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
+			if (CONST_Debug) var_dump($sSQL);
+			$aPlace = $oDB->getRow($sSQL);
+			if (PEAR::IsError($aPlace))
 			{
-				// Street level search is done using placex table
-				$sSQL = 'select place_id from placex';
-				$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
-				$sSQL .= ' and rank_search >= 26 and rank_search <= '.$iMaxRank;
-				$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
-				$sSQL .= ' OR ST_DWithin('.$sPointSQL.', ST_Centroid(geometry), '.$fSearchDiam.'))';
-				$sSQL .= ' ORDER BY rank_search desc, ST_distance('.$sPointSQL.', geometry) ASC limit 1';
-				$iPlaceID = $oDB->getOne($sSQL);
-				if (PEAR::IsError($iPlaceID))
-				{
-					var_Dump($sSQL, $iPlaceID); 
-					exit;
-				}
+				failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); 
+			}
+			$iPlaceID = $aPlace['place_id'];
+			$iParentPlaceID = $aPlace['parent_place_id'];
+		}
+
+		// The point we found might be too small - use the address to find what it is a child of
+		if ($iPlaceID && $iMaxRank < 28)
+		{
+			if ($aPlace['rank_search'] > 28 && $iParentPlaceID) {
+				$iPlaceID = $iParentPlaceID;
 			}
-			else
+			$sSQL = "select address_place_id from place_addressline where place_id = $iPlaceID order by abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc limit 1";
+			$iPlaceID = $oDB->getOne($sSQL);
+			if (PEAR::IsError($iPlaceID))
 			{
-				// Other search uses the location_point and location_area tables
-
-				// If we've not yet done the area search do it now
-				if ($aArea === false)
-				{
-					$sSQL = 'select place_id,rank_address,ST_distance('.$sPointSQL.', centroid) as distance from location_area';
-					$sSQL .= ' WHERE ST_Contains(area,'.$sPointSQL.') and rank_search <= '.$iMaxRank;
-					$sSQL .= ' ORDER BY rank_address desc, ST_distance('.$sPointSQL.', centroid) ASC limit 1';
-					$aArea = $oDB->getRow($sSQL);
-					if ($aArea) $fMaxAreaDistance = $aArea['distance'];
-				}
-
-				// Different search depending if we found an area match
-				if ($aArea)
-				{
-					// Found best match area - is there a better point match?
-					$sSQL = 'select place_id from location_point_'.($iMaxRank+1);
-					$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.') ';
-					$sSQL .= ' and rank_search > '.($aArea['rank_address']+3);
-					$sSQL .= ' ORDER BY rank_address desc, ST_distance('.$sPointSQL.', centroid) ASC limit 1';
-					$iPlaceID = $oDB->getOne($sSQL);
-					if (PEAR::IsError($iPlaceID))
-					{
-						var_Dump($sSQL, $iPlaceID); 
-						exit;
-					}
-				}
-				else
-				{
-					$sSQL = 'select place_id from location_point_'.($iMaxRank+1);
-					$sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.') ';
-					$sSQL .= ' ORDER BY rank_address desc, ST_distance('.$sPointSQL.', centroid) ASC limit 1';
-					$iPlaceID = $oDB->getOne($sSQL);
-					if (PEAR::IsError($iPlaceID))
-					{
-						var_Dump($sSQL, $iPlaceID); 
-						exit;
-					}
-				}
+				failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); 
+			}
+			if (!$iPlaceID)
+			{
+				$iPlaceID = $aPlace['place_id'];
 			}
 		}
-		if (!$iPlaceID && $aArea) $iPlaceID = $aArea['place_id'];
 	}
 
 	if ($iPlaceID)
@@ -152,10 +136,35 @@
 		$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(centroid) as lat, st_x(centroid) as lon";
 	        $sSQL .= " from placex where place_id = $iPlaceID ";
+
 		$aPlace = $oDB->getRow($sSQL);
+//var_dump($sSQL, $aPlace); exit;
+
+		if ($bShowAddressDetails)
+		{
+			$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['calculated_country_code']);
+		}
+		$aClassType = getClassTypes();
+		$sAddressType = '';
+		$sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
+		if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
+		{
+			$sAddressType = $aClassType[$aClassType]['simplelabel'];
+		}
+		else
+		{
+			$sClassType = $aPlace['class'].':'.$aPlace['type'];
+			if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
+				$sAddressType = $aClassType[$sClassType]['simplelabel'];
+			else $sAddressType = $aPlace['class'];
+		}
+		$aPlace['addresstype'] = $sAddressType;
 
-		$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
 	}
-	include('.htlib/output/address-'.$sOutputFormat.'.php');
+
+	if (CONST_Debug) exit;
+
+	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');