Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index bbad4a44697cdc14bcca4974a6b3ebffac11bae9..c348659e25d02fd7cdc136d223ad9b877bd20cd8 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,4 +1,6 @@
 <?php
 <?php

+       @define('CONST_ConnectionBucket_PageType', 'Reverse');
+

        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
 
        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
 


@@ -44,15 +46,16 @@
        $bShowAddressDetails = true;
        if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
 
        $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);
 
         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'))
         {
         $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
        $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
         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


@@ -85,10 +88,10 @@
                        18 => 30, // or >, Building
                        19 => 30, // or >, Building
                        );
                        18 => 30, // or >, Building
                        19 => 30, // or >, Building
                        );

-               $iMaxRank = isset($aZoomRank[$_GET['zoom']])?$aZoomRank[$_GET['zoom']]:28;
+               $iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28;

 
                // Find the nearest point
 
                // Find the nearest point

-               $fSearchDiam = 0.0001;
+               $fSearchDiam = 0.0004;

                $iPlaceID = null;
                $aArea = false;
                $fMaxAreaDistance = 1;
                $iPlaceID = null;
                $aArea = false;
                $fMaxAreaDistance = 1;


@@ -113,16 +116,16 @@
                        $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';
                        $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';

-//var_dump($sSQL);
+                       if (CONST_Debug) var_dump($sSQL);

                        $aPlace = $oDB->getRow($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); 
                        }
                        {
                                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
                }
 
                // The point we found might be too small - use the address to find what it is a child of


@@ -150,23 +153,34 @@
                $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();
                }
                $aClassType = getClassTypes();

-                $sAddressType = '';
-                if (isset($aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]))
-                        $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']]['simplelabel'];
-                elseif (isset($aClassType[$aPlace['class'].':'.$aPlace['type']]))
-                        $sAddressType = $aClassType[$aPlace['class'].':'.$aPlace['type']]['simplelabel'];
-                else $sAddressType = $aPlace['class'];
-                $aPlace['addresstype'] = $sAddressType;
+               $sAddressType = '';
+               $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level'];
+               if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
+               {
+                       $sAddressType = $aClassType[$aClassType]['simplelabel'];
+               }
+               else
+               {
+                       $sClassType = $aPlace['class'].':'.$aPlace['type'];
+                       if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel']))
+                               $sAddressType = $aClassType[$sClassType]['simplelabel'];
+                       else $sAddressType = $aPlace['class'];
+               }
+               $aPlace['addresstype'] = $sAddressType;

 
        }
 
        }

+
+       if (CONST_Debug) exit;
+

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