diff --git a/emergency.json b/emergency.json
index 361337c..25193cb 100644
--- a/emergency.json
+++ b/emergency.json
@@ -33,7 +33,7 @@
"node[amenity~\"^(fire_station|hospital|police)$\"];",
"way[amenity~\"^(fire_station|hospital|police)$\"];",
"relation[amenity~\"^(fire_station|hospital|police)$\"];",
- "node[emergency~\"^(phone)$\"];",
+ "node[emergency~\"^(phone|defibrillator)$\"];",
"node[highway=emergency_access_point];",
")"
]
@@ -91,6 +91,11 @@
"zoom": "13",
"sign": "📞"
},
+ "emergency=defibrillator": {
+ "zoom": "13",
+ "sign": "",
+ "background": "#009262"
+ },
"highway=emergency_access_point": {
"zoom": "13",
"sign": "",
@@ -119,6 +124,10 @@
"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]"
diff --git a/health.json b/health.json
index cc11cf2..75c2d6c 100644
--- a/health.json
+++ b/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": ""
},
- {
- "types": [
- "emergency=defibrillator"
- ],
- "sign": ""
- },
{
"types": [
"healthcare=dentist",