Refactor file loading to use a common class that has proper error handling.

include/storage/io.hpp

@@ -8,10 +8,14 @@
 #include "util/fingerprint.hpp"
 #include "util/simple_logger.hpp"
 #include "util/static_graph.hpp"
+#include "util/exception.hpp"
 
 #include <boost/filesystem/fstream.hpp>
+#include <boost/iostreams/seek.hpp>
 
 #include <tuple>
+#include <cstring>
+#include <cerrno>
 
 namespace osrm
 {
@@ -20,6 +24,122 @@ namespace storage
 namespace io
 {
 
+class File
+{
+  private:
+    std::string filename;
+    boost::filesystem::ifstream input_stream;
+
+  public:
+    File(const std::string &filename, const bool check_fingerprint = false)
+        : File(boost::filesystem::path(filename), check_fingerprint)
+    {
+    }
+
+    File(const boost::filesystem::path &filename_, const bool check_fingerprint = false)
+    {
+        filename = filename_.string();
+        input_stream.open(filename_, std::ios::binary);
+        if (!input_stream)
+            throw util::exception("Error opening " + filename + ":" + std::strerror(errno));
+
+        if (check_fingerprint && !readAndCheckFingerprint())
+        {
+            throw util::exception("Fingerprint mismatch in " + filename);
+        }
+    }
+
+    /* Read count objects of type T into pointer dest */
+    template <typename T> void readInto(T *dest, const std::size_t count)
+    {
+        static_assert(std::is_trivially_copyable<T>::value,
+                      "bytewise reading requires trivially copyable type");
+        if (count == 0)
+            return;
+        input_stream.read(reinterpret_cast<char *>(dest), count * sizeof(T));
+
+        // safe to cast here, according to CPP docs, negative values for gcount
+        // are never used.
+        const unsigned long bytes_read = static_cast<unsigned long>(input_stream.gcount());
+        const auto expected_bytes = count * sizeof(T);
+
+        if (bytes_read == 0)
+        {
+            throw util::exception("Error reading from " + filename + ": " + std::strerror(errno));
+        }
+        else if (bytes_read < expected_bytes)
+        {
+            throw util::exception("Error reading from " + filename + ": Unexpected end of file");
+        }
+    }
+
+    template <typename T> void readInto(T &target) { readInto(&target, 1); }
+
+    template <typename T> T readOne()
+    {
+        T tmp;
+        readInto(tmp);
+        return tmp;
+    }
+
+    template <typename T> void skip(const std::size_t element_count)
+    {
+        boost::iostreams::seek(input_stream, element_count * sizeof(T), BOOST_IOS::cur);
+    }
+
+    /*******************************************/
+
+    std::uint32_t readElementCount32() { return readOne<std::uint32_t>(); }
+    std::uint64_t readElementCount64() { return readOne<std::uint64_t>(); }
+
+    template <typename T> void deserializeVector(std::vector<T> &data)
+    {
+        const auto count = readElementCount64();
+        data.resize(count);
+        readInto(data.data(), count);
+    }
+
+    bool readAndCheckFingerprint()
+    {
+        auto fingerprint = readOne<util::FingerPrint>();
+        const auto valid = util::FingerPrint::GetValid();
+        // compare the compilation state stored in the fingerprint
+        return valid.IsMagicNumberOK(fingerprint) && valid.TestContractor(fingerprint) &&
+               valid.TestGraphUtil(fingerprint) && valid.TestRTree(fingerprint) &&
+               valid.TestQueryObjects(fingerprint);
+    }
+
+    std::size_t size()
+    {
+        auto current_pos = input_stream.tellg();
+        input_stream.seekg(0, input_stream.end);
+        auto length = input_stream.tellg();
+        input_stream.seekg(current_pos, input_stream.beg);
+        return length;
+    }
+
+    std::vector<std::string> readLines()
+    {
+        std::vector<std::string> result;
+        std::string thisline;
+        try
+        {
+            while (std::getline(input_stream, thisline))
+            {
+                std::clog << "Read " << thisline << std::endl;
+                result.push_back(thisline);
+            }
+        }
+        catch (const std::ios_base::failure &e)
+        {
+            // EOF is OK here, everything else, re-throw
+            if (!input_stream.eof())
+                throw;
+        }
+        return result;
+    }
+};
+
 // Reads the count of elements that is written in the file header and returns the number
 inline std::uint64_t readElementCount64(boost::filesystem::ifstream &input_stream)
 {
@@ -59,11 +179,10 @@ static_assert(sizeof(HSGRHeader) == 20, "HSGRHeader is not packed");
 
 // Reads the checksum, number of nodes and number of edges written in the header file of a `.hsgr`
 // file and returns them in a HSGRHeader struct
-inline HSGRHeader readHSGRHeader(boost::filesystem::ifstream &input_stream)
+inline HSGRHeader readHSGRHeader(io::File &input_file)
 {
     const util::FingerPrint fingerprint_valid = util::FingerPrint::GetValid();
-    util::FingerPrint fingerprint_loaded;
+    const auto fingerprint_loaded = input_file.readOne<util::FingerPrint>();
-    input_stream.read(reinterpret_cast<char *>(&fingerprint_loaded), sizeof(util::FingerPrint));
     if (!fingerprint_loaded.TestGraphUtil(fingerprint_valid))
     {
         util::SimpleLogger().Write(logWARNING) << ".hsgr was prepared with different build.\n"
@@ -71,11 +190,9 @@ inline HSGRHeader readHSGRHeader(boost::filesystem::ifstream &input_stream)
     }
 
     HSGRHeader header;
-    input_stream.read(reinterpret_cast<char *>(&header.checksum), sizeof(header.checksum));
+    input_file.readInto(header.checksum);
-    input_stream.read(reinterpret_cast<char *>(&header.number_of_nodes),
+    input_file.readInto(header.number_of_nodes);
-                      sizeof(header.number_of_nodes));
+    input_file.readInto(header.number_of_edges);
-    input_stream.read(reinterpret_cast<char *>(&header.number_of_edges),
-                      sizeof(header.number_of_edges));
 
     BOOST_ASSERT_MSG(0 != header.number_of_nodes, "number of nodes is zero");
     // number of edges can be zero, this is the case in a few test fixtures
@@ -87,7 +204,7 @@ inline HSGRHeader readHSGRHeader(boost::filesystem::ifstream &input_stream)
 // Needs to be called after readHSGRHeader() to get the correct offset in the stream
 using NodeT = typename util::StaticGraph<contractor::QueryEdge::EdgeData>::NodeArrayEntry;
 using EdgeT = typename util::StaticGraph<contractor::QueryEdge::EdgeData>::EdgeArrayEntry;
-inline void readHSGR(boost::filesystem::ifstream &input_stream,
+inline void readHSGR(File &input_file,
                      NodeT *node_buffer,
                      const std::uint64_t number_of_nodes,
                      EdgeT *edge_buffer,
@@ -95,17 +212,17 @@ inline void readHSGR(boost::filesystem::ifstream &input_stream,
 {
     BOOST_ASSERT(node_buffer);
     BOOST_ASSERT(edge_buffer);
-    input_stream.read(reinterpret_cast<char *>(node_buffer), number_of_nodes * sizeof(NodeT));
+    input_file.readInto(node_buffer, number_of_nodes);
-    input_stream.read(reinterpret_cast<char *>(edge_buffer), number_of_edges * sizeof(EdgeT));
+    input_file.readInto(edge_buffer, number_of_edges);
 }
 
 // Loads properties from a `.properties` file into memory
-inline void readProperties(boost::filesystem::ifstream &properties_stream,
+inline void readProperties(File &properties_file,
                            extractor::ProfileProperties *properties,
                            const std::size_t properties_size)
 {
     BOOST_ASSERT(properties);
-    properties_stream.read(reinterpret_cast<char *>(properties), properties_size);
+    properties_file.readInto(properties, properties_size);
 }
 
 // Reads the timestamp in a `.timestamp` file
@@ -120,19 +237,18 @@ inline void readTimestamp(boost::filesystem::ifstream &timestamp_input_stream,
 
 // Loads datasource_indexes from .datasource_indexes into memory
 // Needs to be called after readElementCount() to get the correct offset in the stream
-inline void readDatasourceIndexes(boost::filesystem::ifstream &datasource_indexes_input_stream,
+inline void readDatasourceIndexes(File &datasource_indexes_file,
                                   uint8_t *datasource_buffer,
                                   const std::uint64_t number_of_datasource_indexes)
 {
     BOOST_ASSERT(datasource_buffer);
-    datasource_indexes_input_stream.read(reinterpret_cast<char *>(datasource_buffer),
+    datasource_indexes_file.readInto(datasource_buffer, number_of_datasource_indexes);
-                                         number_of_datasource_indexes * sizeof(std::uint8_t));
 }
 
 // Loads edge data from .edge files into memory which includes its
 // geometry, name ID, turn instruction, lane data ID, travel mode, entry class ID
 // Needs to be called after readElementCount() to get the correct offset in the stream
-inline void readEdges(boost::filesystem::ifstream &edges_input_stream,
+inline void readEdges(File &edges_input_file,
                       GeometryID *geometry_list,
                       NameID *name_id_list,
                       extractor::guidance::TurnInstruction *turn_instruction_list,
@@ -152,7 +268,7 @@ inline void readEdges(boost::filesystem::ifstream &edges_input_stream,
     extractor::OriginalEdgeData current_edge_data;
     for (std::uint64_t i = 0; i < number_of_edges; ++i)
     {
-        edges_input_stream.read((char *)&(current_edge_data), sizeof(extractor::OriginalEdgeData));
+        edges_input_file.readInto(current_edge_data);
 
         geometry_list[i] = current_edge_data.via_geometry;
         name_id_list[i] = current_edge_data.name_id;
@@ -168,7 +284,7 @@ inline void readEdges(boost::filesystem::ifstream &edges_input_stream,
 // Loads coordinates and OSM node IDs from .nodes files into memory
 // Needs to be called after readElementCount() to get the correct offset in the stream
 template <typename OSMNodeIDVectorT>
-void readNodes(boost::filesystem::ifstream &nodes_input_stream,
+void readNodes(io::File &nodes_file,
                util::Coordinate *coordinate_list,
                OSMNodeIDVectorT &osmnodeid_list,
                const std::uint64_t number_of_coordinates)
@@ -177,7 +293,7 @@ void readNodes(boost::filesystem::ifstream &nodes_input_stream,
     extractor::QueryNode current_node;
     for (std::uint64_t i = 0; i < number_of_coordinates; ++i)
     {
-        nodes_input_stream.read((char *)&current_node, sizeof(extractor::QueryNode));
+        nodes_file.readInto(current_node);
         coordinate_list[i] = util::Coordinate(current_node.lon, current_node.lat);
         osmnodeid_list.push_back(current_node.node_id);
         BOOST_ASSERT(coordinate_list[i].IsValid());
@@ -192,12 +308,11 @@ struct DatasourceNamesData
     std::vector<std::size_t> offsets;
     std::vector<std::size_t> lengths;
 };
-inline DatasourceNamesData
+inline DatasourceNamesData readDatasourceNames(io::File &datasource_names_file)
-readDatasourceNames(boost::filesystem::ifstream &datasource_names_input_stream)
 {
     DatasourceNamesData datasource_names_data;
-    std::string name;
+    std::vector<std::string> lines = datasource_names_file.readLines();
-    while (std::getline(datasource_names_input_stream, name))
+    for (const auto &name : lines)
     {
         datasource_names_data.offsets.push_back(datasource_names_data.names.size());
         datasource_names_data.lengths.push_back(name.size());
@@ -214,13 +329,10 @@ readDatasourceNames(boost::filesystem::ifstream &datasource_names_input_stream)
 // NB Cannot be written without templated type because of cyclic depencies between
 // `static_rtree.hpp` and `io.hpp`
 template <typename RTreeNodeT>
-void readRamIndex(boost::filesystem::ifstream &ram_index_input_stream,
+void readRamIndex(File &ram_index_file, RTreeNodeT *rtree_buffer, const std::uint64_t tree_size)
-                  RTreeNodeT *rtree_buffer,
-                  const std::uint64_t tree_size)
 {
     BOOST_ASSERT(rtree_buffer);
-    ram_index_input_stream.read(reinterpret_cast<char *>(rtree_buffer),
+    ram_index_file.readInto(rtree_buffer, tree_size);
-                                sizeof(RTreeNodeT) * tree_size);
 }
 }
 }

include/util/guidance/turn_lanes.hpp

@@ -17,6 +17,7 @@ namespace util
 namespace guidance
 {
 class LaneTuple;
+class LaneTupleIdPair;
 } // namespace guidance
 } // namespace util
 } // namespace osrm
@@ -27,6 +28,11 @@ template <> struct hash<::osrm::util::guidance::LaneTuple>
 {
     inline std::size_t operator()(const ::osrm::util::guidance::LaneTuple &bearing_class) const;
 };
+template <> struct hash<::osrm::util::guidance::LaneTupleIdPair>
+{
+    inline std::size_t
+    operator()(const ::osrm::util::guidance::LaneTupleIdPair &bearing_class) const;
+};
 } // namespace std
 
 namespace osrm
@@ -73,7 +79,23 @@ class LaneTuple
     }
 };
 
-using LaneTupleIdPair = std::pair<util::guidance::LaneTuple, LaneDescriptionID>;
+class LaneTupleIdPair
+{
+  public:
+    util::guidance::LaneTuple first;
+    LaneDescriptionID second;
+
+    bool operator==(const LaneTupleIdPair &other) const;
+
+    friend std::size_t hash_value(const LaneTupleIdPair &pair)
+    {
+        std::size_t seed{0};
+        boost::hash_combine(seed, pair.first);
+        boost::hash_combine(seed, pair.second);
+        return seed;
+    }
+};
+
 } // namespace guidance
 } // namespace util
 } // namespace osrm

include/util/io.hpp

@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "util/fingerprint.hpp"
+#include "storage/io.hpp"
 
 namespace osrm
 {
@@ -28,17 +29,6 @@ inline bool writeFingerprint(std::ostream &stream)
     return static_cast<bool>(stream);
 }
 
-inline bool readAndCheckFingerprint(std::istream &stream)
-{
-    FingerPrint fingerprint;
-    const auto valid = FingerPrint::GetValid();
-    stream.read(reinterpret_cast<char *>(&fingerprint), sizeof(fingerprint));
-    // compare the compilation state stored in the fingerprint
-    return static_cast<bool>(stream) && valid.IsMagicNumberOK(fingerprint) &&
-           valid.TestContractor(fingerprint) && valid.TestGraphUtil(fingerprint) &&
-           valid.TestRTree(fingerprint) && valid.TestQueryObjects(fingerprint);
-}
-
 template <typename simple_type>
 bool serializeVector(const std::string &filename, const std::vector<simple_type> &data)
 {
@@ -66,17 +56,14 @@ bool serializeVector(std::ostream &stream, const std::vector<simple_type> &data)
 template <typename simple_type>
 bool deserializeVector(const std::string &filename, std::vector<simple_type> &data)
 {
-    std::ifstream stream(filename, std::ios::binary);
 
-    if (!readAndCheckFingerprint(stream))
+    storage::io::File file(filename, true);
-        return false;
 
-    std::uint64_t count = 0;
+    const auto count = file.readElementCount64();
-    stream.read(reinterpret_cast<char *>(&count), sizeof(count));
     data.resize(count);
     if (count)
-        stream.read(reinterpret_cast<char *>(&data[0]), sizeof(simple_type) * count);
+        file.readInto(data.data(), count);
-    return static_cast<bool>(stream);
+    return true;
 }
 
 template <typename simple_type>
@@ -199,13 +186,9 @@ inline bool serializeFlags(const boost::filesystem::path &path, const std::vecto
 inline bool deserializeFlags(const boost::filesystem::path &path, std::vector<bool> &flags)
 {
     SimpleLogger().Write() << "Reading flags from " << path;
-    std::ifstream flag_stream(path.string(), std::ios::binary);
+    storage::io::File flag_file(path, true);
 
-    if (!readAndCheckFingerprint(flag_stream))
+    const auto number_of_bits = flag_file.readOne<std::uint32_t>();
-        return false;
-
-    std::uint32_t number_of_bits;
-    flag_stream.read(reinterpret_cast<char *>(&number_of_bits), sizeof(number_of_bits));
     flags.resize(number_of_bits);
     // putting bits in ints
     std::uint32_t chunks = (number_of_bits + 31) / 32;
@@ -213,14 +196,14 @@ inline bool deserializeFlags(const boost::filesystem::path &path, std::vector<bo
     std::uint32_t chunk;
     for (std::size_t chunk_id = 0; chunk_id < chunks; ++chunk_id)
     {
-        flag_stream.read(reinterpret_cast<char *>(&chunk), sizeof(chunk));
+        flag_file.readInto(chunk);
         std::bitset<32> chunk_bits(chunk);
         for (std::size_t bit = 0; bit < 32 && bit_position < number_of_bits; ++bit, ++bit_position)
             flags[bit_position] = chunk_bits[bit];
     }
     SimpleLogger().Write() << "Read " << number_of_bits << " bits in " << chunks
                            << " Chunks from disk.";
-    return static_cast<bool>(flag_stream);
+    return true;
 }
 } // namespace util
 } // namespace osrm

include/util/static_rtree.hpp

@@ -346,18 +346,9 @@ class StaticRTree
                          const CoordinateListT &coordinate_list)
         : m_coordinate_list(coordinate_list)
     {
-        // open tree node file and load into RAM.
+        storage::io::File tree_node_file(node_file);
-        if (!boost::filesystem::exists(node_file))
-        {
-            throw exception("ram index file does not exist");
-        }
-        if (boost::filesystem::file_size(node_file) == 0)
-        {
-            throw exception("ram index file is empty");
-        }
-        boost::filesystem::ifstream tree_node_file(node_file, std::ios::binary);
 
-        const auto tree_size = storage::io::readElementCount64(tree_node_file);
+        const auto tree_size = tree_node_file.readElementCount64();
 
         m_search_tree.resize(tree_size);
         storage::io::readRamIndex(tree_node_file, &m_search_tree[0], tree_size);

src/storage/storage.cpp

@@ -28,13 +28,11 @@
 #endif
 
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/filesystem/fstream.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/sync/named_sharable_mutex.hpp>
 #include <boost/interprocess/sync/named_upgradable_mutex.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
 #include <boost/interprocess/sync/upgradable_lock.hpp>
-#include <boost/iostreams/seek.hpp>
 
 #include <cstdint>
 
@@ -263,19 +261,15 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
         // collect number of elements to store in shared memory object
         util::SimpleLogger().Write() << "load names from: " << config.names_data_path;
         // number of entries in name index
-        boost::filesystem::ifstream name_stream(config.names_data_path, std::ios::binary);
+        io::File name_file(config.names_data_path);
-        if (!name_stream)
+
-        {
+        const auto name_blocks = name_file.readElementCount32();
-            throw util::exception("Could not open " + config.names_data_path.string() +
-                                  " for reading.");
-        }
-        const auto name_blocks = io::readElementCount32(name_stream);
         layout_ptr->SetBlockSize<unsigned>(DataLayout::NAME_OFFSETS, name_blocks);
         layout_ptr->SetBlockSize<typename util::RangeTable<16, true>::BlockT>(
             DataLayout::NAME_BLOCKS, name_blocks);
         BOOST_ASSERT_MSG(0 != name_blocks, "name file broken");
 
-        const auto number_of_chars = io::readElementCount32(name_stream);
+        const auto number_of_chars = name_file.readElementCount32();
         layout_ptr->SetBlockSize<char>(DataLayout::NAME_CHAR_LIST, number_of_chars);
     }
 
@@ -295,13 +289,8 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
 
     // Loading information for original edges
     {
-        boost::filesystem::ifstream edges_input_stream(config.edges_data_path, std::ios::binary);
+        io::File edges_file(config.edges_data_path);
-        if (!edges_input_stream)
+        const auto number_of_original_edges = edges_file.readElementCount64();
-        {
-            throw util::exception("Could not open " + config.edges_data_path.string() +
-                                  " for reading.");
-        }
-        const auto number_of_original_edges = io::readElementCount64(edges_input_stream);
 
         // note: settings this all to the same size is correct, we extract them from the same struct
         layout_ptr->SetBlockSize<NodeID>(DataLayout::VIA_NODE_LIST, number_of_original_edges);
@@ -319,14 +308,9 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
     }
 
     {
-        boost::filesystem::ifstream hsgr_input_stream(config.hsgr_data_path, std::ios::binary);
+        io::File hsgr_file(config.hsgr_data_path);
-        if (!hsgr_input_stream)
-        {
-            throw util::exception("Could not open " + config.hsgr_data_path.string() +
-                                  " for reading.");
-        }
 
-        const auto hsgr_header = io::readHSGRHeader(hsgr_input_stream);
+        const auto hsgr_header = io::readHSGRHeader(hsgr_file);
         layout_ptr->SetBlockSize<unsigned>(DataLayout::HSGR_CHECKSUM, 1);
         layout_ptr->SetBlockSize<QueryGraph::NodeArrayEntry>(DataLayout::GRAPH_NODE_LIST,
                                                              hsgr_header.number_of_nodes);
@@ -336,11 +320,13 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
 
     // load rsearch tree size
     {
-        boost::filesystem::ifstream tree_node_file(config.ram_index_path, std::ios::binary);
+        io::File tree_node_file(config.ram_index_path);
 
-        const auto tree_size = io::readElementCount64(tree_node_file);
+        const auto tree_size = tree_node_file.readElementCount64();
         layout_ptr->SetBlockSize<RTreeNode>(DataLayout::R_SEARCH_TREE, tree_size);
+    }
 
+    {
         // allocate space in shared memory for profile properties
         const auto properties_size = io::readPropertiesCount();
         layout_ptr->SetBlockSize<extractor::ProfileProperties>(DataLayout::PROPERTIES,
@@ -349,38 +335,22 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
 
     // read timestampsize
     {
-        boost::filesystem::ifstream timestamp_stream(config.timestamp_path);
+        io::File timestamp_file(config.timestamp_path);
-        if (!timestamp_stream)
+        const auto timestamp_size = timestamp_file.size();
-        {
-            throw util::exception("Could not open " + config.timestamp_path.string() +
-                                  " for reading.");
-        }
-        const auto timestamp_size = io::readNumberOfBytes(timestamp_stream);
         layout_ptr->SetBlockSize<char>(DataLayout::TIMESTAMP, timestamp_size);
     }
 
     // load core marker size
     {
-        boost::filesystem::ifstream core_marker_file(config.core_data_path, std::ios::binary);
+        io::File core_marker_file(config.core_data_path);
-        if (!core_marker_file)
+        const auto number_of_core_markers = core_marker_file.readElementCount32();
-        {
-            throw util::exception("Could not open " + config.core_data_path.string() +
-                                  " for reading.");
-        }
-
-        const auto number_of_core_markers = io::readElementCount32(core_marker_file);
         layout_ptr->SetBlockSize<unsigned>(DataLayout::CORE_MARKER, number_of_core_markers);
     }
 
     // load coordinate size
     {
-        boost::filesystem::ifstream nodes_input_stream(config.nodes_data_path, std::ios::binary);
+        io::File node_file(config.nodes_data_path);
-        if (!nodes_input_stream)
+        const auto coordinate_list_size = node_file.readElementCount64();
-        {
-            throw util::exception("Could not open " + config.core_data_path.string() +
-                                  " for reading.");
-        }
-        const auto coordinate_list_size = io::readElementCount64(nodes_input_stream);
         layout_ptr->SetBlockSize<util::Coordinate>(DataLayout::COORDINATE_LIST,
                                                    coordinate_list_size);
         // we'll read a list of OSM node IDs from the same data, so set the block size for the same
@@ -392,20 +362,15 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
 
     // load geometries sizes
     {
-        boost::filesystem::ifstream geometry_input_stream(config.geometries_path, std::ios::binary);
+        io::File geometry_file(config.geometries_path);
-        if (!geometry_input_stream)
-        {
-            throw util::exception("Could not open " + config.geometries_path.string() +
-                                  " for reading.");
-        }
 
-        const auto number_of_geometries_indices = io::readElementCount32(geometry_input_stream);
+        const auto number_of_geometries_indices = geometry_file.readElementCount32();
         layout_ptr->SetBlockSize<unsigned>(DataLayout::GEOMETRIES_INDEX,
                                            number_of_geometries_indices);
-        boost::iostreams::seek(
-            geometry_input_stream, number_of_geometries_indices * sizeof(unsigned), BOOST_IOS::cur);
 
-        const auto number_of_compressed_geometries = io::readElementCount32(geometry_input_stream);
+        geometry_file.skip<unsigned>(number_of_geometries_indices);
+
+        const auto number_of_compressed_geometries = geometry_file.readElementCount32();
         layout_ptr->SetBlockSize<NodeID>(DataLayout::GEOMETRIES_NODE_LIST,
                                          number_of_compressed_geometries);
         layout_ptr->SetBlockSize<EdgeWeight>(DataLayout::GEOMETRIES_FWD_WEIGHT_LIST,
@@ -417,15 +382,8 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
     // load datasource sizes.  This file is optional, and it's non-fatal if it doesn't
     // exist.
     {
-        boost::filesystem::ifstream geometry_datasource_input_stream(config.datasource_indexes_path,
+        io::File geometry_datasource_file(config.datasource_indexes_path);
-                                                                     std::ios::binary);
+        const auto number_of_compressed_datasources = geometry_datasource_file.readElementCount64();
-        if (!geometry_datasource_input_stream)
-        {
-            throw util::exception("Could not open " + config.datasource_indexes_path.string() +
-                                  " for reading.");
-        }
-        const auto number_of_compressed_datasources =
-            io::readElementCount64(geometry_datasource_input_stream);
         layout_ptr->SetBlockSize<uint8_t>(DataLayout::DATASOURCES_LIST,
                                           number_of_compressed_datasources);
     }
@@ -433,16 +391,10 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
     // Load datasource name sizes.  This file is optional, and it's non-fatal if it doesn't
     // exist
     {
-        boost::filesystem::ifstream datasource_names_input_stream(config.datasource_names_path,
+        io::File datasource_names_file(config.datasource_names_path);
-                                                                  std::ios::binary);
-        if (!datasource_names_input_stream)
-        {
-            throw util::exception("Could not open " + config.datasource_names_path.string() +
-                                  " for reading.");
-        }
 
         const io::DatasourceNamesData datasource_names_data =
-            io::readDatasourceNames(datasource_names_input_stream);
+            io::readDatasourceNames(datasource_names_file);
 
         layout_ptr->SetBlockSize<char>(DataLayout::DATASOURCE_NAME_DATA,
                                        datasource_names_data.names.size());
@@ -453,54 +405,34 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
     }
 
     {
-        boost::filesystem::ifstream intersection_stream(config.intersection_class_path,
+        io::File intersection_file(config.intersection_class_path, true);
-                                                        std::ios::binary);
-
-        if (!static_cast<bool>(intersection_stream))
-            throw util::exception("Could not open " + config.intersection_class_path.string() +
-                                  " for reading.");
-
-        if (!util::readAndCheckFingerprint(intersection_stream))
-            throw util::exception("Fingerprint of " + config.intersection_class_path.string() +
-                                  " does not match or could not read from file");
 
         std::vector<BearingClassID> bearing_class_id_table;
-        if (!util::deserializeVector(intersection_stream, bearing_class_id_table))
+        intersection_file.deserializeVector(bearing_class_id_table);
-            throw util::exception("Failed to bearing class ids read from " +
-                                  config.names_data_path.string());
 
         layout_ptr->SetBlockSize<BearingClassID>(DataLayout::BEARING_CLASSID,
                                                  bearing_class_id_table.size());
 
-        const auto bearing_blocks = io::readElementCount32(intersection_stream);
+        const auto bearing_blocks = intersection_file.readElementCount32();
-        const auto sum_lengths = io::readElementCount32(intersection_stream);
+        intersection_file.skip<std::uint32_t>(1); // sum_lengths
 
         layout_ptr->SetBlockSize<unsigned>(DataLayout::BEARING_OFFSETS, bearing_blocks);
         layout_ptr->SetBlockSize<typename util::RangeTable<16, true>::BlockT>(
             DataLayout::BEARING_BLOCKS, bearing_blocks);
 
-        // Skip the actual data
+        // No need to read the data
-        boost::iostreams::seek(intersection_stream,
+        intersection_file.skip<unsigned>(bearing_blocks);
-                               bearing_blocks * sizeof(unsigned) +
+        intersection_file.skip<typename util::RangeTable<16, true>::BlockT>(bearing_blocks);
-                                   bearing_blocks *
-                                       sizeof(typename util::RangeTable<16, true>::BlockT),
-                               BOOST_IOS::cur);
 
-        const auto num_bearings = io::readElementCount64(intersection_stream);
+        const auto num_bearings = intersection_file.readElementCount64();
 
         // Skip over the actual data
-        boost::iostreams::seek(
+        intersection_file.skip<DiscreteBearing>(num_bearings);
-            intersection_stream, num_bearings * sizeof(DiscreteBearing), BOOST_IOS::cur);
+
         layout_ptr->SetBlockSize<DiscreteBearing>(DataLayout::BEARING_VALUES, num_bearings);
 
-        if (!static_cast<bool>(intersection_stream))
-            throw util::exception("Failed to read bearing values from " +
-                                  config.intersection_class_path.string());
-
         std::vector<util::guidance::EntryClass> entry_class_table;
-        if (!util::deserializeVector(intersection_stream, entry_class_table))
+        intersection_file.deserializeVector(entry_class_table);
-            throw util::exception("Failed to read entry classes from " +
-                                  config.intersection_class_path.string());
 
         layout_ptr->SetBlockSize<util::guidance::EntryClass>(DataLayout::ENTRY_CLASS,
                                                              entry_class_table.size());
@@ -508,10 +440,10 @@ void Storage::LoadLayout(DataLayout *layout_ptr)
 
     {
         // Loading turn lane data
-        boost::filesystem::ifstream lane_data_stream(config.turn_lane_data_path, std::ios::binary);
+        io::File lane_data_file(config.turn_lane_data_path);
-        const auto lane_tupel_count = io::readElementCount64(lane_data_stream);
+        const auto lane_tuple_count = lane_data_file.readElementCount64();
         layout_ptr->SetBlockSize<util::guidance::LaneTupleIdPair>(DataLayout::TURN_LANE_DATA,
-                                                                  lane_tupel_count);
+                                                                  lane_tuple_count);
     }
 }
 
@@ -522,8 +454,8 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
 
     // Load the HSGR file
     {
-        boost::filesystem::ifstream hsgr_input_stream(config.hsgr_data_path, std::ios::binary);
+        io::File hsgr_file(config.hsgr_data_path);
-        auto hsgr_header = io::readHSGRHeader(hsgr_input_stream);
+        auto hsgr_header = io::readHSGRHeader(hsgr_file);
         unsigned *checksum_ptr =
             layout_ptr->GetBlockPtr<unsigned, true>(memory_ptr, DataLayout::HSGR_CHECKSUM);
         *checksum_ptr = hsgr_header.checksum;
@@ -538,12 +470,11 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
             layout_ptr->GetBlockPtr<QueryGraph::EdgeArrayEntry, true>(memory_ptr,
                                                                       DataLayout::GRAPH_EDGE_LIST);
 
-        io::readHSGR(hsgr_input_stream,
+        io::readHSGR(hsgr_file,
                      graph_node_list_ptr,
                      hsgr_header.number_of_nodes,
                      graph_edge_list_ptr,
                      hsgr_header.number_of_edges);
-        hsgr_input_stream.close();
     }
 
     // store the filename of the on-disk portion of the RTree
@@ -562,61 +493,54 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
 
     // Name data
     {
-        /* To be replaced by io loading code */
+        io::File name_file(config.names_data_path);
-        boost::filesystem::ifstream name_stream(config.names_data_path, std::ios::binary);
+        const auto name_blocks_count = name_file.readElementCount32();
-        const auto name_blocks = io::readElementCount32(name_stream);
+        const auto name_char_list_count = name_file.readElementCount32();
-        const auto number_of_chars = io::readElementCount32(name_stream);
+
-        /* END to be replaced */
+        using NameRangeTable = util::RangeTable<16, true>;
+
+        BOOST_ASSERT(name_blocks_count * sizeof(unsigned) ==
+                     layout_ptr->GetBlockSize(DataLayout::NAME_OFFSETS));
+        BOOST_ASSERT(name_blocks_count * sizeof(typename NameRangeTable::BlockT) ==
+                     layout_ptr->GetBlockSize(DataLayout::NAME_BLOCKS));
 
         // Loading street names
         const auto name_offsets_ptr =
             layout_ptr->GetBlockPtr<unsigned, true>(memory_ptr, DataLayout::NAME_OFFSETS);
-        if (layout_ptr->GetBlockSize(DataLayout::NAME_OFFSETS) > 0)
+        name_file.readInto(name_offsets_ptr, name_blocks_count);
-        {
-            name_stream.read(reinterpret_cast<char *>(name_offsets_ptr),
-                             layout_ptr->GetBlockSize(DataLayout::NAME_OFFSETS));
-        }
 
         const auto name_blocks_ptr =
             layout_ptr->GetBlockPtr<unsigned, true>(memory_ptr, DataLayout::NAME_BLOCKS);
-        if (layout_ptr->GetBlockSize(DataLayout::NAME_BLOCKS) > 0)
+        name_file.readInto(reinterpret_cast<char *>(name_blocks_ptr),
-        {
-            name_stream.read(reinterpret_cast<char *>(name_blocks_ptr),
                            layout_ptr->GetBlockSize(DataLayout::NAME_BLOCKS));
-        }
+
+        // For some reason, this value (the same as )
+        const auto temp_count = name_file.readElementCount32();
 
         const auto name_char_ptr =
             layout_ptr->GetBlockPtr<char, true>(memory_ptr, DataLayout::NAME_CHAR_LIST);
 
-        const auto name_char_list_count = io::readElementCount32(name_stream);
+        BOOST_ASSERT_MSG(layout_ptr->AlignBlockSize(temp_count) ==
-
-        BOOST_ASSERT_MSG(layout_ptr->AlignBlockSize(name_char_list_count) ==
                              layout_ptr->GetBlockSize(DataLayout::NAME_CHAR_LIST),
                          "Name file corrupted!");
 
-        if (layout_ptr->GetBlockSize(DataLayout::NAME_CHAR_LIST) > 0)
+        name_file.readInto(name_char_ptr, temp_count);
-        {
-            name_stream.read(name_char_ptr, layout_ptr->GetBlockSize(DataLayout::NAME_CHAR_LIST));
-        }
     }
 
     // Turn lane data
     {
-        /* NOTE: file io - refactor this in the future */
+        io::File lane_data_file(config.turn_lane_data_path);
-        boost::filesystem::ifstream lane_data_stream(config.turn_lane_data_path, std::ios::binary);
+
-        const auto lane_tupel_count = io::readElementCount64(lane_data_stream);
+        const auto lane_tuple_count = lane_data_file.readElementCount64();
-        /* END NOTE */
 
         // Need to call GetBlockPtr -> it write the memory canary, even if no data needs to be
         // loaded.
         const auto turn_lane_data_ptr =
             layout_ptr->GetBlockPtr<util::guidance::LaneTupleIdPair, true>(
                 memory_ptr, DataLayout::TURN_LANE_DATA);
-        if (layout_ptr->GetBlockSize(DataLayout::TURN_LANE_DATA) > 0)
+        BOOST_ASSERT(lane_tuple_count * sizeof(util::guidance::LaneTupleIdPair) ==
-        {
-            lane_data_stream.read(reinterpret_cast<char *>(turn_lane_data_ptr),
                      layout_ptr->GetBlockSize(DataLayout::TURN_LANE_DATA));
-        }
+        lane_data_file.readInto(turn_lane_data_ptr, lane_tuple_count);
     }
 
     // Turn lane descriptions
@@ -655,16 +579,9 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
 
     // Load original edge data
     {
-        /* NOTE: file io - refactor this in the future */
+        io::File edges_input_file(config.edges_data_path);
-        boost::filesystem::ifstream edges_input_stream(config.edges_data_path, std::ios::binary);
-        if (!edges_input_stream)
-        {
-            throw util::exception("Could not open " + config.edges_data_path.string() +
-                                  " for reading.");
-        }
 
-        const auto number_of_original_edges = io::readElementCount64(edges_input_stream);
+        const auto number_of_original_edges = edges_input_file.readElementCount64();
-        /* END NOTE */
 
         const auto via_geometry_ptr =
             layout_ptr->GetBlockPtr<GeometryID, true>(memory_ptr, DataLayout::VIA_NODE_LIST);
@@ -691,7 +608,7 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
         const auto entry_class_id_ptr =
             layout_ptr->GetBlockPtr<EntryClassID, true>(memory_ptr, DataLayout::ENTRY_CLASSID);
 
-        io::readEdges(edges_input_stream,
+        io::readEdges(edges_input_file,
                       via_geometry_ptr,
                       name_id_ptr,
                       turn_instructions_ptr,
@@ -705,91 +622,53 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
 
     // load compressed geometry
     {
-        /* NOTE: file io - refactor this in the future */
+        io::File geometry_input_file(config.geometries_path);
-        boost::filesystem::ifstream geometry_input_stream(config.geometries_path, std::ios::binary);
-        /* END NOTE */
 
-        const auto geometry_index_count = io::readElementCount32(geometry_input_stream);
+        const auto geometry_index_count = geometry_input_file.readElementCount32();
         const auto geometries_index_ptr =
             layout_ptr->GetBlockPtr<unsigned, true>(memory_ptr, DataLayout::GEOMETRIES_INDEX);
         BOOST_ASSERT(geometry_index_count == layout_ptr->num_entries[DataLayout::GEOMETRIES_INDEX]);
+        geometry_input_file.readInto(geometries_index_ptr, geometry_index_count);
 
-        if (layout_ptr->GetBlockSize(DataLayout::GEOMETRIES_INDEX) > 0)
-        {
-            geometry_input_stream.read(reinterpret_cast<char *>(geometries_index_ptr),
-                                       layout_ptr->GetBlockSize(DataLayout::GEOMETRIES_INDEX));
-        }
         const auto geometries_node_id_list_ptr =
             layout_ptr->GetBlockPtr<NodeID, true>(memory_ptr, DataLayout::GEOMETRIES_NODE_LIST);
-
+        const auto geometry_node_lists_count = geometry_input_file.readElementCount32();
-        const auto geometry_node_lists_count = io::readElementCount32(geometry_input_stream);
         BOOST_ASSERT(geometry_node_lists_count ==
                      layout_ptr->num_entries[DataLayout::GEOMETRIES_NODE_LIST]);
+        geometry_input_file.readInto(geometries_node_id_list_ptr, geometry_node_lists_count);
 
-        if (layout_ptr->GetBlockSize(DataLayout::GEOMETRIES_NODE_LIST) > 0)
-        {
-            geometry_input_stream.read(reinterpret_cast<char *>(geometries_node_id_list_ptr),
-                                       layout_ptr->GetBlockSize(DataLayout::GEOMETRIES_NODE_LIST));
-        }
         const auto geometries_fwd_weight_list_ptr = layout_ptr->GetBlockPtr<EdgeWeight, true>(
             memory_ptr, DataLayout::GEOMETRIES_FWD_WEIGHT_LIST);
-
         BOOST_ASSERT(geometry_node_lists_count ==
                      layout_ptr->num_entries[DataLayout::GEOMETRIES_FWD_WEIGHT_LIST]);
+        geometry_input_file.readInto(geometries_fwd_weight_list_ptr, geometry_node_lists_count);
 
-        if (layout_ptr->GetBlockSize(DataLayout::GEOMETRIES_FWD_WEIGHT_LIST) > 0)
-        {
-            geometry_input_stream.read(
-                reinterpret_cast<char *>(geometries_fwd_weight_list_ptr),
-                layout_ptr->GetBlockSize(DataLayout::GEOMETRIES_FWD_WEIGHT_LIST));
-        }
         const auto geometries_rev_weight_list_ptr = layout_ptr->GetBlockPtr<EdgeWeight, true>(
             memory_ptr, DataLayout::GEOMETRIES_REV_WEIGHT_LIST);
-
         BOOST_ASSERT(geometry_node_lists_count ==
                      layout_ptr->num_entries[DataLayout::GEOMETRIES_REV_WEIGHT_LIST]);
-
+        geometry_input_file.readInto(geometries_rev_weight_list_ptr, geometry_node_lists_count);
-        if (layout_ptr->GetBlockSize(DataLayout::GEOMETRIES_REV_WEIGHT_LIST) > 0)
-        {
-            geometry_input_stream.read(
-                reinterpret_cast<char *>(geometries_rev_weight_list_ptr),
-                layout_ptr->GetBlockSize(DataLayout::GEOMETRIES_REV_WEIGHT_LIST));
-        }
     }
 
     {
-        boost::filesystem::ifstream geometry_datasource_input_stream(config.datasource_indexes_path,
+        io::File geometry_datasource_file(config.datasource_indexes_path);
-                                                                     std::ios::binary);
+        const auto number_of_compressed_datasources = geometry_datasource_file.readElementCount64();
-        if (!geometry_datasource_input_stream)
-        {
-            throw util::exception("Could not open " + config.datasource_indexes_path.string() +
-                                  " for reading.");
-        }
-        const auto number_of_compressed_datasources =
-            io::readElementCount64(geometry_datasource_input_stream);
 
         // load datasource information (if it exists)
         const auto datasources_list_ptr =
             layout_ptr->GetBlockPtr<uint8_t, true>(memory_ptr, DataLayout::DATASOURCES_LIST);
         if (number_of_compressed_datasources > 0)
         {
-            io::readDatasourceIndexes(geometry_datasource_input_stream,
+            io::readDatasourceIndexes(
-                                      datasources_list_ptr,
+                geometry_datasource_file, datasources_list_ptr, number_of_compressed_datasources);
-                                      number_of_compressed_datasources);
         }
     }
 
     {
         /* Load names */
-        boost::filesystem::ifstream datasource_names_input_stream(config.datasource_names_path,
+        io::File datasource_names_file(config.datasource_names_path);
-                                                                  std::ios::binary);
-        if (!datasource_names_input_stream)
-        {
-            throw util::exception("Could not open " + config.datasource_names_path.string() +
-                                  " for reading.");
-        }
 
-        const auto datasource_names_data = io::readDatasourceNames(datasource_names_input_stream);
+        const auto datasource_names_data = io::readDatasourceNames(datasource_names_file);
 
         // load datasource name information (if it exists)
         const auto datasource_name_data_ptr =
@@ -822,8 +701,8 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
 
     // Loading list of coordinates
     {
-        boost::filesystem::ifstream nodes_input_stream(config.nodes_data_path, std::ios::binary);
+        io::File nodes_file(config.nodes_data_path);
-        io::readElementCount64(nodes_input_stream);
+        nodes_file.skip<std::uint64_t>(1); // node_count
         const auto coordinates_ptr = layout_ptr->GetBlockPtr<util::Coordinate, true>(
             memory_ptr, DataLayout::COORDINATE_LIST);
         const auto osmnodeid_ptr =
@@ -832,7 +711,7 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
 
         osmnodeid_list.reset(osmnodeid_ptr, layout_ptr->num_entries[DataLayout::OSM_NODE_ID_LIST]);
 
-        io::readNodes(nodes_input_stream,
+        io::readNodes(nodes_file,
                       coordinates_ptr,
                       osmnodeid_list,
                       layout_ptr->num_entries[DataLayout::COORDINATE_LIST]);
@@ -840,22 +719,21 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
 
     // store timestamp
     {
-        /* NOTE: file io - refactor this in the future */
+        io::File timestamp_file(config.timestamp_path);
-        boost::filesystem::ifstream timestamp_stream(config.timestamp_path);
+        const auto timestamp_size = timestamp_file.size();
-        const auto timestamp_size = io::readNumberOfBytes(timestamp_stream);
-        /* END NOTE */
 
         const auto timestamp_ptr =
             layout_ptr->GetBlockPtr<char, true>(memory_ptr, DataLayout::TIMESTAMP);
-        io::readTimestamp(timestamp_stream, timestamp_ptr, timestamp_size);
+        BOOST_ASSERT(timestamp_size == layout_ptr->num_entries[DataLayout::TIMESTAMP]);
+        timestamp_file.readInto(timestamp_ptr, timestamp_size);
     }
 
     // store search tree portion of rtree
     {
-        boost::filesystem::ifstream tree_node_file(config.ram_index_path, std::ios::binary);
+        io::File tree_node_file(config.ram_index_path);
         // perform this read so that we're at the right stream position for the next
         // read.
-        io::readElementCount64(tree_node_file);
+        tree_node_file.skip<std::uint64_t>(1);
         const auto rtree_ptr =
             layout_ptr->GetBlockPtr<RTreeNode, true>(memory_ptr, DataLayout::R_SEARCH_TREE);
         io::readRamIndex(
@@ -863,21 +741,12 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
     }
 
     {
-        /* NOTE: file io - refactor this in the future */
+        io::File core_marker_file(config.core_data_path);
-        boost::filesystem::ifstream core_marker_file(config.core_data_path, std::ios::binary);
+        const auto number_of_core_markers = core_marker_file.readElementCount32();
-        if (!core_marker_file)
-        {
-            throw util::exception("Could not open " + config.core_data_path.string() +
-                                  " for reading.");
-        }
-
-        const auto number_of_core_markers = io::readElementCount32(core_marker_file);
-        /* END NOTE */
 
         // load core markers
         std::vector<char> unpacked_core_markers(number_of_core_markers);
-        core_marker_file.read(reinterpret_cast<char *>(unpacked_core_markers.data()),
+        core_marker_file.readInto(unpacked_core_markers.data(), number_of_core_markers);
-                              sizeof(char) * number_of_core_markers);
 
         const auto core_marker_ptr =
             layout_ptr->GetBlockPtr<unsigned, true>(memory_ptr, DataLayout::CORE_MARKER);
@@ -906,68 +775,38 @@ void Storage::LoadData(DataLayout *layout_ptr, char *memory_ptr)
 
     // load profile properties
     {
-        boost::filesystem::ifstream profile_properties_stream(config.properties_path);
+        io::File profile_properties_file(config.properties_path);
-        if (!profile_properties_stream)
-        {
-            util::exception("Could not open " + config.properties_path.string() + " for reading!");
-        }
-        io::readPropertiesCount();
         const auto profile_properties_ptr =
             layout_ptr->GetBlockPtr<extractor::ProfileProperties, true>(memory_ptr,
                                                                         DataLayout::PROPERTIES);
-        io::readProperties(profile_properties_stream,
+        const auto properties_size = io::readPropertiesCount();
-                           profile_properties_ptr,
+        io::readProperties(profile_properties_file, profile_properties_ptr, properties_size);
-                           sizeof(extractor::ProfileProperties));
     }
 
     // Load intersection data
     {
-        boost::filesystem::ifstream intersection_stream(config.intersection_class_path,
+        io::File intersection_file(config.intersection_class_path, true);
-                                                        std::ios::binary);
-        if (!static_cast<bool>(intersection_stream))
-            throw util::exception("Could not open " + config.intersection_class_path.string() +
-                                  " for reading.");
-
-        if (!util::readAndCheckFingerprint(intersection_stream))
-            throw util::exception("Fingerprint of " + config.intersection_class_path.string() +
-                                  " does not match or could not read from file");
 
         std::vector<BearingClassID> bearing_class_id_table;
-        if (!util::deserializeVector(intersection_stream, bearing_class_id_table))
+        intersection_file.deserializeVector(bearing_class_id_table);
-            throw util::exception("Failed to bearing class ids read from " +
-                                  config.names_data_path.string());
 
-        const auto bearing_blocks = io::readElementCount32(intersection_stream);
+        const auto bearing_blocks = intersection_file.readElementCount32();
-        const auto sum_lengths = io::readElementCount32(intersection_stream);
+        intersection_file.skip<std::uint32_t>(1); // sum_lengths
 
         std::vector<unsigned> bearing_offsets_data(bearing_blocks);
         std::vector<typename util::RangeTable<16, true>::BlockT> bearing_blocks_data(
             bearing_blocks);
 
-        if (bearing_blocks)
+        intersection_file.readInto(bearing_offsets_data.data(), bearing_blocks);
-        {
+        intersection_file.readInto(bearing_blocks_data.data(), bearing_blocks);
-            intersection_stream.read(reinterpret_cast<char *>(bearing_offsets_data.data()),
-                                     bearing_blocks *
-                                         sizeof(decltype(bearing_offsets_data)::value_type));
-        }
 
-        if (bearing_blocks)
+        const auto num_bearings = intersection_file.readElementCount64();
-        {
-            intersection_stream.read(reinterpret_cast<char *>(bearing_blocks_data.data()),
-                                     bearing_blocks *
-                                         sizeof(decltype(bearing_blocks_data)::value_type));
-        }
-
-        const auto num_bearings = io::readElementCount64(intersection_stream);
 
         std::vector<DiscreteBearing> bearing_class_table(num_bearings);
-        intersection_stream.read(reinterpret_cast<char *>(bearing_class_table.data()),
+        intersection_file.readInto(bearing_class_table.data(), num_bearings);
-                                 sizeof(decltype(bearing_class_table)::value_type) * num_bearings);
 
         std::vector<util::guidance::EntryClass> entry_class_table;
-        if (!util::deserializeVector(intersection_stream, entry_class_table))
+        intersection_file.deserializeVector(entry_class_table);
-            throw util::exception("Failed to read entry classes from " +
-                                  config.intersection_class_path.string());
 
         // load intersection classes
         if (!bearing_class_id_table.empty())

src/util/guidance/turn_lanes.cpp

@@ -31,6 +31,11 @@ bool LaneTuple::operator==(const LaneTuple other) const
 
 bool LaneTuple::operator!=(const LaneTuple other) const { return !(*this == other); }
 
+bool LaneTupleIdPair::operator==(const LaneTupleIdPair &other) const
+{
+    return other.first == first && other.second == second;
+}
+
 } // namespace guidance
 } // namespace util
 } // namespace osrm