second argument of array_merge can be empty

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index d1c554a454352a79914f2f75a4096c182f8fa490..b1a7d77e8ded60c6a3d4f7a0724ea61c6ce1deda 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -6,19 +6,6 @@
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.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;
-               }
-       }
-
-
        $bAsPoints = false;
        $bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
        $bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
@@ -102,15 +89,19 @@
                $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
 
                $fRadius = $fDiameter = getResultDiameter($aPlace);
-               $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'],$aPlace['lon'],$aPlace['lat'],$fRadius);
+               $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], $fRadius);
 
-               $aPlace = array_merge($aPlace, $aOutlineResult);
+               if ($aOutlineResult)
+               {
+                       $aPlace = array_merge($aPlace, $aOutlineResult);
+               }
        }
        else
        {
                $aPlace = null;
        }
 
+       logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
 
        if (CONST_Debug)
        {