second argument of array_merge can be empty

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 48ff7c4ea7ba8204abbb3bdbd1d684eb81a31582..765849e74a7052ad7fa6e22d41b067df6d0d3e6e 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -78,19 +78,23 @@
 
        // Website settings
        @define('CONST_NoAccessControl', true);
-       @define('CONST_ClosedForIndexing', false);
-       @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
+       @define('CONST_IPBanFile', CONST_BasePath.'/settings/ip_blocks');
+       @define('CONST_WhitelistedIPs', '');
+       @define('CONST_BlockedUserAgents', '');
+       @define('CONST_BlockReverseMaxLoad', 15);
        @define('CONST_BulkUserIPs', '');
        @define('CONST_BlockMessage', ''); // additional info to show for blocked IPs
 
-       @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
+       @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Default_Language', false);
        @define('CONST_Default_Lat', 20.0);
        @define('CONST_Default_Lon', 0.0);
        @define('CONST_Default_Zoom', 2);
+       @define('CONST_Map_Tile_URL', 'http://{s}.tile.osm.org/{z}/{x}/{y}.png');
+       @define('CONST_Map_Tile_Attribution', ''); // Set if tile source isn't osm.org
 
        @define('CONST_Search_AreaPolygons_Enabled', true);
        @define('CONST_Search_AreaPolygons', true);
@@ -99,6 +103,9 @@
 
        @define('CONST_Search_TryDroppedAddressTerms', false);
        @define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
+       // If set to true, then reverse order of queries will be tried by default.
+       // When set to false only selected languages alloow reverse search.
+       @define('CONST_Search_ReversePlanForAll', true);
 
        @define('CONST_Places_Max_ID_count', 50); 
 
@@ -111,3 +118,5 @@
        @define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
        @define('CONST_Log_File_SearchLog', '');
        @define('CONST_Log_File_ReverseLog', '');
+
+