diff --git a/data/categories.txt b/data/categories.txt index fdce8f0403..2dc9067038 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -4773,6 +4773,9 @@ vi:Diểm tham quan zh-Hans:陵墓 zh-Hant:陵墓 +man_made-cross +en:Cross + historic-wayside_cross en:Wayside cross ar:صليب مسيحي diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index d30c91387b..463036aaae 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -802,7 +802,7 @@ deprecated|deprecated;688;x deprecated|deprecated;689;x deprecated|deprecated;690;x deprecated:boundary|administrative|country:04.2024;[boundary=administrative][border_type=country];x;name;int_name;691; -deprecated|deprecated;692;x +man_made|cross;692; natural|orchard;693;landuse|orchard deprecated|deprecated;694;x deprecated|deprecated;695;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 795c0b7529..6fe4b0a0a0 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -16089,7 +16089,12 @@ zh-Hans = 陵墓 zh-Hant = 陵墓 + [type.man_made.cross] + comment = Usually has no historic and sometimes no religious context. E.g. a mountain summit cross. + en = Cross + [type.historic.wayside_cross] + comment = Usually a Christian historical cross placed along a road. en = Wayside Cross af = Wegkruis ar = صليب جانب الطريق diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index dc1b3d1ddd..fca30f17e7 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -469,7 +469,8 @@ node|z16-[historic=locomotive], node|z16-[historic=boundary_stone], area|z16-[historic=boundary_stone], node|z16-[historic=wayside_cross], -area|z16-[historic=wayside_cross], +node|z16-[historic=cross], +node|z16-[man_made=cross], node|z16-[historic=tomb], area|z16-[historic=tomb], node|z16-[tourism=aquarium], @@ -672,8 +673,8 @@ node|z16-[historic=pillory], area|z16-[historic=pillory], {icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;} node|z16-[historic=wayside_cross], -area|z16-[historic=wayside_cross], -{icon-image: cross-m.svg;font-size: 11;icon-min-distance: 8;} +node|z16-[man_made=cross], +{icon-image: cross-m.svg; font-size: 11;} node|z15-[historic=ship], {icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;} node|z16-[historic=tomb], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 266330984e..fca79e1211 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -985,6 +985,7 @@ historic-pillory # icon z16- (also has captio historic-tomb # icon z16- (also has caption(optional) z16-) historic-wayside_cross # icon z16- (also has caption(optional) z16-) historic-wayside_shrine # icon z16- (also has caption(optional) z17-) +man_made-cross tourism-artwork # icon z15- (also has caption(optional) z15-) tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) tourism-artwork-painting # icon z15- (also has caption(optional) z15-) diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index a8c1ff93a8..67bd456dd0 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -408,3 +408,8 @@ node|z16-[man_made=silo], node|z16-[man_made=storage_tank], node|z16-[man_made=water_tower], {font-size: 12;} + +node|z14-[man_made=cross], +{icon-image: cross-m.svg; font-size: 11;} +node|z16-[man_made=cross], +{font-size: 12;} diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 5deca040b9..2725429a21 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -985,6 +985,7 @@ historic-pillory # icon z16- (also has captio historic-tomb # icon z16- (also has caption(optional) z16-) historic-wayside_cross # icon z16- (also has caption(optional) z16-) historic-wayside_shrine # icon z16- (also has caption(optional) z17-) +man_made-cross tourism-artwork # icon z15- (also has caption(optional) z15-) tourism-artwork-architecture # icon z15- (also has caption(optional) z15-) tourism-artwork-painting # icon z15- (also has caption(optional) z15-) diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 1316eba69c..061501c10f 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2500,6 +2500,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"leisure", "water_park"}, {"man_made", "breakwater"}, {"man_made", "chimney"}, + {"man_made", "cross"}, {"man_made", "cutline"}, {"man_made", "embankment"}, {"man_made", "lighthouse"},