Merge remote-tracking branch 'upstream/master'

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

index c155fa573030fa54cb5a71629727b808dc2be972..d43b05348640782f8bf2d83bcf3c574c8fce67cd 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,7 +1,25 @@
  <?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');
  
+    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();
          if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
          {
                  $fLoadAvg = getLoadAverage();
@@ -97,7 +115,7 @@
                         $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';
  //var_dump($sSQL);
                         $aPlace = $oDB->getRow($sSQL);
                         $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
  //var_dump($sSQL);
                         $aPlace = $oDB->getRow($sSQL);
@@ -134,10 +152,11 @@
                 $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)
                 {