Add BufferWriter/BufferReader and simplify interface for ConditionalRestrictions

2018-03-19 23:31:49 +00:00
parent 4f454a3761
commit 06f28ffd34
18 changed files with 237 additions and 147 deletions
@@ -596,9 +596,8 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
    std::vector<extractor::ConditionalTurnPenalty> conditional_turns;
    if (update_conditional_turns)
    {
-        using storage::io::FileReader;
-        FileReader reader(config.GetPath(".osrm.restrictions"), FileReader::VerifyFingerprint);
-        extractor::serialization::read(reader, conditional_turns);
+        extractor::files::readConditionalRestrictions(config.GetPath(".osrm.restrictions"),
+                                                      conditional_turns);
    }

    tbb::concurrent_vector<GeometryID> updated_segments;