Ignore postcodes with comma and semicolon when computing address

[nominatim.git] / settings / defaults.php

diff --git a/settings/defaults.php b/settings/defaults.php
index a35c3cc8d5036c26ee9d0dd43725de8abd051b96..9f694c89fb24699a62ee1d05c09b20b57c98f59a 100644 (file)
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -17,6 +17,10 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 // 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);
@@ -41,7 +45,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 // Paths
 @define('CONST_ExtraDataPath', CONST_BasePath.'/data');
 @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
-@define('CONST_Osmosis_Binary', '@OSMOSIS_PATH@');
+@define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');
 @define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
 @define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
 
@@ -67,7 +71,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
 // Replication settings
 @define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
-@define('CONST_Replication_MaxInterval', '3600');
+@define('CONST_Replication_Max_Diff_size', '30'); // MB of update data to download per batch
 @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