From 9c753cc5045e6edc568eed08cc6c54193558088a Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 4 Jul 2023 16:06:54 +0200 Subject: [PATCH 1/9] fix misspelling in tag value for Barbecue Restaurant, fixes #943 --- .../amenity/restaurant/{barbeque.json => barbecue.json} | 9 ++++++--- interim/source_strings.yaml | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) rename data/presets/amenity/restaurant/{barbeque.json => barbecue.json} (73%) diff --git a/data/presets/amenity/restaurant/barbeque.json b/data/presets/amenity/restaurant/barbecue.json similarity index 73% rename from data/presets/amenity/restaurant/barbeque.json rename to data/presets/amenity/restaurant/barbecue.json index c389dee6..e336b121 100644 --- a/data/presets/amenity/restaurant/barbeque.json +++ b/data/presets/amenity/restaurant/barbecue.json @@ -19,11 +19,14 @@ ], "tags": { "amenity": "restaurant", - "cuisine": "barbeque" + "cuisine": "barbecue" }, "reference": { "key": "cuisine", - "value": "barbeque" + "value": "barbecue" }, - "name": "Barbeque Restaurant" + "name": "Barbecue Restaurant", + "aliases": [ + "Barbeque Restaurant" + ] } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 40381800..6f1ebfc0 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6807,11 +6807,11 @@ en: name: Asian Restaurant # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table' terms: - amenity/restaurant/barbeque: - # amenity=restaurant + cuisine=barbeque | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Barbeque Restaurant + amenity/restaurant/barbecue: + # amenity=restaurant + cuisine=barbecue | Barbeque Restaurant | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Barbecue Restaurant # 'terms: bar,bbq,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table' - terms: + terms: amenity/restaurant/chinese: # amenity=restaurant + cuisine=chinese | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Chinese Restaurant From 31c86a618b1b8d3721a85466a917bd96ab9e1d24 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 4 Jul 2023 16:19:20 +0200 Subject: [PATCH 2/9] add deprecation rules for barbeque/bbq -> barbecue, see #943 --- data/deprecated.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/deprecated.json b/data/deprecated.json index 795206fb..6ed1c7ef 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -446,6 +446,14 @@ "old": {"crossing": "no", "highway": "crossing"}, "replace": {"crossing": "no"} }, + { + "old": {"cuisine": "barbeque"}, + "replace": {"cuisine": "barbecue"} + }, + { + "old": {"cuisine": "bbq"}, + "replace": {"cuisine": "barbecue"} + }, { "old": {"cuisine": "gluten-free"}, "replace": {"diet:gluten_free": "*"} From 22b1fbb2acce69f27161755154cd25764de27fe3 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 4 Jul 2023 16:25:16 +0200 Subject: [PATCH 3/9] add direction field to highway=emergency_bay preset (closes #942) and allow mapping as lines see https://wiki.openstreetmap.org/w/index.php?title=Tag:highway%3Demergency_bay&oldid=2434234 --- data/presets/highway/emergency_bay.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/presets/highway/emergency_bay.json b/data/presets/highway/emergency_bay.json index bbb109ce..fd2a1f86 100644 --- a/data/presets/highway/emergency_bay.json +++ b/data/presets/highway/emergency_bay.json @@ -1,11 +1,15 @@ { "icon": "maki-car", "geometry": [ - "vertex" + "vertex", + "line" ], "tags": { "highway": "emergency_bay" }, + "fields": [ + "direction_vertex_dual" + ], "terms": [ "Highway Emergency Bay" ], From 6ad11810f90b672a2de451526a492758031fe41a Mon Sep 17 00:00:00 2001 From: Win Olario Date: Sun, 2 Jul 2023 09:14:06 +0800 Subject: [PATCH 4/9] Fix typo in Barangay Hall preset: "barrio", not "barrior". --- data/presets/amenity/townhall/barangay-PH.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/amenity/townhall/barangay-PH.json b/data/presets/amenity/townhall/barangay-PH.json index 27e9577c..57bb69ac 100644 --- a/data/presets/amenity/townhall/barangay-PH.json +++ b/data/presets/amenity/townhall/barangay-PH.json @@ -10,7 +10,7 @@ "area" ], "terms": [ - "barrior hall" + "barrio hall" ], "tags": { "amenity": "townhall", From 4afabc1bc46880252c7eff1b7d47d52810b36dbb Mon Sep 17 00:00:00 2001 From: tyrasd Date: Tue, 4 Jul 2023 14:29:45 +0000 Subject: [PATCH 5/9] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@6ad11810f90b672a2de451526a492758031fe41?= =?UTF-8?q?a=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 6f1ebfc0..6f7737dc 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -7083,7 +7083,7 @@ en: amenity/townhall/barangay-PH: # amenity=townhall + townhall:type=barangay | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "PH" name: Barangay Hall - # 'terms: barrior hall' + # 'terms: barrio hall' terms: amenity/townhall/city: # amenity=townhall + townhall:type=city | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). From 215b0f18e7269a362ea479e999f6d9c2b9ae6570 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 4 Jul 2023 16:37:41 +0200 Subject: [PATCH 6/9] add more fields to Parcel Locker * wheelchair * indoor (closes #940) * collection_times, * surveillance --- data/presets/amenity/parcel_locker.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/presets/amenity/parcel_locker.json b/data/presets/amenity/parcel_locker.json index 72d254dc..5203d029 100644 --- a/data/presets/amenity/parcel_locker.json +++ b/data/presets/amenity/parcel_locker.json @@ -6,11 +6,15 @@ "parcel_dropoff", "opening_hours", "payment_multi", - "ref" + "ref", + "wheelchair" ], "moreFields": [ "brand", - "colour" + "collection_times", + "colour", + "indoor", + "surveillance" ], "geometry": [ "point", From 2a7faa922a7593b1530c8b577c1e527fa6d85460 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Tue, 4 Jul 2023 14:40:02 +0000 Subject: [PATCH 7/9] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@215b0f18e7269a362ea479e999f6d9c2b9ae657?= =?UTF-8?q?0=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 6f7737dc..d1f67513 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1041,6 +1041,7 @@ en: collection_times: # collection_times=* label: Collection Times + terms: '[translate with synonyms or related terms for ''Collection Times'', separated by commas]' collector: # collector=* label: Items @@ -4975,6 +4976,7 @@ en: surveillance: # surveillance=* label: Surveillance Kind + terms: '[translate with synonyms or related terms for ''Surveillance Kind'', separated by commas]' surveillance/type: # surveillance:type=* label: Surveillance Type From f9e0e2b2404fe77e7659e5013f9a66d8f3fd3123 Mon Sep 17 00:00:00 2001 From: kjonosm <51236777+kjonosm@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:50:20 +0200 Subject: [PATCH 8/9] Add translatable strings to healthcare field (#935) --- data/fields/healthcare.json | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/data/fields/healthcare.json b/data/fields/healthcare.json index 0e71c85d..09830cd9 100644 --- a/data/fields/healthcare.json +++ b/data/fields/healthcare.json @@ -1,5 +1,35 @@ { "key": "healthcare", "type": "typeCombo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "alternative": "Alternative Medicine", + "audiologist": "Audiologist", + "birthing_centre": "Birthing Center", + "blood_bank": "Blood Bank", + "blood_donation": "Blood Donation Center", + "clinic": "Clinic", + "community_health_worker": "Community Health Worker", + "counselling": "Counselling Center", + "dentist": "Dentist", + "dialysis": "Dialysis Center", + "doctor": "Doctor", + "hospice": "Hospice", + "hospital": "Hospital", + "laboratory": "Medical Laboratory", + "midwife": "Midwife", + "nurse": "Nurse", + "occupational_therapist": "Occupational Therapist", + "optometrist": "Optometrist", + "pharmacy": "Pharmacy", + "physiotherapist": "Physiotherapist", + "podiatrist": "Podiatrist", + "psychotherapist": "Psychotherapist", + "rehabilitation": "Rehabilitation Facility", + "sample_collection": "Sample Collection Facility", + "speech_therapist": "Speech Therapist", + "vaccination_centre": "Vaccination Center" + } + } } From 8f0f711c900821779deaf2f76406a97da37faef9 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Tue, 4 Jul 2023 15:50:42 +0000 Subject: [PATCH 9/9] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@f9e0e2b2404fe77e7659e5013f9a66d8f3fd312?= =?UTF-8?q?3=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 53 +++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index d1f67513..8b364969 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2317,6 +2317,59 @@ en: healthcare: # healthcare=* label: Type + options: + # healthcare=alternative + alternative: Alternative Medicine + # healthcare=audiologist + audiologist: Audiologist + # healthcare=birthing_centre + birthing_centre: Birthing Center + # healthcare=blood_bank + blood_bank: Blood Bank + # healthcare=blood_donation + blood_donation: Blood Donation Center + # healthcare=clinic + clinic: Clinic + # healthcare=community_health_worker + community_health_worker: Community Health Worker + # healthcare=counselling + counselling: Counselling Center + # healthcare=dentist + dentist: Dentist + # healthcare=dialysis + dialysis: Dialysis Center + # healthcare=doctor + doctor: Doctor + # healthcare=hospice + hospice: Hospice + # healthcare=hospital + hospital: Hospital + # healthcare=laboratory + laboratory: Medical Laboratory + # healthcare=midwife + midwife: Midwife + # healthcare=nurse + nurse: Nurse + # healthcare=occupational_therapist + occupational_therapist: Occupational Therapist + # healthcare=optometrist + optometrist: Optometrist + # healthcare=pharmacy + pharmacy: Pharmacy + # healthcare=physiotherapist + physiotherapist: Physiotherapist + # healthcare=podiatrist + podiatrist: Podiatrist + # healthcare=psychotherapist + psychotherapist: Psychotherapist + # healthcare=rehabilitation + rehabilitation: Rehabilitation Facility + # healthcare=sample_collection + sample_collection: Sample Collection Facility + # healthcare=speech_therapist + speech_therapist: Speech Therapist + # healthcare=vaccination_centre + vaccination_centre: Vaccination Center healthcare/speciality: # healthcare:speciality=* label: Specialties