Renumber node IDs in .osrm.maneuver_overrides

This commit is contained in:
Michael Krasnyk
2018-02-22 10:49:01 +01:00
parent 5acf660f37
commit 83588fd00f
7 changed files with 87 additions and 22 deletions
+23
View File
@@ -261,6 +261,29 @@ inline void writeTurnLaneDescriptions(const boost::filesystem::path &path,
storage::serialization::write(writer, turn_offsets);
storage::serialization::write(writer, turn_masks);
}
// reads .osrm.maneuver_overrides
template <typename StorageManeuverOverrideT, typename NodeSequencesT>
inline void readManeuverOverrides(const boost::filesystem::path &path,
StorageManeuverOverrideT &maneuver_overrides,
NodeSequencesT &node_sequences)
{
const auto fingerprint = storage::io::FileReader::VerifyFingerprint;
storage::io::FileReader reader{path, fingerprint};
serialization::read(reader, maneuver_overrides, node_sequences);
}
// writes .osrm.maneuver_overrides
inline void writeManeuverOverrides(const boost::filesystem::path &path,
const std::vector<StorageManeuverOverride> &maneuver_overrides,
const std::vector<NodeID> &node_sequences)
{
const auto fingerprint = storage::io::FileWriter::GenerateFingerprint;
storage::io::FileWriter writer{path, fingerprint};
serialization::write(writer, maneuver_overrides, node_sequences);
}
}
}
}
+11 -4
View File
@@ -304,10 +304,17 @@ inline void write(storage::io::FileWriter &writer,
const std::vector<StorageManeuverOverride> &maneuver_overrides,
const std::vector<NodeID> &node_sequences)
{
writer.WriteElementCount64(maneuver_overrides.size());
writer.WriteElementCount64(node_sequences.size());
writer.WriteFrom(maneuver_overrides);
writer.WriteFrom(node_sequences);
storage::serialization::write(writer, maneuver_overrides);
storage::serialization::write(writer, node_sequences);
}
template <typename ManeuverOverridesT, typename NodeSequenceT>
inline void read(storage::io::FileReader &reader,
ManeuverOverridesT &maneuver_overrides,
NodeSequenceT &node_sequences)
{
storage::serialization::read(reader, maneuver_overrides);
storage::serialization::read(reader, node_sequences);
}
}
}