emergency: include emergency=lifeguard, =access_point

emergency.json

@@ -23,17 +23,15 @@
     "query": {
         "11": [
             "(",
-            "node[amenity~\"^(fire_station|hospital)$\"];",
-            "way[amenity~\"^(fire_station|hospital)$\"];",
-            "relation[amenity~\"^(fire_station|hospital)$\"];",
+            "nwr[amenity~\"^(fire_station|hospital)$\"];",
+            "nwr[emergency~\"^(lifeguard)$\"];",
             ")"
         ],
         "13": [
             "(",
-            "node[amenity~\"^(fire_station|hospital|police)$\"];",
-            "way[amenity~\"^(fire_station|hospital|police)$\"];",
-            "relation[amenity~\"^(fire_station|hospital|police)$\"];",
-            "node[emergency~\"^(phone)$\"];",
+            "nwr[amenity~\"^(fire_station|hospital|police)$\"];",
+            "nwr[emergency~\"^(lifeguard)$\"];",
+            "node[emergency~\"^(phone|defibrillator|access_point)$\"];",
             "node[highway=emergency_access_point];",
             ")"
         ]
@@ -87,10 +85,19 @@
             "zoom": "13",
             "sign": "👮"
         },
+        "emergency=lifeguard": {
+            "zoom": "11",
+            "sign": "<i class='far fa-life-ring'></i>"
+        },
         "emergency=phone": {
             "zoom": "13",
             "sign": "📞"
         },
+        "emergency=defibrillator": {
+            "zoom": "13",
+            "sign": "<img data-src='maki:defibrillator?fill=white'>",
+            "background": "#009262"
+        },
         "highway=emergency_access_point": {
             "zoom": "13",
             "sign": "<img data-src='maki:hospital?fill=white'>",
@@ -115,13 +122,21 @@
                     "name": "{{ tagTrans('amenity', 'police') }}",
                     "query": "nwr[amenity=police]"
                 },
+                "lifeguard": {
+                    "name": "{{ tagTrans('emergency', 'lifeguard') }}",
+                    "query": "nwr[emergency=lifeguard]"
+                },
                 "emergency_phone": {
                     "name": "{{ tagTrans('emergency', 'phone') }}",
                     "query": "node[emergency=phone]"
                 },
+                "defibrillator": {
+                    "name": "{{ tagTrans('emergency', 'defibrillator') }}",
+                    "query": "node[emergency=defibrillator]"
+                },
                 "emergency_access_point": {
                     "name": "{{ tagTrans('highway', 'emergency_access_point') }}",
-                    "query": "node[highway=emergency_access_point]"
+                    "query": "(node[highway=emergency_access_point];node[emergency=access_point];)"
                 }
             }
         }

health.json

@@ -32,7 +32,6 @@
         "14": [
             "(",
             "node[amenity~\"^(baby_hatch|clinic|dentist|doctors|hospital|nursing_home|pharmacy|social_facility|veterinary)$\"];",
-            "node[emergency=defibrillator];",
             "way[amenity~\"^(baby_hatch|clinic|dentist|doctors|hospital|nursing_home|pharmacy|social_facility|veterinary)$\"];",
             "relation[amenity~\"^(baby_hatch|clinic|dentist|doctors|hospital|nursing_home|pharmacy|social_facility|veterinary)$\"];",
             "node[healthcare];",
@@ -43,10 +42,7 @@
     },
     "feature": {
         "pre": [
-            "{% if tags.emergency in [ 'defibrillator' ] %}",
-            "  {% set key = 'emergency' %}",
-            "  {% set value = tags.emergency %}",
-            "{% elseif tags.healthcare %}",
+            "{% if tags.healthcare %}",
             "  {% set key = 'healthcare' %}",
             "  {% set value = tags.healthcare|split(';')[0] %}",
             "{% else %}",
@@ -112,12 +108,6 @@
             ],
             "sign": "<img data-src='maki:pharmacy'>"
         },
-        {
-            "types": [
-                "emergency=defibrillator"
-            ],
-            "sign": "<img data-src='maki:defibrillator'>"
-        },
         {
             "types": [
                 "healthcare=dentist",