diff --git a/data/categories.txt b/data/categories.txt index e4caeac6b..d3f736415 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -4879,6 +4879,9 @@ fi:Koirapuisto he:גינת כלבים ja:ドッグラン +leisure-dance|amenity-dancing_school|@category_entertainment +en:4Dance|Dancing school + leisure-garden en:3Garden ru:Сад diff --git a/data/editor.config b/data/editor.config index 89a554520..645bc0f7b 100644 --- a/data/editor.config +++ b/data/editor.config @@ -641,6 +641,9 @@ + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 1b97dae3d..68e9d2927 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1250,7 +1250,7 @@ amenity|vending_machine|condoms;[amenity=vending_machine][vending=condoms];;name amenity|vending_machine|food;[amenity=vending_machine][vending=food];;name;int_name;1129; amenity|vending_machine|newspapers;[amenity=vending_machine][vending=newspapers];;name;int_name;1130; amenity|vending_machine|sweets;[amenity=vending_machine][vending=sweets];;name;int_name;1131; -leisure|dance;1132; +leisure|dance;[leisure=dance],[amenity=dancing_school];;;;1132; amenity|music_school;1133; amenity|language_school;1134; historic|city_gate;1135; diff --git a/data/styles/default/dark/symbols/dance-m.svg b/data/styles/default/dark/symbols/dance-m.svg new file mode 100644 index 000000000..4a9731cba --- /dev/null +++ b/data/styles/default/dark/symbols/dance-m.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 2d0c303e5..0bea74c01 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1283,6 +1283,8 @@ node|z17-[leisure=fitness_station] node|z17-[leisure=sports_centre] node|z17-[leisure=sports_hall] {icon-image: pitch-m.svg;icon-min-distance: 10;} +node|z17-[leisure=dance] +{icon-image: dance-m.svg;icon-min-distance: 10;} node|z17-[leisure=fitness_centre] {icon-image: fitness_centre-m.svg;icon-min-distance: 10;} node|z17-[leisure=sauna] diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index a4db5d90c..49b67a2e4 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -923,7 +923,6 @@ healthcare-laboratory # icon z17- (also has captio healthcare-optometrist # icon z17- (also has caption(optional) z17-) healthcare-physiotherapist # icon z17- (also has caption(optional) z17-) healthcare-sample_collection # icon z17- (also has caption(optional) z17-) -leisure-dance # caption z17- leisure-fitness_centre # icon z17- (also has caption(optional) z17-) leisure-hackerspace # icon z17- (also has caption(optional) z17-) leisure-sauna # icon z17- (also has caption(optional) z17-) @@ -1057,6 +1056,7 @@ landuse-recreation_ground # caption z15- (also has are leisure-recreation_ground # caption z17- leisure-sports_centre # icon z17- (also has caption(optional) z17-, area z15-) leisure-sports_hall # icon z17- (also has caption(optional) z17-) +leisure-dance === 1250 amenity-compressed_air # icon z18- (also has caption(optional) z19-) @@ -1998,6 +1998,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-dojo # caption(optional) z18- (also has icon z17-) # leisure-sports_centre # caption(optional) z17- (also has icon z17-, area z15-) # leisure-sports_hall # caption(optional) z17- (also has icon z17-) +# leisure-dance # === -8750 # amenity-compressed_air # caption(optional) z19- (also has icon z18-) diff --git a/data/styles/default/light/symbols/dance-m.svg b/data/styles/default/light/symbols/dance-m.svg new file mode 100644 index 000000000..afae3c7ac --- /dev/null +++ b/data/styles/default/light/symbols/dance-m.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 6351150d3..e6f1a9003 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1057,6 +1057,7 @@ landuse-recreation_ground # caption z15- (also has are leisure-recreation_ground # caption z17- leisure-sports_centre # icon z17- (also has caption(optional) z17-, area z15-) leisure-sports_hall # icon z17- (also has caption(optional) z17-) +leisure-dance === 1250 amenity-compressed_air # icon z18- (also has caption(optional) z19-) @@ -2001,6 +2002,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-dojo # caption(optional) z18- (also has icon z17-) # leisure-sports_centre # caption(optional) z17- (also has icon z17-, area z15-) # leisure-sports_hall # caption(optional) z17- (also has icon z17-) +# leisure-dance # === -8750 # amenity-compressed_air # caption(optional) z19- (also has icon z18-) diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 60f925348..5a2d8f1b1 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2491,6 +2491,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"leisure", "sauna"}, {"leisure", "slipway"}, {"leisure", "sports_centre"}, + {"leisure", "dance"}, {"leisure", "stadium"}, {"leisure", "swimming_pool"}, {"leisure", "track"},