Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fingerprint .tld

Browse Source
This commit is contained in:
Pepijn Schoen
2017-04-07 14:05:19 +02:00
committed by Patrick Niklaus
parent 5b9d858f57
commit 8da96f8d94
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extractor/files.hpp
+2 -2
View File
@@ -151,7 +151,7 @@ inline void readTurnLaneDescriptions(const boost::filesystem::path &path,
""); "");
static_assert(std::is_same<typename OffsetsT::value_type, std::uint32_t>::value, ""); static_assert(std::is_same<typename OffsetsT::value_type, std::uint32_t>::value, "");
const auto fingerprint = storage::io::FileReader::HasNoFingerprint; const auto fingerprint = storage::io::FileReader::VerifyFingerprint;
storage::io::FileReader reader{path, fingerprint}; storage::io::FileReader reader{path, fingerprint};
storage::serialization::read(reader, turn_offsets); storage::serialization::read(reader, turn_offsets);
@@ -169,7 +169,7 @@ inline void writeTurnLaneDescriptions(const boost::filesystem::path &path,
""); "");
static_assert(std::is_same<typename OffsetsT::value_type, std::uint32_t>::value, ""); static_assert(std::is_same<typename OffsetsT::value_type, std::uint32_t>::value, "");
const auto fingerprint = storage::io::FileWriter::HasNoFingerprint; const auto fingerprint = storage::io::FileWriter::GenerateFingerprint;
storage::io::FileWriter writer{path, fingerprint}; storage::io::FileWriter writer{path, fingerprint};
storage::serialization::write(writer, turn_offsets); storage::serialization::write(writer, turn_offsets);
src/extractor/extractor.cpp
+1 -3
View File
@@ -658,9 +658,7 @@ void Extractor::WriteTurnLaneData(const std::string &turn_lane_file) const
util::Log() << "Writing turn lane masks..."; util::Log() << "Writing turn lane masks...";
TIMER_START(turn_lane_timer); TIMER_START(turn_lane_timer);
storage::io::FileWriter writer(turn_lane_file, storage::io::FileWriter::HasNoFingerprint); files::writeTurnLaneDescriptions(turn_lane_file, turn_lane_offsets, turn_lane_masks);
storage::serialization::write(writer, turn_lane_offsets);
storage::serialization::write(writer, turn_lane_masks);
TIMER_STOP(turn_lane_timer); TIMER_STOP(turn_lane_timer);
util::Log() << "done (" << TIMER_SEC(turn_lane_timer) << ")"; util::Log() << "done (" << TIMER_SEC(turn_lane_timer) << ")";
src/storage/storage.cpp
+1 -1
View File
@@ -218,7 +218,7 @@ void Storage::PopulateLayout(DataLayout &layout)
} }
{ {
io::FileReader reader(config.turn_lane_description_path, io::FileReader::HasNoFingerprint); io::FileReader reader(config.turn_lane_description_path, io::FileReader::VerifyFingerprint);
auto num_offsets = reader.ReadVectorSize<std::uint32_t>(); auto num_offsets = reader.ReadVectorSize<std::uint32_t>();
auto num_masks = reader.ReadVectorSize<extractor::guidance::TurnLaneType::Mask>(); auto num_masks = reader.ReadVectorSize<extractor::guidance::TurnLaneType::Mask>();