Refactor turn description into own file

include/extractor/files.hpp

@@ -1,6 +1,7 @@
 #ifndef OSRM_EXTRACTOR_FILES_HPP
 #define OSRM_EXTRACTOR_FILES_HPP
 
+#include "extractor/guidance/turn_lane_types.hpp"
 #include "extractor/seralization.hpp"
 
 #include <boost/assert.hpp>
@@ -92,6 +93,33 @@ inline void writeTurnData(const boost::filesystem::path &path,
 
     serialization::write(writer, turn_data);
 }
+
+// reads .osrm.tls
+template <bool UseShareMemory>
+inline void readTurnLaneDescriptions(const boost::filesystem::path &path,
+                         typename util::ShM<std::uint32_t, UseShareMemory>::vector &turn_offsets,
+                         typename util::ShM<extractor::guidance::TurnLaneType::Mask, UseShareMemory>::vector &turn_masks)
+{
+    const auto fingerprint = storage::io::FileReader::HasNoFingerprint;
+    storage::io::FileReader reader{path, fingerprint};
+
+    reader.DeserializeVector(turn_offsets);
+    reader.DeserializeVector(turn_masks);
+}
+
+// writes .osrm.tls
+template <bool UseShareMemory>
+inline void writeTurnLaneDescriptions(const boost::filesystem::path &path,
+                         const typename util::ShM<std::uint32_t, UseShareMemory>::vector &turn_offsets,
+                         const typename util::ShM<extractor::guidance::TurnLaneType::Mask, UseShareMemory>::vector &turn_masks)
+{
+    const auto fingerprint = storage::io::FileWriter::HasNoFingerprint;
+    storage::io::FileWriter writer{path, fingerprint};
+
+    writer.SerializeVector(turn_offsets);
+    writer.SerializeVector(turn_masks);
+}
+
 }
 }
 }

include/util/io.hpp

@@ -1,46 +0,0 @@
-#ifndef OSRM_INCLUDE_UTIL_IO_HPP_
-#define OSRM_INCLUDE_UTIL_IO_HPP_
-
-#include "util/log.hpp"
-
-#include <boost/filesystem.hpp>
-#include <boost/numeric/conversion/cast.hpp>
-
-#include <cstddef>
-#include <cstdint>
-
-#include <bitset>
-#include <fstream>
-#include <stxxl/vector>
-#include <vector>
-
-#include "storage/io.hpp"
-#include "util/fingerprint.hpp"
-
-namespace osrm
-{
-namespace util
-{
-
-template <typename simple_type>
-void deserializeAdjacencyArray(const std::string &filename,
-                               std::vector<std::uint32_t> &offsets,
-                               std::vector<simple_type> &data)
-{
-    storage::io::FileReader file(filename, storage::io::FileReader::HasNoFingerprint);
-
-    file.DeserializeVector(offsets);
-    file.DeserializeVector(data);
-
-    // offsets have to match up with the size of the data
-    if (offsets.empty() || (offsets.back() != boost::numeric_cast<std::uint32_t>(data.size())))
-        throw util::exception(
-            "Error in " + filename +
-            (offsets.empty() ? "Offsets are empty" : "Offset and data size do not match") +
-            SOURCE_REF);
-}
-
-} // namespace util
-} // namespace osrm
-
-#endif // OSRM_INCLUDE_UTIL_IO_HPP_