travis: exclude poldi, waterway tests

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 8f2fb1d9f62a29e9f8a701ba08818b0831e98252..cdb02924a6c0dcfa9d76dce4f2e978dc3b36205d 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -11,6 +11,18 @@
        @define('CONST_Database_Web_User', 'www-data');
        @define('CONST_Max_Word_Frequency', '50000');
        @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);
@@ -50,46 +62,21 @@
        @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').'/');
-       @define('CONST_Tile_Default', 'Mapnik');
-
+       // Language to assume when none is supplied with the query.
+       // When set to false, the local language (i.e. the name tag without suffix)
+       // will be used.
        @define('CONST_Default_Language', false);
+       // Appearance of the map in the debug interface.
        @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);
 
        @define('CONST_Search_BatchMode', false);
@@ -100,16 +87,19 @@
        // When set to false only selected languages alloow reverse search.
        @define('CONST_Search_ReversePlanForAll', true);
 
+       // Maximum number of OSM ids that may be queried at once
+       // for the places endpoint.
        @define('CONST_Places_Max_ID_count', 50); 
 
-       // Set to zero to disable polygon output
+       // Number of different geometry formats that may be queried in parallel.
+       // Set to zero to disable polygon output.
        @define('CONST_PolygonOutput_MaximumTypes', 1);
 
        // Log settings
-       @define('CONST_Log_DB', true);
+       // Set to true to log into new_query_log table.
+       // You should set up a cron job that regularly clears out this table.
+       @define('CONST_Log_DB', false);
+       // Set to a file name to enable logging to a file.
        @define('CONST_Log_File', false);
-       @define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
-       @define('CONST_Log_File_SearchLog', '');
-       @define('CONST_Log_File_ReverseLog', '');