From 000b4a465a3056b499b0ea2df9e096cb7b3683ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 5 Oct 2017 21:50:12 +0200 Subject: [PATCH] Health: Support 'healthcare' and 'healthcare:speciality' --- health.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/health.json b/health.json index ae3dca1..ea16882 100644 --- a/health.json +++ b/health.json @@ -16,12 +16,12 @@ "uk": "Здоров'я" }, "query": { - "11": "(\nnode[amenity~\"^(hospital)$\"];\nway[amenity~\"^(hospital)$\"];\nrelation[amenity~\"^(hospital)$\"]\n)", - "14": "(\nnode[amenity~\"^(baby_hatch|clinic|dentist|doctors|hospital|nursing_home|pharmacy|social_facility|veterinary)$\"];\nnode[emergency=defibrillator];\nway[amenity~\"^(baby_hatch|clinic|dentist|doctors|hospital|nursing_home|pharmacy|social_facility|veterinary)$\"];\nrelation[amenity~\"^(baby_hatch|clinic|dentist|doctors|hospital|nursing_home|pharmacy|social_facility|veterinary)$\"]\n)" + "11": "(\nnode[amenity~\"^(hospital)$\"];\nway[amenity~\"^(hospital)$\"];\nrelation[amenity~\"^(hospital)$\"];\nnode[healthcare~\"^(hospital|clinic)$\"];\nway[healthcare~\"^(hospital|clinic)$\"];\nrelation[healthcare~\"^(hospital|clinic)$\"];\n)", + "14": "(\nnode[amenity~\"^(baby_hatch|clinic|dentist|doctors|hospital|nursing_home|pharmacy|social_facility|veterinary)$\"];\nnode[emergency=defibrillator];\nway[amenity~\"^(baby_hatch|clinic|dentist|doctors|hospital|nursing_home|pharmacy|social_facility|veterinary)$\"];\nrelation[amenity~\"^(baby_hatch|clinic|dentist|doctors|hospital|nursing_home|pharmacy|social_facility|veterinary)$\"];\nnode[healthcare];\nway[healthcare];\nrelation[healthcare];\n)" }, "feature": { - "pre": "{% if tags.emergency in [ 'defibrillator' ] %}\n {% set key = 'emergency' %}\n {% set value = tags.emergency %}\n{% else %}\n {% set key = 'amenity' %}\n {% set value = tags.amenity %}\n{% endif %}\n", - "description": "{{ tagTrans(key, value) }}", + "pre": "{% if tags.emergency in [ 'defibrillator' ] %}\n {% set key = 'emergency' %}\n {% set value = tags.emergency %}\n{% elseif tags.healthcare %}\n {% set key = 'healthcare' %}\n {% set value = tags.healthcare %}\n{% else %}\n {% set key = 'amenity' %}\n {% set value = tags.amenity %}\n{% endif %}\n", + "description": "{{ tagTrans(key, value) }}\n{% if attribute(tags, 'healthcare:speciality') %}\n-\n{{ tagTransList('healthcare:speciality', attribute(tags, 'healthcare:speciality')) }}\n{% endif %}", "markerSign": "{{ const[value] }}" }, "const": { @@ -29,6 +29,7 @@ "clinic": "🏥", "dentist": "☤", "defibrillator": "❤", + "doctor": "☤", "doctors": "☤", "hospital": "🏥", "nursing_home": "",