Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / defaults.php

diff --git a/settings/defaults.php b/settings/defaults.php
index 4f8d58c5b66903f7857d6116c3e40ff991e15f9e..7c984a542d3770ecaf09534c42a4c1325bf44d35 100644 (file)
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -11,17 +11,28 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_Database_Web_User', 'www-data');
 @define('CONST_Max_Word_Frequency', '50000');
 @define('CONST_Limit_Reindexing', true);
+// Restrict search languages.
+// Normally Nominatim will include all language variants of name:XX
+// in the search index. Set this to a comma separated list of language
+// codes, to restrict import to a subset of languages.
+// Currently only affects the import of country names and special phrases.
+@define('CONST_Languages', false);
+// Rules for normalizing terms for comparison before doing comparisons.
+// The default is to remove accents and punctuation and to lower-case the
+// term. Spaces are kept but collapsed to one standard space.
+@define('CONST_Term_Normalization_Rules', ":: NFD (); [:Nonspacing Mark:] >;  :: lower (); [[:Punctuation:][:Space:]]+ > ' '; :: NFC ();");
+
 // 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.
+/* 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.
+/* 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
@@ -32,9 +43,11 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_HTTP_Proxy_Password', '');
 
 // Paths
+@define('CONST_ExtraDataPath', CONST_BasePath.'/data');
 @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
-@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
-@define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
+@define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');
+@define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
+@define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
 
 // osm2pgsql settings
 @define('CONST_Osm2pgsql_Flatnode_File', null);
@@ -56,11 +69,18 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_Tablespace_Aux_Data', false);
 @define('CONST_Tablespace_Aux_Index', false);
 
-// Replication settings
+//// Replication settings
+
+// Base URL of replication service
 @define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
-@define('CONST_Replication_MaxInterval', '3600');
-@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
+
+// Maximum size in MB of data to download per batch
+@define('CONST_Replication_Max_Diff_size', '30');
+// How long until the service publishes the next diff
+// (relative to the age of data in the diff).
+@define('CONST_Replication_Update_Interval', '75');
+// How long to sleep when no update could be found
+@define('CONST_Replication_Recheck_Interval', '60');
 
 // Website settings
 @define('CONST_NoAccessControl', true);
@@ -89,7 +109,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
 // Maximum number of OSM ids that may be queried at once
 // for the places endpoint.
-@define('CONST_Places_Max_ID_count', 50); 
+@define('CONST_Places_Max_ID_count', 50);
 
 // Number of different geometry formats that may be queried in parallel.
 // Set to zero to disable polygon output.
@@ -101,4 +121,3 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_Log_DB', false);
 // Set to a file name to enable logging to a file.
 @define('CONST_Log_File', false);
-