From 84b72029731ff9e5f76d0e799f87fc4507e22619 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Tue, 10 Apr 2018 17:49:58 +0300 Subject: [PATCH] Added new kml points format --- kml/kml_tests/serdes_tests.cpp | 93 +++++++++++++------------- kml/serdes.cpp | 14 ++-- kml/serdes.hpp | 2 +- kml/serdes_binary.hpp | 13 +++- kml/type_utils.hpp | 3 +- kml/types.hpp | 10 +-- kml/visitors.hpp | 119 ++++++++++++++++++++++++--------- map/bookmark_helpers.cpp | 2 +- 8 files changed, 163 insertions(+), 93 deletions(-) diff --git a/kml/kml_tests/serdes_tests.cpp b/kml/kml_tests/serdes_tests.cpp index 880d47262e..d2fd6c0dfb 100644 --- a/kml/kml_tests/serdes_tests.cpp +++ b/kml/kml_tests/serdes_tests.cpp @@ -123,42 +123,42 @@ char const * kTextKml = ""; std::vector const kBinKml = { - 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x3A, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x01, 0x00, - 0x01, 0x00, 0x02, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xE2, 0xAB, 0xEB, 0x96, 0xE2, 0xFE, 0x83, 0xD4, 0x11, 0x00, 0x03, 0x01, 0x00, 0x03, 0x00, - 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xF3, 0xC2, 0xFB, 0xF9, 0x01, 0x9E, 0xD0, 0xC7, 0x95, 0x9B, 0x9D, 0xBD, 0xAB, 0x12, - 0x00, 0x03, 0x01, 0x00, 0x04, 0x01, 0x00, 0x05, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0xBC, 0xED, 0xA7, 0x03, 0xEA, - 0xA4, 0xD0, 0x9C, 0xD9, 0xA7, 0xBE, 0x9A, 0x19, 0x00, 0x03, 0x01, 0x00, 0x06, 0x00, 0x00, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xE4, 0xAF, 0xA7, 0xC1, 0xEB, 0xA6, 0xBE, 0x9A, 0x19, 0x00, 0x03, 0x01, 0x00, 0x07, 0x01, - 0x00, 0x08, 0x00, 0x00, 0x54, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0E, 0x08, - 0x1B, 0x1A, 0x41, 0x0C, 0x11, 0x25, 0x3F, 0x00, 0x02, 0x00, 0x01, 0x08, 0x03, 0x02, 0x06, 0x01, - 0x03, 0x06, 0x40, 0x05, 0x07, 0x8D, 0x01, 0x06, 0x05, 0x02, 0x07, 0x07, 0x71, 0x09, 0x05, 0x05, - 0x0A, 0x07, 0x12, 0x0B, 0x06, 0x5E, 0x0D, 0x06, 0xBA, 0x01, 0x0E, 0x05, 0x04, 0x0F, 0x05, 0x75, - 0x11, 0x05, 0x0D, 0x12, 0x06, 0x09, 0x13, 0x07, 0x4E, 0x15, 0x06, 0x91, 0x01, 0x16, 0x06, 0x0B, - 0x17, 0x06, 0x73, 0x19, 0x05, 0x06, 0x1A, 0x08, 0x1C, 0x1B, 0x07, 0x63, 0x1D, 0x06, 0xC0, 0x01, - 0x1E, 0x05, 0x07, 0x1F, 0x06, 0x77, 0x21, 0x06, 0x0A, 0x22, 0x07, 0x08, 0x23, 0x07, 0x49, 0x25, - 0x07, 0x90, 0x01, 0x27, 0x06, 0x72, 0x2A, 0x08, 0x14, 0x2B, 0x06, 0x62, 0x2D, 0x06, 0xBD, 0x01, - 0x32, 0x06, 0x0C, 0x33, 0x06, 0x57, 0x35, 0x07, 0xA1, 0x01, 0x36, 0x06, 0x0F, 0x37, 0x07, 0x76, - 0x3A, 0x08, 0x31, 0x3B, 0x06, 0x68, 0x3D, 0x06, 0xD1, 0x01, 0x3F, 0x06, 0x79, 0x41, 0x07, 0xB8, - 0x01, 0x45, 0x07, 0x8F, 0x01, 0x47, 0x07, 0x74, 0x4A, 0x07, 0x13, 0x53, 0x07, 0x59, 0x5A, 0x07, - 0x29, 0x5B, 0x07, 0x6D, 0x62, 0x08, 0x10, 0x63, 0x07, 0x4B, 0x65, 0x07, 0x96, 0x01, 0x6A, 0x08, - 0x18, 0x75, 0x07, 0xB7, 0x01, 0x77, 0x07, 0x8A, 0x01, 0x7A, 0x08, 0x3F, 0x81, 0x01, 0x08, 0x0E, - 0x9A, 0x01, 0x08, 0x25, 0xAA, 0x01, 0x08, 0x17, 0xBA, 0x01, 0x08, 0x3E, 0xE2, 0x01, 0x08, 0x11, - 0xEA, 0x01, 0x08, 0x19, 0xFA, 0x01, 0x08, 0x41, 0xB0, 0x01, 0xD7, 0x64, 0xD6, 0x6E, 0x37, 0x46, - 0x07, 0x3D, 0xA1, 0xA8, 0x65, 0x2F, 0x34, 0x01, 0x83, 0xBE, 0x2E, 0x87, 0x3C, 0x64, 0x71, 0x6E, - 0xA3, 0xE7, 0xCC, 0xB7, 0x8E, 0x6D, 0xA7, 0xE2, 0xFD, 0x13, 0xBC, 0x9A, 0x51, 0x7D, 0xF2, 0xE9, - 0x17, 0x8F, 0x33, 0x91, 0x28, 0xDB, 0xA1, 0x22, 0x5F, 0xB3, 0x14, 0x65, 0xE9, 0x57, 0x92, 0xAC, - 0x33, 0xC5, 0xF8, 0x3E, 0x37, 0x35, 0x00, 0x88, 0x1C, 0x96, 0x62, 0x97, 0x17, 0x09, 0xA5, 0x3F, - 0x42, 0x18, 0x98, 0xD5, 0x45, 0x96, 0x1D, 0x0A, 0x46, 0x2C, 0xB9, 0x94, 0xFE, 0x35, 0xF7, 0x00, - 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xD0, 0xA2, 0xD9, 0x95, 0x6B, 0xDC, 0x69, 0xEA, 0x2D, - 0x52, 0xB0, 0x43, 0xA8, 0x7C, 0xA9, 0x32, 0x0E, 0x01, 0x00, 0x09, + 0x01, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xE5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x3D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x01, + 0x00, 0x01, 0x00, 0x02, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x8D, 0xB7, 0xF5, 0x71, 0xFC, 0x8C, 0xFC, 0xC0, 0x02, 0x00, 0x03, 0x01, 0x00, 0x03, + 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xF3, 0xC2, 0xFB, 0xF9, 0x01, 0xE3, 0xB9, 0xBB, 0x8E, 0x01, 0xC3, 0xC5, 0xD2, + 0xBB, 0x02, 0x00, 0x03, 0x01, 0x00, 0x04, 0x01, 0x00, 0x05, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0xBC, 0xED, 0xA7, + 0x03, 0x97, 0xB0, 0x9A, 0xA7, 0x02, 0xA4, 0xD6, 0xAE, 0xDB, 0x02, 0x00, 0x03, 0x01, 0x00, 0x06, + 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9C, 0xCD, 0x97, 0xA7, 0x02, 0xFD, 0xC1, 0xAC, 0xDB, 0x02, 0x00, 0x03, + 0x01, 0x00, 0x07, 0x01, 0x00, 0x08, 0x00, 0x00, 0x54, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x07, 0x0E, 0x08, 0x1B, 0x1A, 0x41, 0x0C, 0x11, 0x25, 0x3F, 0x00, 0x02, 0x00, 0x01, 0x08, + 0x03, 0x02, 0x06, 0x01, 0x03, 0x06, 0x40, 0x05, 0x07, 0x8D, 0x01, 0x06, 0x05, 0x02, 0x07, 0x07, + 0x71, 0x09, 0x05, 0x05, 0x0A, 0x07, 0x12, 0x0B, 0x06, 0x5E, 0x0D, 0x06, 0xBA, 0x01, 0x0E, 0x05, + 0x04, 0x0F, 0x05, 0x75, 0x11, 0x05, 0x0D, 0x12, 0x06, 0x09, 0x13, 0x07, 0x4E, 0x15, 0x06, 0x91, + 0x01, 0x16, 0x06, 0x0B, 0x17, 0x06, 0x73, 0x19, 0x05, 0x06, 0x1A, 0x08, 0x1C, 0x1B, 0x07, 0x63, + 0x1D, 0x06, 0xC0, 0x01, 0x1E, 0x05, 0x07, 0x1F, 0x06, 0x77, 0x21, 0x06, 0x0A, 0x22, 0x07, 0x08, + 0x23, 0x07, 0x49, 0x25, 0x07, 0x90, 0x01, 0x27, 0x06, 0x72, 0x2A, 0x08, 0x14, 0x2B, 0x06, 0x62, + 0x2D, 0x06, 0xBD, 0x01, 0x32, 0x06, 0x0C, 0x33, 0x06, 0x57, 0x35, 0x07, 0xA1, 0x01, 0x36, 0x06, + 0x0F, 0x37, 0x07, 0x76, 0x3A, 0x08, 0x31, 0x3B, 0x06, 0x68, 0x3D, 0x06, 0xD1, 0x01, 0x3F, 0x06, + 0x79, 0x41, 0x07, 0xB8, 0x01, 0x45, 0x07, 0x8F, 0x01, 0x47, 0x07, 0x74, 0x4A, 0x07, 0x13, 0x53, + 0x07, 0x59, 0x5A, 0x07, 0x29, 0x5B, 0x07, 0x6D, 0x62, 0x08, 0x10, 0x63, 0x07, 0x4B, 0x65, 0x07, + 0x96, 0x01, 0x6A, 0x08, 0x18, 0x75, 0x07, 0xB7, 0x01, 0x77, 0x07, 0x8A, 0x01, 0x7A, 0x08, 0x3F, + 0x81, 0x01, 0x08, 0x0E, 0x9A, 0x01, 0x08, 0x25, 0xAA, 0x01, 0x08, 0x17, 0xBA, 0x01, 0x08, 0x3E, + 0xE2, 0x01, 0x08, 0x11, 0xEA, 0x01, 0x08, 0x19, 0xFA, 0x01, 0x08, 0x41, 0xB0, 0x01, 0xD7, 0x64, + 0xD6, 0x6E, 0x37, 0x46, 0x07, 0x3D, 0xA1, 0xA8, 0x65, 0x2F, 0x34, 0x01, 0x83, 0xBE, 0x2E, 0x87, + 0x3C, 0x64, 0x71, 0x6E, 0xA3, 0xE7, 0xCC, 0xB7, 0x8E, 0x6D, 0xA7, 0xE2, 0xFD, 0x13, 0xBC, 0x9A, + 0x51, 0x7D, 0xF2, 0xE9, 0x17, 0x8F, 0x33, 0x91, 0x28, 0xDB, 0xA1, 0x22, 0x5F, 0xB3, 0x14, 0x65, + 0xE9, 0x57, 0x92, 0xAC, 0x33, 0xC5, 0xF8, 0x3E, 0x37, 0x35, 0x00, 0x88, 0x1C, 0x96, 0x62, 0x97, + 0x17, 0x09, 0xA5, 0x3F, 0x42, 0x18, 0x98, 0xD5, 0x45, 0x96, 0x1D, 0x0A, 0x46, 0x2C, 0xB9, 0x94, + 0xFE, 0x35, 0xF7, 0x00, 0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xD0, 0xA2, 0xD9, 0x95, 0x6B, + 0xDC, 0x69, 0xEA, 0x2D, 0x52, 0xB0, 0x43, 0xA8, 0x7C, 0xA9, 0x32, 0x0E, 0x01, 0x00, 0x09, }; // This function can be used to generate textual representation of vector like you see above. @@ -181,6 +181,7 @@ auto const kRuLang = static_cast(8); kml::FileData GenerateKmlFileData() { kml::FileData result; + result.m_deviceId = "AAAA"; result.m_categoryData.m_name[kDefaultLang] = "Test category"; result.m_categoryData.m_name[kRuLang] = "Тестовая категория"; @@ -207,8 +208,8 @@ kml::FileData GenerateKmlFileData() bookmarkData.m_description[kDefaultLang] = "Test bookmark description"; bookmarkData.m_description[kRuLang] = "Тестовое описание метки"; bookmarkData.m_featureTypes = {8, 13, 34, 565}; - bookmarkData.m_featureName[kDefaultLang] = "Гостиница Москва"; - bookmarkData.m_featureName[kEnLang] = "Moscow Inn Hotel"; + bookmarkData.m_customName[kDefaultLang] = "Мое любимое место"; + bookmarkData.m_customName[kEnLang] = "My favorite place"; bookmarkData.m_color = {kml::PredefinedColor::Blue, 0}; bookmarkData.m_icon = kml::BookmarkIcon::None; bookmarkData.m_viewportScale = 15; @@ -351,10 +352,10 @@ char const * kGeneratedKml = " 34\n" " 565\n" " \n" - " \n" - " Moscow Inn Hotel\n" - " Гостиница Москва\n" - " \n" + " \n" + " My favorite place\n" + " Мое любимое место\n" + " \n" " 15\n" " \n" " 0\n" @@ -490,7 +491,7 @@ UNIT_TEST(Kml_Serialization_Bin_Memory) // 4. Check deserialization from the text file. UNIT_TEST(Kml_Deserialization_Text_File) { - string const kmlFile = my::JoinFoldersToPath(GetPlatform().TmpDir(), "tmp.kml"); + std::string const kmlFile = my::JoinFoldersToPath(GetPlatform().TmpDir(), "tmp.kml"); MY_SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmlFile)); try { @@ -527,7 +528,7 @@ UNIT_TEST(Kml_Deserialization_Text_File) // 5. Check deserialization from the binary file. UNIT_TEST(Kml_Deserialization_Bin_File) { - string const kmbFile = my::JoinFoldersToPath(GetPlatform().TmpDir(), "tmp.kmb"); + std::string const kmbFile = my::JoinFoldersToPath(GetPlatform().TmpDir(), "tmp.kmb"); MY_SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmbFile)); try { @@ -567,7 +568,7 @@ UNIT_TEST(Kml_Serialization_Bin_File) { auto data = GenerateKmlFileData(); - string const kmbFile = my::JoinFoldersToPath(GetPlatform().TmpDir(), "tmp.kmb"); + std::string const kmbFile = my::JoinFoldersToPath(GetPlatform().TmpDir(), "tmp.kmb"); MY_SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmbFile)); try { @@ -603,7 +604,7 @@ UNIT_TEST(Kml_Serialization_Text_File) { auto data = GenerateKmlFileData(); - string const kmlFile = my::JoinFoldersToPath(GetPlatform().TmpDir(), "tmp.kml"); + std::string const kmlFile = my::JoinFoldersToPath(GetPlatform().TmpDir(), "tmp.kml"); MY_SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmlFile)); try { diff --git a/kml/serdes.cpp b/kml/serdes.cpp index 3441649b4a..fb6f2670d9 100644 --- a/kml/serdes.cpp +++ b/kml/serdes.cpp @@ -325,7 +325,7 @@ void SaveCategoryData(KmlWriter::WriterWrapper & writer, CategoryData const & ca void SaveBookmarkExtendedData(KmlWriter::WriterWrapper & writer, BookmarkData const & bookmarkData) { if (bookmarkData.m_name.size() < 2 && bookmarkData.m_description.size() < 2 && - bookmarkData.m_featureName.empty() && bookmarkData.m_viewportScale == 0 && + bookmarkData.m_customName.empty() && bookmarkData.m_viewportScale == 0 && bookmarkData.m_icon == BookmarkIcon::None && bookmarkData.m_featureTypes.empty() && bookmarkData.m_boundTracks.empty()) { @@ -342,8 +342,8 @@ void SaveBookmarkExtendedData(KmlWriter::WriterWrapper & writer, BookmarkData co types.push_back(strings::to_string(t)); SaveStringsArray(writer, types, "featureTypes", kIndent6); - if (!bookmarkData.m_featureName.empty()) - SaveLocalizableString(writer, bookmarkData.m_featureName, "featureName", kIndent6); + if (!bookmarkData.m_customName.empty()) + SaveLocalizableString(writer, bookmarkData.m_customName, "customName", kIndent6); if (bookmarkData.m_viewportScale != 0) { @@ -511,7 +511,7 @@ void KmlParser::ResetPoint() m_styleUrlKey.clear(); m_featureTypes.clear(); - m_featureName.clear(); + m_customName.clear(); m_boundTracks.clear(); m_localId = 0; m_trackLayers.clear(); @@ -689,7 +689,7 @@ void KmlParser::Pop(std::string const & tag) data.m_timestamp = m_timestamp; data.m_point = m_org; data.m_featureTypes = std::move(m_featureTypes); - data.m_featureName = std::move(m_featureName); + data.m_customName = std::move(m_customName); data.m_boundTracks = std::move(m_boundTracks); m_data.m_bookmarksData.push_back(std::move(data)); } @@ -968,8 +968,8 @@ void KmlParser::CharData(std::string value) m_name[m_attrCode] = value; else if (prevTag == "mwm:description" && m_attrCode >= 0) m_description[m_attrCode] = value; - else if (prevTag == "mwm:featureName" && m_attrCode >= 0) - m_featureName[m_attrCode] = value; + else if (prevTag == "mwm:customName" && m_attrCode >= 0) + m_customName[m_attrCode] = value; m_attrCode = StringUtf8Multilang::kUnsupportedLanguageCode; } else if (currTag == "mwm:value") diff --git a/kml/serdes.hpp b/kml/serdes.hpp index bb21443cb2..9b2b6729ae 100644 --- a/kml/serdes.hpp +++ b/kml/serdes.hpp @@ -113,7 +113,7 @@ private: m2::PointD m_org; uint8_t m_viewportScale; std::vector m_featureTypes; - LocalizableString m_featureName; + LocalizableString m_customName; std::vector m_boundTracks; LocalId m_localId; BookmarkIcon m_icon; diff --git a/kml/serdes_binary.hpp b/kml/serdes_binary.hpp index b58febab37..8a903e0890 100644 --- a/kml/serdes_binary.hpp +++ b/kml/serdes_binary.hpp @@ -20,7 +20,8 @@ namespace binary enum class Version : uint8_t { V0 = 0, - Latest = V0 + V1 = 1, // 11th April 2018 (new Point2D storage, added deviceId, feature name -> custom name). + Latest = V1 }; class SerializerKml @@ -37,6 +38,11 @@ public: // Write format version. WriteToSink(sink, Version::Latest); + // Write device id. + auto const sz = m_data.m_deviceId.size(); + WriteVarUint(sink, static_cast(sz)); + sink.Write(m_data.m_deviceId.data(), sz); + auto const startPos = sink.Pos(); // Reserve place for the header. @@ -117,6 +123,11 @@ public: if (v != Version::Latest) MYTHROW(DeserializeException, ("Incorrect file version.")); + // Read device id. + auto const sz = ReadVarUint(source); + m_data.m_deviceId.resize(sz); + source.Read(&m_data.m_deviceId[0], sz); + auto subReader = reader.CreateSubReader(source.Pos(), source.Size()); InitializeIfNeeded(*subReader); diff --git a/kml/type_utils.hpp b/kml/type_utils.hpp index 0e8249a363..efaaf93084 100644 --- a/kml/type_utils.hpp +++ b/kml/type_utils.hpp @@ -72,10 +72,9 @@ inline bool IsEqual(Timestamp const & ts1, Timestamp const & ts2) uint32_t constexpr kEmptyStringId = 0; double constexpr kMinLineWidth = 0.0; double constexpr kMaxLineWidth = 100.0; -uint32_t constexpr kLineWidthBits = 30; double constexpr kMinRating = 0.0; double constexpr kMaxRating = 10.0; -uint32_t constexpr kRatingBits = 30; +uint32_t constexpr kDoubleBits = 30; int8_t constexpr kDefaultLangCode = 0; diff --git a/kml/types.hpp b/kml/types.hpp index 0406513862..de6c95ac99 100644 --- a/kml/types.hpp +++ b/kml/types.hpp @@ -103,7 +103,7 @@ struct BookmarkData visitor(m_name, "name"), visitor(m_description, "description"), visitor(m_featureTypes, "featureTypes"), - visitor(m_featureName, "featureName"), + visitor(m_customName, "customName"), visitor(m_color, "color"), visitor(m_icon, "icon"), visitor(m_viewportScale, "viewportScale"), @@ -112,7 +112,7 @@ struct BookmarkData visitor(m_boundTracks, "boundTracks"), VISITOR_COLLECTABLE) - DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_featureName) + DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName) bool operator==(BookmarkData const & data) const { @@ -124,7 +124,7 @@ struct BookmarkData IsEqual(m_timestamp, data.m_timestamp) && m_point.EqualDxDy(data.m_point, kEps) && m_featureTypes == data.m_featureTypes && - m_featureName == data.m_featureName && + m_customName == data.m_customName && m_boundTracks == data.m_boundTracks; } @@ -138,8 +138,8 @@ struct BookmarkData LocalizableString m_description; // Bound feature's types. std::vector m_featureTypes; - // Bound feature's name. - LocalizableString m_featureName; + // Custom bookmark's name. + LocalizableString m_customName; // Bookmark's color. ColorData m_color; // Bookmark's icon. diff --git a/kml/visitors.hpp b/kml/visitors.hpp index 4f2d4647e5..37d6315f0c 100644 --- a/kml/visitors.hpp +++ b/kml/visitors.hpp @@ -2,11 +2,14 @@ #include "kml/types.hpp" +#include "coding/geometry_coding.hpp" #include "coding/point_to_integer.hpp" #include "coding/pointd_to_pointu.hpp" #include "coding/text_storage.hpp" #include "coding/varint.hpp" +#include "geometry/mercator.hpp" + #include "base/bits.hpp" #include @@ -192,6 +195,49 @@ inline void WriteLocalizableStringIndex(Sink & sink, LocalizableStringIndex cons } } +template +inline void ReadLocalizableStringIndex(Source & source, LocalizableStringIndex & index) +{ + auto const indexSize = ReadVarUint(source); + index.reserve(indexSize); + for (uint32_t i = 0; i < indexSize; ++i) + { + index.emplace_back(LocalizableStringSubIndex()); + auto const subIndexSize = ReadVarUint(source); + for (uint32_t j = 0; j < subIndexSize; ++j) + { + auto const lang = ReadPrimitiveFromSource(source); + auto const strIndex = ReadVarUint(source); + index.back()[lang] = strIndex; + } + } +} + +template +inline void WritePointU2D(Sink & sink, m2::PointU const & pt) +{ + WriteVarUint(sink, pt.x); + WriteVarUint(sink, pt.y); +} + +template +inline void WritePoint2D(Sink & sink, m2::PointD const & pt) +{ + WritePointU2D(sink, PointDToPointU(pt, kDoubleBits)); +} + +template +inline m2::PointU ReadPointU2D(Source & source) +{ + return {ReadVarUint(source), ReadVarUint(source)}; +} + +template +inline m2::PointD ReadPoint2D(Source & source) +{ + return PointUToPointD(ReadPointU2D(source), kDoubleBits); +} + template class CategorySerializerVisitor { @@ -222,14 +268,13 @@ public: void operator()(double d, char const * /* name */ = nullptr) { - uint64_t const encoded = DoubleToUint32(d, kMinRating, kMaxRating, kRatingBits); + auto const encoded = DoubleToUint32(d, kMinRating, kMaxRating, kDoubleBits); WriteVarUint(m_sink, encoded); } void operator()(m2::PointD const & pt, char const * /* name */ = nullptr) { - uint64_t const encoded = bits::ZigZagEncode(PointToInt64Obsolete(pt, POINT_COORD_BITS)); - WriteVarUint(m_sink, encoded); + WritePoint2D(m_sink, pt); } template @@ -286,13 +331,12 @@ public: void operator()(m2::PointD const & pt, char const * /* name */ = nullptr) { - uint64_t const encoded = bits::ZigZagEncode(PointToInt64Obsolete(pt, POINT_COORD_BITS)); - WriteVarUint(m_sink, encoded); + WritePoint2D(m_sink, pt); } void operator()(double d, char const * /* name */ = nullptr) { - uint64_t const encoded = DoubleToUint32(d, kMinLineWidth, kMaxLineWidth, kLineWidthBits); + auto const encoded = DoubleToUint32(d, kMinLineWidth, kMaxLineWidth, kDoubleBits); WriteVarUint(m_sink, encoded); } @@ -319,6 +363,26 @@ public: (*this)(v); } + void operator()(std::vector const & points, char const * /* name */ = nullptr) + { + WriteVarUint(m_sink, static_cast(points.size())); + m2::PointU lastUpt; + for (uint32_t i = 0; i < static_cast(points.size()); ++i) + { + if (i == 0) + { + lastUpt = PointDToPointU(points[i], kDoubleBits); + WritePointU2D(m_sink, lastUpt); + } + else + { + auto const upt = PointDToPointU(points[i], kDoubleBits); + coding::EncodePointDelta(m_sink, lastUpt, upt); + lastUpt = upt; + } + } + } + template std::enable_if_t::value> operator()(D d, char const * /* name */ = nullptr) @@ -343,24 +407,6 @@ private: Sink & m_sink; }; -template -inline void ReadLocalizableStringIndex(Source & source, LocalizableStringIndex & index) -{ - auto const indexSize = ReadVarUint(source); - index.reserve(indexSize); - for (uint32_t i = 0; i < indexSize; ++i) - { - index.emplace_back(LocalizableStringSubIndex()); - auto const subIndexSize = ReadVarUint(source); - for (uint32_t j = 0; j < subIndexSize; ++j) - { - auto const lang = ReadPrimitiveFromSource(source); - auto const strIndex = ReadVarUint(source); - index.back()[lang] = strIndex; - } - } -} - template class CategoryDeserializerVisitor { @@ -393,13 +439,12 @@ public: void operator()(double & d, char const * /* name */ = nullptr) { auto const v = ReadVarUint(m_source); - d = Uint32ToDouble(v, kMinRating, kMaxRating, kRatingBits); + d = Uint32ToDouble(v, kMinRating, kMaxRating, kDoubleBits); } void operator()(m2::PointD & pt, char const * /* name */ = nullptr) { - auto const v = ReadVarUint(m_source); - pt = Int64ToPointObsolete(bits::ZigZagDecode(v), POINT_COORD_BITS); + pt = ReadPoint2D(m_source); } template @@ -460,14 +505,13 @@ public: void operator()(m2::PointD & pt, char const * /* name */ = nullptr) { - auto const v = ReadVarUint(m_source); - pt = Int64ToPointObsolete(bits::ZigZagDecode(v), POINT_COORD_BITS); + pt = ReadPoint2D(m_source); } void operator()(double & d, char const * /* name */ = nullptr) { auto const v = ReadVarUint(m_source); - d = Uint32ToDouble(v, kMinLineWidth, kMaxLineWidth, kLineWidthBits); + d = Uint32ToDouble(v, kMinLineWidth, kMaxLineWidth, kDoubleBits); } void operator()(Timestamp & t, char const * /* name */ = nullptr) @@ -503,6 +547,21 @@ public: } } + void operator()(std::vector & points, char const * /* name */ = nullptr) + { + auto const sz = ReadVarUint(m_source); + points.reserve(sz); + m2::PointU lastUpt; + for (uint32_t i = 0; i < sz; ++i) + { + if (i == 0) + lastUpt = ReadPointU2D(m_source); + else + lastUpt = coding::DecodePointDelta(m_source, lastUpt); + points.emplace_back(PointUToPointD(lastUpt, kDoubleBits)); + } + } + template std::enable_if_t::value> operator()(D & d, char const * /* name */ = nullptr) diff --git a/map/bookmark_helpers.cpp b/map/bookmark_helpers.cpp index 69dd83c903..708e79eb2f 100644 --- a/map/bookmark_helpers.cpp +++ b/map/bookmark_helpers.cpp @@ -123,6 +123,6 @@ void SaveFeatureInfo(StringUtf8Multilang const & name, feature::TypesHolder cons name.ForEach([&bmData](int8_t langCode, std::string const & localName) { - bmData.m_featureName[langCode] = localName; + bmData.m_name[langCode] = localName; }); }