construct extract/contract configs to disable conditional restriction…

… parsing by default
Elveris · Nov 20, 2017 · 834890c · 834890c
1 parent a53794f
commit 834890c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/include/extractor/extractor_config.hpp b/include/extractor/extractor_config.hpp
@@ -69,6 +69,7 @@ struct ExtractorConfig final : storage::IOConfig
                                       ".osrm.cnbg",
                                       ".osrm.cnbg_to_ebg"}),
                                  requested_num_threads(0),
+                                 parse_conditionals(false),
                                  use_locations_cache(true)
     {
     }

diff --git a/include/updater/updater_config.hpp b/include/updater/updater_config.hpp
@@ -44,22 +44,20 @@ namespace updater
 struct UpdaterConfig final : storage::IOConfig
 {
     UpdaterConfig()
-        : IOConfig(
-              {
-                  ".osrm.ebg",
-                  ".osrm.turn_weight_penalties",
-                  ".osrm.turn_duration_penalties",
-                  ".osrm.turn_penalties_index",
-                  ".osrm.nbg_nodes",
-                  ".osrm.ebg_nodes",
-                  ".osrm.edges",
-                  ".osrm.geometry",
-                  ".osrm.fileIndex",
-                  ".osrm.properties",
-                  ".osrm.restrictions",
-              },
-              {},
-              {".osrm.datasource_names"})
+        : IOConfig({".osrm.ebg",
+                    ".osrm.turn_weight_penalties",
+                    ".osrm.turn_duration_penalties",
+                    ".osrm.turn_penalties_index",
+                    ".osrm.nbg_nodes",
+                    ".osrm.ebg_nodes",
+                    ".osrm.edges",
+                    ".osrm.geometry",
+                    ".osrm.fileIndex",
+                    ".osrm.properties",
+                    ".osrm.restrictions"},
+                   {},
+                   {".osrm.datasource_names"}),
+          valid_now(0)
     {
     }