X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a44e21de49d397d8fb6d860a03f1cde711be59c0..55b59ea1396741b5f152dba3ff4ade8266442fc1:/website/reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index b053d764..c155fa57 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -28,8 +28,8 @@
 	$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);
@@ -95,18 +95,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 .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
 //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