From cf8ceb77347f2fdeb59a1d49c15cf7cb5667d410 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 13 Sep 2017 13:46:49 -0400 Subject: [PATCH] Move healthcare:speciality to subfolder --- data/presets.yaml | 21 +---- data/presets/fields.json | 24 ++---- .../fields/{ => healthcare}/speciality.json | 3 + data/presets/fields/speciality_clinic.json | 11 --- data/presets/presets.json | 84 ++++++++++--------- data/presets/presets/amenity/clinic.json | 7 +- data/presets/presets/amenity/dentist.json | 2 + data/presets/presets/amenity/doctors.json | 2 + data/presets/presets/amenity/hospital.json | 1 + data/taginfo.json | 3 - dist/locales/en.json | 19 +---- 11 files changed, 70 insertions(+), 107 deletions(-) rename data/presets/fields/{ => healthcare}/speciality.json (63%) delete mode 100644 data/presets/fields/speciality_clinic.json diff --git a/data/presets.yaml b/data/presets.yaml index d58621909..9aa79aa04 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -587,6 +587,9 @@ en: label: Hashtags # hashtags field placeholder placeholder: '#example' + healthcare/speciality: + # 'healthcare:speciality=*' + label: Specialties height: # height=* label: Height (Meters) @@ -1238,17 +1241,6 @@ en: source: # source=* label: Sources - speciality: - # 'healthcare:speciality=*' - label: Specialties - speciality_clinic: - # 'healthcare:speciality=*' - label: Specialties - options: - # 'healthcare:speciality=abortion' - abortion: Abortion - # 'healthcare:speciality=fertility' - fertility: Fertility sport: # sport=* label: Sports @@ -1689,7 +1681,7 @@ en: amenity/clinic: # amenity=clinic name: Clinic - # 'terms: medical,urgentcare,abortion,fertility' + # 'terms: medical,urgentcare' terms: '' amenity/clock: # amenity=clock @@ -2786,11 +2778,6 @@ en: name: Midwife # 'terms: pregnancy,childbirth' terms: '' - healthcare/specialist: - # 'healthcare:speciality=*' - name: Healthcare Specialist - # 'terms: special' - terms: '' highway: # highway=* name: Highway diff --git a/data/presets/fields.json b/data/presets/fields.json index f3dc87ab9..57a013fb7 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -808,6 +808,14 @@ "label": "Hashtags", "placeholder": "#example" }, + "healthcare/speciality": { + "key": "healthcare:speciality", + "type": "semiCombo", + "reference": { + "key": "healthcare" + }, + "label": "Specialties" + }, "height": { "key": "height", "type": "number", @@ -1661,22 +1669,6 @@ "streetlevel imagery" ] }, - "speciality_clinic": { - "key": "healthcare:speciality", - "type": "semiCombo", - "label": "Specialties", - "strings": { - "options": { - "abortion": "Abortion", - "fertility": "Fertility" - } - } - }, - "speciality": { - "key": "healthcare:speciality", - "type": "semiCombo", - "label": "Specialties" - }, "sport_ice": { "key": "sport", "type": "semiCombo", diff --git a/data/presets/fields/speciality.json b/data/presets/fields/healthcare/speciality.json similarity index 63% rename from data/presets/fields/speciality.json rename to data/presets/fields/healthcare/speciality.json index f4739cf07..8a731b756 100644 --- a/data/presets/fields/speciality.json +++ b/data/presets/fields/healthcare/speciality.json @@ -1,5 +1,8 @@ { "key": "healthcare:speciality", "type": "semiCombo", + "reference": { + "key": "healthcare" + }, "label": "Specialties" } diff --git a/data/presets/fields/speciality_clinic.json b/data/presets/fields/speciality_clinic.json deleted file mode 100644 index d31b4c78d..000000000 --- a/data/presets/fields/speciality_clinic.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "key": "healthcare:speciality", - "type": "semiCombo", - "label": "Specialties", - "strings": { - "options": { - "abortion": "Abortion", - "fertility": "Fertility" - } - } -} diff --git a/data/presets/presets.json b/data/presets/presets.json index a459f6e2a..a048f3a94 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1153,7 +1153,8 @@ "icon": "hospital", "fields": [ "name", - "speciality_clinic", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -1164,9 +1165,7 @@ ], "terms": [ "medical", - "urgentcare", - "abortion", - "fertility" + "urgentcare" ], "tags": { "amenity": "clinic" @@ -1299,6 +1298,8 @@ "icon": "dentist", "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -1332,6 +1333,8 @@ "icon": "hospital", "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -1599,6 +1602,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -6143,11 +6147,10 @@ "fields": [ "name", "operator", + "blood_components", "address", "building_area", - "blood_components", - "opening_hours", - "ref" + "opening_hours" ], "geometry": [ "point", @@ -6174,8 +6177,7 @@ "operator", "building_area", "address", - "opening_hours", - "ref" + "opening_hours" ], "geometry": [ "point", @@ -6197,8 +6199,7 @@ "operator", "building_area", "address", - "opening_hours", - "ref" + "opening_hours" ], "geometry": [ "point", @@ -6213,35 +6214,6 @@ }, "name": "Midwife" }, - "healthcare/specialist": { - "icon": "hospital", - "fields": [ - "name", - "operator", - "speciality", - "building_area", - "address", - "opening_hours", - "ref" - ], - "geometry": [ - "point", - "area" - ], - "terms": [ - "special" - ], - "tags": { - "healthcare:speciality": "*" - }, - "addTags": { - "healthcare:speciality": "general" - }, - "removeTags": { - "healthcare:speciality": "general" - }, - "name": "Healthcare Specialist" - }, "highway/bridleway": { "fields": [ "name", @@ -29336,7 +29308,8 @@ ], "fields": [ "name", - "speciality_clinic", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -29356,6 +29329,8 @@ ], "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -29375,6 +29350,8 @@ ], "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -29394,6 +29371,8 @@ ], "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -29413,6 +29392,8 @@ ], "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -29432,6 +29413,8 @@ ], "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -29451,6 +29434,8 @@ ], "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -29470,6 +29455,8 @@ ], "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -29489,6 +29476,8 @@ ], "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -29508,6 +29497,8 @@ ], "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -38790,6 +38781,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38809,6 +38801,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38828,6 +38821,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38847,6 +38841,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38866,6 +38861,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38885,6 +38881,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38904,6 +38901,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38923,6 +38921,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38942,6 +38941,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38961,6 +38961,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], @@ -38980,6 +38981,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], diff --git a/data/presets/presets/amenity/clinic.json b/data/presets/presets/amenity/clinic.json index 16df517bf..30e004116 100644 --- a/data/presets/presets/amenity/clinic.json +++ b/data/presets/presets/amenity/clinic.json @@ -2,7 +2,8 @@ "icon": "hospital", "fields": [ "name", - "speciality_clinic", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" @@ -13,9 +14,7 @@ ], "terms": [ "medical", - "urgentcare", - "abortion", - "fertility" + "urgentcare" ], "tags": { "amenity": "clinic" diff --git a/data/presets/presets/amenity/dentist.json b/data/presets/presets/amenity/dentist.json index 395945f58..5219fbe78 100644 --- a/data/presets/presets/amenity/dentist.json +++ b/data/presets/presets/amenity/dentist.json @@ -2,6 +2,8 @@ "icon": "dentist", "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" diff --git a/data/presets/presets/amenity/doctors.json b/data/presets/presets/amenity/doctors.json index f5a7ff897..ac4822ad1 100644 --- a/data/presets/presets/amenity/doctors.json +++ b/data/presets/presets/amenity/doctors.json @@ -2,6 +2,8 @@ "icon": "hospital", "fields": [ "name", + "operator", + "healthcare/speciality", "address", "building_area", "opening_hours" diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json index c4a46b1b1..a5fc08898 100644 --- a/data/presets/presets/amenity/hospital.json +++ b/data/presets/presets/amenity/hospital.json @@ -3,6 +3,7 @@ "fields": [ "name", "operator", + "healthcare/speciality", "address", "emergency" ], diff --git a/data/taginfo.json b/data/taginfo.json index a8cc6d1e5..b5aba1a9d 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1213,9 +1213,6 @@ "key": "healthcare", "value": "midwife" }, - { - "key": "healthcare:speciality" - }, { "key": "highway", "value": "bridleway" diff --git a/dist/locales/en.json b/dist/locales/en.json index ca6584498..2feb475e3 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1582,6 +1582,9 @@ "label": "Hashtags", "placeholder": "#example" }, + "healthcare/speciality": { + "label": "Specialties" + }, "height": { "label": "Height (Meters)" }, @@ -2115,16 +2118,6 @@ "source": { "label": "Sources" }, - "speciality_clinic": { - "label": "Specialties", - "options": { - "abortion": "Abortion", - "fertility": "Fertility" - } - }, - "speciality": { - "label": "Specialties" - }, "sport_ice": { "label": "Sports" }, @@ -2551,7 +2544,7 @@ }, "amenity/clinic": { "name": "Clinic", - "terms": "medical,urgentcare,abortion,fertility" + "terms": "medical,urgentcare" }, "amenity/clock": { "name": "Clock", @@ -3529,10 +3522,6 @@ "name": "Midwife", "terms": "pregnancy,childbirth" }, - "healthcare/specialist": { - "name": "Healthcare Specialist", - "terms": "special" - }, "highway/bridleway": { "name": "Bridle Path", "terms": "bridleway,equestrian,horse"