X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0dd10c3fff9896ca23b884a7ec7a97002065d083..f9a7f032391965df507318691897ad80eca4f926:/website/reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 1cdbf467..5eec5c74 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -99,7 +99,7 @@
 			$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.', ST_Centroid(geometry), '.$fSearchDiam.'))';
+			$sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
 			$sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
 //var_dump($sSQL);
 			$aPlace = $oDB->getRow($sSQL);
@@ -136,7 +136,7 @@
         	$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 ";
 
 		$aPlace = $oDB->getRow($sSQL);
@@ -144,7 +144,7 @@
 
 		if ($bShowAddressDetails)
 		{
-			$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
+			$aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['calculated_country_code']);
 		}
 		$aClassType = getClassTypes();
 		$sAddressType = '';