Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorДобрый Ээх <bukharaev@gmail.com>2017-03-20 17:52:17 +0300
committerVladimir Byko-Ianko <bykoianko@gmail.com>2017-03-20 18:07:22 +0300
commita9c5bbbebad48d71d456f56661730440f836c703 (patch)
tree75223978a3b59e186430a9bfb8bfcaea664ded49
parent42ceabc905dae250643079ad8b3ce6e35eea06ca (diff)
[routing] fix cross mwm section generatorbeta-692
-rw-r--r--generator/routing_index_generator.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp
index e141dee0f8..505f77548c 100644
--- a/generator/routing_index_generator.cpp
+++ b/generator/routing_index_generator.cpp
@@ -194,6 +194,12 @@ void FillWeights(string const & path, string const & country, CrossMwmConnector
connector.GetPoint(exit, true /* front */));
});
}
+
+serial::CodingParams LoadCodingParams(string const & mwmFile)
+{
+ DataHeader const dataHeader(mwmFile);
+ return dataHeader.GetDefCodingParams();
+}
} // namespace
namespace routing
@@ -239,12 +245,9 @@ void BuildCrossMwmSection(string const & path, string const & mwmFile, string co
FillWeights(path, country, connectors[static_cast<size_t>(VehicleType::Car)]);
+ serial::CodingParams const codingParams = LoadCodingParams(mwmFile);
FilesContainerW cont(mwmFile, FileWriter::OP_WRITE_EXISTING);
FileWriter writer = cont.GetWriter(CROSS_MWM_FILE_TAG);
-
- DataHeader const dataHeader(mwmFile);
- serial::CodingParams const & codingParams = dataHeader.GetDefCodingParams();
-
auto const startPos = writer.Pos();
CrossMwmConnectorSerializer::Serialize(transitions, connectors, codingParams, writer);
auto const sectionSize = writer.Pos() - startPos;