Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php
diff --git a/website/reverse.php b/website/reverse.php

index 1cdbf46754f1f6bdcbea1367b195fcde94ef78dd..c348659e25d02fd7cdc136d223ad9b877bd20cd8 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -4,6 +4,22 @@
         require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
         require_once(CONST_BasePath.'/lib/log.php');
  
+    if (preg_match(CONST_BlockedUserAgents, $_SERVER["HTTP_USER_AGENT"]) > 0)
+    {
+        $fLoadAvg = getLoadAverage();
+        if ($fLoadAvg >= CONST_BlockReverseMaxLoad) {
+            header('HTTP/1.0 403 Forbidden');
+            header('Content-type: text/html; charset=utf-8');
+               echo "<html><body><h1>App temporarily blocked</h1>";
+            echo "Your application has been temporarily blocked from the OpenStreetMap Nominatim ";
+            echo "geolocation service due to high server load.";
+            echo "\n</body></html>\n";
+            exit;
+        }
+
+    }
+
+
          if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
          {
                  $fLoadAvg = getLoadAverage();
@@ -38,7 +54,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 +91,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;
@@ -99,9 +116,9 @@
                         $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';
-//var_dump($sSQL);
+                       if (CONST_Debug) var_dump($sSQL);
                         $aPlace = $oDB->getRow($sSQL);
                         if (PEAR::IsError($aPlace))
                         {
@@ -136,7 +153,7 @@
                 $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 ";
  
                 $aPlace = $oDB->getRow($sSQL);
@@ -144,7 +161,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 +180,7 @@
                 $aPlace['addresstype'] = $sAddressType;
  
         }
+
+       if (CONST_Debug) exit;
+
         include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');