Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 33e6cd5e638b4986469a3bc1bf4168472c348177..a1c39d9d49e72c1824f43de6bc2bd3a9cb1bc1e9 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -4,44 +4,32 @@
        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
 
-        if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
-        {
-                $fLoadAvg = getLoadAverage();
-                if ($fLoadAvg > 2) sleep(60);
-                if ($fLoadAvg > 4) sleep(120);
-                if ($fLoadAvg > 6)
-                {
-                        echo "Bulk User: Temporary block due to high server load\n";
-                        exit;
-                }
-        }
-
-        $oDB =& getDB();
-        ini_set('memory_limit', '200M');
-
-        // Format for output
-        $sOutputFormat = 'xml';
-        if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
-        {
-                $sOutputFormat = $_GET['format'];
-        }
+       $oDB =& getDB();
+       ini_set('memory_limit', '200M');
+
+       // Format for output
+       $sOutputFormat = 'xml';
+       if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
+       {
+               $sOutputFormat = $_GET['format'];
+       }
 
        // Show address breakdown
        $bShowAddressDetails = true;
        if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails'];
 
-        // Preferred language
-        $aLangPrefOrder = getPreferredLanguages();
-        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
+       // 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'))
-        {
-                $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 (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($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
        {
                // Location to look up
@@ -51,27 +39,27 @@
 
                // Zoom to rank, this could probably be calculated but a lookup gives fine control
                $aZoomRank = array(
-                       0 => 2, // Continent / Sea
-                       1 => 2,
-                       2 => 2,
-                       3 => 4, // Country
-                       4 => 4,
-                       5 => 8, // State
-                       6 => 10, // Region
-                       7 => 10,
-                       8 => 12, // County
-                       9 => 12,
-                       10 => 17, // City
-                       11 => 17,
-                       12 => 18, // Town / Village
-                       13 => 18,
-                       14 => 22, // Suburb
-                       15 => 22,
-                       16 => 26, // Street, TODO: major street?
-                       17 => 26,
-                       18 => 30, // or >, Building
-                       19 => 30, // or >, Building
-                       );
+                               0 => 2, // Continent / Sea
+                               1 => 2,
+                               2 => 2,
+                               3 => 4, // Country
+                               4 => 4,
+                               5 => 8, // State
+                               6 => 10, // Region
+                               7 => 10,
+                               8 => 12, // County
+                               9 => 12,
+                               10 => 17, // City
+                               11 => 17,
+                               12 => 18, // Town / Village
+                               13 => 18,
+                               14 => 22, // Suburb
+                               15 => 22,
+                               16 => 26, // Street, TODO: major street?
+                               17 => 26,
+                               18 => 30, // or >, Building
+                               19 => 30, // or >, Building
+                               );
                $iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28;
 
                // Find the nearest point
@@ -106,7 +94,7 @@
                        $aPlace = $oDB->getRow($sSQL);
                        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'];
@@ -115,14 +103,15 @@
                // The point we found might be too small - use the address to find what it is a child of
                if ($iPlaceID && $iMaxRank < 28)
                {
-                       if ($aPlace['rank_search'] > 28 && $iParentPlaceID) {
+                       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); 
+                               failInternalError("Could not get parent for place.", $sSQL, $iPlaceID);
                        }
                        if (!$iPlaceID)
                        {
@@ -134,14 +123,14 @@
        if ($iPlaceID)
        {
                $sSQL = "select placex.*,";
-               $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(centroid) as lat, st_x(centroid) as lon";
-               $sSQL .= " from placex where place_id = $iPlaceID ";
+               $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(centroid) as lat, st_x(centroid) as lon";
+               $sSQL .= " from placex where place_id = $iPlaceID ";
 
                $aPlace = $oDB->getRow($sSQL);
-//var_dump($sSQL, $aPlace); exit;
+               //var_dump($sSQL, $aPlace); exit;
 
                if ($bShowAddressDetails)
                {