Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index ef2ebe4ee6de6afea753329fe55dcfe5b46c36b3..8ebd81ee6c326b84f8b85999a975e1d2b8653840 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,13 +5,14 @@
        // General settings
        @define('CONST_Debug', false);
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
+       @define('CONST_Max_Word_Frequency', '50000');
 
        // Paths
-       @define('CONST_Postgresql_Version', '9.0');
+       @define('CONST_Postgresql_Version', '9.1');
        @define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
        @define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-1.5');
-    @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/../osm2pgsql/osm2pgsql');
-    @define('CONST_Osmosis_Binary', CONST_BasePath.'/../osmosis-0.40.1/bin/osmosis');
+       @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
+       @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 
        // Website settings
        @define('CONST_BlockedIPs', '');
@@ -19,6 +20,7 @@
        @define('CONST_WhitelistedIPs', '');
        @define('CONST_BlockedUserAgents', '');
        @define('CONST_BlockReverseMaxLoad', 15);
+       @define('CONST_BulkUserIPs', '');
 
        @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
        @define('CONST_Tile_Default', 'Mapnik');
@@ -29,9 +31,14 @@
        @define('CONST_Default_Zoom', 2);
 
        @define('CONST_Search_AreaPolygons_Enabled', true);
+       @define('CONST_Search_AreaPolygons', true);
+       @define('CONST_Search_TryDroppedAddressTerms', false);
 
        @define('CONST_Suggestions_Enabled', false);
 
+       // Set to zero to disable polygon output
+       @define('CONST_PolygonOutput_MaximumTypes', 1);
+
        // Log settings
        @define('CONST_Log_DB', true);
        @define('CONST_Log_File', false);