ignore railways, tunnels and bridges when reverse geocoding

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index b050484d0c052b54ef964cceebd6ea11c181be86..bbad4a44697cdc14bcca4974a6b3ebffac11bae9 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -71,17 +71,17 @@
                        4 => 4,
                        5 => 8, // State
                        6 => 10, // Region
-                       7 => 10, 
+                       7 => 10,
                        8 => 12, // County
-                       9 => 12,  
+                       9 => 12,
                        10 => 17, // City
-                       11 => 17, 
+                       11 => 17,
                        12 => 18, // Town / Village
-                       13 => 18, 
+                       13 => 18,
                        14 => 22, // Suburb
                        15 => 22,
                        16 => 26, // Street, TODO: major street?
-                       17 => 26, 
+                       17 => 26,
                        18 => 30, // or >, Building
                        19 => 30, // or >, Building
                        );
@@ -107,46 +107,35 @@
                        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 .= ' 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);
                        $iPlaceID = $aPlace['place_id'];
+                       $iParentPlaceID = $aPlace['parent_place_id'];
                        if (PEAR::IsError($iPlaceID))
                        {
-                               var_Dump($sSQL, $iPlaceID); 
-                               exit;
+                               failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); 
                        }
                }
 
                // 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))
                        {
-                               var_Dump($sSQL, $iPlaceID); 
-                               exit;
-                       }
-
-                       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))
-                               {
-                                       var_Dump($sSQL, $iPlaceID); 
-                                       exit;
-                               }
+                               failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); 
                        }
                        if (!$iPlaceID)
                        {