From 16cae17c50c400f21f05c25ba84b4e2b82ff3d4a Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 30 Jan 2025 11:10:22 +0300 Subject: [PATCH] [classif] Add emergency-mountain_rescue Signed-off-by: Konstantin Pastbin --- data/categories.txt | 3 +++ data/mapcss-mapping.csv | 2 +- data/strings/types_strings.txt | 3 +++ data/styles/default/include/Icons.mapcss | 5 +++++ .../default/include/priorities_4_overlays.prio.txt | 1 + data/styles/outdoors/include/Icons.mapcss | 11 +++++++++++ .../outdoors/include/priorities_4_overlays.prio.txt | 1 + generator/generator_tests/osm_type_test.cpp | 1 + 8 files changed, 26 insertions(+), 1 deletion(-) diff --git a/data/categories.txt b/data/categories.txt index 20d63981bd..a6334cc74a 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -15761,6 +15761,9 @@ mr:अग्निशामक नाळ|फायर हायड्रंट emergency-lifeguard en:Lifeguard|lifesaver +emergency-mountain_rescue +en:Mountain Rescue Station + leisure-fitness_station en:3Fitness Station|street workout ru:4Спортивные снаряды diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 277958b24f..9711e4c6b1 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -587,7 +587,7 @@ man_made|communications_tower;472; man_made|petroleum_well;[man_made=petroleum_well],[man_made=gas_well];;;;473; natural|grassland;474; emergency|lifeguard;475; -deprecated|deprecated;476;x +emergency|mountain_rescue;476; aerialway|platter;477; deprecated|deprecated;478;x deprecated|deprecated;479;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 93fc171cde..5106effce8 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -11908,6 +11908,9 @@ comment = A place where a lifeguard is on duty. en = Lifeguard + [type.emergency.mountain_rescue] + en = Mountain Rescue Station + [type.entrance] comment = This is for secondary entrances, for main entrances see type.entrance.main en = Entrance diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 57d9bcbb5b..04b1b2d97e 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -951,6 +951,7 @@ node|z16-[amenity=events_venue], area|z16-[amenity=events_venue], node|z16-[amenity=exhibition_centre], area|z16-[amenity=exhibition_centre], +node|z16-[emergency=mountain_rescue], node|z17-[amenity=pharmacy], area|z17-[amenity=pharmacy], node|z17-[amenity=clinic], @@ -1707,6 +1708,10 @@ area|z18-[emergency=assembly_point] node|z17-[emergency=lifeguard], {icon-image: lifeguard-m.svg; font-size: 11;} +/* TODO: a better icon? */ +node|z16-[emergency=mountain_rescue], +{icon-image: hospital-m.svg; font-size: 11;} + node|z17-[office=lawyer], area|z17-[office=lawyer] {icon-image: lawyer-m.svg;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 8e75260aa5..b7c29a3e09 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -408,6 +408,7 @@ amenity-pub # icon z15- (also has captio amenity-shelter-basic_hut # icon z16- (also has caption(optional) z16-) amenity-shelter-lean_to # icon z16- (also has caption(optional) z16-) +emergency-mountain_rescue tourism-wilderness_hut # icon z16- (also has caption(optional) z16-) === 3900 diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss index fa90ddd9ae..89aed8090c 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/outdoors/include/Icons.mapcss @@ -201,6 +201,7 @@ node|z11-[tourism=alpine_hut], area|z11-[tourism=alpine_hut], node|z13-[tourism=wilderness_hut], area|z13-[tourism=wilderness_hut], +node|z12-[emergency=mountain_rescue], node|z13-[tourism=viewpoint], node|z14-[tourism=chalet], area|z14-[tourism=chalet], @@ -439,3 +440,13 @@ node|z14-[emergency=lifeguard], {icon-image: lifeguard-m.svg; font-size: 11;} node|z16-[emergency=lifeguard], {font-size: 12;} + +/* TODO: a better icon? */ +node|z12-[emergency=mountain_rescue], +{icon-image: hospital-s.svg;} +node|z13-[emergency=mountain_rescue], +{font-size: 11;} +node|z14-[emergency=mountain_rescue], +{icon-image: hospital-m.svg;} +node|z16-[emergency=mountain_rescue], +{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 8de0a54ceb..39726bc216 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -408,6 +408,7 @@ amenity-pub # icon z15- (also has captio amenity-shelter-basic_hut # icon z12- (also has caption(optional) z13-) amenity-shelter-lean_to # icon z12- (also has caption(optional) z13-) +emergency-mountain_rescue tourism-wilderness_hut # icon z12- (also has caption(optional) z13-) === 3900 diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index bebc6c4980..4ce7e4f15d 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2388,6 +2388,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"emergency", "defibrillator"}, {"emergency", "fire_hydrant"}, {"emergency", "lifeguard"}, + {"emergency", "mountain_rescue"}, {"emergency", "phone"}, {"fee", "no"}, {"fee", "yes"},