Merge branch 'master' of github.com:twain47/Nominatim

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index ed7090e264ba68e871a482534a6bc4b4f89ddc7b..810be3c491fd2c96a8de4415a0b64c1c93b94a90 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -44,8 +44,8 @@
        $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);
         $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
        $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);


@@ -71,21 +71,21 @@
                        4 => 4,
                        5 => 8, // State
                        6 => 10, // Region
                        4 => 4,
                        5 => 8, // State
                        6 => 10, // Region

-                       7 => 10, 
+                       7 => 10,

                        8 => 12, // County
                        8 => 12, // County

-                       9 => 12,  
+                       9 => 12,

                        10 => 17, // City
                        10 => 17, // City

-                       11 => 17, 
+                       11 => 17,

                        12 => 18, // Town / Village
                        12 => 18, // Town / Village

-                       13 => 18, 
+                       13 => 18,

                        14 => 22, // Suburb
                        15 => 22,
                        16 => 26, // Street, TODO: major street?
                        14 => 22, // Suburb
                        15 => 22,
                        16 => 26, // Street, TODO: major street?

-                       17 => 26, 
+                       17 => 26,

                        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
                $fSearchDiam = 0.0001;
 
                // Find the nearest point
                $fSearchDiam = 0.0001;


@@ -107,44 +107,36 @@
                        if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
                        if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26;
 
                        if ($fSearchDiam > 0.008 && $iMaxRank > 22) $iMaxRank = 22;
                        if ($fSearchDiam > 0.001 && $iMaxRank > 26) $iMaxRank = 26;
 

-                       $sSQL = 'select place_id,parent_place_id from placex';
+                       $sSQL = 'select place_id,parent_place_id,rank_search from placex';

                        $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
                        $sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank;
                        $sSQL .= ' and (name is not null or housenumber is not null)';
                        $sSQL .= ' WHERE ST_DWithin('.$sPointSQL.', geometry, '.$fSearchDiam.')';
                        $sSQL .= ' and rank_search != 28 and rank_search >= '.$iMaxRank;
                        $sSQL .= ' and (name is not null or housenumber is not null)';

-                       $sSQL .= ' and class not in (\'waterway\')';
+                       $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 .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
 //var_dump($sSQL);
                        $aPlace = $oDB->getRow($sSQL);
                        $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
                        $sSQL .= ' OR ST_DWithin('.$sPointSQL.', ST_Centroid(geometry), '.$fSearchDiam.'))';
                        $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
 //var_dump($sSQL);
                        $aPlace = $oDB->getRow($sSQL);

-                       $iPlaceID = $aPlace['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

-               if ($iPlaceID)
+               if ($iPlaceID && $iMaxRank < 28)

                {
                {

-                       $sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = $iPlaceID order by cached_rank_address desc,isaddress desc,distance desc limit 1";
-//var_dump($sSQL);
+                       if ($aPlace['rank_search'] > 28 && $iParentPlaceID) {
+                               $iPlaceID = $iParentPlaceID;
+                       }
+                       $sSQL = "select address_place_id from place_addressline where place_id = $iPlaceID order by abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc limit 1";

                        $iPlaceID = $oDB->getOne($sSQL);
                        if (PEAR::IsError($iPlaceID))
                        {
                                failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); 
                        }
                        $iPlaceID = $oDB->getOne($sSQL);
                        if (PEAR::IsError($iPlaceID))
                        {
                                failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); 
                        }

-
-                       if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
-                       {
-                               $sSQL = "select address_place_id from place_addressline where cached_rank_address <= $iMaxRank and place_id = ".$aPlace['place_id']." order by cached_rank_address desc,isaddress desc,distance desc";
-//var_dump($sSQL);
-                               $iPlaceID = $oDB->getOne($sSQL);
-                               if (PEAR::IsError($iPlaceID))
-                               {
-                                       failInternalError("Could not get larger parent for place.", $sSQL, $iPlaceID); 
-                               }
-                       }

                        if (!$iPlaceID)
                        {
                                $iPlaceID = $aPlace['place_id'];
                        if (!$iPlaceID)
                        {
                                $iPlaceID = $aPlace['place_id'];


@@ -168,13 +160,20 @@
                        $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
                }
                $aClassType = getClassTypes();
                        $aAddress = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPlace['country_code']);
                }
                $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;

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