drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tests] Update tests for new wetland types

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-07-12 14:25:00 +07:00
committed by Konstantin Pastbin
parent f1ec689532
commit b0f338273b
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/replaced_tags.txt
View File

@@ -86,7 +86,6 @@ highway=platform : highway=pedestrian
man_made=quay : man_made=pier man_made=quay : man_made=pier
natural=marsh : natural=wetland, wetland=marsh
natural=waterfall : waterway=waterfall natural=waterfall : waterway=waterfall
natural=forest : natural=wood natural=forest : natural=wood
natural=shrubbery : natural=scrub natural=shrubbery : natural=scrub

8
generator/generator_tests/osm_type_test.cpp
View File

@@ -2935,6 +2935,14 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
{{"natural", "water", "lock"}, {{"natural", "water"}, {"water", "lock"}}}, {{"natural", "water", "lock"}, {{"natural", "water"}, {"water", "lock"}}},
{{"natural", "wetland", "bog"}, {{"natural", "wetland"}, {"wetland", "bog"}}}, {{"natural", "wetland", "bog"}, {{"natural", "wetland"}, {"wetland", "bog"}}},
{{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}}, {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}},
{{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "wet_meadow"}}},
{{"natural", "wetland", "saltmarsh"}, {{"natural", "wetland"}, {"wetland", "saltmarsh"}}},
{{"natural", "wetland", "saltmarsh", "tidal"}, {{"natural", "wetland"}, {"wetland", "saltmarsh"}, {"tidal", "yes"}}},
{{"natural", "wetland", "fen"}, {{"natural", "wetland"}, {"wetland", "fen"}}},
{{"natural", "wetland", "reedbed"}, {{"natural", "wetland"}, {"wetland", "reedbed"}}},
{{"natural", "wetland", "swamp"}, {{"natural", "wetland"}, {"wetland", "swamp"}}},
{{"natural", "wetland", "mangrove"}, {{"natural", "wetland"}, {"wetland", "mangrove"}}},
{{"natural", "wetland", "tidalflat"}, {{"natural", "wetland"}, {"wetland", "tidalflat"}}},
{{"office"}, {{"office", "any_value"}}}, {{"office"}, {{"office", "any_value"}}},
{{"piste:type", "downhill", "advanced"}, {{"piste:type", "downhill"}, {"piste:difficulty", "advanced"}}}, {{"piste:type", "downhill", "advanced"}, {{"piste:type", "downhill"}, {"piste:difficulty", "advanced"}}},
{{"piste:type", "downhill", "easy"}, {{"piste:type", "downhill"}, {"piste:difficulty", "easy"}}}, {{"piste:type", "downhill", "easy"}, {{"piste:type", "downhill"}, {"piste:difficulty", "easy"}}},

4
generator/generator_tests/tag_admixer_test.cpp
View File

@@ -72,10 +72,6 @@ UNIT_TEST(TagsReplacer_Smoke)
" aerodrome:type = international : aerodrome = international "; " aerodrome:type = international : aerodrome = international ";
TestReplacer(source, {{{"aerodrome:type", "international"}, {{"aerodrome", "international"}}}}); TestReplacer(source, {{{"aerodrome:type", "international"}, {{"aerodrome", "international"}}}});
} }
{
std::string const source = "natural=marsh : natural=wetland, wetland=marsh";
TestReplacer(source, {{{"natural", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}}});
}
{ {
std::string const source = std::string const source =
"natural = forest : natural = wood\n" "natural = forest : natural = wood\n"