Merge pull request #734 from lonvia/use-pyosmium-for-updates

[nominatim.git] / settings / defaults.php

diff --git a/settings/defaults.php b/settings/defaults.php
index e34f4db04200a96549569c91c5bda4587b1ef5a5..16711542faee15872a176e6eb0f10f20185f293c 100644 (file)
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -39,10 +39,11 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_HTTP_Proxy_Password', '');
 
 // Paths
 @define('CONST_HTTP_Proxy_Password', '');
 
 // Paths

+@define('CONST_ExtraDataPath', CONST_BasePath.'/data');

 @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/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');
-@define('CONST_Wikipedia_Data_Path', CONST_BasePath.'/data');
+@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);
 
 // osm2pgsql settings
 @define('CONST_Osm2pgsql_Flatnode_File', null);


@@ -66,7 +67,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
 // Replication settings
 @define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
 
 // 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
 
 @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