travis: exclude poldi, waterway tests

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 33cfa3f201768fbef491b0532738dec505458350..cdb02924a6c0dcfa9d76dce4f2e978dc3b36205d 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -13,6 +13,16 @@
        @define('CONST_Limit_Reindexing', true);
        // Set to false to avoid importing extra postcodes for the US.
        @define('CONST_Use_Extra_US_Postcodes', true);
+       // Set to true after importing Tiger house number data for the US.
+       // Note: The tables must already exist or queries will throw errors.
+       //       After changing this setting run ./utils/setup --create-functions
+       //       again.
+       @define('CONST_Use_US_Tiger_Data', false);
+       // Set to true after importing other external house number data.
+       // Note: the aux tables must already exist or queries will throw errors.
+       //       After changing this setting run ./utils/setup --create-functions
+       //       again.
+       @define('CONST_Use_Aux_Location_data', false);
 
        // Proxy settings
        @define('CONST_HTTP_Proxy', false);
@@ -52,34 +62,8 @@
        @define('CONST_Replication_Update_Interval', '60');  // How often upstream publishes diffs
        @define('CONST_Replication_Recheck_Interval', '60'); // How long to sleep if no update found yet
 
-       // Connection buckets to rate limit people being nasty
-       @define('CONST_ConnectionBucket_MemcacheServerAddress', false);
-       @define('CONST_ConnectionBucket_MemcacheServerPort', 11211);
-       @define('CONST_ConnectionBucket_MaxBlockList', 100);
-       @define('CONST_ConnectionBucket_LeakRate', 1);
-       @define('CONST_ConnectionBucket_BlockLimit', 10);
-       @define('CONST_ConnectionBucket_WaitLimit', 6);
-       @define('CONST_ConnectionBucket_MaxSleeping', 10);
-       @define('CONST_ConnectionBucket_Cost_Reverse', 1);
-       @define('CONST_ConnectionBucket_Cost_Search', 2);
-       @define('CONST_ConnectionBucket_Cost_Details', 3);
-       @define('CONST_ConnectionBucket_Cost_Status', 1);
-
-       // Override this function to add an adjustment factor to the cost
-       // based on server load. e.g. getBlockingProcesses
-       if (!function_exists('user_busy_cost'))
-       {
-               function user_busy_cost()
-               {
-                       return 0;
-               }
-       }
-
        // Website settings
        @define('CONST_NoAccessControl', true);
-       @define('CONST_BlockedIPs', '');
-       @define('CONST_BulkUserIPs', '');
-       @define('CONST_BlockMessage', ''); // additional info to show for blocked IPs
 
        @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
        // Language to assume when none is supplied with the query.