diff --git a/android/sdk/src/main/res/values-de/types_strings.xml b/android/sdk/src/main/res/values-de/types_strings.xml index 9cc262e33..e2b05083c 100644 --- a/android/sdk/src/main/res/values-de/types_strings.xml +++ b/android/sdk/src/main/res/values-de/types_strings.xml @@ -339,6 +339,7 @@ Notfall Rettungspunkt Notfall-Sammelpunkt + Rettungsring Defibrillator Hydrant Notruftelefon diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 940eb0aff..4c18f8fd7 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -373,6 +373,7 @@ Emergency Emergency Rescue Point Emergency Assembly Point + Lifebuoy Defibrillator Fire Hydrant Emergency Phone diff --git a/data/categories-strings/de.json/localize.json b/data/categories-strings/de.json/localize.json index cd9d906cd..127beb9b6 100644 --- a/data/categories-strings/de.json/localize.json +++ b/data/categories-strings/de.json/localize.json @@ -399,6 +399,7 @@ "amenity-shower": "Dusche", "emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfall-Treffpunkt", "emergency-assembly_point": "Notfall-Sammelpunkt", +"emergency-life_ring": "4Rettungsring", "emergency-defibrillator": "4Defibrillator", "emergency-fire_hydrant": "4Hydrant", "emergency-lifeguard": "Notfall-Rettungsschwimmer|Rettungsschwimmer", diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 00844914b..75f382445 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -429,6 +429,7 @@ "amenity-shower": "Shower", "emergency-access_point": "5Emergency Rescue Point|Emergency Location|Emergency Marker|Emergency Access Point", "emergency-assembly_point": "Emergency Assembly Point", +"emergency-life_ring": "5Lifebuoy|6Life Ring|life-ring|lifering|flotation device|floatation device", "emergency-defibrillator": "4Defibrillator|AED", "emergency-fire_hydrant": "4Fire Hydrant|Fire Plug", "emergency-lifeguard": "Lifeguard|Lifesaver", diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index d0dd1104e..0fd34cb08 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -225,7 +225,7 @@ place|suburb;128; landuse|allotments;129; landuse|forest|coniferous;[landuse=forest][wood=coniferous],[landuse=forest][leaf_type=coniferous],[natural=wood][wood=coniferous],[natural=wood][leaf_type=coniferous];;name;int_name;130; landuse|forest|mixed;[landuse=forest][wood=mixed],[landuse=forest][leaf_type=mixed],[landuse=forest][leaf_cycle=mixed],[natural=wood][wood=mixed],[natural=wood][leaf_type=mixed],[natural=wood][leaf_cycle=mixed];;name;int_name;131; -deprecated:natural|wood|mixed:01.2020;[natural=wood][wood=mixed],[natural=wood][leaf_type=mixed],[natural=wood][leaf_cycle=mixed];x;name;int_name;132;landuse|forest|mixed +emergency|life_ring;132; sport|tennis;133; # ~730k usages. landuse|vineyard;134; diff --git a/data/styles/default/dark/symbols/lifebuoy-m.svg b/data/styles/default/dark/symbols/lifebuoy-m.svg new file mode 100644 index 000000000..1fd208aef --- /dev/null +++ b/data/styles/default/dark/symbols/lifebuoy-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 9a5000e43..47ebcdb55 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -929,6 +929,7 @@ node|z18-[amenity=internet_cafe], node|z18-[emergency=defibrillator], node|z18-[emergency=access_point], node|z18-[emergency=assembly_point], +node|z19-[emergency=life_ring], node|z18-[emergency=lifeguard], node|z18-[amenity=toilets], node|z18-[amenity=atm], @@ -1532,6 +1533,9 @@ node|z18-[emergency=access_point], node|z18-[emergency=assembly_point], {icon-image: assembly_point-m.svg;font-size: 11;} +node|z19-[emergency=life_ring], +{icon-image: lifebuoy-m.svg; font-size: 11;} + node|z17-[emergency=lifeguard], {icon-image: lifeguard-m.svg; font-size: 11;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 2eeb35530..4c807e776 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -2369,6 +2369,7 @@ man_made-telescope # icon z18- (also has captio amenity-waste_basket # icon z18- (also has caption(optional) z19-) emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +emergency-life_ring # icon z19- (also has caption(optional) z19-) power-substation # icon z17- (also has caption(optional) z18-, area z13-) === -9990 @@ -2396,6 +2397,7 @@ amenity-loading_dock # icon z18- (also has captio # emergency-assembly_point # caption(optional) z18- (also has icon z18-) # emergency-defibrillator # caption(optional) z18- (also has icon z18-) # emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) # entrance # caption(optional) z19- (also has icon z17-) entrance-exit # icon z17- (also has caption(optional) z19-) # entrance-exit # caption(optional) z19- (also has icon z17-) diff --git a/data/styles/default/light/symbols/lifebuoy-m.svg b/data/styles/default/light/symbols/lifebuoy-m.svg new file mode 100644 index 000000000..f634a553f --- /dev/null +++ b/data/styles/default/light/symbols/lifebuoy-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index cf3f90442..0b2d2cdc4 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -2375,6 +2375,7 @@ man_made-telescope # icon z18- (also has captio amenity-waste_basket # icon z18- (also has caption(optional) z19-) emergency-fire_hydrant # icon z19- (also has caption(optional) z19-) +emergency-life_ring # icon z19- (also has caption(optional) z19-) power-substation # icon z17- (also has caption(optional) z18-, area z13-) === -9990 @@ -2402,6 +2403,7 @@ amenity-loading_dock # icon z18- (also has captio # emergency-assembly_point # caption(optional) z18- (also has icon z18-) # emergency-defibrillator # caption(optional) z18- (also has icon z18-) # emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) +# emergency-life_ring # caption(optional) z19- (also has icon z19-) # entrance # caption(optional) z19- (also has icon z17-) entrance-exit # icon z17- (also has caption(optional) z19-) # entrance-exit # caption(optional) z19- (also has icon z17-) diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings index afc7c48ae..4a9dbd9cd 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings @@ -361,6 +361,7 @@ "type.emergency" = "Notfall"; "type.emergency.access_point" = "Rettungspunkt"; "type.emergency.assembly_point" = "Notfall-Sammelpunkt"; +"type.emergency.life_ring" = "Rettungsring"; "type.emergency.defibrillator" = "Defibrillator"; "type.emergency.fire_hydrant" = "Hydrant"; "type.emergency.phone" = "Notruftelefon"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index d9800d4e8..5617e7aed 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -369,6 +369,7 @@ "type.emergency" = "Emergency"; "type.emergency.access_point" = "Emergency Rescue Point"; "type.emergency.assembly_point" = "Emergency Assembly Point"; +"type.emergency.life_ring" = "Lifebuoy"; "type.emergency.defibrillator" = "Defibrillator"; "type.emergency.fire_hydrant" = "Fire Hydrant"; "type.emergency.phone" = "Emergency Phone"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 086eec67e..30504651b 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -388,6 +388,7 @@ "type.emergency" = "Emergency"; "type.emergency.access_point" = "Emergency Rescue Point"; "type.emergency.assembly_point" = "Emergency Assembly Point"; +"type.emergency.life_ring" = "Lifebuoy"; "type.emergency.defibrillator" = "Defibrillator"; "type.emergency.fire_hydrant" = "Fire Hydrant"; "type.emergency.phone" = "Emergency Phone";