From 994a288e70e83b378fba6b3a6afe39f744d3a716 Mon Sep 17 00:00:00 2001 From: archpdx Date: Tue, 27 Jun 2023 04:46:44 -0700 Subject: [PATCH 1/8] Use more common names for Trash Can & Recycling Bin presets (#938) --- data/presets/amenity/recycling_container.json | 5 ++++- data/presets/amenity/waste_basket.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data/presets/amenity/recycling_container.json b/data/presets/amenity/recycling_container.json index 340cb003..f3847fb1 100644 --- a/data/presets/amenity/recycling_container.json +++ b/data/presets/amenity/recycling_container.json @@ -38,5 +38,8 @@ "key": "amenity", "value": "recycling" }, - "name": "Recycling Container" + "aliases": [ + "Recycling Container" + ], + "name": "Recycling Bin" } diff --git a/data/presets/amenity/waste_basket.json b/data/presets/amenity/waste_basket.json index c482eb06..ec76b181 100644 --- a/data/presets/amenity/waste_basket.json +++ b/data/presets/amenity/waste_basket.json @@ -26,5 +26,8 @@ "litter", "trash" ], - "name": "Waste Basket" + "aliases": [ + "Waste Basket" + ], + "name": "Trash Can" } From 00bf18a10b76c19f041f8efcf12d3db7318f48e5 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Tue, 27 Jun 2023 11:47:13 +0000 Subject: [PATCH 2/8] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@994a288e70e83b378fba6b3a6afe39f744d3a71?= =?UTF-8?q?6=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index e0406ac3..0fa3502d 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6719,10 +6719,10 @@ en: # 'terms: bottle,can,dump,glass,garbage,rubbish,scrap,trash' terms: amenity/recycling_container: - # amenity=recycling + recycling_type=container | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Recycling Container + # amenity=recycling + recycling_type=container | Recycling Container | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Recycling Bin # 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash' - terms: + terms: amenity/refugee_site: # amenity=refugee_site | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Refugee Camp @@ -7176,10 +7176,10 @@ en: # 'terms: bin,garbage,rubbish,litter,trash,poo,dog' terms: amenity/waste_basket: - # amenity=waste_basket | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Waste Basket + # amenity=waste_basket | Waste Basket | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Trash Can # 'terms: bin,garbage,rubbish,litter,trash' - terms: + terms: amenity/waste_disposal: # amenity=waste_disposal | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Garbage Dumpster From 71cf6944f7157886caedb0abb97dd13948bcad87 Mon Sep 17 00:00:00 2001 From: archpdx Date: Tue, 27 Jun 2023 04:53:16 -0700 Subject: [PATCH 3/8] Change ramp field to combo, add option for value `separate` (#939) --- data/fields/ramp.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/data/fields/ramp.json b/data/fields/ramp.json index d28d6df3..deaf5950 100644 --- a/data/fields/ramp.json +++ b/data/fields/ramp.json @@ -1,6 +1,14 @@ { "key": "ramp", - "type": "check", + "type": "combo", + "strings": { + "options": { + "yes": "Yes", + "no": "No", + "separate": "Separately Mapped" + } + }, + "customValues": false, "label": "Embedded Ramp", "terms": [ "bicycle stairway", From b30e2ae23feb36a9374172c69bd19ac4867f77d4 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Tue, 27 Jun 2023 11:53:38 +0000 Subject: [PATCH 4/8] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@71cf6944f7157886caedb0abb97dd13948bcad8?= =?UTF-8?q?7=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 0fa3502d..3f156308 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -3941,6 +3941,13 @@ en: ramp: # ramp=* label: Embedded Ramp + options: + # ramp=no + 'no': 'No' + # ramp=separate + separate: Separately Mapped + # ramp=yes + 'yes': 'Yes' # 'terms: bicycle stairway,push ramp,runnel,wheeling ramp' terms: '[translate with synonyms or related terms for ''Embedded Ramp'', separated by commas]' rating: From 4ec25ad3310fc46737a231f38ef81b85b10de112 Mon Sep 17 00:00:00 2001 From: kjonosm <51236777+kjonosm@users.noreply.github.com> Date: Tue, 27 Jun 2023 14:51:05 +0200 Subject: [PATCH 5/8] Add translatable strings to telecom field (#933) --- data/fields/telecom.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/data/fields/telecom.json b/data/fields/telecom.json index ffb3c83c..2f58296c 100644 --- a/data/fields/telecom.json +++ b/data/fields/telecom.json @@ -1,5 +1,14 @@ { "key": "telecom", "type": "combo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "connection_point": "Connection Point", + "data_center": "Data Center", + "distribution_point": "Distribution Point", + "exchange": "Exchange", + "service_device": "Service Device" + } + } } From 0b3a3855ce7601c6af048769dcff6f8ae128c617 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Tue, 27 Jun 2023 12:51:28 +0000 Subject: [PATCH 6/8] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@4ec25ad3310fc46737a231f38ef81b85b10de11?= =?UTF-8?q?2=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 3f156308..c79aa2b7 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -5041,6 +5041,17 @@ en: telecom: # telecom=* label: Type + options: + # telecom=connection_point + connection_point: Connection Point + # telecom=data_center + data_center: Data Center + # telecom=distribution_point + distribution_point: Distribution Point + # telecom=exchange + exchange: Exchange + # telecom=service_device + service_device: Service Device telecom/medium: # telecom:medium=* label: Medium From 699e10f70cef3b0fbf4fd8fa942ab62aa8afdd0f Mon Sep 17 00:00:00 2001 From: Win Olario Date: Tue, 27 Jun 2023 14:59:22 +0200 Subject: [PATCH 7/8] Create preset for "Barangay Hall". A "barangay" in the Philippines is the smallest administrative government unit. According to [taginfo](https://taginfo.openstreetmap.org/tags/townhall%3Atype=barangay#overview), "barangay" is the third most used value for `townhall:type`, and one of the most popular POI added by mappers from the Philippines. --- .../presets/amenity/townhall/barangay-PH.json | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 data/presets/amenity/townhall/barangay-PH.json diff --git a/data/presets/amenity/townhall/barangay-PH.json b/data/presets/amenity/townhall/barangay-PH.json new file mode 100644 index 00000000..27e9577c --- /dev/null +++ b/data/presets/amenity/townhall/barangay-PH.json @@ -0,0 +1,29 @@ +{ + "icon": "fas-building-flag", + "locationSet": { + "include": [ + "ph" + ] + }, + "geometry": [ + "point", + "area" + ], + "terms": [ + "barrior hall" + ], + "tags": { + "amenity": "townhall", + "townhall:type": "barangay" + }, + "addTags": { + "amenity": "townhall", + "townhall:type": "barangay", + "admin_level": "10" + }, + "reference": { + "key": "amenity", + "value": "townhall" + }, + "name": "Barangay Hall" +} From e809db1fb16141427959bfbed78b28a5e8477421 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Tue, 27 Jun 2023 13:03:18 +0000 Subject: [PATCH 8/8] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@699e10f70cef3b0fbf4fd8fa942ab62aa8afdd0?= =?UTF-8?q?f=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index c79aa2b7..2a641d0f 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -7039,6 +7039,11 @@ en: name: Town Hall # 'terms: village,city,government,courthouse,municipal' terms: + 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: 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). name: City Hall