Add CRC checksums to EBG and turns data

include/guidance/files.hpp

@@ -19,7 +19,9 @@ namespace files
 
 // reads .osrm.edges
 template <typename TurnDataT>
-inline void readTurnData(const boost::filesystem::path &path, TurnDataT &turn_data)
+inline void readTurnData(const boost::filesystem::path &path,
+                         TurnDataT &turn_data,
+                         std::uint32_t &connectivity_checksum)
 {
     static_assert(std::is_same<guidance::TurnDataContainer, TurnDataT>::value ||
                       std::is_same<guidance::TurnDataView, TurnDataT>::value ||
@@ -28,12 +30,14 @@ inline void readTurnData(const boost::filesystem::path &path, TurnDataT &turn_da
     const auto fingerprint = storage::io::FileReader::VerifyFingerprint;
     storage::io::FileReader reader{path, fingerprint};
 
-    serialization::read(reader, turn_data);
+    serialization::read(reader, turn_data, connectivity_checksum);
 }
 
 // writes .osrm.edges
 template <typename TurnDataT>
-inline void writeTurnData(const boost::filesystem::path &path, const TurnDataT &turn_data)
+inline void writeTurnData(const boost::filesystem::path &path,
+                          const TurnDataT &turn_data,
+                          const std::uint32_t connectivity_checksum)
 {
     static_assert(std::is_same<guidance::TurnDataContainer, TurnDataT>::value ||
                       std::is_same<guidance::TurnDataView, TurnDataT>::value ||
@@ -42,7 +46,7 @@ inline void writeTurnData(const boost::filesystem::path &path, const TurnDataT &
     const auto fingerprint = storage::io::FileWriter::GenerateFingerprint;
     storage::io::FileWriter writer{path, fingerprint};
 
-    serialization::write(writer, turn_data);
+    serialization::write(writer, turn_data, connectivity_checksum);
 }
 }
 }

include/guidance/guidance_processing.hpp

@@ -41,7 +41,8 @@ void annotateTurns(const util::NodeBasedDynamicGraph &node_based_graph,
                    guidance::TurnDataExternalContainer &turn_data_container,
                    BearingClassesVector &bearing_class_by_node_based_node,
                    BearingClassesMap &bearing_class_hash,
-                   EntryClassesMap &entry_class_hash);
+                   EntryClassesMap &entry_class_hash,
+                   std::uint32_t &connectivity_checksum);
 
 } // namespace customizer
 } // namespace osrm

include/guidance/serialization.hpp

@@ -18,24 +18,28 @@ namespace serialization
 // read/write for turn data file
 template <storage::Ownership Ownership>
 inline void read(storage::io::FileReader &reader,
-                 guidance::detail::TurnDataContainerImpl<Ownership> &turn_data_container)
+                 guidance::detail::TurnDataContainerImpl<Ownership> &turn_data_container,
+                 std::uint32_t &connectivity_checksum)
 {
     storage::serialization::read(reader, turn_data_container.turn_instructions);
     storage::serialization::read(reader, turn_data_container.lane_data_ids);
     storage::serialization::read(reader, turn_data_container.entry_class_ids);
     storage::serialization::read(reader, turn_data_container.pre_turn_bearings);
     storage::serialization::read(reader, turn_data_container.post_turn_bearings);
+    reader.ReadInto(connectivity_checksum);
 }
 
 template <storage::Ownership Ownership>
 inline void write(storage::io::FileWriter &writer,
-                  const guidance::detail::TurnDataContainerImpl<Ownership> &turn_data_container)
+                  const guidance::detail::TurnDataContainerImpl<Ownership> &turn_data_container,
+                  const std::uint32_t connectivity_checksum)
 {
     storage::serialization::write(writer, turn_data_container.turn_instructions);
     storage::serialization::write(writer, turn_data_container.lane_data_ids);
     storage::serialization::write(writer, turn_data_container.entry_class_ids);
     storage::serialization::write(writer, turn_data_container.pre_turn_bearings);
     storage::serialization::write(writer, turn_data_container.post_turn_bearings);
+    writer.WriteOne(connectivity_checksum);
 }
 }
 }

include/guidance/turn_data_container.hpp

@@ -24,11 +24,14 @@ template <storage::Ownership Ownership> class TurnDataContainerImpl;
 namespace serialization
 {
 template <storage::Ownership Ownership>
-void read(storage::io::FileReader &reader, detail::TurnDataContainerImpl<Ownership> &turn_data);
+void read(storage::io::FileReader &reader,
+          detail::TurnDataContainerImpl<Ownership> &turn_data,
+          std::uint32_t &connectivity_checksum);
 
 template <storage::Ownership Ownership>
 void write(storage::io::FileWriter &writer,
-           const detail::TurnDataContainerImpl<Ownership> &turn_data);
+           const detail::TurnDataContainerImpl<Ownership> &turn_data,
+           const std::uint32_t connectivity_checksum);
 }
 
 struct TurnData
@@ -95,9 +98,11 @@ template <storage::Ownership Ownership> class TurnDataContainerImpl
     }
 
     friend void serialization::read<Ownership>(storage::io::FileReader &reader,
-                                               TurnDataContainerImpl &turn_data_container);
+                                               TurnDataContainerImpl &turn_data_container,
+                                               std::uint32_t &connectivity_checksum);
     friend void serialization::write<Ownership>(storage::io::FileWriter &writer,
-                                                const TurnDataContainerImpl &turn_data_container);
+                                                const TurnDataContainerImpl &turn_data_container,
+                                                const std::uint32_t connectivity_checksum);
 
   private:
     Vector<TurnInstruction> turn_instructions;