From 2f55f3a4d5bcfac9d3fafa9631c882a144103a54 Mon Sep 17 00:00:00 2001 From: "S. Kozyr" Date: Tue, 12 Sep 2023 11:11:37 +0300 Subject: [PATCH] Hack to read new KMB format Signed-off-by: S. Kozyr --- kml/header_binary.hpp | 2 +- kml/types.hpp | 2 +- kml/types_v8.hpp | 2 +- kml/visitors.hpp | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/kml/header_binary.hpp b/kml/header_binary.hpp index fd17f7021d..d186b1ee2e 100644 --- a/kml/header_binary.hpp +++ b/kml/header_binary.hpp @@ -68,7 +68,7 @@ struct Header bool HasCompilationsSection() const { - return static_cast(m_version) > static_cast(Version::V7); + return static_cast(m_version) > static_cast(Version::V8); } Version m_version = Version::Latest; diff --git a/kml/types.hpp b/kml/types.hpp index c02a84ea14..19dfeaac52 100644 --- a/kml/types.hpp +++ b/kml/types.hpp @@ -388,7 +388,7 @@ struct TrackData struct CategoryData { DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryData, visitor(m_id, "id"), - visitor(m_compilationId, "compilationId"), + //visitor(m_compilationId, "compilationId"), visitor(m_type, "type"), visitor(m_name, "name"), visitor(m_imageUrl, "imageUrl"), diff --git a/kml/types_v8.hpp b/kml/types_v8.hpp index 299193b858..0c2e7f61a5 100644 --- a/kml/types_v8.hpp +++ b/kml/types_v8.hpp @@ -21,7 +21,7 @@ struct BookmarkDataV8 visitor(m_visible, "visible"), visitor(m_nearestToponym, "nearestToponym"), visitor(m_properties, "properties"), - visitor(m_compilations, "compilations"), + //visitor(m_compilations, "compilations"), VISITOR_COLLECTABLE) DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName, diff --git a/kml/visitors.hpp b/kml/visitors.hpp index 1cce97d3ad..21945809e9 100644 --- a/kml/visitors.hpp +++ b/kml/visitors.hpp @@ -489,8 +489,10 @@ public: void operator()(Timestamp & t, char const * /* name */ = nullptr) { - auto const v = ReadVarUint(m_source); - t = FromSecondsSinceEpoch(v); + auto v = ReadVarUint(m_source); + if (v > 32503680000) // If timestamp is older than 01 Jan 3000 it means that v contains milliseconds instead of seconds. + v /= 1000; + t = FromSecondsSinceEpoch(v/1000); } void operator()(double & d, char const * /* name */ = nullptr)