From 892a2e8650af92aeb1abf4f9b7e35f2dc63b4295 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 5 Apr 2023 18:53:12 +0300 Subject: [PATCH] [tests] Expand areas priority tests Signed-off-by: Konstantin Pastbin --- map/style_tests/classificator_tests.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/map/style_tests/classificator_tests.cpp b/map/style_tests/classificator_tests.cpp index 53d8e490df..f1b714f58c 100644 --- a/map/style_tests/classificator_tests.cpp +++ b/map/style_tests/classificator_tests.cpp @@ -212,7 +212,7 @@ void CheckPriority(vector const & arrT, vector const & a } // namespace // Check area drawing priority according to the types order below (from downmost to upmost). -// If someone is desagree with this order, please, refer to VNG :) +// If someone disagrees with this order, please refer to VNG :) // natural-coastline // place-island = natural-land // natural-scrub,heath,grassland = landuse-grass,farm,farmland,forest @@ -235,11 +235,15 @@ UNIT_TEST(Classificator_AreaPriority) }, {1, 2, 7, 4}, drule::area); CheckPriority({ - // 0 - {"natural", "water"}, {"landuse", "reservoir"}, - // 1 + // ? - linear waterways @todo: add ability to compare different drule types (areas vs lines) + //{"waterway", "river"}, {"waterway", "stream"}, {"natural", "strait"}, {"waterway", "ditch"}, + // 0 - water areas + {"natural", "water"}, {"landuse", "reservoir"}, {"natural", "water", "river"}, {"waterway", "dock"}, + // ? - hatching fills @todo: absent in vehicle style, need to test main style only + //{"leisure", "nature_reserve"}, {"boundary", "national_park"}, {"landuse", "military"}, + // 1 - above-water features {"man_made", "pier"}, {"man_made", "breakwater"}, {"waterway", "dam"}, - }, {2, 3}, drule::area); + }, {4, 3}, drule::area); CheckPriority({ // 0