construct extract/contract configs to disable conditional restriction parsing by default

This commit is contained in:
karenzshea 2017-10-18 15:35:44 +02:00 committed by Patrick Niklaus
parent a53794f864
commit 834890cf0b
2 changed files with 15 additions and 16 deletions

View File

@ -69,6 +69,7 @@ struct ExtractorConfig final : storage::IOConfig
".osrm.cnbg", ".osrm.cnbg",
".osrm.cnbg_to_ebg"}), ".osrm.cnbg_to_ebg"}),
requested_num_threads(0), requested_num_threads(0),
parse_conditionals(false),
use_locations_cache(true) use_locations_cache(true)
{ {
} }

View File

@ -44,9 +44,7 @@ namespace updater
struct UpdaterConfig final : storage::IOConfig struct UpdaterConfig final : storage::IOConfig
{ {
UpdaterConfig() UpdaterConfig()
: IOConfig( : IOConfig({".osrm.ebg",
{
".osrm.ebg",
".osrm.turn_weight_penalties", ".osrm.turn_weight_penalties",
".osrm.turn_duration_penalties", ".osrm.turn_duration_penalties",
".osrm.turn_penalties_index", ".osrm.turn_penalties_index",
@ -56,10 +54,10 @@ struct UpdaterConfig final : storage::IOConfig
".osrm.geometry", ".osrm.geometry",
".osrm.fileIndex", ".osrm.fileIndex",
".osrm.properties", ".osrm.properties",
".osrm.restrictions", ".osrm.restrictions"},
},
{}, {},
{".osrm.datasource_names"}) {".osrm.datasource_names"}),
valid_now(0)
{ {
} }