add small penalty for special searches

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index fda11582b23abe2ed30a2ac29dcf0447467d9d77..134b5e4e84d76cdb8ba6d12243b62993d6e71027 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -4,18 +4,6 @@
        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');
 
@@ -100,13 +88,14 @@
                        $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 indexed_status = 0 ';
                        $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
                        $sSQL .= ' ORDER BY ST_distance('.$sPointSQL.', geometry) ASC limit 1';
                        if (CONST_Debug) var_dump($sSQL);
                        $aPlace = $oDB->getRow($sSQL);
                        if (PEAR::IsError($aPlace))
                        {
-                               failInternalError("Could not determine closest place.", $sSQL, $iPlaceID);
+                               failInternalError("Could not determine closest place.", $sSQL, $aPlace);
                        }
                        $iPlaceID = $aPlace['place_id'];
                        $iParentPlaceID = $aPlace['parent_place_id'];