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

diff --git a/website/reverse.php b/website/reverse.php
index aac99c0d..33e6cd5e 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,4 +1,6 @@
 <?php
+	@define('CONST_ConnectionBucket_PageType', 'Reverse');
+
 	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
 
@@ -28,15 +30,16 @@
 	$bShowAddressDetails = true;
 	if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
 
-        // Prefered language
-        $aLangPrefOrder = getPrefferedLangauges();
+        // 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
@@ -69,10 +72,10 @@
 			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 = 1;
@@ -95,18 +98,18 @@
 			$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\')';
+			$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.', ST_Centroid(geometry), '.$fSearchDiam.'))';
+			$sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
 			$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
-//var_dump($sSQL);
+			if (CONST_Debug) var_dump($sSQL);
 			$aPlace = $oDB->getRow($sSQL);
-			$iPlaceID = $aPlace['place_id'];
-			$iParentPlaceID = $aPlace['parent_place_id'];
-			if (PEAR::IsError($iPlaceID))
+			if (PEAR::IsError($aPlace))
 			{
 				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
@@ -134,23 +137,34 @@
         	$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 .= " st_y(st_centroid(geometry)) as lat, st_x(st_centroid(geometry)) as lon";
+        	$sSQL .= " st_y(centroid) as lat, st_x(centroid) as lon";
 	        $sSQL .= " from placex where place_id = $iPlaceID ";
-//var_dump($sSQL);
+
 		$aPlace = $oDB->getRow($sSQL);
+//var_dump($sSQL, $aPlace); exit;
 
 		if ($bShowAddressDetails)
 		{
-			$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
+			$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['calculated_country_code']);
 		}
 		$aClassType = getClassTypes();
-                $sAddressType = '';
-                if (isset($aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]))
-                        $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]['simplelabel'];
-                elseif (isset($aClassType[$aPlace['class'].':'.$aPlace['type']]))
-                        $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type']]['simplelabel'];
-                else $sAddressType = $aPlace['class'];
-                $aPlace['addresstype'] = $sAddressType;
+		$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;
 
 	}
+
+	if (CONST_Debug) exit;
+
 	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');