diff --git a/data/gpx_test_data/osmand1.gpx b/data/gpx_test_data/osmand1.gpx index fab91de010..b3ea1e2a7e 100644 --- a/data/gpx_test_data/osmand1.gpx +++ b/data/gpx_test_data/osmand1.gpx @@ -297,4 +297,32 @@ thin solid + + + + car + 0 + + + + + car + 71 + + + + + + + car + 0 + + + + + car + 71 + + + \ No newline at end of file diff --git a/kml/kml_tests/gpx_tests.cpp b/kml/kml_tests/gpx_tests.cpp index e0ae792ee1..5ce4e20ca0 100644 --- a/kml/kml_tests/gpx_tests.cpp +++ b/kml/kml_tests/gpx_tests.cpp @@ -9,15 +9,13 @@ #include "platform/platform.hpp" - -kml::FileData loadGpxFromString(std::string const & content) { - kml::FileData dataFromText; +namespace gpx_tests +{ +static kml::FileData loadGpxFromString(std::string_view content) { try { - const char * input = content.c_str(); - kml::DeserializerGpx des(dataFromText); - MemReader const reader(input, strlen(input)); - des.Deserialize(reader); + kml::FileData dataFromText; + kml::DeserializerGpx(dataFromText).Deserialize(MemReader(content)); return dataFromText; } catch (kml::DeserializerGpx::DeserializeException const & exc) @@ -26,7 +24,7 @@ kml::FileData loadGpxFromString(std::string const & content) { } } -kml::FileData loadGpxFromFile(std::string const & file) { +static kml::FileData loadGpxFromFile(std::string const & file) { auto const fileName = GetPlatform().TestsDataPathForFile(file); std::string text; FileReader(fileName).ReadAsString(text); @@ -35,7 +33,7 @@ kml::FileData loadGpxFromFile(std::string const & file) { UNIT_TEST(Gpx_Test_Point) { - std::string const input = R"( + std::string_view constexpr input = R"( @@ -43,8 +41,6 @@ UNIT_TEST(Gpx_Test_Point) )"; - kml::FileData const dataFromText = loadGpxFromString(input); - kml::FileData data; kml::BookmarkData bookmarkData; bookmarkData.m_name[kml::kDefaultLang] = "Waypoint 1"; @@ -53,13 +49,14 @@ UNIT_TEST(Gpx_Test_Point) bookmarkData.m_color = {kml::PredefinedColor::Red, 0}; data.m_bookmarksData.emplace_back(std::move(bookmarkData)); + kml::FileData const dataFromText = loadGpxFromString(input); + TEST_EQUAL(dataFromText, data, ()); } - UNIT_TEST(Gpx_Test_Route) { - std::string const input = R"( + std::string_view constexpr input = R"( new @@ -100,12 +97,21 @@ UNIT_TEST(Gpx_Test_Route) TEST_EQUAL(line.size(), 2, ()); TEST_EQUAL(line.back(), geometry::PointWithAltitude(mercator::FromLatLon(54.32933804825253, 25.136718750000004), 0), ()); } -} + // Also test default colors for tracks. + { + TEST_EQUAL(dataFromText.m_tracksData.size(), 1, ()); + TEST_EQUAL(dataFromText.m_tracksData[0].m_layers.size(), 1, ()); + auto const & layer = dataFromText.m_tracksData[0].m_layers[0]; + TEST_EQUAL(layer.m_color.m_rgba, kml::kDefaultTrackColor, ()); + TEST_EQUAL(layer.m_color.m_predefinedColor, kml::PredefinedColor::None, ()); + TEST_EQUAL(layer.m_lineWidth, kml::kDefaultTrackWidth, ()); + } +} UNIT_TEST(Gpx_Altitude_Issues) { - std::string const input = R"( + std::string_view constexpr input = R"( new @@ -136,14 +142,14 @@ UNIT_TEST(Gpx_Altitude_Issues) UNIT_TEST(GoMap) { kml::FileData const dataFromFile = loadGpxFromFile("gpx_test_data/go_map.gpx"); - auto line = dataFromFile.m_tracksData[0].m_geometry.m_lines[0]; + auto const & line = dataFromFile.m_tracksData[0].m_geometry.m_lines[0]; TEST_EQUAL(line.size(), 101, ()); } UNIT_TEST(GpxStudio) { kml::FileData const dataFromFile = loadGpxFromFile("gpx_test_data/gpx_studio.gpx"); - auto line = dataFromFile.m_tracksData[0].m_geometry.m_lines[0]; + auto const & line = dataFromFile.m_tracksData[0].m_geometry.m_lines[0]; TEST_EQUAL(line.size(), 328, ()); } @@ -213,8 +219,12 @@ UNIT_TEST(Empty) UNIT_TEST(OsmandColor1) { kml::FileData const dataFromFile = loadGpxFromFile("gpx_test_data/osmand1.gpx"); - uint32_t const expected = 0xFF7800FF; + uint32_t constexpr expected = 0xFF7800FF; + TEST_EQUAL(dataFromFile.m_tracksData.size(), 4, ()); TEST_EQUAL(expected, dataFromFile.m_tracksData[0].m_layers[0].m_color.m_rgba, ()); + TEST_EQUAL(expected, dataFromFile.m_tracksData[1].m_layers[0].m_color.m_rgba, ()); + TEST_EQUAL(expected, dataFromFile.m_tracksData[2].m_layers[0].m_color.m_rgba, ()); + TEST_EQUAL(expected, dataFromFile.m_tracksData[3].m_layers[0].m_color.m_rgba, ()); } UNIT_TEST(OsmandColor2) @@ -251,3 +261,5 @@ d5 TEST_EQUAL("d4\nd5\n\nc4", dataFromText.m_bookmarksData[3].m_description.at(kml::kDefaultLang), ()); TEST_EQUAL("qqq", dataFromText.m_bookmarksData[4].m_description.at(kml::kDefaultLang), ()); } + +} // namespace gpx_tests diff --git a/kml/kml_tests/serdes_tests.cpp b/kml/kml_tests/serdes_tests.cpp index de52af7bf7..61ba6bfce8 100644 --- a/kml/kml_tests/serdes_tests.cpp +++ b/kml/kml_tests/serdes_tests.cpp @@ -795,7 +795,7 @@ UNIT_TEST(Kml_Deserialization_From_Bin_V6_And_V7) UNIT_TEST(Kml_Ver_2_3) { - char const * data = R"( + std::string_view constexpr data = R"( @@ -859,7 +859,7 @@ UNIT_TEST(Kml_Ver_2_3) kml::FileData fData; try { - MemReader reader(data, strlen(data)); + MemReader const reader(data); kml::DeserializerKml des(fData); des.Deserialize(reader); } @@ -877,7 +877,7 @@ UNIT_TEST(Kml_Ver_2_3) UNIT_TEST(Kml_Placemark_contains_both_Bookmark_and_Track_data) { - char const * input = R"( + std::string_view constexpr input = R"( @@ -905,7 +905,7 @@ UNIT_TEST(Kml_Placemark_contains_both_Bookmark_and_Track_data) kml::FileData fData; try { - MemReader reader(input, strlen(input)); + MemReader const reader(input); kml::DeserializerKml des(fData); des.Deserialize(reader); } @@ -917,3 +917,44 @@ UNIT_TEST(Kml_Placemark_contains_both_Bookmark_and_Track_data) TEST_EQUAL(fData.m_bookmarksData.size(), 2, ()); TEST_EQUAL(fData.m_tracksData.size(), 2, ()); } + +// See https://github.com/organicmaps/organicmaps/issues/5800 +UNIT_TEST(Fix_Invisible_Color_Bug_In_Gpx_Tracks) +{ + std::string_view constexpr input = R"( + + + 2023-08-20 Malente Radtour + 1 + + 2023-08-20 Malente Radtour + + 10.565979,54.16597,26 10.565956,54.165997,26 + + + Test default colors and width + 10.465979,54.16597,26 10.465956,54.165997,26 + + + + )"; + + kml::FileData fData; + try + { + kml::DeserializerKml(fData).Deserialize(MemReader(input)); + } + catch (kml::DeserializerKml::DeserializeException const & ex) + { + TEST(false, ("Exception raised", ex.Msg())); + } + + TEST_EQUAL(fData.m_tracksData.size(), 2, ()); + TEST_EQUAL(fData.m_tracksData[0].m_layers.size(), 1, ()); + auto const & layer = fData.m_tracksData[0].m_layers[0]; + TEST_EQUAL(layer.m_color.m_rgba, kml::kDefaultTrackColor, ("Wrong transparency should be fixed")); + TEST_EQUAL(layer.m_lineWidth, 3, ()); +} diff --git a/kml/serdes.cpp b/kml/serdes.cpp index ed07855789..3be716984d 100644 --- a/kml/serdes.cpp +++ b/kml/serdes.cpp @@ -976,7 +976,12 @@ void KmlParser::Pop(std::string_view tag) // loading of KML files which were stored by older versions of OMaps. TrackLayer layer; layer.m_lineWidth = m_trackWidth; - layer.m_color.m_rgba = (m_color != 0 ? m_color : kDefaultTrackColor); + // Fix wrongly parsed transparent color, see https://github.com/organicmaps/organicmaps/issues/5800 + // TODO: Remove this fix in 2024 when all users will have their imported GPX files fixed. + if (m_color == 0 || (m_color & 0xFF) < 10) + layer.m_color.m_rgba = kDefaultTrackColor; + else + layer.m_color.m_rgba = m_color; m_trackLayers.push_back(layer); m_trackWidth = kDefaultTrackWidth; diff --git a/kml/serdes_gpx.cpp b/kml/serdes_gpx.cpp index d841b075e3..aad10c2cac 100644 --- a/kml/serdes_gpx.cpp +++ b/kml/serdes_gpx.cpp @@ -35,6 +35,7 @@ int constexpr kInvalidColor = 0; GpxParser::GpxParser(FileData & data) : m_data{data} , m_categoryData{&m_data.m_categoryData} +, m_globalColor{kInvalidColor} { ResetPoint(); } @@ -47,7 +48,6 @@ void GpxParser::ResetPoint() m_org = {}; m_predefinedColor = PredefinedColor::None; m_color = kInvalidColor; - m_globalColor = kInvalidColor; m_customName.clear(); m_geometry.Clear(); m_geometryType = GEOMETRY_TYPE_UNKNOWN;