[types] Add emergency access points

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

android/sdk/src/main/res/values-de/types_strings.xml

@@ -337,6 +337,7 @@
     <string name="type.cuisine.vegetarian">Vegetarisch</string>
     <string name="type.cuisine.vietnamese">Vietnamesisch</string>
     <string name="type.emergency">Notfall</string>
+    <string name="type.emergency.access_point">Rettungspunkt</string>
     <string name="type.emergency.assembly_point">Notfall-Sammelpunkt</string>
     <string name="type.emergency.defibrillator">Defibrillator</string>
     <string name="type.emergency.fire_hydrant">Hydrant</string>

android/sdk/src/main/res/values/types_strings.xml

@@ -371,6 +371,7 @@
     <string name="type.cuisine.vegetarian">Vegetarian</string>
     <string name="type.cuisine.vietnamese">Vietnamese</string>
     <string name="type.emergency">Emergency</string>
+    <string name="type.emergency.access_point">Emergency Rescue Point</string>
     <string name="type.emergency.assembly_point">Emergency Assembly Point</string>
     <string name="type.emergency.defibrillator">Defibrillator</string>
     <string name="type.emergency.fire_hydrant">Fire Hydrant</string>

data/categories-strings/de.json/localize.json

@@ -397,6 +397,7 @@
 "amenity-payment_terminal": "Bezahlterminal",
 "amenity-public_bath": "Öffentliches Bad",
 "amenity-shower": "Dusche",
+"emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfall-Treffpunkt",
 "emergency-assembly_point": "Notfall-Sammelpunkt",
 "emergency-defibrillator": "4Defibrillator",
 "emergency-fire_hydrant": "4Hydrant",

data/categories-strings/en.json/localize.json

@@ -427,6 +427,7 @@
 "amenity-payment_centre": "Payment Centre",
 "amenity-public_bath": "Public Bath",
 "amenity-shower": "Shower",
+"emergency-access_point": "5Emergency Rescue Point|Emergency Location|Emergency Marker|Emergency Access Point",
 "emergency-assembly_point": "Emergency Assembly Point",
 "emergency-defibrillator": "4Defibrillator|AED",
 "emergency-fire_hydrant": "4Fire Hydrant|Fire Plug",

data/mapcss-mapping.csv

@@ -169,7 +169,7 @@ highway|residential|bridge;[highway=residential][bridge?];;name;int_name;81;
 # railway|rail|service|bridge;[railway=rail][service?][service!=spur][bridge?];...
 railway|rail|bridge;[railway=rail][bridge?][dont=match];;name;int_name;82;
 deprecated:boundary|administrative|10:04.2024;[boundary=administrative][admin_level=10];x;name;int_name;83;
-deprecated:boundary|administrative|6:04.2024;[boundary=administrative][admin_level=6];x;name;int_name;84;
+emergency|access_point;[emergency=access_point];;name;;84;
 highway|secondary|bridge;[highway=secondary][bridge?];;name;int_name;85;
 highway|tertiary|bridge;[highway=tertiary][bridge?];;name;int_name;86;
 barrier|bollard;87;

data/replaced_tags.txt

@@ -77,6 +77,8 @@ vending=water : vending=drinks
 vending=milk : vending=drinks
 vending=bread : vending=food
 
+highway=emergency_access_point : emergency=access_point
+
 building=entrance : entrance=yes
 
 ice_road=yes : highway=ice_road

data/styles/default/dark/colors.mapcss

@@ -242,6 +242,7 @@
 @neutral_label: #51585E;
 @healthcare_label: #983E44;
 @public_transport_label: #2F6499;
+@emergency_label: #247F52;
 
 /* 6.4 Road labels */
 

data/styles/default/include/Icons.mapcss

@@ -927,6 +927,7 @@ node|z16-[man_made=observatory],
 node|z17-[amenity=fire_station],
 node|z18-[amenity=internet_cafe],
 node|z18-[emergency=defibrillator],
+node|z18-[emergency=access_point],
 node|z18-[emergency=assembly_point],
 node|z18-[emergency=lifeguard],
 node|z18-[amenity=toilets],
@@ -1525,6 +1526,9 @@ node|z19-[emergency=fire_hydrant],
 node|z18-[emergency=defibrillator],
 {icon-image: defibrillator-m.svg;font-size: 11;}
 
+node|z18-[emergency=access_point],
+{icon-image: access_point-m.svg;font-size: 11;}
+
 node|z18-[emergency=assembly_point],
 {icon-image: assembly_point-m.svg;font-size: 11;}
 

data/styles/default/include/Icons_Label_Colors.mapcss

@@ -158,3 +158,6 @@ node[healthcare],
 node[amenity=bicycle_rental],
 node[amenity=taxi],
 {text-color: @public_transport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[emergency=access_point],
+{text-color: @emergency_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -2360,6 +2360,7 @@ amenity-bench                                       # icon z18- (also has captio
 amenity-bench-backless                              # icon z18- (also has caption(optional) z19-)
 amenity-lounger                                     # icon z18- (also has caption(optional) z19-)
 amenity-waste_disposal                              # icon z18- (also has caption(optional) z18-)
+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-phone                                     # icon z17-
@@ -2391,6 +2392,7 @@ amenity-loading_dock                                # icon z18- (also has captio
 # amenity-vending_machine-sweets                    # caption(optional) z18- (also has icon z18-)
 # amenity-waste_basket                              # caption(optional) z19- (also has icon z18-)
 # amenity-waste_disposal                            # caption(optional) z18- (also has icon z18-)
+# 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-fire_hydrant                            # caption(optional) z19- (also has icon z19-)

data/styles/default/light/colors.mapcss

@@ -240,6 +240,7 @@
 @neutral_label: #494F54;
 @healthcare_label: #A6454B;
 @public_transport_label: #234B73;
+@emergency_label: #247F52;
 
 /* 6.4 Road labels */
 

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -2366,6 +2366,7 @@ amenity-bench                                       # icon z18- (also has captio
 amenity-bench-backless                              # icon z18- (also has caption(optional) z19-)
 amenity-lounger                                     # icon z18- (also has caption(optional) z19-)
 amenity-waste_disposal                              # icon z18- (also has caption(optional) z18-)
+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-phone                                     # icon z17-
@@ -2397,6 +2398,7 @@ amenity-loading_dock                                # icon z18- (also has captio
 # amenity-vending_machine-sweets                    # caption(optional) z18- (also has icon z18-)
 # amenity-waste_basket                              # caption(optional) z19- (also has icon z18-)
 # amenity-waste_disposal                            # caption(optional) z18- (also has icon z18-)
+# 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-fire_hydrant                            # caption(optional) z19- (also has icon z19-)

data/styles/vehicle/dark/colors.mapcss

@@ -180,6 +180,7 @@
 @neutral_label: #51585E;
 @healthcare_label: #983E44;
 @public_transport_label: #2F6499;
+@emergency_label: #247F52;
 
 /* 6.4 Road labels */
 

data/styles/vehicle/light/colors.mapcss

@@ -151,6 +151,7 @@
 @neutral_label: #494F54;
 @healthcare_label: #A6454B;
 @public_transport_label: #234B73;
+@emergency_label: #247F52;
 
 /* ROADS LABELS */
 @shield_text: #000000;

generator/feature_builder.cpp

@@ -225,6 +225,11 @@ bool FeatureBuilder::PreSerialize()
         });
         m_params.name = std::move(nameWithRef);
       }
+      else if (ftypes::IsEmergencyAccessPointChecker::Instance()(types))
+      {
+        m_params.name.Clear();
+        m_params.name.AddString(StringUtf8Multilang::kDefaultCode, m_params.ref);
+      }
 
       m_params.ref.clear();
     }

iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings

@@ -359,6 +359,7 @@
 "type.cuisine.vegetarian" = "Vegetarisch";
 "type.cuisine.vietnamese" = "Vietnamesisch";
 "type.emergency" = "Notfall";
+"type.emergency.access_point" = "Rettungspunkt";
 "type.emergency.assembly_point" = "Notfall-Sammelpunkt";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Hydrant";

iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings

@@ -367,6 +367,7 @@
 "type.cuisine.vegetarian" = "Vegetarian";
 "type.cuisine.vietnamese" = "Vietnamese";
 "type.emergency" = "Emergency";
+"type.emergency.access_point" = "Emergency Rescue Point";
 "type.emergency.assembly_point" = "Emergency Assembly Point";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Fire Hydrant";

iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings

@@ -386,6 +386,7 @@
 "type.cuisine.vegetarian" = "Vegetarian";
 "type.cuisine.vietnamese" = "Vietnamese";
 "type.emergency" = "Emergency";
+"type.emergency.access_point" = "Emergency Rescue Point";
 "type.emergency.assembly_point" = "Emergency Assembly Point";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Fire Hydrant";

libs/indexer/ftypes_matcher.cpp

@@ -854,6 +854,12 @@ IsPlatformChecker::IsPlatformChecker()
   m_types.push_back(c.GetTypeByPath({"public_transport", "platform"}));
 }
 
+IsEmergencyAccessPointChecker::IsEmergencyAccessPointChecker()
+{
+  Classificator const & c = classif();
+  m_types.push_back(c.GetTypeByPath({"emergency", "access_point"}));
+}
+
 IsAddressInterpolChecker::IsAddressInterpolChecker() : BaseChecker(1 /* level */)
 {
   Classificator const & c = classif();

libs/indexer/ftypes_matcher.hpp

@@ -629,6 +629,14 @@ public:
   DECLARE_CHECKER_INSTANCE(IsPlatformChecker);
 };
 
+class IsEmergencyAccessPointChecker : public BaseChecker
+{
+  IsEmergencyAccessPointChecker();
+
+public:
+  DECLARE_CHECKER_INSTANCE(IsEmergencyAccessPointChecker);
+};
+
 class IsAddressInterpolChecker : public BaseChecker
 {
   IsAddressInterpolChecker();