X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a4ecd9d73e93a56aeee336c7fa7e18aa42bd9e03..badd2e46aa59c7eef187eada4ef1bbd32873b6f5:/settings/settings.php?ds=sidebyside

diff --git a/settings/settings.php b/settings/settings.php
index d48aff73..d44bb967 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -1,6 +1,7 @@
 <?php
 	@define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
 	@define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
+	if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
 	if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
 	if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
@@ -10,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);
@@ -18,13 +31,7 @@
 	@define('CONST_HTTP_Proxy_Login', '');
 	@define('CONST_HTTP_Proxy_Password', '');
 
-	// Software versions
-	@define('CONST_Postgresql_Version', '9.3'); // values: 9.0, ... , 9.4
-	@define('CONST_Postgis_Version', '2.1'); // values: 1.5, 2.0, 2.1
-
 	// Paths
-	@define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
-	@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
 	@define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
 	@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 	@define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
@@ -80,23 +87,22 @@
 
 	// Website settings
 	@define('CONST_NoAccessControl', true);
-	@define('CONST_ClosedForIndexing', false);
-	@define('CONST_ClosedForIndexingExceptionIPs', '');
 	@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);
@@ -107,16 +113,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', '');