correct rank_address range for postalcodes

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index a0f5cea665d135c9d12dd50736daf0cc63e1d8ca..33e6cd5e638b4986469a3bc1bf4168472c348177 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -38,7 +38,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'))
         {
-                $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
@@ -74,7 +75,7 @@
                $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;
@@ -101,7 +102,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';
-//var_dump($sSQL);
+                       if (CONST_Debug) var_dump($sSQL);
                        $aPlace = $oDB->getRow($sSQL);
                        if (PEAR::IsError($aPlace))
                        {
@@ -144,7 +145,7 @@
 
                if ($bShowAddressDetails)
                {
-                       $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
+                       $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['calculated_country_code']);
                }
                $aClassType = getClassTypes();
                $sAddressType = '';
@@ -163,4 +164,7 @@
                $aPlace['addresstype'] = $sAddressType;
 
        }
+
+       if (CONST_Debug) exit;
+
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');