Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index d43b05348640782f8bf2d83bcf3c574c8fce67cd..c348659e25d02fd7cdc136d223ad9b877bd20cd8 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -54,7 +54,8 @@
 
         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'))
         {
 
         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
                if (!$iPlaceID) $sError = 'OSM ID Not Found';
         }
        else


@@ -90,7 +91,7 @@
                $iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28;
 
                // Find the nearest point
                $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;
                $iPlaceID = null;
                $aArea = false;
                $fMaxAreaDistance = 1;


@@ -117,7 +118,7 @@
                        $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
                        $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
                        $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
                        $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
                        $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);
                        if (PEAR::IsError($aPlace))
                        {
                        $aPlace = $oDB->getRow($sSQL);
                        if (PEAR::IsError($aPlace))
                        {


@@ -160,7 +161,7 @@
 
                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 = '';


@@ -179,4 +180,7 @@
                $aPlace['addresstype'] = $sAddressType;
 
        }
                $aPlace['addresstype'] = $sAddressType;
 
        }

+
+       if (CONST_Debug) exit;
+

        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');