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 f69034226..7176d2e1d 100644 --- a/android/sdk/src/main/res/values-de/types_strings.xml +++ b/android/sdk/src/main/res/values-de/types_strings.xml @@ -340,6 +340,7 @@ Notfall Rettungspunkt Notfall-Sammelpunkt + Notfall-Treffpunkt Rettungsring Defibrillator Hydrant diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index d9b5ce4f6..7c63e4fcc 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -377,6 +377,7 @@ Emergency Emergency Rescue Point Emergency Assembly Point + Emergency Disaster Help Point Lifebuoy Defibrillator Fire Hydrant diff --git a/data/categories-strings/de.json/localize.json b/data/categories-strings/de.json/localize.json index 695fa6d77..aa23781cf 100644 --- a/data/categories-strings/de.json/localize.json +++ b/data/categories-strings/de.json/localize.json @@ -405,8 +405,9 @@ "amenity-payment_terminal": "3Bezahlterminal", "amenity-public_bath": "4Öffentliches Bad|4Hallenbad|5Schwimmen|5Schwimmbad|U+1F3CA", "amenity-shower": "Dusche", -"emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfall-Treffpunkt", -"emergency-assembly_point": "4Notfall-Sammelpunkt|4Sammelstelle|U+1F46A|U+2795", +"emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfalltrettungspunkt", +"emergency-assembly_point": "4Notfall-Sammelpunkt|4Sammelstelle|Notfallsammelpunkt|U+1F46A|U+2795", +"emergency-disaster_help_point": "4Notfall-Treffpunkt|Notfalltreffpunkt|4Notfall-Infopunkt|Notfallinfopunkt|7Katastrophenschutz-Leuchtturm|Katastrophenschutzleuchtturm", "emergency-life_ring": "4Rettungsring", "emergency-defibrillator": "4Defibrillator", "emergency-fire_hydrant": "4Hydrant|4Feuerhydrant|4Löschwasser", diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index d259bfff0..96f71ffdb 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -440,6 +440,7 @@ "amenity-shower": "Shower", "emergency-access_point": "5Emergency Rescue Point|Emergency Location|Emergency Marker|Emergency Access Point", "emergency-assembly_point": "5Emergency assembly point", +"emergency-disaster_help_point": "5Emergency Disaster Help Point|5Disaster Help 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|Hydrant", diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 4088cbdf3..8d4c1af6d 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -541,7 +541,7 @@ healthcare|psychotherapist;426; # TODO: deprecated, migrate to ford=* highway|ford;427; area:highway|path;428; -deprecated:railway|siding:06.2023;429;x +emergency|disaster_help_point;429; highway|track|area;[highway=track][area?];;name;int_name;430; amenity|sanitary_dump_station;431; railway|funicular;432; diff --git a/data/styles/default/dark/symbols/disaster_help_point-m.svg b/data/styles/default/dark/symbols/disaster_help_point-m.svg new file mode 100644 index 000000000..a30f6f3df --- /dev/null +++ b/data/styles/default/dark/symbols/disaster_help_point-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 7a18ff763..aa6e67cf7 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1102,6 +1102,7 @@ node|z18-[amenity=internet_cafe], node|z18-[emergency=defibrillator], node|z18-[emergency=access_point], node|z18-[emergency=assembly_point], +node|z18-[emergency=disaster_help_point], node|z19-[emergency=life_ring], node|z18-[emergency=lifeguard], node|z18-[amenity=toilets], @@ -1713,6 +1714,9 @@ node|z18-[emergency=access_point], node|z18-[emergency=assembly_point], {icon-image: assembly_point-m.svg;font-size: 11;} +node|z18-[emergency=disaster_help_point], +{icon-image: disaster_help_point-m.svg;font-size: 11;} + node|z19-[emergency=life_ring], {icon-image: lifebuoy-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 63701dc28..b5b62d4be 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -2445,6 +2445,7 @@ amenity-waste_disposal # icon z18- (also has captio emergency-access_point # icon z18- (also has caption(optional) z18-) emergency-assembly_point # icon z18- (also has caption(optional) z18-) emergency-defibrillator # icon z18- (also has caption(optional) z18-) +emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) emergency-phone # icon z17- (also has caption(optional) z19-) man_made-telescope # icon z18- (also has caption(optional) z18-) === -9980 @@ -2483,6 +2484,7 @@ amenity-loading_dock # icon z19- (also has captio # emergency-access_point # caption(optional) z18- (also has icon z18-) # emergency-assembly_point # caption(optional) z18- (also has icon z18-) # emergency-defibrillator # caption(optional) z18- (also has icon z18-) +# emergency-disaster_help_point # 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-) # emergency-phone # caption(optional) z19- (also has icon z17-) diff --git a/data/styles/default/light/symbols/disaster_help_point-m.svg b/data/styles/default/light/symbols/disaster_help_point-m.svg new file mode 100644 index 000000000..f556814f0 --- /dev/null +++ b/data/styles/default/light/symbols/disaster_help_point-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 e0d7aa002..feb5770c8 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -2451,6 +2451,7 @@ amenity-waste_disposal # icon z18- (also has captio emergency-access_point # icon z18- (also has caption(optional) z18-) emergency-assembly_point # icon z18- (also has caption(optional) z18-) emergency-defibrillator # icon z18- (also has caption(optional) z18-) +emergency-disaster_help_point # icon z18- (also has caption(optional) z18-) emergency-phone # icon z17- (also has caption(optional) z19-) man_made-telescope # icon z18- (also has caption(optional) z18-) === -9980 @@ -2489,6 +2490,7 @@ amenity-loading_dock # icon z19- (also has captio # emergency-access_point # caption(optional) z18- (also has icon z18-) # emergency-assembly_point # caption(optional) z18- (also has icon z18-) # emergency-defibrillator # caption(optional) z18- (also has icon z18-) +# emergency-disaster_help_point # 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-) # emergency-phone # 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 a61da11ce..81e5a20bc 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings @@ -362,6 +362,7 @@ "type.emergency" = "Notfall"; "type.emergency.access_point" = "Rettungspunkt"; "type.emergency.assembly_point" = "Notfall-Sammelpunkt"; +"type.emergency.disaster_help_point" = "Notfall-Treffpunkt"; "type.emergency.life_ring" = "Rettungsring"; "type.emergency.defibrillator" = "Defibrillator"; "type.emergency.fire_hydrant" = "Hydrant"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index c99d2e8ac..8eb38b8e9 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -373,6 +373,7 @@ "type.emergency" = "Emergency"; "type.emergency.access_point" = "Emergency Rescue Point"; "type.emergency.assembly_point" = "Emergency Assembly Point"; +"type.emergency.disaster_help_point" = "Emergency Disaster Help Point"; "type.emergency.life_ring" = "Lifebuoy"; "type.emergency.defibrillator" = "Defibrillator"; "type.emergency.fire_hydrant" = "Fire Hydrant"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 4ea3f40b5..a6b3b0579 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -392,6 +392,7 @@ "type.emergency" = "Emergency"; "type.emergency.access_point" = "Emergency Rescue Point"; "type.emergency.assembly_point" = "Emergency Assembly Point"; +"type.emergency.disaster_help_point" = "Emergency Disaster Help Point"; "type.emergency.life_ring" = "Lifebuoy"; "type.emergency.defibrillator" = "Defibrillator"; "type.emergency.fire_hydrant" = "Fire Hydrant";