diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index c09a24f39e..c51f0d8f50 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -303,8 +303,8 @@ deprecated|deprecated;302;x power|generator;303; highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304; man_made|pipeline|overground;[man_made=pipeline][location=overground];;name;int_name;305; -deprecated|deprecated;306;x -deprecated|deprecated;307;x +natural|saddle;306; +mountain_pass;[mountain_pass];;name;int_name;307; highway|raceway;308; highway|primary|tunnel;[highway=primary][tunnel?];;name;int_name;309; highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 4a84b6d280..2c1e36b7fa 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -12868,6 +12868,13 @@ zh-Hans = 地堡 zh-Hant = 地堡 + [type.mountain_pass] + en = Mountain Pass + be = Перавал + it = Passo + ru = Перевал + uk = Перевал + [type.natural] en = Natural ja = 自然 @@ -13242,6 +13249,13 @@ zh-Hans = 峰 zh-Hant = 山峰 + [type.natural.saddle] + en = Mountain Saddle + be = Седлавіна + it = Sella + ru = Седловина + uk = Сідловина + [type.natural.water.pond] en = Pond ar = بركة diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 04975682e0..b57b59e6dd 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -74,6 +74,10 @@ node[natural=volcano], area[natural=volcano], node[natural=peak], area[natural=peak], +node[natural=saddle], +area[natural=saddle], +node[mountain_pass], +area[mountain_pass], node[tourism=information], node[historic=wayside_shrine], area[historic=wayside_shrine], @@ -639,6 +643,10 @@ node|z11-[waterway=waterfall], area|z11-[waterway=waterfall], node|z13-[natural=peak], area|z13-[natural=peak], +node|z14-[natural=saddle], +area|z14-[natural=saddle], +node|z14-[mountain_pass], +area|z14-[mountain_pass], node|z14-[natural=spring], area|z14-[natural=spring], node|z14-[natural=hot_spring], @@ -721,6 +729,13 @@ area|z15-[natural=bare_rock], area|z15-[natural=rock] {icon-image: peakt-m.svg;text-offset: 1;font-size: 10;text-optional: true;} +/* ToDo: Make the same as natural=peak when we will have -s,-m icons */ +node|z14-[natural=saddle], +area|z14-[natural=saddle], +node|z14-[mountain_pass], +area|z14-[mountain_pass], +{icon-image: mountain-pass.svg;text-offset: 1;font-size: 10;text-optional: true;} + node|z16[leisure=beach_resort], area|z16[leisure=beach_resort] {icon-image: beach-m.svg;} diff --git a/data/styles/clear/style-clear/symbols/mountain-pass.svg b/data/styles/clear/style-clear/symbols/mountain-pass.svg new file mode 100644 index 0000000000..bfeea7e8b0 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/mountain-pass.svg @@ -0,0 +1,8 @@ + + + mountain-pass + + + + diff --git a/data/styles/clear/style-night/symbols/mountain-pass.svg b/data/styles/clear/style-night/symbols/mountain-pass.svg new file mode 100644 index 0000000000..6e19dd6f9f --- /dev/null +++ b/data/styles/clear/style-night/symbols/mountain-pass.svg @@ -0,0 +1,8 @@ + + + mountain-pass + + + + diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index bc8c0d6d49..3ece8633b5 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1681,6 +1681,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"natural", "land"}, {"natural", "peak"}, {"natural", "rock"}, + {"natural", "saddle"}, {"natural", "scrub"}, {"natural", "spring"}, {"natural", "volcano"}, @@ -2095,6 +2096,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) {{"leisure", "park", "private"}, {{"leisure", "park"}, {"access", "private"}}}, {{"leisure", "sports_centre", "climbing"}, {{"leisure", "sports_centre"}, {"sport", "climbing"}}}, {{"leisure", "sports_centre", "yoga"}, {{"leisure", "sports_centre"}, {"sport", "yoga"}}}, + {{"mountain_pass"}, {{"mountain_pass", "any_value"}}}, {{"natural", "water", "pond"}, {{"natural", "water"}, {"water", "pond"}}}, {{"natural", "water", "lake"}, {{"natural", "water"}, {"water", "lake"}}}, {{"natural", "water", "reservoir"}, {{"natural", "water"}, {"water", "reservoir"}}},