A bunch more places that should be using calculated_country_code not country_code

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index d5a36998efd4143a7513dc6f5f8a30797f9e4aab..5eec5c747867672e028382cd384ae12759a77dc9 100755 (executable)
--- 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 .= ' 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);
                        $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
 //var_dump($sSQL);
                        $aPlace = $oDB->getRow($sSQL);


@@ -136,14 +136,15 @@
                $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_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 ";
                $sSQL .= " from placex where place_id = $iPlaceID ";

-//var_dump($sSQL);
+

                $aPlace = $oDB->getRow($sSQL);
                $aPlace = $oDB->getRow($sSQL);

+//var_dump($sSQL, $aPlace); exit;

 
                if ($bShowAddressDetails)
                {
 
                if ($bShowAddressDetails)
                {

-                       $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
+                       $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['calculated_country_code']);

                }
                $aClassType = getClassTypes();
                $sAddressType = '';
                }
                $aClassType = getClassTypes();
                $sAddressType = '';