Merge commit '8c7f8165bdb611f48c0ae63f9318c8490138ffea'

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 4e9d71f031742d17bd530d8282c6313524a7d5fc..11e450e9e9d74b47eb0b0233fe8e1f21b60dd18d 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -6,6 +6,7 @@
        @define('CONST_Debug', false);
        @define('CONST_Database_DSN', 'pgsql://@/nominatim'); // <driver>://<username>:<password>@<host>:<port>/<database>
        @define('CONST_Max_Word_Frequency', '50000');
        @define('CONST_Debug', false);
        @define('CONST_Database_DSN', 'pgsql://@/nominatim'); // <driver>://<username>:<password>@<host>:<port>/<database>
        @define('CONST_Max_Word_Frequency', '50000');

+       @define('CONST_Limit_Reindexing', true);

 
        // Software versions
        @define('CONST_Postgresql_Version', '9.1'); // values: 8.3, 8.4, 9.0, 9.1, 9.2
 
        // Software versions
        @define('CONST_Postgresql_Version', '9.1'); // values: 8.3, 8.4, 9.0, 9.1, 9.2


@@ -57,6 +58,7 @@
        @define('CONST_BlockedUserAgents', '');
        @define('CONST_BlockReverseMaxLoad', 15);
        @define('CONST_BulkUserIPs', '');
        @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://nominatim.openstreetmap.org/');
        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
        @define('CONST_Tile_Default', 'Mapnik');


@@ -69,6 +71,8 @@
        @define('CONST_Search_AreaPolygons_Enabled', true);
        @define('CONST_Search_AreaPolygons', true);
 
        @define('CONST_Search_AreaPolygons_Enabled', true);
        @define('CONST_Search_AreaPolygons', true);
 

+       @define('CONST_Search_BatchMode', false);
+

        @define('CONST_Search_TryDroppedAddressTerms', false);
        @define('CONST_Search_NameOnlySearchFrequencyThreshold', false);
 
        @define('CONST_Search_TryDroppedAddressTerms', false);
        @define('CONST_Search_NameOnlySearchFrequencyThreshold', false);