diff options
author | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2017-03-01 17:46:26 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-01 17:46:26 +0300 |
commit | aaa7e9c66592beaeb02dce8102f408eba0ae5dd9 (patch) | |
tree | 04b7736511810b772c0cc1350784b59adcbacdfc /generator/centers_table_builder.cpp | |
parent | ae10370e128b98935b37e188f4e9279795c0bb3a (diff) | |
parent | 316268660e47c5b21b0376d7081b5d500ccba53c (diff) |
Merge pull request #5468 from dobriy-eeh/cross-mwm-routingbeta-657
[routing] Enable cross mwm index router
Diffstat (limited to 'generator/centers_table_builder.cpp')
-rw-r--r-- | generator/centers_table_builder.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/generator/centers_table_builder.cpp b/generator/centers_table_builder.cpp index b58608b1aa..3a44717e17 100644 --- a/generator/centers_table_builder.cpp +++ b/generator/centers_table_builder.cpp @@ -28,9 +28,14 @@ bool BuildCentersTableFromDataFile(string const & filename, bool forceRebuild) if (!forceRebuild && rcont.IsExist(CENTERS_FILE_TAG)) return true; - feature::DataHeader header(rcont); + version::MwmVersion version; + if (!ReadVersion(rcont, version)) + { + LOG(LERROR, ("Can't read version from", filename)); + return false; + } - version::MwmTraits const traits(header.GetFormat()); + version::MwmTraits const traits(version); if (!traits.HasOffsetsTable()) { LOG(LERROR, (filename, "does not have an offsets table!")); @@ -44,6 +49,7 @@ bool BuildCentersTableFromDataFile(string const & filename, bool forceRebuild) return false; } + feature::DataHeader const header(rcont); FeaturesVector const features(rcont, header, table.get()); builder.SetCodingParams(header.GetDefCodingParams()); |