X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c391479c5852f165c4be85b6e39d1290ae2d4a58..7dd0a63b688c14b49179c47b592bdf309abe6d08:/settings/settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 1b5422f9..d48aff73 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -1,5 +1,7 @@
 <?php
-	if (file_exists(CONST_BasePath.'/settings/local.php')) require_once(CONST_BasePath.'/settings/local.php');
+	@define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
+	@define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
+	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);
 
 	// General settings
@@ -9,15 +11,23 @@
 	@define('CONST_Max_Word_Frequency', '50000');
 	@define('CONST_Limit_Reindexing', true);
 
+	// Proxy settings
+	@define('CONST_HTTP_Proxy', false);
+	@define('CONST_HTTP_Proxy_Host', 'proxy.mydomain.com');
+	@define('CONST_HTTP_Proxy_Port', '3128');
+	@define('CONST_HTTP_Proxy_Login', '');
+	@define('CONST_HTTP_Proxy_Password', '');
+
 	// Software versions
-	@define('CONST_Postgresql_Version', '9.1'); // values: 9.0, 9.1, 9.2
-	@define('CONST_Postgis_Version', '1.5'); // values: 1.5, 2.0
+	@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_BasePath.'/osm2pgsql/osm2pgsql');
+	@define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
 	@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
+	@define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
 
 	// osm2pgsql settings
 	@define('CONST_Osm2pgsql_Flatnode_File', null);
@@ -35,7 +45,7 @@
 	// search tables - needed for lookups
 	@define('CONST_Tablespace_Search_Data', false);
 	@define('CONST_Tablespace_Search_Index', false);
-	// additional data, e.g. TIGER data - needed for lookups
+	// additional data, e.g. TIGER data, type searches - needed for lookups
 	@define('CONST_Tablespace_Aux_Data', false);
 	@define('CONST_Tablespace_Aux_Index', false);
 
@@ -83,6 +93,8 @@
 	@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);
@@ -90,7 +102,12 @@
 	@define('CONST_Search_BatchMode', false);
 
 	@define('CONST_Search_TryDroppedAddressTerms', false);
-	@define('CONST_Search_NameOnlySearchFrequencyThreshold', false);
+	@define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
+	// If set to true, then reverse order of queries will be tried by default.
+	// When set to false only selected languages alloow reverse search.
+	@define('CONST_Search_ReversePlanForAll', true);
+
+	@define('CONST_Places_Max_ID_count', 50); 
 
 	// Set to zero to disable polygon output
 	@define('CONST_PolygonOutput_MaximumTypes', 1);
@@ -101,3 +118,5 @@
 	@define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
 	@define('CONST_Log_File_SearchLog', '');
 	@define('CONST_Log_File_ReverseLog', '');
+
+