From: Brian Quinion <openstreetmap@brian.quinion.co.uk>
Date: Thu, 24 May 2012 15:54:51 +0000 (+0100)
Subject: Updated reverse geocoding to improve handling of zoom=0
X-Git-Tag: deploy~694
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/352fea4ff31a8d0f6120f6316d6fb687acc194b6

Updated reverse geocoding to improve handling of zoom=0

Conflicts:

	website/reverse.php
---

diff --git a/website/reverse.php b/website/reverse.php
index ed7090e2..253b84a5 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -71,17 +71,17 @@
 			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, 
+			17 => 26,
 			18 => 30, // or >, Building
 			19 => 30, // or >, Building
 			);
@@ -107,7 +107,7 @@
 			if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
 			if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26;
 
-			$sSQL = 'select place_id,parent_place_id from placex';
+			$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)';
@@ -118,6 +118,7 @@
 //var_dump($sSQL);
 			$aPlace = $oDB->getRow($sSQL);
 			$iPlaceID = $aPlace['place_id'];
+			$iParentPlaceID = $aPlace['parent_place_id'];
 			if (PEAR::IsError($iPlaceID))
 			{
 				failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); 
@@ -125,26 +126,17 @@
 		}
 
 		// The point we found might be too small - use the address to find what it is a child of
-		if ($iPlaceID)
+		if ($iPlaceID && $iMaxRank < 28)
 		{
-			$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = $iPlaceID order by cached_rank_address desc,isaddress desc,distance desc limit 1";
-//var_dump($sSQL);
+			if ($aPlace['rank_search'] > 28 && $iParentPlaceID) {
+				$iPlaceID = $iParentPlaceID;
+			}
+			$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))
 			{
 				failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); 
 			}
-
-			if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
-			{
-				$sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = ".$aPlace['place_id']." order by cached_rank_address desc,isaddress desc,distance desc";
-//var_dump($sSQL);
-				$iPlaceID = $oDB->getOne($sSQL);
-				if (PEAR::IsError($iPlaceID))
-				{
-					failInternalError("Could not get larger parent for place.", $sSQL, $iPlaceID); 
-				}
-			}
 			if (!$iPlaceID)
 			{
 				$iPlaceID = $aPlace['place_id'];