From a9c5bbbebad48d71d456f56661730440f836c703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BE=D0=B1=D1=80=D1=8B=D0=B8=CC=86=20=D0=AD=D1=8D?= =?UTF-8?q?=D1=85?= Date: Mon, 20 Mar 2017 17:52:17 +0300 Subject: [routing] fix cross mwm section generator --- generator/routing_index_generator.cpp | 11 +++++++---- 1 file 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(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; -- cgit v1.2.3