allow slashes in house numbers

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

index f569ffac1abbf6ba9dc82ad33ddcc7acb1f1500f..ed7090e264ba68e871a482534a6bc4b4f89ddc7b 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -2,7 +2,21 @@
         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');
  
-       $oDB =& getDB();
+    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)
          {
  
          if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
          {
@@ -16,10 +30,11 @@
                  }
          }
  
                  }
          }
  
+        $oDB =& getDB();
          ini_set('memory_limit', '200M');
  
          // Format for output
          ini_set('memory_limit', '200M');
  
          // Format for output
-       $sOutputFormat = 'xml';
+        $sOutputFormat = 'xml';
          if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
          {
                  $sOutputFormat = $_GET['format'];
          if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
          {
                  $sOutputFormat = $_GET['format'];
@@ -105,8 +120,7 @@
                         $iPlaceID = $aPlace['place_id'];
                         if (PEAR::IsError($iPlaceID))
                         {
                         $iPlaceID = $aPlace['place_id'];
                         if (PEAR::IsError($iPlaceID))
                         {
-                               var_Dump($sSQL, $iPlaceID); 
-                               exit;
+                               failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); 
                         }
                 }
  
                         }
                 }
  
@@ -118,8 +132,7 @@
                         $iPlaceID = $oDB->getOne($sSQL);
                         if (PEAR::IsError($iPlaceID))
                         {
                         $iPlaceID = $oDB->getOne($sSQL);
                         if (PEAR::IsError($iPlaceID))
                         {
-                               var_Dump($sSQL, $iPlaceID); 
-                               exit;
+                               failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); 
                         }
  
                         if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
                         }
  
                         if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
@@ -129,8 +142,7 @@
                                 $iPlaceID = $oDB->getOne($sSQL);
                                 if (PEAR::IsError($iPlaceID))
                                 {
                                 $iPlaceID = $oDB->getOne($sSQL);
                                 if (PEAR::IsError($iPlaceID))
                                 {
-                                       var_Dump($sSQL, $iPlaceID); 
-                                       exit;
+                                       failInternalError("Could not get larger parent for place.", $sSQL, $iPlaceID); 
                                 }
                         }
                         if (!$iPlaceID)
                                 }
                         }
                         if (!$iPlaceID)