Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / defaults.php

diff --git a/settings/defaults.php b/settings/defaults.php
index 9c0859bad19e5b7c5ca5958d6f828c95769c7821..2d8f47d097887a79e84951d359f6e44c1a4ee36e 100644 (file)
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -20,7 +20,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 // 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.
 // 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 ();");
+@define('CONST_Term_Normalization_Rules', ":: NFD (); [[:Nonspacing Mark:] [:Cf:]] >;  :: lower (); [[:Punctuation:][:Space:]]+ > ' '; :: NFC ();");

 
 // Set to false to avoid importing extra postcodes for the US.
 @define('CONST_Use_Extra_US_Postcodes', true);
 
 // Set to false to avoid importing extra postcodes for the US.
 @define('CONST_Use_Extra_US_Postcodes', true);


@@ -72,7 +72,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 //// Replication settings
 
 // Base URL of replication service
 //// Replication settings
 
 // Base URL of replication service

-@define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
+@define('CONST_Replication_Url', 'https://planet.openstreetmap.org/replication/minute');

 
 // Maximum size in MB of data to download per batch
 @define('CONST_Replication_Max_Diff_size', '30');
 
 // Maximum size in MB of data to download per batch
 @define('CONST_Replication_Max_Diff_size', '30');