From b79ecf04e4a36edb3b0c00c55e8bc2a138c282a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sat, 23 Oct 2021 01:49:12 -0700 Subject: [PATCH 01/77] Translatable strings for generic payment types (10k+) --- data/fields/payment_multi.json | 14 +++++++++++- data/fields/payment_multi_fee.json | 12 +++++++++++ interim/source_strings.yaml | 34 ++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/data/fields/payment_multi.json b/data/fields/payment_multi.json index 587fb013..9a4e59b4 100644 --- a/data/fields/payment_multi.json +++ b/data/fields/payment_multi.json @@ -1,5 +1,17 @@ { "key": "payment:", "type": "multiCombo", - "label": "Payment Types" + "label": "Payment Types", + "strings": { + "options": { + "cash": "Cash", + "coins": "Coins", + "contactless": "Contactless Payment", + "credit_cards": "Credit Card", + "debit_cards": "Debit Card", + "electronic_purses": "Electronic Purse", + "notes": "Banknotes", + "telephone_cards": "Telephone Card" + } + } } diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index b9ad3525..8f298094 100644 --- a/data/fields/payment_multi_fee.json +++ b/data/fields/payment_multi_fee.json @@ -5,5 +5,17 @@ "prerequisiteTag": { "key": "fee", "valueNot": "no" + }, + "strings": { + "options": { + "cash": "Cash", + "coins": "Coins", + "contactless": "Contactless Payment", + "credit_cards": "Credit Card", + "debit_cards": "Debit Card", + "electronic_purses": "Electronic Purse", + "notes": "Banknotes", + "telephone_cards": "Telephone Card" + } } } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 7047386d..6d970611 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1790,10 +1790,44 @@ en: payment_multi: # 'payment:=*' label: Payment Types + options: + # 'payment:=cash' + cash: Cash + # 'payment:=coins' + coins: Coins + # 'payment:=contactless' + contactless: Contactless Payment + # 'payment:=credit_cards' + credit_cards: Credit Card + # 'payment:=debit_cards' + debit_cards: Debit Card + # 'payment:=electronic_purses' + electronic_purses: Electronic Purse + # 'payment:=notes' + notes: Banknotes + # 'payment:=telephone_cards' + telephone_cards: Telephone Card terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' payment_multi_fee: # 'payment:=*' label: Payment Types + options: + # 'payment:=cash' + cash: Cash + # 'payment:=coins' + coins: Coins + # 'payment:=contactless' + contactless: Contactless Payment + # 'payment:=credit_cards' + credit_cards: Credit Card + # 'payment:=debit_cards' + debit_cards: Debit Card + # 'payment:=electronic_purses' + electronic_purses: Electronic Purse + # 'payment:=notes' + notes: Banknotes + # 'payment:=telephone_cards' + telephone_cards: Telephone Card terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' phases: # phases=* From 51ed277e368ebe37196e430571a282eb28e8aaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sat, 23 Oct 2021 01:49:39 -0700 Subject: [PATCH 02/77] Translatable strings for branded payment types (10k+) --- data/fields/payment_multi.json | 7 ++++++- data/fields/payment_multi_fee.json | 7 ++++++- interim/source_strings.yaml | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/data/fields/payment_multi.json b/data/fields/payment_multi.json index 9a4e59b4..261220f1 100644 --- a/data/fields/payment_multi.json +++ b/data/fields/payment_multi.json @@ -11,7 +11,12 @@ "debit_cards": "Debit Card", "electronic_purses": "Electronic Purse", "notes": "Banknotes", - "telephone_cards": "Telephone Card" + "telephone_cards": "Telephone Card", + "american_express": "American Express", + "maestro": "Maestro", + "mastercard": "Mastercard", + "visa": "Visa", + "visa_electron": "Visa Electron" } } } diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index 8f298094..40720a63 100644 --- a/data/fields/payment_multi_fee.json +++ b/data/fields/payment_multi_fee.json @@ -15,7 +15,12 @@ "debit_cards": "Debit Card", "electronic_purses": "Electronic Purse", "notes": "Banknotes", - "telephone_cards": "Telephone Card" + "telephone_cards": "Telephone Card", + "american_express": "American Express", + "maestro": "Maestro", + "mastercard": "Mastercard", + "visa": "Visa", + "visa_electron": "Visa Electron" } } } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 6d970611..9ea55f39 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1791,6 +1791,8 @@ en: # 'payment:=*' label: Payment Types options: + # 'payment:=american_express' + american_express: American Express # 'payment:=cash' cash: Cash # 'payment:=coins' @@ -1803,15 +1805,25 @@ en: debit_cards: Debit Card # 'payment:=electronic_purses' electronic_purses: Electronic Purse + # 'payment:=maestro' + maestro: Maestro + # 'payment:=mastercard' + mastercard: Mastercard # 'payment:=notes' notes: Banknotes # 'payment:=telephone_cards' telephone_cards: Telephone Card + # 'payment:=visa' + visa: Visa + # 'payment:=visa_electron' + visa_electron: Visa Electron terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' payment_multi_fee: # 'payment:=*' label: Payment Types options: + # 'payment:=american_express' + american_express: American Express # 'payment:=cash' cash: Cash # 'payment:=coins' @@ -1824,10 +1836,18 @@ en: debit_cards: Debit Card # 'payment:=electronic_purses' electronic_purses: Electronic Purse + # 'payment:=maestro' + maestro: Maestro + # 'payment:=mastercard' + mastercard: Mastercard # 'payment:=notes' notes: Banknotes # 'payment:=telephone_cards' telephone_cards: Telephone Card + # 'payment:=visa' + visa: Visa + # 'payment:=visa_electron' + visa_electron: Visa Electron terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' phases: # phases=* From 94ac2124f65461fd9c8994606f2249b744b0f3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sat, 23 Oct 2021 02:02:34 -0700 Subject: [PATCH 03/77] Translatable strings for generic payment types (1k+) --- data/fields/payment_multi.json | 6 ++++++ data/fields/payment_multi_fee.json | 6 ++++++ interim/source_strings.yaml | 24 ++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/data/fields/payment_multi.json b/data/fields/payment_multi.json index 261220f1..bf686833 100644 --- a/data/fields/payment_multi.json +++ b/data/fields/payment_multi.json @@ -4,13 +4,19 @@ "label": "Payment Types", "strings": { "options": { + "account_cards": "Account Card", + "app": "Mobile Application", + "cards": "Payment Card", "cash": "Cash", + "cheque": "Check", "coins": "Coins", "contactless": "Contactless Payment", "credit_cards": "Credit Card", + "cryptocurrencies": "Cryptocurrency", "debit_cards": "Debit Card", "electronic_purses": "Electronic Purse", "notes": "Banknotes", + "prepaid_ticket": "Prepaid Ticket", "telephone_cards": "Telephone Card", "american_express": "American Express", "maestro": "Maestro", diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index 40720a63..c53cb775 100644 --- a/data/fields/payment_multi_fee.json +++ b/data/fields/payment_multi_fee.json @@ -8,13 +8,19 @@ }, "strings": { "options": { + "account_cards": "Account Card", + "app": "Mobile Application", + "cards": "Payment Card", "cash": "Cash", + "cheque": "Check", "coins": "Coins", "contactless": "Contactless Payment", "credit_cards": "Credit Card", + "cryptocurrencies": "Cryptocurrency", "debit_cards": "Debit Card", "electronic_purses": "Electronic Purse", "notes": "Banknotes", + "prepaid_ticket": "Prepaid Ticket", "telephone_cards": "Telephone Card", "american_express": "American Express", "maestro": "Maestro", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 9ea55f39..7e852a54 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1791,16 +1791,26 @@ en: # 'payment:=*' label: Payment Types options: + # 'payment:=account_cards' + account_cards: Account Card # 'payment:=american_express' american_express: American Express + # 'payment:=app' + app: Mobile Application + # 'payment:=cards' + cards: Payment Card # 'payment:=cash' cash: Cash + # 'payment:=cheque' + cheque: Check # 'payment:=coins' coins: Coins # 'payment:=contactless' contactless: Contactless Payment # 'payment:=credit_cards' credit_cards: Credit Card + # 'payment:=cryptocurrencies' + cryptocurrencies: Cryptocurrency # 'payment:=debit_cards' debit_cards: Debit Card # 'payment:=electronic_purses' @@ -1811,6 +1821,8 @@ en: mastercard: Mastercard # 'payment:=notes' notes: Banknotes + # 'payment:=prepaid_ticket' + prepaid_ticket: Prepaid Ticket # 'payment:=telephone_cards' telephone_cards: Telephone Card # 'payment:=visa' @@ -1822,16 +1834,26 @@ en: # 'payment:=*' label: Payment Types options: + # 'payment:=account_cards' + account_cards: Account Card # 'payment:=american_express' american_express: American Express + # 'payment:=app' + app: Mobile Application + # 'payment:=cards' + cards: Payment Card # 'payment:=cash' cash: Cash + # 'payment:=cheque' + cheque: Check # 'payment:=coins' coins: Coins # 'payment:=contactless' contactless: Contactless Payment # 'payment:=credit_cards' credit_cards: Credit Card + # 'payment:=cryptocurrencies' + cryptocurrencies: Cryptocurrency # 'payment:=debit_cards' debit_cards: Debit Card # 'payment:=electronic_purses' @@ -1842,6 +1864,8 @@ en: mastercard: Mastercard # 'payment:=notes' notes: Banknotes + # 'payment:=prepaid_ticket' + prepaid_ticket: Prepaid Ticket # 'payment:=telephone_cards' telephone_cards: Telephone Card # 'payment:=visa' From 171c568d8486b8053a66b54f23594f43a4ab6101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sat, 23 Oct 2021 02:33:35 -0700 Subject: [PATCH 04/77] Translatable strings for branded payment types (1k+) --- data/fields/payment_multi.json | 23 +++++++- data/fields/payment_multi_fee.json | 23 +++++++- interim/source_strings.yaml | 84 ++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 2 deletions(-) diff --git a/data/fields/payment_multi.json b/data/fields/payment_multi.json index bf686833..0d3e70c5 100644 --- a/data/fields/payment_multi.json +++ b/data/fields/payment_multi.json @@ -18,11 +18,32 @@ "notes": "Banknotes", "prepaid_ticket": "Prepaid Ticket", "telephone_cards": "Telephone Card", + "alipay": "Alipay", "american_express": "American Express", + "apple_pay": "Apple Pay", + "bancomat": "Bancomat", + "blik": "Blik", + "clipper": "Clipper", + "diners_club": "Diners Club", + "discover_card": "Discover", + "dkv": "DKV", + "ep_easycard": "悠遊卡EasyCard", + "ep_geldkarte": "GeldKarte", + "ep_ipass": "iPASS一卡通", + "girocard": "Girocard", + "google_pay": "Google Pay", + "jcb": "JCB", "maestro": "Maestro", "mastercard": "Mastercard", + "mastercard_contactless": "Mastercard Contactless", + "paypal": "PayPal", + "unionpay": "UnionPay", + "uta": "UTA", + "v_pay": "V Pay", "visa": "Visa", - "visa_electron": "Visa Electron" + "visa_debit": "Visa Debit", + "visa_electron": "Visa Electron", + "wechat": "WeChat Pay" } } } diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index c53cb775..dd5167f3 100644 --- a/data/fields/payment_multi_fee.json +++ b/data/fields/payment_multi_fee.json @@ -22,11 +22,32 @@ "notes": "Banknotes", "prepaid_ticket": "Prepaid Ticket", "telephone_cards": "Telephone Card", + "alipay": "Alipay", "american_express": "American Express", + "apple_pay": "Apple Pay", + "bancomat": "Bancomat", + "blik": "Blik", + "clipper": "Clipper", + "diners_club": "Diners Club", + "discover_card": "Discover", + "dkv": "DKV", + "ep_easycard": "悠遊卡EasyCard", + "ep_geldkarte": "GeldKarte", + "ep_ipass": "iPASS一卡通", + "girocard": "Girocard", + "google_pay": "Google Pay", + "jcb": "JCB", "maestro": "Maestro", "mastercard": "Mastercard", + "mastercard_contactless": "Mastercard Contactless", + "paypal": "PayPal", + "unionpay": "UnionPay", + "uta": "UTA", + "v_pay": "V Pay", "visa": "Visa", - "visa_electron": "Visa Electron" + "visa_debit": "Visa Debit", + "visa_electron": "Visa Electron", + "wechat": "WeChat Pay" } } } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 7e852a54..89dfd278 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1793,16 +1793,26 @@ en: options: # 'payment:=account_cards' account_cards: Account Card + # 'payment:=alipay' + alipay: Alipay # 'payment:=american_express' american_express: American Express # 'payment:=app' app: Mobile Application + # 'payment:=apple_pay' + apple_pay: Apple Pay + # 'payment:=bancomat' + bancomat: Bancomat + # 'payment:=blik' + blik: Blik # 'payment:=cards' cards: Payment Card # 'payment:=cash' cash: Cash # 'payment:=cheque' cheque: Check + # 'payment:=clipper' + clipper: Clipper # 'payment:=coins' coins: Coins # 'payment:=contactless' @@ -1813,22 +1823,54 @@ en: cryptocurrencies: Cryptocurrency # 'payment:=debit_cards' debit_cards: Debit Card + # 'payment:=diners_club' + diners_club: Diners Club + # 'payment:=discover_card' + discover_card: Discover + # 'payment:=dkv' + dkv: DKV # 'payment:=electronic_purses' electronic_purses: Electronic Purse + # 'payment:=ep_easycard' + ep_easycard: 悠遊卡EasyCard + # 'payment:=ep_geldkarte' + ep_geldkarte: GeldKarte + # 'payment:=ep_ipass' + ep_ipass: iPASS一卡通 + # 'payment:=girocard' + girocard: Girocard + # 'payment:=google_pay' + google_pay: Google Pay + # 'payment:=jcb' + jcb: JCB # 'payment:=maestro' maestro: Maestro # 'payment:=mastercard' mastercard: Mastercard + # 'payment:=mastercard_contactless' + mastercard_contactless: Mastercard Contactless # 'payment:=notes' notes: Banknotes + # 'payment:=paypal' + paypal: PayPal # 'payment:=prepaid_ticket' prepaid_ticket: Prepaid Ticket # 'payment:=telephone_cards' telephone_cards: Telephone Card + # 'payment:=unionpay' + unionpay: UnionPay + # 'payment:=uta' + uta: UTA + # 'payment:=v_pay' + v_pay: V Pay # 'payment:=visa' visa: Visa + # 'payment:=visa_debit' + visa_debit: Visa Debit # 'payment:=visa_electron' visa_electron: Visa Electron + # 'payment:=wechat' + wechat: WeChat Pay terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' payment_multi_fee: # 'payment:=*' @@ -1836,16 +1878,26 @@ en: options: # 'payment:=account_cards' account_cards: Account Card + # 'payment:=alipay' + alipay: Alipay # 'payment:=american_express' american_express: American Express # 'payment:=app' app: Mobile Application + # 'payment:=apple_pay' + apple_pay: Apple Pay + # 'payment:=bancomat' + bancomat: Bancomat + # 'payment:=blik' + blik: Blik # 'payment:=cards' cards: Payment Card # 'payment:=cash' cash: Cash # 'payment:=cheque' cheque: Check + # 'payment:=clipper' + clipper: Clipper # 'payment:=coins' coins: Coins # 'payment:=contactless' @@ -1856,22 +1908,54 @@ en: cryptocurrencies: Cryptocurrency # 'payment:=debit_cards' debit_cards: Debit Card + # 'payment:=diners_club' + diners_club: Diners Club + # 'payment:=discover_card' + discover_card: Discover + # 'payment:=dkv' + dkv: DKV # 'payment:=electronic_purses' electronic_purses: Electronic Purse + # 'payment:=ep_easycard' + ep_easycard: 悠遊卡EasyCard + # 'payment:=ep_geldkarte' + ep_geldkarte: GeldKarte + # 'payment:=ep_ipass' + ep_ipass: iPASS一卡通 + # 'payment:=girocard' + girocard: Girocard + # 'payment:=google_pay' + google_pay: Google Pay + # 'payment:=jcb' + jcb: JCB # 'payment:=maestro' maestro: Maestro # 'payment:=mastercard' mastercard: Mastercard + # 'payment:=mastercard_contactless' + mastercard_contactless: Mastercard Contactless # 'payment:=notes' notes: Banknotes + # 'payment:=paypal' + paypal: PayPal # 'payment:=prepaid_ticket' prepaid_ticket: Prepaid Ticket # 'payment:=telephone_cards' telephone_cards: Telephone Card + # 'payment:=unionpay' + unionpay: UnionPay + # 'payment:=uta' + uta: UTA + # 'payment:=v_pay' + v_pay: V Pay # 'payment:=visa' visa: Visa + # 'payment:=visa_debit' + visa_debit: Visa Debit # 'payment:=visa_electron' visa_electron: Visa Electron + # 'payment:=wechat' + wechat: WeChat Pay terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' phases: # phases=* From 722e33d2933e0adaa9fdabc70150c04d9b354f41 Mon Sep 17 00:00:00 2001 From: Marc-marc-marc <31963329+Marc-marc-marc@users.noreply.github.com> Date: Mon, 26 Sep 2022 12:48:50 +0200 Subject: [PATCH 05/77] also catch internet_access=wi-fi and WLAN (#592) source https://wiki.openstreetmap.org/wiki/Tag:internet_access=wlan --- data/deprecated.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/deprecated.json b/data/deprecated.json index 1178746c..db4f2e82 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -774,6 +774,14 @@ "old": {"internet_access": "wifi"}, "replace": {"internet_access": "wlan"} }, +{ + "old": {"internet_access": "wi-fi"}, + "replace": {"internet_access": "wlan"} + }, +{ + "old": {"internet_access": "WLAN"}, + "replace": {"internet_access": "wlan"} + }, { "old": {"internet_access:fee": "0"}, "replace": {"internet_access:fee": "no"} From bead36d43b94a83deb648df1bf65264386d49312 Mon Sep 17 00:00:00 2001 From: kjonosm <51236777+kjonosm@users.noreply.github.com> Date: Mon, 26 Sep 2022 13:01:19 +0200 Subject: [PATCH 06/77] Add preset for water=oxbow (#595, #118) --- data/presets/natural/water/oxbow.json | 23 +++++++++++++++++++++++ interim/source_strings.yaml | 5 +++++ 2 files changed, 28 insertions(+) create mode 100644 data/presets/natural/water/oxbow.json diff --git a/data/presets/natural/water/oxbow.json b/data/presets/natural/water/oxbow.json new file mode 100644 index 00000000..34750b20 --- /dev/null +++ b/data/presets/natural/water/oxbow.json @@ -0,0 +1,23 @@ +{ + "icon": "maki-water", + "geometry": [ + "area" + ], + "tags": { + "natural": "water", + "water": "oxbow" + }, + "reference": { + "key": "water", + "value": "oxbow" + }, + "terms": [ + "anabranch", + "billabong", + "cut off", + "meander", + "oxbow", + "resaca" + ], + "name": "Oxbow Lake" +} diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 8fbcba17..d310c5b3 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -8033,6 +8033,11 @@ en: # natural=water + water=moat | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Moat terms: + natural/water/oxbow: + # natural=water + water=oxbow | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Oxbow Lake + # 'terms: anabranch,billabong,cut off,meander,oxbow,resaca' + terms: natural/water/pond: # natural=water + water=pond | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Pond From 4075329e31d5f8e6378198e2c178c9e24ef06cc7 Mon Sep 17 00:00:00 2001 From: kjonosm <51236777+kjonosm@users.noreply.github.com> Date: Mon, 26 Sep 2022 13:18:43 +0200 Subject: [PATCH 07/77] add preset for power=catenary_mast.json (#564, #593) --- data/presets/power/catenary_mast.json | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 data/presets/power/catenary_mast.json diff --git a/data/presets/power/catenary_mast.json b/data/presets/power/catenary_mast.json new file mode 100644 index 00000000..f931150b --- /dev/null +++ b/data/presets/power/catenary_mast.json @@ -0,0 +1,28 @@ +{ + "icon": "temaki-power_pole", + "fields": [ + "ref", + "operator" + ], + "moreFields": [ + "height", + "line_attachment", + "line_management", + "manufacturer", + "material" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "power": "catenary_mast" + }, + "terms": [ + "catenary pylon", + "catenary mast", + "overhead line", + "overhead wire" + ], + "name": "Catenary Pole" +} From ad8ec05d8ccf9861a525c40af175f4c7ea2ee5b6 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 26 Sep 2022 11:19:09 +0000 Subject: [PATCH 08/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@4075329e31d5f8e6378198e2c178c9e24ef06?= =?UTF-8?q?cc7=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index d310c5b3..3d3440fa 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1734,6 +1734,7 @@ en: line_attachment: # line_attachment=* label: Line Attachment + terms: '[translate with synonyms or related terms for ''Line Attachment'', separated by commas]' line_management: # line_management=* label: Line Management @@ -8637,6 +8638,11 @@ en: # power=cable + location=underground | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Underground Power Cable terms: + power/catenary_mast: + # power=catenary_mast | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Catenary Pole + # 'terms: catenary pylon,catenary mast,overhead line,overhead wire' + terms: power/generator: # power=generator | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Power Generator From d5fece12ce028df382ff27791abc4a290391ba22 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 26 Sep 2022 19:06:33 +0200 Subject: [PATCH 09/77] add "salt" as valid value for the surface tag see https://github.com/openstreetmap/iD/issues/9305 --- data/fields/surface.json | 3 ++- interim/source_strings.yaml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/fields/surface.json b/data/fields/surface.json index 012dabce..30d06052 100644 --- a/data/fields/surface.json +++ b/data/fields/surface.json @@ -16,7 +16,8 @@ "grass": "Grass", "sand": "Sand", "wood": "Wood", - "artificial_turf": "Artificial Turf" + "artificial_turf": "Artificial Turf", + "salt": "Salt" } } } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 3d3440fa..e44ae6e8 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -3123,6 +3123,8 @@ en: paved: Paved # surface=paving_stones paving_stones: Paving Stones + # surface=salt + salt: Salt # surface=sand sand: Sand # surface=unpaved From 49ec9436d4d4c2ec0cedcedbef73f30a2062f443 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Thu, 29 Sep 2022 14:33:24 +0200 Subject: [PATCH 10/77] move aliases of `highway=track` from terms to aliases field and add further terms (#470) see https://github.com/openstreetmap/id-tagging-schema/pull/288#issuecomment-1134043557 --- data/presets/highway/track.json | 17 +++++++++++++---- interim/source_strings.yaml | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index de233624..c786e676 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -33,26 +33,35 @@ "agricultural road", "atv", "carriage road", + "dirt road", "double track", "farm road", "fire road", "forest road", + "forestry road", "four wheel drive", + "haul road", + "haulage road", "high-clearance", "jeep", - "land access road", "logging road", + "mining road", "offroad", + "off-road", "overgrown", "primitive", "quad", "ranch road", "rut", - "track", - "track road", + "two-track", "two track", "unmaintained", + "vehicular trail", "woods road" ], - "name": "Track / Land-Access Road" + "name": "Track / Land-Access Road", + "aliases": [ + "Land-Access Road", + "Track Road" + ] } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index e44ae6e8..86ab1c99 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6528,7 +6528,7 @@ en: highway/track: # highway=track | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Track / Land-Access Road - # 'terms: 4wd,4x4,agricultural road,atv,carriage road,double track,farm road,fire road,forest road,four wheel drive,high-clearance,jeep,land access road,logging road,offroad,overgrown,primitive,quad,ranch road,rut,track,track road,two track,unmaintained,woods road' + # 'terms: 4wd,4x4,agricultural road,atv,carriage road,dirt road,double track,farm road,fire road,forest road,forestry road,four wheel drive,haul road,haulage road,high-clearance,jeep,logging road,mining road,offroad,off-road,overgrown,primitive,ranch road,quad,rut,two-track,two track,unmaintained,vehicular trail,woods road' terms: highway/traffic_mirror: # highway=traffic_mirror | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). From f512b12f0c419d7ff04cf34be4df96e1f74aebc7 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Thu, 29 Sep 2022 12:33:49 +0000 Subject: [PATCH 11/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@49ec9436d4d4c2ec0cedcedbef73f30a2062f?= =?UTF-8?q?443=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 86ab1c99..50336486 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6526,9 +6526,9 @@ en: # 'terms: license plate camera toll,cashless toll,electronic toll,free-flow toll,toll gantry,transponder toll' terms: highway/track: - # highway=track | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + # highway=track | Land-Access Road, Track Road | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Track / Land-Access Road - # 'terms: 4wd,4x4,agricultural road,atv,carriage road,dirt road,double track,farm road,fire road,forest road,forestry road,four wheel drive,haul road,haulage road,high-clearance,jeep,logging road,mining road,offroad,off-road,overgrown,primitive,ranch road,quad,rut,two-track,two track,unmaintained,vehicular trail,woods road' + # 'terms: 4wd,4x4,agricultural road,atv,carriage road,dirt road,double track,farm road,fire road,forest road,forestry road,four wheel drive,haul road,haulage road,high-clearance,jeep,logging road,mining road,offroad,off-road,overgrown,primitive,quad,ranch road,rut,two-track,two track,unmaintained,vehicular trail,woods road' terms: highway/traffic_mirror: # highway=traffic_mirror | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). From 174a15e80c76240aebca8153f1dc01384f4c27e0 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Thu, 29 Sep 2022 16:20:05 +0200 Subject: [PATCH 12/77] add some new surface values (#597) --- data/fields/surface.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/fields/surface.json b/data/fields/surface.json index 30d06052..59079c40 100644 --- a/data/fields/surface.json +++ b/data/fields/surface.json @@ -12,11 +12,16 @@ "compacted": "Compacted", "concrete": "Concrete", "paving_stones": "Paving Stones", + "sett": "Sett", "dirt": "Dirt", "grass": "Grass", "sand": "Sand", "wood": "Wood", + "metal": "Metal", "artificial_turf": "Artificial Turf", + "unhewn_cobblestone": "Cobblestone (uncut, rounded stones)", + "mud": "Persistently Muddy", + "woodchips": "Woodchips", "salt": "Salt" } } From 603cdad1519e4c8f34967b39182cc4617b6a5297 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Thu, 29 Sep 2022 14:20:32 +0000 Subject: [PATCH 13/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@174a15e80c76240aebca8153f1dc01384f4c2?= =?UTF-8?q?7e0=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 50336486..46c30527 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -3119,6 +3119,10 @@ en: gravel: Gravel # surface=ground ground: Ground + # surface=metal + metal: Metal + # surface=mud + mud: Persistently Muddy # surface=paved paved: Paved # surface=paving_stones @@ -3127,10 +3131,16 @@ en: salt: Salt # surface=sand sand: Sand + # surface=sett + sett: Sett + # surface=unhewn_cobblestone + unhewn_cobblestone: Cobblestone (uncut, rounded stones) # surface=unpaved unpaved: Unpaved # surface=wood wood: Wood + # surface=woodchips + woodchips: Woodchips terms: '[translate with synonyms or related terms for ''Surface'', separated by commas]' surveillance: # surveillance=* From 4df0dd3f35a2286da55ccea4f622a25055eef3bf Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 17 Feb 2022 16:44:55 +0100 Subject: [PATCH 14/77] upgrade to schema-builder v5 --- data/fields/address.json | 1 - data/fields/colour.json | 2 +- data/fields/contact/webcam.json | 1 - data/fields/ele.json | 1 - data/fields/ele_node.json | 1 - data/fields/note.json | 1 - data/fields/phone.json | 1 - data/fields/restrictions.json | 1 - data/fields/source.json | 1 - data/fields/website.json | 1 - data/fields/wheelchair.json | 1 - data/fields/wikidata.json | 1 - data/fields/wikipedia.json | 1 - package.json | 3 ++- scripts/build.js | 3 +-- scripts/dist.js | 2 +- scripts/test.js | 3 ++- 17 files changed, 7 insertions(+), 18 deletions(-) diff --git a/data/fields/address.json b/data/fields/address.json index a660165f..bec5e811 100644 --- a/data/fields/address.json +++ b/data/fields/address.json @@ -25,7 +25,6 @@ "addr:suburb", "addr:unit" ], - "icon": "address", "label": "Address", "strings": { "placeholders": { diff --git a/data/fields/colour.json b/data/fields/colour.json index d53e2a95..e47495f6 100644 --- a/data/fields/colour.json +++ b/data/fields/colour.json @@ -1,5 +1,5 @@ { "key": "colour", - "type": "text", + "type": "colour", "label": "Color" } diff --git a/data/fields/contact/webcam.json b/data/fields/contact/webcam.json index 54a6c878..33a1b939 100644 --- a/data/fields/contact/webcam.json +++ b/data/fields/contact/webcam.json @@ -1,7 +1,6 @@ { "key": "contact:webcam", "type": "url", - "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/" } diff --git a/data/fields/ele.json b/data/fields/ele.json index 4bd7a541..fe94c916 100644 --- a/data/fields/ele.json +++ b/data/fields/ele.json @@ -1,7 +1,6 @@ { "key": "ele", "type": "number", - "icon": "elevation", "label": "Elevation (Meters)", "geometry": [ "line", diff --git a/data/fields/ele_node.json b/data/fields/ele_node.json index 2b2a1ba1..41b072a5 100644 --- a/data/fields/ele_node.json +++ b/data/fields/ele_node.json @@ -1,7 +1,6 @@ { "key": "ele", "type": "number", - "icon": "elevation", "label": "Elevation (Meters)", "universal": true, "geometry": [ diff --git a/data/fields/note.json b/data/fields/note.json index b53905b1..fa35a600 100644 --- a/data/fields/note.json +++ b/data/fields/note.json @@ -2,7 +2,6 @@ "key": "note", "type": "textarea", "universal": true, - "icon": "note", "label": "Note", "terms": [ "comment" diff --git a/data/fields/phone.json b/data/fields/phone.json index 23ed71e2..fe129ed9 100644 --- a/data/fields/phone.json +++ b/data/fields/phone.json @@ -1,7 +1,6 @@ { "key": "phone", "type": "tel", - "icon": "maki-telephone", "label": "Telephone", "placeholder": "+31 42 123 4567", "terms": [ diff --git a/data/fields/restrictions.json b/data/fields/restrictions.json index 9a4eee14..61420c4e 100644 --- a/data/fields/restrictions.json +++ b/data/fields/restrictions.json @@ -3,7 +3,6 @@ "geometry": [ "vertex" ], - "icon": "iD-restrictions", "usage": "manual", "reference": { "rtype": "restriction" diff --git a/data/fields/source.json b/data/fields/source.json index 98439ed5..bff414b7 100644 --- a/data/fields/source.json +++ b/data/fields/source.json @@ -1,7 +1,6 @@ { "key": "source", "type": "semiCombo", - "icon": "source", "universal": true, "label": "Sources", "snake_case": false, diff --git a/data/fields/website.json b/data/fields/website.json index 69a333ac..6f50b192 100644 --- a/data/fields/website.json +++ b/data/fields/website.json @@ -1,7 +1,6 @@ { "key": "website", "type": "url", - "icon": "website", "placeholder": "https://example.com", "label": "Website", "terms": [ diff --git a/data/fields/wheelchair.json b/data/fields/wheelchair.json index 127042d8..d06f36e4 100644 --- a/data/fields/wheelchair.json +++ b/data/fields/wheelchair.json @@ -8,7 +8,6 @@ "no": "No" } }, - "icon": "maki-wheelchair", "label": "Wheelchair Access", "terms": [ "handicap access" diff --git a/data/fields/wikidata.json b/data/fields/wikidata.json index 5fe33792..b413c01c 100644 --- a/data/fields/wikidata.json +++ b/data/fields/wikidata.json @@ -5,7 +5,6 @@ "wikipedia" ], "type": "wikidata", - "icon": "wikipedia", "universal": true, "label": "Wikidata" } diff --git a/data/fields/wikipedia.json b/data/fields/wikipedia.json index a886cc02..1164729e 100644 --- a/data/fields/wikipedia.json +++ b/data/fields/wikipedia.json @@ -5,7 +5,6 @@ "wikidata" ], "type": "wikipedia", - "icon": "wikipedia", "universal": true, "label": "Wikipedia" } diff --git a/package.json b/package.json index 28a7d038..b4c6238e 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "type": "module", "name": "@openstreetmap/id-tagging-schema", "version": "3.5.1", "description": "The OpenStreetMap tagging model used by the iD editor", @@ -19,7 +20,7 @@ "translations": "node scripts/translations.js" }, "devDependencies": { - "@ideditor/schema-builder": "~4.0.6", + "@ideditor/schema-builder": "~5.0.0", "prettier": "~2.7.1" } } diff --git a/scripts/build.js b/scripts/build.js index ff710d55..a6d9a238 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -1,4 +1,3 @@ - -const schemaBuilder = require('@ideditor/schema-builder'); +import schemaBuilder from '@ideditor/schema-builder'; schemaBuilder.buildDev(); diff --git a/scripts/dist.js b/scripts/dist.js index 342e3f72..af5baadf 100644 --- a/scripts/dist.js +++ b/scripts/dist.js @@ -1,4 +1,4 @@ -const schemaBuilder = require('@ideditor/schema-builder'); +import schemaBuilder from '@ideditor/schema-builder'; schemaBuilder.buildDist({ taginfoProjectInfo: { diff --git a/scripts/test.js b/scripts/test.js index 271cdc68..ae2dddf7 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -1,2 +1,3 @@ -const schemaBuilder = require('@ideditor/schema-builder'); +import schemaBuilder from '@ideditor/schema-builder'; + schemaBuilder.validate(); From fbcf02d3f8e477f10b253068efd2f2a492f46efb Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 29 Sep 2022 19:22:50 +0200 Subject: [PATCH 15/77] bump version number (skipping v4 to match major v. of schema-builder) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4c6238e..a53fc523 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "@openstreetmap/id-tagging-schema", - "version": "3.5.1", + "version": "5.0.0-dev", "description": "The OpenStreetMap tagging model used by the iD editor", "homepage": "https://github.com/openstreetmap/id-tagging-schema#readme", "bugs": "https://github.com/openstreetmap/id-tagging-schema/issues", From 2542974846eb50b2ecbbbed4247867b11f4daa84 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 29 Sep 2022 20:26:13 +0200 Subject: [PATCH 16/77] consolidate duplicate names/terms by using new cross-references --- data/fields/building/levels_building.json | 2 +- data/fields/payment_multi_fee.json | 2 +- data/presets/highway/motorway_link-US-CA.json | 10 +--------- data/presets/highway/primary_link-US-CA.json | 9 +-------- data/presets/highway/trunk_link-US-CA.json | 9 +-------- interim/source_strings.yaml | 13 ------------- 6 files changed, 5 insertions(+), 40 deletions(-) diff --git a/data/fields/building/levels_building.json b/data/fields/building/levels_building.json index 03850c68..fa696d47 100644 --- a/data/fields/building/levels_building.json +++ b/data/fields/building/levels_building.json @@ -2,7 +2,7 @@ "key": "building:levels", "type": "number", "minValue": 0, - "label": "Building Levels", + "label": "{building/levels}", "placeholder": "2, 4, 6...", "prerequisiteTag": { "key": "building", diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index b9ad3525..5db2a39b 100644 --- a/data/fields/payment_multi_fee.json +++ b/data/fields/payment_multi_fee.json @@ -1,7 +1,7 @@ { "key": "payment:", "type": "multiCombo", - "label": "Payment Types", + "label": "{payment_multi}", "prerequisiteTag": { "key": "fee", "valueNot": "no" diff --git a/data/presets/highway/motorway_link-US-CA.json b/data/presets/highway/motorway_link-US-CA.json index afe1f844..8c712c5a 100644 --- a/data/presets/highway/motorway_link-US-CA.json +++ b/data/presets/highway/motorway_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "Motorway Link", + "name": "{motorway_link}", "icon": "iD-highway-motorway-link", "fields": [ "destination_oneway", @@ -34,14 +34,6 @@ "tags": { "highway": "motorway_link" }, - "terms": [ - "exit", - "ramp", - "road", - "street", - "on ramp", - "off ramp" - ], "locationSet": { "include": [ "ca", diff --git a/data/presets/highway/primary_link-US-CA.json b/data/presets/highway/primary_link-US-CA.json index 293ae85d..26f37875 100644 --- a/data/presets/highway/primary_link-US-CA.json +++ b/data/presets/highway/primary_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "Primary Link", + "name": "{primary_link}", "icon": "iD-highway-primary-link", "fields": [ "destination_oneway", @@ -38,13 +38,6 @@ "tags": { "highway": "primary_link" }, - "terms": [ - "on ramp", - "off ramp", - "ramp", - "road", - "street" - ], "locationSet": { "include": [ "ca", diff --git a/data/presets/highway/trunk_link-US-CA.json b/data/presets/highway/trunk_link-US-CA.json index 7fb672fa..eac25f91 100644 --- a/data/presets/highway/trunk_link-US-CA.json +++ b/data/presets/highway/trunk_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "Trunk Link", + "name": "{trunk_link}", "icon": "iD-highway-trunk-link", "fields": [ "{highway/motorway_link-US-CA}" @@ -13,13 +13,6 @@ "tags": { "highway": "trunk_link" }, - "terms": [ - "on ramp", - "off ramp", - "ramp", - "road", - "street" - ], "locationSet": { "include": [ "ca", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index e44ae6e8..01519b7d 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -431,10 +431,8 @@ en: terms: '[translate with synonyms or related terms for ''Underground Levels'', separated by commas]' building/levels_building: # building:levels=* - label: Building Levels # building/levels_building field placeholder placeholder: 2, 4, 6... - terms: '[translate with synonyms or related terms for ''Building Levels'', separated by commas]' building/material: # building:material=* label: Material @@ -2165,8 +2163,6 @@ en: terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' payment_multi_fee: # payment:=* - label: Payment Types - terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]' phases: # phases=* label: Phases @@ -6358,9 +6354,6 @@ en: terms: highway/motorway_link-US-CA: # highway=motorway_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Motorway Link - # 'terms: exit,ramp,road,street,on ramp,off ramp' - terms: highway/passing_place: # highway=passing_place | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Passing Place @@ -6403,9 +6396,6 @@ en: terms: highway/primary_link-US-CA: # highway=primary_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Primary Link - # 'terms: on ramp,off ramp,ramp,road,street' - terms: highway/raceway: # highway=raceway | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Motorsport Racetrack @@ -6557,9 +6547,6 @@ en: terms: highway/trunk_link-US-CA: # highway=trunk_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Trunk Link - # 'terms: on ramp,off ramp,ramp,road,street' - terms: highway/turning_circle: # highway=turning_circle | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Turning Circle From 85ff0905cd083a5afeb81d80caf2ceac38b8336a Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 29 Sep 2022 20:46:14 +0200 Subject: [PATCH 17/77] bump schema to v5.1, allows to cross-reference placeholders --- data/fields/building/levels_building.json | 2 +- interim/source_strings.yaml | 2 -- package.json | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/fields/building/levels_building.json b/data/fields/building/levels_building.json index fa696d47..52203809 100644 --- a/data/fields/building/levels_building.json +++ b/data/fields/building/levels_building.json @@ -3,7 +3,7 @@ "type": "number", "minValue": 0, "label": "{building/levels}", - "placeholder": "2, 4, 6...", + "placeholder": "{building/levels}", "prerequisiteTag": { "key": "building", "valueNot": "no" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 01519b7d..d023d4ec 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -431,8 +431,6 @@ en: terms: '[translate with synonyms or related terms for ''Underground Levels'', separated by commas]' building/levels_building: # building:levels=* - # building/levels_building field placeholder - placeholder: 2, 4, 6... building/material: # building:material=* label: Material diff --git a/package.json b/package.json index a53fc523..7d072646 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "translations": "node scripts/translations.js" }, "devDependencies": { - "@ideditor/schema-builder": "~5.0.0", + "@ideditor/schema-builder": "~5.1.0", "prettier": "~2.7.1" } } From 3cca279599bdfb086eb3d85f962522b8f7a4c9ba Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 29 Sep 2022 21:12:36 +0200 Subject: [PATCH 18/77] update to schema v5.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d072646..4a760228 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "translations": "node scripts/translations.js" }, "devDependencies": { - "@ideditor/schema-builder": "~5.1.0", + "@ideditor/schema-builder": "~5.1.1", "prettier": "~2.7.1" } } From ad24670912571c942edc05ccb3f098ccae971336 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 3 Oct 2022 08:47:23 +0200 Subject: [PATCH 19/77] fix preset references --- data/presets/highway/motorway_link-US-CA.json | 2 +- data/presets/highway/primary_link-US-CA.json | 2 +- data/presets/highway/trunk_link-US-CA.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/presets/highway/motorway_link-US-CA.json b/data/presets/highway/motorway_link-US-CA.json index 8c712c5a..a20fd1a4 100644 --- a/data/presets/highway/motorway_link-US-CA.json +++ b/data/presets/highway/motorway_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "{motorway_link}", + "name": "{highway/motorway_link}", "icon": "iD-highway-motorway-link", "fields": [ "destination_oneway", diff --git a/data/presets/highway/primary_link-US-CA.json b/data/presets/highway/primary_link-US-CA.json index 26f37875..7d8b44a4 100644 --- a/data/presets/highway/primary_link-US-CA.json +++ b/data/presets/highway/primary_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "{primary_link}", + "name": "{highway/primary_link}", "icon": "iD-highway-primary-link", "fields": [ "destination_oneway", diff --git a/data/presets/highway/trunk_link-US-CA.json b/data/presets/highway/trunk_link-US-CA.json index eac25f91..5425bc5e 100644 --- a/data/presets/highway/trunk_link-US-CA.json +++ b/data/presets/highway/trunk_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "{trunk_link}", + "name": "{highway/trunk_link}", "icon": "iD-highway-trunk-link", "fields": [ "{highway/motorway_link-US-CA}" From 44d087816df094fe802a1db6b8c48fb6f2b591bc Mon Sep 17 00:00:00 2001 From: archpdx Date: Mon, 3 Oct 2022 02:38:09 -0700 Subject: [PATCH 20/77] Fix typo in changelog (#599) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eceef7cd..16db42b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ _Breaking developer changes, which may affect downstream projects or sites that * Add a preset for Barbeque Restaurants ([#535], thanks [@arch0345]) * Add Horse Race Course preset ([#537], thanks [@arch0345]) * Add presets for building=allotment_house and building=outhouse ([#528], thanks [@matkoniecz]) -* Add presets for more playground features: Play Activity Panel, Hanging Roundabout, Play Bridge, Play CLimbing Wall, Funnel Ball Funnel, Painted Playground Map, Play Sledding Hill, Play Splash Pad, Teen Shelter, Tetherball Pole, Trampoline, Play Tunnel, Gaga Pit, Funnel Ball Court ([#543], thanks [@arch0345]) +* Add presets for more playground features: Play Activity Panel, Hanging Roundabout, Play Bridge, Play Climbing Wall, Funnel Ball Funnel, Painted Playground Map, Play Sledding Hill, Play Splash Pad, Teen Shelter, Tetherball Pole, Trampoline, Play Tunnel, Gaga Pit, Funnel Ball Court ([#543], thanks [@arch0345]) * Add (hidden) preset for unspecified Barriers (`barrier=yes`) ([#531]) * Add (hidden) presets for unspecified Healthcare (`healthcare=yes`) and unspecified Traffic Calming (`traffic_calming=yes`) features ([#547]) * Add (hidden) preset for unspecified Man Made Feature (`man_made=yes`) From 752dff71e114c7af2fe319b7e90a40106e50cc38 Mon Sep 17 00:00:00 2001 From: archpdx Date: Mon, 3 Oct 2022 02:43:25 -0700 Subject: [PATCH 21/77] Add Fire Station Building preset (#603) --- data/presets/building/fire_station.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 data/presets/building/fire_station.json diff --git a/data/presets/building/fire_station.json b/data/presets/building/fire_station.json new file mode 100644 index 00000000..3b83a73c --- /dev/null +++ b/data/presets/building/fire_station.json @@ -0,0 +1,11 @@ +{ + "icon": "fas-house-fire", + "geometry": [ + "area" + ], + "tags": { + "building": "fire_station" + }, + "matchScore": 0.5, + "name": "Fire Station Building" +} From 2c9198f40a83f3bfcf43e4327ca7e7c8b00002ca Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 3 Oct 2022 09:43:54 +0000 Subject: [PATCH 22/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@752dff71e114c7af2fe319b7e90a40106e50c?= =?UTF-8?q?c38=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 46c30527..ef1e200d 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -5439,6 +5439,10 @@ en: name: Farm Building # 'terms: agriculture,auxiliary,auxilary,chicken coop,farm auxiliary,pigsty,sty' terms: + building/fire_station: + # building=fire_station | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Fire Station Building + terms: building/garage: # building=garage | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Garage From b15dfff25706a714111951ba67241f6f0b1b179a Mon Sep 17 00:00:00 2001 From: archpdx Date: Mon, 3 Oct 2022 02:48:01 -0700 Subject: [PATCH 23/77] Add Prefabricated field (#600) --- data/fields/building/prefabricated.json | 10 ++++++++++ data/presets/building.json | 1 + 2 files changed, 11 insertions(+) create mode 100644 data/fields/building/prefabricated.json diff --git a/data/fields/building/prefabricated.json b/data/fields/building/prefabricated.json new file mode 100644 index 00000000..5fb8cfd7 --- /dev/null +++ b/data/fields/building/prefabricated.json @@ -0,0 +1,10 @@ +{ + "key": "building:prefabricated", + "type": "check", + "terms": [ + "manufactured", + "modular", + "portable" + ], + "label": "Prefabricated" +} diff --git a/data/presets/building.json b/data/presets/building.json index d767ce1b..15850c76 100644 --- a/data/presets/building.json +++ b/data/presets/building.json @@ -11,6 +11,7 @@ "architect", "building/levels/underground", "building/material", + "building/prefabricated", "ele", "gnis/feature_id-US", "layer", From dc751e4719b5f910041fab87dc8060626b84802e Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 3 Oct 2022 09:48:24 +0000 Subject: [PATCH 24/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@b15dfff25706a714111951ba67241f6f0b1b1?= =?UTF-8?q?79a=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 ef1e200d..e9416b29 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -442,6 +442,11 @@ en: building/part: # building:part=* label: Building Part + building/prefabricated: + # building:prefabricated=* + label: Prefabricated + # 'terms: manufactured,modular,portable' + terms: '[translate with synonyms or related terms for ''Prefabricated'', separated by commas]' building_area: # building=* label: Building From e0414bb51d253eada98cf4eca5dc58dbab906fba Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Mon, 10 Oct 2022 12:45:55 +0200 Subject: [PATCH 25/77] add descriptions of bicycle parkings (#608) * add descriptions of bicycle parkings * tweak capitalization of strings Co-authored-by: Martin Raifer --- data/fields/bicycle_parking.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/data/fields/bicycle_parking.json b/data/fields/bicycle_parking.json index 77feeeff..7d9ac040 100644 --- a/data/fields/bicycle_parking.json +++ b/data/fields/bicycle_parking.json @@ -1,5 +1,15 @@ { "key": "bicycle_parking", "type": "combo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "stands": "Stand (supports bicycle frame)", + "wall_loops": "Wheelbender (supports wheel only)", + "shed": "Closed Shed", + "lockers": "Individual Lockers", + "building": "In a Building", + "handlebar_holder": "Handlebar Holder" + } + } } From 443336c2b3168e6c5fd6ebc0595f0ab672bef017 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 10 Oct 2022 10:46:29 +0000 Subject: [PATCH 26/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@e0414bb51d253eada98cf4eca5dc58dbab906?= =?UTF-8?q?fba=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index e9416b29..886d13a9 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -334,6 +334,19 @@ en: bicycle_parking: # bicycle_parking=* label: Type + options: + # bicycle_parking=building + building: In a Building + # bicycle_parking=handlebar_holder + handlebar_holder: Handlebar Holder + # bicycle_parking=lockers + lockers: Individual Lockers + # bicycle_parking=shed + shed: Closed Shed + # bicycle_parking=stands + stands: Stand (supports bicycle frame) + # bicycle_parking=wall_loops + wall_loops: Wheelbender (supports wheel only) bin: # bin=* label: Waste Bin From 96f30790a15b4f086fc19428799f9e19b443f751 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 11 Oct 2022 15:18:24 +0200 Subject: [PATCH 27/77] allow point geometry for the Water Slide preset (fixes #612) --- data/presets/attraction/water_slide.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/attraction/water_slide.json b/data/presets/attraction/water_slide.json index 5beb284b..f8ceada0 100644 --- a/data/presets/attraction/water_slide.json +++ b/data/presets/attraction/water_slide.json @@ -10,8 +10,8 @@ "min_age" ], "geometry": [ - "line", - "area" + "point", + "line" ], "terms": [ "theme park", From 2375a6bef46555f0d344a8b7ee71ee8d3adb91d0 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 11 Oct 2022 18:29:34 +0200 Subject: [PATCH 28/77] add field for the "two_sided=yes" tag see https://github.com/openstreetmap/iD/issues/9329#issuecomment-1270589307 --- data/fields/crossing_raised.json | 8 +------- data/fields/two_sided.json | 17 +++++++++++++++++ data/presets/barrier/city_wall.json | 4 ++++ data/presets/barrier/guard_rail.json | 4 ++++ data/presets/barrier/kerb.json | 3 ++- interim/source_strings.yaml | 10 ++++++++++ 6 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 data/fields/two_sided.json diff --git a/data/fields/crossing_raised.json b/data/fields/crossing_raised.json index b28dd659..3717dafd 100644 --- a/data/fields/crossing_raised.json +++ b/data/fields/crossing_raised.json @@ -13,11 +13,5 @@ "undefined": "No", "table": "Yes" } - }, - "terms": [ - "flat top", - "hump", - "speed", - "slow" - ] + } } diff --git a/data/fields/two_sided.json b/data/fields/two_sided.json new file mode 100644 index 00000000..164212b5 --- /dev/null +++ b/data/fields/two_sided.json @@ -0,0 +1,17 @@ +{ + "key": "two_sided", + "type": "defaultCheck", + "label": "Two-Sided", + "terms": [ + "double-sided" + ], + "geometry": [ + "line" + ], + "strings": { + "options": { + "undefined": "No", + "yes": "Yes" + } + } +} diff --git a/data/presets/barrier/city_wall.json b/data/presets/barrier/city_wall.json index 4962a9f5..9ff89717 100644 --- a/data/presets/barrier/city_wall.json +++ b/data/presets/barrier/city_wall.json @@ -4,6 +4,10 @@ "height", "material" ], + "moreFields": [ + "{barrier}", + "two_sided" + ], "geometry": [ "line", "area" diff --git a/data/presets/barrier/guard_rail.json b/data/presets/barrier/guard_rail.json index 0e4978de..1e384ddb 100644 --- a/data/presets/barrier/guard_rail.json +++ b/data/presets/barrier/guard_rail.json @@ -3,6 +3,10 @@ "fields": [ "material" ], + "moreFields": [ + "{barrier}", + "two_sided" + ], "geometry": [ "line" ], diff --git a/data/presets/barrier/kerb.json b/data/presets/barrier/kerb.json index 1c55a9c5..81f9636d 100644 --- a/data/presets/barrier/kerb.json +++ b/data/presets/barrier/kerb.json @@ -3,7 +3,8 @@ "fields": [ "kerb", "tactile_paving", - "wheelchair" + "wheelchair", + "two_sided" ], "moreFields": [ "material" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 886d13a9..d5b7a346 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -3462,6 +3462,16 @@ en: turning_circle: # turning_circle=* label: Shape + two_sided: + # two_sided=* + label: Two-Sided + options: + # two_sided=undefined + undefined: 'No' + # two_sided=yes + 'yes': 'Yes' + # 'terms: double-sided' + terms: '[translate with synonyms or related terms for ''Two-Sided'', separated by commas]' usage_rail: # usage=* label: Usage Type From 86c53547dbb269b00eb293dac4d4f6e2808bd75e Mon Sep 17 00:00:00 2001 From: archpdx Date: Thu, 13 Oct 2022 01:43:41 -0700 Subject: [PATCH 29/77] Fix Jersey Barrier geometry types (#614) --- data/presets/barrier/jersey_barrier.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/barrier/jersey_barrier.json b/data/presets/barrier/jersey_barrier.json index 0921b9c2..179ae8d6 100644 --- a/data/presets/barrier/jersey_barrier.json +++ b/data/presets/barrier/jersey_barrier.json @@ -8,7 +8,7 @@ "access" ], "geometry": [ - "point", + "vertex", "line" ], "tags": { From 256fb7f894416c1533a9a7ecccdc43497e2e106f Mon Sep 17 00:00:00 2001 From: Morion-Self Date: Thu, 13 Oct 2022 15:57:39 +0500 Subject: [PATCH 30/77] Add preset Cafeteria (#613) --- data/presets/amenity/fast_food/cafeteria.json | 22 +++++++++++++++++++ interim/source_strings.yaml | 5 +++++ 2 files changed, 27 insertions(+) create mode 100644 data/presets/amenity/fast_food/cafeteria.json diff --git a/data/presets/amenity/fast_food/cafeteria.json b/data/presets/amenity/fast_food/cafeteria.json new file mode 100644 index 00000000..8daa4af3 --- /dev/null +++ b/data/presets/amenity/fast_food/cafeteria.json @@ -0,0 +1,22 @@ +{ + "icon": "maki-restaurant", + "geometry": [ + "point", + "area" + ], + "terms": [ + "canteen", + "dining hall", + "lunchroom", + "refectory" + ], + "tags": { + "amenity": "fast_food", + "fast_food": "cafeteria" + }, + "fields": [ + "{amenity/fast_food}", + "access_simple" + ], + "name": "Cafeteria" +} diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index d5b7a346..49c6e6db 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -4177,6 +4177,11 @@ en: name: Burger Fast Food # 'terms: breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table' terms: + amenity/fast_food/cafeteria: + # amenity=fast_food + fast_food=cafeteria | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Cafeteria + # 'terms: eat,breakfast,tea,dining,dinner' + terms: amenity/fast_food/chicken: # amenity=fast_food + cuisine=chicken | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Chicken Fast Food From 041e6f1666ce0af3d49b67f99d962912038b2227 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Thu, 13 Oct 2022 10:58:12 +0000 Subject: [PATCH 31/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@256fb7f894416c1533a9a7ecccdc43497e2e1?= =?UTF-8?q?06f=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 49c6e6db..af703fc1 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -4180,7 +4180,7 @@ en: amenity/fast_food/cafeteria: # amenity=fast_food + fast_food=cafeteria | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Cafeteria - # 'terms: eat,breakfast,tea,dining,dinner' + # 'terms: canteen,dining hall,lunchroom,refectory' terms: amenity/fast_food/chicken: # amenity=fast_food + cuisine=chicken | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). From 5248a93995d84ef7b5e0802aa2b5343a06acab57 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 13 Oct 2022 18:47:59 +0200 Subject: [PATCH 32/77] upgrade to v5: add string cross references --- data/fields/payment_multi_fee.json | 87 +++++++++++++++--------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index dd5167f3..3630f8c8 100644 --- a/data/fields/payment_multi_fee.json +++ b/data/fields/payment_multi_fee.json @@ -1,53 +1,52 @@ { "key": "payment:", "type": "multiCombo", - "label": "Payment Types", + "label": "{payment_multi}", "prerequisiteTag": { "key": "fee", "valueNot": "no" }, - "strings": { - "options": { - "account_cards": "Account Card", - "app": "Mobile Application", - "cards": "Payment Card", - "cash": "Cash", - "cheque": "Check", - "coins": "Coins", - "contactless": "Contactless Payment", - "credit_cards": "Credit Card", - "cryptocurrencies": "Cryptocurrency", - "debit_cards": "Debit Card", - "electronic_purses": "Electronic Purse", - "notes": "Banknotes", - "prepaid_ticket": "Prepaid Ticket", - "telephone_cards": "Telephone Card", - "alipay": "Alipay", - "american_express": "American Express", - "apple_pay": "Apple Pay", - "bancomat": "Bancomat", - "blik": "Blik", - "clipper": "Clipper", - "diners_club": "Diners Club", - "discover_card": "Discover", - "dkv": "DKV", - "ep_easycard": "悠遊卡EasyCard", - "ep_geldkarte": "GeldKarte", - "ep_ipass": "iPASS一卡通", - "girocard": "Girocard", - "google_pay": "Google Pay", - "jcb": "JCB", - "maestro": "Maestro", - "mastercard": "Mastercard", - "mastercard_contactless": "Mastercard Contactless", - "paypal": "PayPal", - "unionpay": "UnionPay", - "uta": "UTA", - "v_pay": "V Pay", - "visa": "Visa", - "visa_debit": "Visa Debit", - "visa_electron": "Visa Electron", - "wechat": "WeChat Pay" - } + "stringsCrossReference": "{payment_multi}", + "options": { + "account_cards", + "app", + "cards", + "cash", + "cheque", + "coins", + "contactless", + "credit_cards", + "cryptocurrencies", + "debit_cards", + "electronic_purses", + "notes", + "prepaid_ticket", + "telephone_cards", + "alipay", + "american_express", + "apple_pay", + "bancomat", + "blik", + "clipper", + "diners_club", + "discover_card", + "dkv", + "ep_easycard", + "ep_geldkarte", + "ep_ipass", + "girocard", + "google_pay", + "jcb", + "maestro", + "mastercard", + "mastercard_contactless", + "paypal", + "unionpay", + "uta", + "v_pay", + "visa", + "visa_debit", + "visa_electron", + "wechat" } } From 3c4b231bec8cf0534114a561964f2b44014c5bf2 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 13 Oct 2022 18:51:22 +0200 Subject: [PATCH 33/77] Update payment_multi_fee.json --- data/fields/payment_multi_fee.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index 3630f8c8..474694da 100644 --- a/data/fields/payment_multi_fee.json +++ b/data/fields/payment_multi_fee.json @@ -7,7 +7,7 @@ "valueNot": "no" }, "stringsCrossReference": "{payment_multi}", - "options": { + "options": [ "account_cards", "app", "cards", @@ -48,5 +48,5 @@ "visa_debit", "visa_electron", "wechat" - } + ] } From b724c453664dce59ec78da026c8d39e6cad0cf80 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 13 Oct 2022 18:53:02 +0200 Subject: [PATCH 34/77] drop options (will not be necessary) --- data/fields/payment_multi_fee.json | 44 +----------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index 474694da..6986c66d 100644 --- a/data/fields/payment_multi_fee.json +++ b/data/fields/payment_multi_fee.json @@ -6,47 +6,5 @@ "key": "fee", "valueNot": "no" }, - "stringsCrossReference": "{payment_multi}", - "options": [ - "account_cards", - "app", - "cards", - "cash", - "cheque", - "coins", - "contactless", - "credit_cards", - "cryptocurrencies", - "debit_cards", - "electronic_purses", - "notes", - "prepaid_ticket", - "telephone_cards", - "alipay", - "american_express", - "apple_pay", - "bancomat", - "blik", - "clipper", - "diners_club", - "discover_card", - "dkv", - "ep_easycard", - "ep_geldkarte", - "ep_ipass", - "girocard", - "google_pay", - "jcb", - "maestro", - "mastercard", - "mastercard_contactless", - "paypal", - "unionpay", - "uta", - "v_pay", - "visa", - "visa_debit", - "visa_electron", - "wechat" - ] + "stringsCrossReference": "{payment_multi}" } From 45593d1cbf918ec78d7bf9f71e213dc2ae8885f8 Mon Sep 17 00:00:00 2001 From: kolgza <46303203+kolgza@users.noreply.github.com> Date: Fri, 14 Oct 2022 07:54:48 -0400 Subject: [PATCH 35/77] Add `highway=busway` preset (#164) --- data/deprecated.json | 4 ++++ data/presets/highway/busway.json | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 data/presets/highway/busway.json diff --git a/data/deprecated.json b/data/deprecated.json index db4f2e82..8a66cef5 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -710,6 +710,10 @@ "old": {"highway": "abandoned"}, "replace": {"abandoned:highway": "*"} }, + { + "old": {"highway": "service", "service": "busway"}, + "replace": {"highway": "busway"} + }, { "old": {"highway": "bridleway", "horse": "no"}, "replace": {"highway": "path", "horse": "no"} diff --git a/data/presets/highway/busway.json b/data/presets/highway/busway.json new file mode 100644 index 00000000..e8b62bb9 --- /dev/null +++ b/data/presets/highway/busway.json @@ -0,0 +1,27 @@ +{ + "icon": "temaki-bus", + "fields": [ + "name", + "operator", + "oneway", + "structure", + "covered" + ], + "moreFields": [ + "trolley_wire" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "busway" + }, + "aliases": [ + "Transitway", + "Bus Rapid Transit" + ], + "terms": [ + "brt" + ], + "name": "Busway" +} From 7defadba178519c7ccd31cd0b7bfd9637824a402 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Fri, 14 Oct 2022 11:55:15 +0000 Subject: [PATCH 36/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@45593d1cbf918ec78d7bf9f71e213dc2ae888?= =?UTF-8?q?5f8=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 6aae0955..889cf291 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6309,6 +6309,11 @@ en: highway/bus_stop: # highway=bus_stop | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Bus Stop + highway/busway: + # highway=busway | Transitway, Bus Rapid Transit | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Busway + # 'terms: brt' + terms: highway/construction: # highway=construction | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Road Under Construction From 51d64f2d543a8a459b6470190bbfe4dca6b3a694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Fri, 14 Oct 2022 04:59:36 -0700 Subject: [PATCH 37/77] Added translatable tunnel types (#251) Co-authored-by: Martin Raifer --- data/fields/tunnel_combo.json | 10 +++++++++- interim/source_strings.yaml | 9 +++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/data/fields/tunnel_combo.json b/data/fields/tunnel_combo.json index 832e5e2b..3b9d1b72 100644 --- a/data/fields/tunnel_combo.json +++ b/data/fields/tunnel_combo.json @@ -1,5 +1,13 @@ { "key": "tunnel", "type": "combo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "avalanche_protector": "Avalanche Protector", + "building_passage": "Building Passage", + "culvert": "Culvert", + "flooded": "Flooded Tunnel" + } + } } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 889cf291..61365c4c 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -3534,6 +3534,15 @@ en: tunnel_combo: # tunnel=* label: Type + options: + # tunnel=avalanche_protector + avalanche_protector: Avalanche Protector + # tunnel=building_passage + building_passage: Building Passage + # tunnel=culvert + culvert: Culvert + # tunnel=flooded + flooded: Flooded Tunnel turning_circle: # turning_circle=* label: Shape From 130e5dd7561ccfa24e297bed97ecfdefc0bbef4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Fri, 14 Oct 2022 05:12:01 -0700 Subject: [PATCH 38/77] Translatable strings for crops (#257) --- data/fields/crop.json | 32 +++++++++++++++++++++- interim/source_strings.yaml | 53 +++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/data/fields/crop.json b/data/fields/crop.json index 1aac1542..fd923f36 100644 --- a/data/fields/crop.json +++ b/data/fields/crop.json @@ -1,5 +1,35 @@ { "key": "crop", "type": "semiCombo", - "label": "Crops" + "label": "Crops", + "strings": { + "options": { + "asparagus": "Asparagus", + "barley": "Barley", + "beet": "Beets", + "cassava": "Cassava", + "coffee": "Coffee", + "cotton": "Cotton", + "cranberries": "Cranberries", + "fast_growing_wood": "Short-Rotation Coppice", + "flowers": "Flowers", + "grape": "Grapes", + "grass": "Grass", + "hop": "Hops", + "lavender": "Lavender", + "maize": "Corn", + "potato": "Potatoes", + "rape": "Rapeseed", + "rice": "Rice", + "strawberry": "Strawberries", + "sugar_beet": "Sugar Beets", + "sugarcane": "Sugarcane", + "sunflower": "Sunflowers", + "soy": "Soybeans", + "tea": "Tea", + "tobacco": "Tobacco", + "vegetable": "Vegetables", + "wheat": "Wheat" + } + } } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 61365c4c..5f4b38a0 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -696,6 +696,59 @@ en: crop: # crop=* label: Crops + options: + # crop=asparagus + asparagus: Asparagus + # crop=barley + barley: Barley + # crop=beet + beet: Beets + # crop=cassava + cassava: Cassava + # crop=coffee + coffee: Coffee + # crop=cotton + cotton: Cotton + # crop=cranberries + cranberries: Cranberries + # crop=fast_growing_wood + fast_growing_wood: Short-Rotation Coppice + # crop=flowers + flowers: Flowers + # crop=grape + grape: Grapes + # crop=grass + grass: Grass + # crop=hop + hop: Hops + # crop=lavender + lavender: Lavender + # crop=maize + maize: Corn + # crop=potato + potato: Potatoes + # crop=rape + rape: Rapeseed + # crop=rice + rice: Rice + # crop=soy + soy: Soybeans + # crop=strawberry + strawberry: Strawberries + # crop=sugar_beet + sugar_beet: Sugar Beets + # crop=sugarcane + sugarcane: Sugarcane + # crop=sunflower + sunflower: Sunflowers + # crop=tea + tea: Tea + # crop=tobacco + tobacco: Tobacco + # crop=vegetable + vegetable: Vegetables + # crop=wheat + wheat: Wheat crossing: # crossing=* label: Type From 1b29e3b96597935327f15847031c9c91377fa6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Fri, 14 Oct 2022 09:00:29 -0700 Subject: [PATCH 39/77] Add Population Date and Population Source fields (#261) * Added Population Date and Population Source fields * drop icon Co-authored-by: Martin Raifer --- data/fields/population.json | 5 ++++- data/fields/population/date.json | 12 ++++++++++++ data/fields/source/population.json | 14 ++++++++++++++ data/presets/amenity/refugee_site.json | 4 +++- data/presets/place/city.json | 4 +++- data/presets/place/hamlet.json | 4 +++- data/presets/place/neighbourhood.json | 4 +++- data/presets/place/quarter.json | 4 +++- data/presets/place/suburb.json | 4 +++- data/presets/place/town.json | 4 +++- data/presets/place/village.json | 4 +++- interim/source_strings.yaml | 8 ++++++++ 12 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 data/fields/population/date.json create mode 100644 data/fields/source/population.json diff --git a/data/fields/population.json b/data/fields/population.json index 74a231f8..1eca1140 100644 --- a/data/fields/population.json +++ b/data/fields/population.json @@ -2,5 +2,8 @@ "key": "population", "type": "number", "minValue": 0, - "label": "Population" + "label": "Population", + "terms": [ + "census" + ] } diff --git a/data/fields/population/date.json b/data/fields/population/date.json new file mode 100644 index 00000000..4c3a624b --- /dev/null +++ b/data/fields/population/date.json @@ -0,0 +1,12 @@ +{ + "key": "population:date", + "type": "text", + "label": "Population Date", + "placeholder": "YYYY-MM-DD", + "prerequisiteTag": { + "key": "population" + }, + "terms": [ + "census date" + ] +} diff --git a/data/fields/source/population.json b/data/fields/source/population.json new file mode 100644 index 00000000..4c1f42ea --- /dev/null +++ b/data/fields/source/population.json @@ -0,0 +1,14 @@ +{ + "key": "source:population", + "type": "combo", + "label": "Population Source", + "prerequisiteTag": { + "key": "population" + }, + "snake_case": false, + "caseSensitive": true, + "terms": [ + "census", + "population reference" + ] +} diff --git a/data/presets/amenity/refugee_site.json b/data/presets/amenity/refugee_site.json index 959d8d2e..72e21d63 100644 --- a/data/presets/amenity/refugee_site.json +++ b/data/presets/amenity/refugee_site.json @@ -7,7 +7,9 @@ "informal", "start_date", "capacity", - "population" + "population", + "population/date", + "source/population" ], "moreFields": [ "internet_access", diff --git a/data/presets/place/city.json b/data/presets/place/city.json index da8fcd75..78c6c577 100644 --- a/data/presets/place/city.json +++ b/data/presets/place/city.json @@ -2,7 +2,9 @@ "icon": "maki-city", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/hamlet.json b/data/presets/place/hamlet.json index fb33b6f2..36b9e7be 100644 --- a/data/presets/place/hamlet.json +++ b/data/presets/place/hamlet.json @@ -2,7 +2,9 @@ "icon": "maki-triangle-stroked", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/neighbourhood.json b/data/presets/place/neighbourhood.json index 96b872ce..9145c7a0 100644 --- a/data/presets/place/neighbourhood.json +++ b/data/presets/place/neighbourhood.json @@ -2,7 +2,9 @@ "icon": "maki-triangle-stroked", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "moreFields": [ "gnis/feature_id-US" diff --git a/data/presets/place/quarter.json b/data/presets/place/quarter.json index 1291d5bd..194ba0ea 100644 --- a/data/presets/place/quarter.json +++ b/data/presets/place/quarter.json @@ -2,7 +2,9 @@ "icon": "maki-triangle-stroked", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/suburb.json b/data/presets/place/suburb.json index 03c23532..7752a520 100644 --- a/data/presets/place/suburb.json +++ b/data/presets/place/suburb.json @@ -2,7 +2,9 @@ "icon": "maki-triangle-stroked", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/town.json b/data/presets/place/town.json index 911abfcb..c97bb7f9 100644 --- a/data/presets/place/town.json +++ b/data/presets/place/town.json @@ -2,7 +2,9 @@ "icon": "maki-town", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/data/presets/place/village.json b/data/presets/place/village.json index d08042fa..0a6af854 100644 --- a/data/presets/place/village.json +++ b/data/presets/place/village.json @@ -2,7 +2,9 @@ "icon": "maki-village", "fields": [ "name", - "population" + "population", + "population/date", + "source/population" ], "geometry": [ "point", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 5f4b38a0..833f3372 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2509,6 +2509,11 @@ en: population: # population=* label: Population + population/date: + # 'population:date=*' + label: Population Date + # population/date field placeholder + placeholder: YYYY-MM-DD portable: # portable=* label: Portable @@ -3094,6 +3099,9 @@ en: survey: Survey # 'terms: reference' terms: '[translate with synonyms or related terms for ''Sources'', separated by commas]' + source/population: + # 'source:population=*' + label: Population Source species: # species=* label: Species From 4aa23877337e30c307412cb2806b7b50e67d3657 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Fri, 14 Oct 2022 16:01:12 +0000 Subject: [PATCH 40/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@1b29e3b96597935327f15847031c9c91377fa?= =?UTF-8?q?6bf=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 833f3372..003c0811 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2510,7 +2510,7 @@ en: # population=* label: Population population/date: - # 'population:date=*' + # population:date=* label: Population Date # population/date field placeholder placeholder: YYYY-MM-DD @@ -3100,7 +3100,7 @@ en: # 'terms: reference' terms: '[translate with synonyms or related terms for ''Sources'', separated by commas]' source/population: - # 'source:population=*' + # source:population=* label: Population Source species: # species=* From 406277e7f0e7fbf60023c99391e546054877a2ab Mon Sep 17 00:00:00 2001 From: kjonosm <51236777+kjonosm@users.noreply.github.com> Date: Mon, 17 Oct 2022 11:07:47 +0200 Subject: [PATCH 41/77] Update speciality.json (#392) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update speciality.json Add strings derived from https://wiki.openstreetmap.org/wiki/Key:healthcare:speciality * Update data/fields/healthcare/speciality.json Co-authored-by: Minh Nguyễn * Update speciality.json Co-authored-by: Minh Nguyễn --- data/fields/healthcare/speciality.json | 91 +++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/data/fields/healthcare/speciality.json b/data/fields/healthcare/speciality.json index f4739cf0..215ac6bb 100644 --- a/data/fields/healthcare/speciality.json +++ b/data/fields/healthcare/speciality.json @@ -1,5 +1,94 @@ { "key": "healthcare:speciality", "type": "semiCombo", - "label": "Specialties" + "label": "Specialties", + "strings": { + "options": { + "abortion": "Abortion", + "acupuncture": "Acupuncture", + "allergology": "Allergy & Asthma", + "anaesthetics": "Anesthesiology", + "angiology": "Angiology", + "anthroposophical": "Anthroposophic Medicine", + "applied_kinesiology": "Applied Kinesiology", + "aromatherapy": "Aromatherapy", + "ayurveda": "Ayurveda", + "behavior": "Behavior Therapy", + "biochemistry": "Biochemistry", + "biology": "Biology", + "blood_check": "Blood Test", + "body": "Body Therapy", + "cardiology": "Cardiology", + "cardiothoracic_surgery": "Cardiothoracic Surgery", + "child_psychiatry": "Child & Adolescent Psychiatry", + "chiropractic": "Chiropractic", + "clinical_pathology": "Clinical Pathology", + "community": "Community & Public Health", + "depth": "Depth Psychology", + "dermatology": "Dermatology", + "dermatovenereology": "Dermatovenereology", + "diabetology": "Diabetology", + "diagnostic_radiology": "Diagnostic Radiology", + "emergency": "Emergency Medicine", + "endocrinology": "Endocrinology", + "fertility": "Fertility", + "gastroenterology": "Gastroenterology", + "general": "General Practice", + "geriatrics": "Geriatric Medicine", + "gynaecology": "Obstetrics & Gynecology", + "haematology": "Hematology", + "hepatology": "Hepatology", + "herbalism": "Herbalism", + "homeopathy": "Homeopathy", + "humanistic": "Humanistic Psychology", + "hydrotherapy": "Hydrotherapy", + "hypnosis": "Hypnosis", + "infectious_diseases": "Infectious Disease", + "intensive": "Intensive Care", + "internal": "Internal Medicine", + "dental_oral_maxillo_facial_surgery": "Dental, Oral & Maxillofacial Surgery", + "naturopathy": "Naturopathy", + "neonatology": "Neonatology", + "nephrology": "Nephrology", + "neurology": "Neurology", + "neuropsychiatry": "Neuropsychiatry", + "neurosurgery": "Neurosurgery", + "nuclear": "Nuclear Medicine", + "occupational": "Occupational Medicine", + "oncology": "Oncology", + "ophthalmology": "Ophthalmology", + "orthodontics": "Orthodontics", + "orthopaedics": "Orthopedic Surgery", + "osteopathy": "Osteopathy", + "otolaryngology": "Ear, Nose & Throat", + "paediatric_surgery": "Pediatric Surgery", + "paediatrics": "Pediatrics", + "palliative": "Palliative Care", + "pathology": "Pathology", + "physiatry": "Physical Medicine & Rehabilitation", + "plastic_surgery": "Plastic Surgery", + "podiatry": "Podiatry", + "proctology": "Colorectal Surgery", + "psychiatry": "Psychiatry", + "pulmonology": "Pulmonology", + "radiology": "Radiology", + "radiotherapy": "Radiotherapy", + "reflexology": "Reflexology", + "reiki": "Reiki", + "rheumatology": "Rheumatology", + "shiatsu": "Shiatsu", + "stomatology": "Stomatology", + "surgery": "General Surgery", + "systemic": "Systemic Therapy", + "traditional_chinese_medicine": "Traditional Chinese Medicine", + "transplant": "Transplant Surgery", + "trauma": "Trauma Surgery", + "tropical": "Tropical Medicine", + "tuina": "Tuī ná", + "unani": "Unani Medicine", + "urology": "Urology", + "vaccination": "Vaccination", + "vascular_surgery": "Vascular Surgery" + } + } } From 7f7a077e0750bb7ccd959c92eccaa66cd8343ae7 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 17 Oct 2022 09:08:13 +0000 Subject: [PATCH 42/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@406277e7f0e7fbf60023c99391e546054877a?= =?UTF-8?q?2ab=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 171 ++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 003c0811..2a007d2d 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1464,6 +1464,177 @@ en: healthcare/speciality: # healthcare:speciality=* label: Specialties + options: + # healthcare:speciality=abortion + abortion: Abortion + # healthcare:speciality=acupuncture + acupuncture: Acupuncture + # healthcare:speciality=allergology + allergology: Allergy & Asthma + # healthcare:speciality=anaesthetics + anaesthetics: Anesthesiology + # healthcare:speciality=angiology + angiology: Angiology + # healthcare:speciality=anthroposophical + anthroposophical: Anthroposophic Medicine + # healthcare:speciality=applied_kinesiology + applied_kinesiology: Applied Kinesiology + # healthcare:speciality=aromatherapy + aromatherapy: Aromatherapy + # healthcare:speciality=ayurveda + ayurveda: Ayurveda + # healthcare:speciality=behavior + behavior: Behavior Therapy + # healthcare:speciality=biochemistry + biochemistry: Biochemistry + # healthcare:speciality=biology + biology: Biology + # healthcare:speciality=blood_check + blood_check: Blood Test + # healthcare:speciality=body + body: Body Therapy + # healthcare:speciality=cardiology + cardiology: Cardiology + # healthcare:speciality=cardiothoracic_surgery + cardiothoracic_surgery: Cardiothoracic Surgery + # healthcare:speciality=child_psychiatry + child_psychiatry: Child & Adolescent Psychiatry + # healthcare:speciality=chiropractic + chiropractic: Chiropractic + # healthcare:speciality=clinical_pathology + clinical_pathology: Clinical Pathology + # healthcare:speciality=community + community: Community & Public Health + # healthcare:speciality=dental_oral_maxillo_facial_surgery + dental_oral_maxillo_facial_surgery: Dental, Oral & Maxillofacial Surgery + # healthcare:speciality=depth + depth: Depth Psychology + # healthcare:speciality=dermatology + dermatology: Dermatology + # healthcare:speciality=dermatovenereology + dermatovenereology: Dermatovenereology + # healthcare:speciality=diabetology + diabetology: Diabetology + # healthcare:speciality=diagnostic_radiology + diagnostic_radiology: Diagnostic Radiology + # healthcare:speciality=emergency + emergency: Emergency Medicine + # healthcare:speciality=endocrinology + endocrinology: Endocrinology + # healthcare:speciality=fertility + fertility: Fertility + # healthcare:speciality=gastroenterology + gastroenterology: Gastroenterology + # healthcare:speciality=general + general: General Practice + # healthcare:speciality=geriatrics + geriatrics: Geriatric Medicine + # healthcare:speciality=gynaecology + gynaecology: Obstetrics & Gynecology + # healthcare:speciality=haematology + haematology: Hematology + # healthcare:speciality=hepatology + hepatology: Hepatology + # healthcare:speciality=herbalism + herbalism: Herbalism + # healthcare:speciality=homeopathy + homeopathy: Homeopathy + # healthcare:speciality=humanistic + humanistic: Humanistic Psychology + # healthcare:speciality=hydrotherapy + hydrotherapy: Hydrotherapy + # healthcare:speciality=hypnosis + hypnosis: Hypnosis + # healthcare:speciality=infectious_diseases + infectious_diseases: Infectious Disease + # healthcare:speciality=intensive + intensive: Intensive Care + # healthcare:speciality=internal + internal: Internal Medicine + # healthcare:speciality=naturopathy + naturopathy: Naturopathy + # healthcare:speciality=neonatology + neonatology: Neonatology + # healthcare:speciality=nephrology + nephrology: Nephrology + # healthcare:speciality=neurology + neurology: Neurology + # healthcare:speciality=neuropsychiatry + neuropsychiatry: Neuropsychiatry + # healthcare:speciality=neurosurgery + neurosurgery: Neurosurgery + # healthcare:speciality=nuclear + nuclear: Nuclear Medicine + # healthcare:speciality=occupational + occupational: Occupational Medicine + # healthcare:speciality=oncology + oncology: Oncology + # healthcare:speciality=ophthalmology + ophthalmology: Ophthalmology + # healthcare:speciality=orthodontics + orthodontics: Orthodontics + # healthcare:speciality=orthopaedics + orthopaedics: Orthopedic Surgery + # healthcare:speciality=osteopathy + osteopathy: Osteopathy + # healthcare:speciality=otolaryngology + otolaryngology: Ear, Nose & Throat + # healthcare:speciality=paediatric_surgery + paediatric_surgery: Pediatric Surgery + # healthcare:speciality=paediatrics + paediatrics: Pediatrics + # healthcare:speciality=palliative + palliative: Palliative Care + # healthcare:speciality=pathology + pathology: Pathology + # healthcare:speciality=physiatry + physiatry: Physical Medicine & Rehabilitation + # healthcare:speciality=plastic_surgery + plastic_surgery: Plastic Surgery + # healthcare:speciality=podiatry + podiatry: Podiatry + # healthcare:speciality=proctology + proctology: Colorectal Surgery + # healthcare:speciality=psychiatry + psychiatry: Psychiatry + # healthcare:speciality=pulmonology + pulmonology: Pulmonology + # healthcare:speciality=radiology + radiology: Radiology + # healthcare:speciality=radiotherapy + radiotherapy: Radiotherapy + # healthcare:speciality=reflexology + reflexology: Reflexology + # healthcare:speciality=reiki + reiki: Reiki + # healthcare:speciality=rheumatology + rheumatology: Rheumatology + # healthcare:speciality=shiatsu + shiatsu: Shiatsu + # healthcare:speciality=stomatology + stomatology: Stomatology + # healthcare:speciality=surgery + surgery: General Surgery + # healthcare:speciality=systemic + systemic: Systemic Therapy + # healthcare:speciality=traditional_chinese_medicine + traditional_chinese_medicine: Traditional Chinese Medicine + # healthcare:speciality=transplant + transplant: Transplant Surgery + # healthcare:speciality=trauma + trauma: Trauma Surgery + # healthcare:speciality=tropical + tropical: Tropical Medicine + # healthcare:speciality=tuina + tuina: Tuī ná + # healthcare:speciality=unani + unani: Unani Medicine + # healthcare:speciality=urology + urology: Urology + # healthcare:speciality=vaccination + vaccination: Vaccination + # healthcare:speciality=vascular_surgery + vascular_surgery: Vascular Surgery heating: # heating=* label: Heating From 562c26f5d8c8d8424379607f45d8b53f1c4e04cd Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 17 Oct 2022 11:23:09 +0200 Subject: [PATCH 43/77] add preset for the tag man_made=tailings_pond see #142, #144 --- data/presets/man_made/tailings_pond.json | 26 ++++++++++++++++++++++++ interim/source_strings.yaml | 5 +++++ 2 files changed, 31 insertions(+) create mode 100644 data/presets/man_made/tailings_pond.json diff --git a/data/presets/man_made/tailings_pond.json b/data/presets/man_made/tailings_pond.json new file mode 100644 index 00000000..d9044f42 --- /dev/null +++ b/data/presets/man_made/tailings_pond.json @@ -0,0 +1,26 @@ +{ + "icon": "maki-water", + "fields": [ + "name", + "resource", + "operator", + "intermittent" + ], + "geometry": [ + "area" + ], + "tags": { + "man_made": "tailings_pond" + }, + "terms": [ + "mining", + "separation", + "slurry" + ], + "aliases": [ + "Tailing Pond", + "Settling Pond", + "Settling Pit" + ], + "name": "Tailings Pond" +} diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 2a007d2d..a9c41609 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -8071,6 +8071,11 @@ en: name: Survey Point # 'terms: trig point,trig station,survey marker,geodetic mark,geodetic point,triangulation pillar,trigonometrical station' terms: + man_made/tailings_pond: + # man_made=tailings_pond | Tailing Pond, Settling Pond, Settling Pit | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Tailings Pond + # 'terms: mining,separation,slurry' + terms: man_made/torii: # man_made=torii | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Torii From 0b9f4431848005ff601ae733752bd07f718c11f0 Mon Sep 17 00:00:00 2001 From: Marc-marc-marc <31963329+Marc-marc-marc@users.noreply.github.com> Date: Mon, 17 Oct 2022 11:43:49 +0200 Subject: [PATCH 44/77] add deprecation for reservoir_type=tailings, closes #142 (#144) add several combinaison with the depreciated tag reservoir_type=tailings --- data/deprecated.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/deprecated.json b/data/deprecated.json index 8a66cef5..f64eeaec 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -890,6 +890,14 @@ "old": {"landuse": "reservoir"}, "replace": {"natural": "water", "water": "reservoir"} }, + { + "old": {"landuse": "reservoir", "reservoir_type": "tailings", "natural": "water", "water": "reservoir"}, + "replace": {"man_made": "tailings_pond"} + }, + { + "old": {"landuse": "reservoir", "reservoir_type": "tailings"}, + "replace": {"man_made": "tailings_pond"} + }, { "old": {"landuse": "school"}, "replace": {"landuse": "education"} @@ -1078,6 +1086,10 @@ "old": {"natural": "marsh"}, "replace": {"natural": "wetland", "wetland": "marsh"} }, + { + "old": {"natural": "water", "water": "reservoir", "reservoir_type": "tailings"}, + "replace": {"man_made": "tailings_pond"} + }, { "old": {"natural": "waterfall"}, "replace": {"waterway": "waterfall"} From b4ffc1d4cb27e3fbb5e7e4f074ddd3922ff62d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 17 Oct 2022 02:50:35 -0700 Subject: [PATCH 45/77] Add translatable strings for Religion field (#263) * Added translatable strings for Religion field * tweak labels Co-authored-by: Martin Raifer --- data/fields/religion.json | 28 ++++++++++++++++++++++- interim/source_strings.yaml | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/data/fields/religion.json b/data/fields/religion.json index 36b5b67c..19c1dfbb 100644 --- a/data/fields/religion.json +++ b/data/fields/religion.json @@ -1,5 +1,31 @@ { "key": "religion", "type": "combo", - "label": "Religion" + "label": "Religion", + "strings": { + "options": { + "bahai": "Bahá’í", + "benzhu": "Benzhu", + "buddhist": "Buddhist", + "caodaism": "Caodaist", + "chinese_folk": "Chinese Folk Religion", + "christian": "Christian", + "confucian": "Confucian", + "hindu": "Hindu", + "jain": "Jain", + "jewish": "Jewish", + "multifaith": "Multifaith", + "muslim": "Muslim", + "none": "Nonreligious", + "pagan": "Pagan", + "shinto": "Shinto", + "sikh": "Sikh", + "spiritualist": "Spiritualist", + "taoist": "Taoist", + "tenrikyo": "Tenrikyo", + "unitarian_universalist": "Unitarian Universalist", + "vietnamese_folk": "Vietnamese Folk Religion", + "voodoo": "Voodoo" + } + } } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index a9c41609..5e006a6e 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2872,6 +2872,51 @@ en: religion: # religion=* label: Religion + options: + # religion=bahai + bahai: Bahá’í + # religion=benzhu + benzhu: Benzhu + # religion=buddhist + buddhist: Buddhist + # religion=caodaism + caodaism: Caodaist + # religion=chinese_folk + chinese_folk: Chinese Folk + # religion=christian + christian: Christian + # religion=confucian + confucian: Confucian + # religion=hindu + hindu: Hindu + # religion=jain + jain: Jain + # religion=jewish + jewish: Jewish + # religion=multifaith + multifaith: Multifaith + # religion=muslim + muslim: Muslim + # religion=none + none: Nonreligious + # religion=pagan + pagan: Pagan + # religion=shinto + shinto: Shinto + # religion=sikh + sikh: Sikh + # religion=spiritualist + spiritualist: Spiritualist + # religion=taoist + taoist: Taoist + # religion=tenrikyo + tenrikyo: Tenrikyo + # religion=unitarian_universalist + unitarian_universalist: Unitarian Universalist + # religion=vietnamese_folk + vietnamese_folk: Vietnamese Folk + # religion=voodoo + voodoo: Voodoo terms: '[translate with synonyms or related terms for ''Religion'', separated by commas]' reservation: # reservation=* From 2358f857c1f03b9b59052e0c755ed886a8e477f0 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 17 Oct 2022 09:50:59 +0000 Subject: [PATCH 46/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@b4ffc1d4cb27e3fbb5e7e4f074ddd3922ff62?= =?UTF-8?q?d0c=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 5e006a6e..4b89d085 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2882,7 +2882,7 @@ en: # religion=caodaism caodaism: Caodaist # religion=chinese_folk - chinese_folk: Chinese Folk + chinese_folk: Chinese Folk Religion # religion=christian christian: Christian # religion=confucian @@ -2914,7 +2914,7 @@ en: # religion=unitarian_universalist unitarian_universalist: Unitarian Universalist # religion=vietnamese_folk - vietnamese_folk: Vietnamese Folk + vietnamese_folk: Vietnamese Folk Religion # religion=voodoo voodoo: Voodoo terms: '[translate with synonyms or related terms for ''Religion'', separated by commas]' From a2615cefe6de5a860a9264b12bfc09258c7aeb53 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 17 Oct 2022 12:06:53 +0200 Subject: [PATCH 47/77] add toilets field as optional field of more POI presets & add toilets:wheelchair field (#325) --- data/fields/toilets/wheelchair.json | 16 ++++++++++++++++ data/presets/amenity/cafe.json | 2 ++ data/presets/amenity/pub.json | 2 ++ data/presets/amenity/restaurant.json | 2 ++ data/presets/shop.json | 2 ++ data/presets/tourism/aquarium.json | 2 ++ data/presets/tourism/gallery.json | 2 ++ data/presets/tourism/information/office.json | 2 ++ data/presets/tourism/museum.json | 2 ++ data/presets/tourism/zoo.json | 2 ++ interim/source_strings.yaml | 11 +++++++++++ 11 files changed, 45 insertions(+) create mode 100644 data/fields/toilets/wheelchair.json diff --git a/data/fields/toilets/wheelchair.json b/data/fields/toilets/wheelchair.json new file mode 100644 index 00000000..949545af --- /dev/null +++ b/data/fields/toilets/wheelchair.json @@ -0,0 +1,16 @@ +{ + "key": "toilets/wheelchair", + "type": "radio", + "strings": { + "options": { + "yes": "Yes", + "limited": "Limited", + "no": "No" + } + }, + "label": "Wheelchair Accessible Toilet", + "prerequisiteTag": { + "key": "toilets", + "valueNot": "no" + } +} diff --git a/data/presets/amenity/cafe.json b/data/presets/amenity/cafe.json index 8f788d58..5c9e482c 100644 --- a/data/presets/amenity/cafe.json +++ b/data/presets/amenity/cafe.json @@ -34,6 +34,8 @@ "reservation", "smoking", "takeaway", + "toilets", + "toilets/wheelchair", "wheelchair", "highchair" ], diff --git a/data/presets/amenity/pub.json b/data/presets/amenity/pub.json index 17a0e24d..229c2531 100644 --- a/data/presets/amenity/pub.json +++ b/data/presets/amenity/pub.json @@ -29,6 +29,8 @@ "ref/FR/siret-FR", "real_fire-GB-IE", "sport_pub", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/restaurant.json b/data/presets/amenity/restaurant.json index 6fdcbf94..cb2dbdee 100644 --- a/data/presets/amenity/restaurant.json +++ b/data/presets/amenity/restaurant.json @@ -38,6 +38,8 @@ "sport_pub", "stars", "takeaway", + "toilets", + "toilets/wheelchair", "wheelchair", "highchair" ], diff --git a/data/presets/shop.json b/data/presets/shop.json index 7e0ec732..a8a617d7 100644 --- a/data/presets/shop.json +++ b/data/presets/shop.json @@ -31,6 +31,8 @@ "ref/FR/siret-FR", "second_hand", "stroller", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/tourism/aquarium.json b/data/presets/tourism/aquarium.json index f93671ce..441037ab 100644 --- a/data/presets/tourism/aquarium.json +++ b/data/presets/tourism/aquarium.json @@ -21,6 +21,8 @@ "phone", "ref/vatin", "smoking", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/tourism/gallery.json b/data/presets/tourism/gallery.json index d7dcd6f7..dd379573 100644 --- a/data/presets/tourism/gallery.json +++ b/data/presets/tourism/gallery.json @@ -18,6 +18,8 @@ "payment_multi", "phone", "ref/vatin", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/tourism/information/office.json b/data/presets/tourism/information/office.json index 0d222846..b67653d4 100644 --- a/data/presets/tourism/information/office.json +++ b/data/presets/tourism/information/office.json @@ -16,6 +16,8 @@ "height_building", "internet_access/ssid", "phone", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/tourism/museum.json b/data/presets/tourism/museum.json index 79197f2e..27fe10e1 100644 --- a/data/presets/tourism/museum.json +++ b/data/presets/tourism/museum.json @@ -25,6 +25,8 @@ "opening_hours/covid19", "payment_multi", "phone", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/tourism/zoo.json b/data/presets/tourism/zoo.json index 1d4d367c..ce38564f 100644 --- a/data/presets/tourism/zoo.json +++ b/data/presets/tourism/zoo.json @@ -19,6 +19,8 @@ "opening_hours/covid19", "phone", "ref/vatin", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 4b89d085..6bf9d56b 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -3656,6 +3656,17 @@ en: # toilets:position=* label: Positions terms: '[translate with synonyms or related terms for ''Positions'', separated by commas]' + toilets/wheelchair: + # toilets/wheelchair=* + label: Wheelchair Accessible Toilet + options: + # toilets/wheelchair=limited + limited: Limited + # toilets/wheelchair=no + 'no': 'No' + # toilets/wheelchair=yes + 'yes': 'Yes' + terms: '[translate with synonyms or related terms for ''Wheelchair Accessible Toilet'', separated by commas]' toll: # toll=* label: Toll From 22400a7d9ae954e60601b9ca1acecf8725087ffd Mon Sep 17 00:00:00 2001 From: archpdx Date: Mon, 17 Oct 2022 03:08:02 -0700 Subject: [PATCH 48/77] Add Bike and Ride field (#521) --- data/fields/bike_ride.json | 5 +++++ data/presets/amenity/bicycle_parking.json | 1 + 2 files changed, 6 insertions(+) create mode 100644 data/fields/bike_ride.json diff --git a/data/fields/bike_ride.json b/data/fields/bike_ride.json new file mode 100644 index 00000000..207b6606 --- /dev/null +++ b/data/fields/bike_ride.json @@ -0,0 +1,5 @@ +{ + "key": "bike_ride", + "type": "check", + "label": "Bike and Ride" +} diff --git a/data/presets/amenity/bicycle_parking.json b/data/presets/amenity/bicycle_parking.json index a249bb12..37855797 100644 --- a/data/presets/amenity/bicycle_parking.json +++ b/data/presets/amenity/bicycle_parking.json @@ -12,6 +12,7 @@ "charge_fee" ], "moreFields": [ + "bike_ride", "colour", "indoor", "level", From 027ce473600955eeb066a44d0043f7790b18e032 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 17 Oct 2022 10:08:33 +0000 Subject: [PATCH 49/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@22400a7d9ae954e60601b9ca1acecf8725087?= =?UTF-8?q?ffd=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 6bf9d56b..6e828374 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -347,6 +347,10 @@ en: stands: Stand (supports bicycle frame) # bicycle_parking=wall_loops wall_loops: Wheelbender (supports wheel only) + bike_ride: + # bike_ride=* + label: Bike and Ride + terms: '[translate with synonyms or related terms for ''Bike and Ride'', separated by commas]' bin: # bin=* label: Waste Bin From bb97b0fd306522400cb317749297a2ea52ef4a5f Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 17 Oct 2022 12:09:24 +0200 Subject: [PATCH 50/77] departure_board can also be used for arrival times (#582) --- data/fields/departures_board.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/departures_board.json b/data/fields/departures_board.json index 693f5f9a..6d8afe19 100644 --- a/data/fields/departures_board.json +++ b/data/fields/departures_board.json @@ -1,7 +1,7 @@ { "key": "departures_board", "type": "combo", - "label": "Departures Board", + "label": "Departures/Arrivals Board", "strings": { "options": { "yes": "Yes", From d625ff715991f114eebd423b1be77ec734ec8402 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 17 Oct 2022 10:09:46 +0000 Subject: [PATCH 51/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@bb97b0fd306522400cb317749297a2ea52ef4?= =?UTF-8?q?a5f=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 6e828374..94ff4e19 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -950,7 +950,7 @@ en: label: Denotation departures_board: # departures_board=* - label: Departures Board + label: Departures/Arrivals Board options: # departures_board=no 'no': None From d8acca837f007bf689a359f22f2e2183c32ee77d Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 17 Oct 2022 12:14:39 +0200 Subject: [PATCH 52/77] add preset for highway=service mapped as areas (#463) see https://wiki.openstreetmap.org/w/index.php?title=Tag:highway%3Dservice&oldid=2321782#Linear_ways_and_areas preset is non-searchable as usage is pretty niche and showing the preset in search results could potentially mislead mappers to misuse the tag --- data/presets/highway/service_area.json | 41 ++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 data/presets/highway/service_area.json diff --git a/data/presets/highway/service_area.json b/data/presets/highway/service_area.json new file mode 100644 index 00000000..01507c3d --- /dev/null +++ b/data/presets/highway/service_area.json @@ -0,0 +1,41 @@ +{ + "icon": "iD-highway-service", + "fields": [ + "name", + "service", + "maxspeed", + "surface", + "structure", + "access" + ], + "moreFields": [ + "covered_no", + "flood_prone", + "lit", + "maxheight", + "maxspeed/advisory", + "maxweight_bridge", + "smoothness", + "trolley_wire" + ], + "geometry": [ + "area" + ], + "tags": { + "highway": "service" + }, + "terms": [ + "maneuvering area", + "maneuvering surface", + "manoeuvring area", + "manoeuvring surface", + "paved lot", + "service road", + "service yard", + "shunting area", + "staging lot", + "yard" + ], + "searchable": false, + "name": "Paved Service Area" +} From de50002dde983552cab0057df4753de73614c4cd Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 17 Oct 2022 10:14:59 +0000 Subject: [PATCH 53/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@d8acca837f007bf689a359f22f2e2183c32ee?= =?UTF-8?q?77d=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 94ff4e19..b7734a06 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6897,6 +6897,9 @@ en: # highway=service + service=parking_aisle | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Parking Aisle terms: + highway/service_area: + # highway=service | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Paved Service Area highway/services: # highway=services | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Service Area From 95c206bc2398c98ddd75232bd828d077749ccc6c Mon Sep 17 00:00:00 2001 From: Maksim Gurtovenko Date: Mon, 17 Oct 2022 18:04:28 +0200 Subject: [PATCH 54/77] add strings for fields: fuel, entrance and substation (#467) --- data/fields/entrance.json | 16 +++++- data/fields/fuel/fuel_multi-RU.json | 22 ++++++++ data/fields/fuel/fuel_multi.json | 53 ++++++++++++++++++ data/fields/fuel_multi.json | 5 -- data/fields/substation.json | 16 +++++- data/presets/amenity/fuel.json | 3 +- data/presets/shop/fuel.json | 2 +- data/presets/waterway/fuel.json | 2 +- interim/source_strings.yaml | 87 ++++++++++++++++++++++++++++- 9 files changed, 195 insertions(+), 11 deletions(-) create mode 100644 data/fields/fuel/fuel_multi-RU.json create mode 100644 data/fields/fuel/fuel_multi.json delete mode 100644 data/fields/fuel_multi.json diff --git a/data/fields/entrance.json b/data/fields/entrance.json index 16d04b3f..724eb105 100644 --- a/data/fields/entrance.json +++ b/data/fields/entrance.json @@ -1,5 +1,19 @@ { "key": "entrance", "type": "typeCombo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "yes": "Unspecified", + "main": "Main", + "secondary": "Secondary", + "service": "Service", + "exit": "Exit Only", + "entrance": "Entrance Only", + "emergency": "Emergency Exit", + "staircase": "Staircase", + "home": "Private House or Apartment", + "garage": "Garage Door" + } + } } diff --git a/data/fields/fuel/fuel_multi-RU.json b/data/fields/fuel/fuel_multi-RU.json new file mode 100644 index 00000000..4e2a4047 --- /dev/null +++ b/data/fields/fuel/fuel_multi-RU.json @@ -0,0 +1,22 @@ +{ + "key": "fuel:", + "type": "multiCombo", + "label": "{fuel/fuel_multi}", + "stringsCrossReference": "{fuel/fuel_multi}", + "options": [ + "diesel", + "octane_80", + "octane_92", + "octane_95", + "octane_98", + "octane_100", + "lpg", + "cng" + ], + "autoSuggestions": false, + "locationSet": { + "include": [ + "RU" + ] + } +} diff --git a/data/fields/fuel/fuel_multi.json b/data/fields/fuel/fuel_multi.json new file mode 100644 index 00000000..e0b8bf6d --- /dev/null +++ b/data/fields/fuel/fuel_multi.json @@ -0,0 +1,53 @@ +{ + "key": "fuel:", + "type": "multiCombo", + "label": "Fuel Types", + "strings": { + "options": { + "diesel": "Diesel", + "GTL_diesel": "GTL Diesel", + "HGV_diesel": "HGV Diesel", + "biodiesel": "Bio Diesel", + "octane_80": "Gasoline (80 Octane)", + "octane_87": "Gasoline (87 Octane)", + "octane_89": "Gasoline (89 Octane)", + "octane_91": "Gasoline (91 Octane)", + "octane_92": "Gasoline (92 Octane)", + "octane_95": "Gasoline (95 Octane)", + "octane_98": "Gasoline (98 Octane)", + "octane_100": "Gasoline (100 Octane)", + "e10": "E10 Gasoline", + "e85": "E85 Gasoline", + "lpg": "Liquefied Natural Gas (LPG)", + "cng": "Compressed Natural Gas (CNG)", + "propane": "Propane", + "LH2": "Liquid Hydrogen", + "h70": "Gaseous Hydrogen (700 bar)", + "adblue": "AdBlue / AUS 32", + "adblue:canister": "AdBlue / AUS 32 (sold in canisters)" + } + }, + "autoSuggestions": true, + "caseSensitive": true, + "terms": [ + "diesel", + "gas", + "gasoline", + "petrol", + "ethanol", + "biodiesel", + "bioethanol", + "fuel", + "fuel mix", + "mixture", + "propane", + "lpg", + "cng", + "lng" + ], + "locationSet": { + "exclude": [ + "RU" + ] + } +} diff --git a/data/fields/fuel_multi.json b/data/fields/fuel_multi.json deleted file mode 100644 index bb76d9ab..00000000 --- a/data/fields/fuel_multi.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "key": "fuel:", - "type": "multiCombo", - "label": "Fuel Types" -} diff --git a/data/fields/substation.json b/data/fields/substation.json index b83834b8..6b4ae9cc 100644 --- a/data/fields/substation.json +++ b/data/fields/substation.json @@ -1,5 +1,19 @@ { "key": "substation", "type": "typeCombo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "transmission": "High Voltage Transmission", + "distribution": "Regional Distribution", + "minor_distribution": "Local Distribution", + "industrial": "Industrial", + "generation": "Generation", + "transition": "Overground/Underground Transition", + "traction": "Traction System Supply", + "converter": "High Voltage AC/DC Converter", + "compensation": "Reactive Power Compensation" + } + }, + "autoSuggestions": false } diff --git a/data/presets/amenity/fuel.json b/data/presets/amenity/fuel.json index 3aa5f363..8ac84cf5 100644 --- a/data/presets/amenity/fuel.json +++ b/data/presets/amenity/fuel.json @@ -5,7 +5,8 @@ "brand", "operator", "address", - "fuel_multi", + "fuel/fuel_multi", + "fuel/fuel_multi-RU", "self_service", "building_area" ], diff --git a/data/presets/shop/fuel.json b/data/presets/shop/fuel.json index 3e7012f9..d32e2157 100644 --- a/data/presets/shop/fuel.json +++ b/data/presets/shop/fuel.json @@ -2,7 +2,7 @@ "icon": "temaki-propane_tank", "fields": [ "{shop}", - "fuel_multi" + "fuel/fuel_multi" ], "geometry": [ "point", diff --git a/data/presets/waterway/fuel.json b/data/presets/waterway/fuel.json index 2b81d9d2..07c1fe52 100644 --- a/data/presets/waterway/fuel.json +++ b/data/presets/waterway/fuel.json @@ -5,7 +5,7 @@ "operator", "address", "opening_hours", - "fuel_multi" + "fuel/fuel_multi" ], "moreFields": [ "branch_brand", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index b7734a06..0a671e28 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1240,6 +1240,27 @@ en: entrance: # entrance=* label: Type + options: + # entrance=emergency + emergency: Emergency Exit + # entrance=entrance + entrance: Entrance Only + # entrance=exit + exit: Exit Only + # entrance=garage + garage: Garage Door + # entrance=home + home: Private House or Apartment + # entrance=main + main: Main + # entrance=secondary + secondary: Secondary + # entrance=service + service: Service + # entrance=staircase + staircase: Staircase + # entrance=yes + 'yes': Unspecified terms: '[translate with synonyms or related terms for ''Type'', separated by commas]' except: # except=* @@ -1381,9 +1402,54 @@ en: fuel: # fuel=* label: Fuel - fuel_multi: + fuel/fuel_multi: # fuel:=* label: Fuel Types + options: + # fuel:=GTL_diesel + GTL_diesel: GTL Diesel + # fuel:=HGV_diesel + HGV_diesel: HGV Diesel + # fuel:=LH2 + LH2: Liquid Hydrogen + # fuel:=adblue + adblue: AdBlue / AUS 32 + #canister': fuel:=adblue:canister + adblue:canister: AdBlue / AUS 32 (sold in canisters) + # fuel:=biodiesel + biodiesel: Bio Diesel + # fuel:=cng + cng: Compressed Natural Gas (CNG) + # fuel:=diesel + diesel: Diesel + # fuel:=e10 + e10: E10 Gasoline + # fuel:=e85 + e85: E85 Gasoline + # fuel:=h70 + h70: Gaseous Hydrogen (700 bar) + # fuel:=lpg + lpg: Liquefied Natural Gas (LPG) + # fuel:=octane_100 + octane_100: Gasoline (100 Octane) + # fuel:=octane_80 + octane_80: Gasoline (80 Octane) + # fuel:=octane_87 + octane_87: Gasoline (87 Octane) + # fuel:=octane_89 + octane_89: Gasoline (89 Octane) + # fuel:=octane_91 + octane_91: Gasoline (91 Octane) + # fuel:=octane_92 + octane_92: Gasoline (92 Octane) + # fuel:=octane_95 + octane_95: Gasoline (95 Octane) + # fuel:=octane_98 + octane_98: Gasoline (98 Octane) + # fuel:=propane + propane: Propane + fuel/fuel_multi-RU: + # fuel:=* gambling: # gambling=* label: Games @@ -3464,6 +3530,25 @@ en: substation: # substation=* label: Type + options: + # substation=compensation + compensation: Reactive Power Compensation + # substation=converter + converter: High Voltage AC/DC Converter + # substation=distribution + distribution: Regional Distribution + # substation=generation + generation: Generation + # substation=industrial + industrial: Industrial + # substation=minor_distribution + minor_distribution: Local Distribution + # substation=traction + traction: Traction System Supply + # substation=transition + transition: Overground/Underground Transition + # substation=transmission + transmission: High Voltage Transmission supervised: # supervised=* label: Supervised From 27d7b8fb0e9aff70a21e20631865b887fdaf5d8e Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 18 Oct 2022 09:15:57 +0200 Subject: [PATCH 55/77] tweak labels see https://github.com/openstreetmap/id-tagging-schema/pull/467#pullrequestreview-1144609013 --- data/fields/fuel/fuel_multi.json | 4 ++-- data/fields/substation.json | 4 ++-- interim/source_strings.yaml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/fields/fuel/fuel_multi.json b/data/fields/fuel/fuel_multi.json index e0b8bf6d..63d33e85 100644 --- a/data/fields/fuel/fuel_multi.json +++ b/data/fields/fuel/fuel_multi.json @@ -6,8 +6,8 @@ "options": { "diesel": "Diesel", "GTL_diesel": "GTL Diesel", - "HGV_diesel": "HGV Diesel", - "biodiesel": "Bio Diesel", + "HGV_diesel": "Truck Diesel", + "biodiesel": "Biodiesel", "octane_80": "Gasoline (80 Octane)", "octane_87": "Gasoline (87 Octane)", "octane_89": "Gasoline (89 Octane)", diff --git a/data/fields/substation.json b/data/fields/substation.json index 6b4ae9cc..1f433a92 100644 --- a/data/fields/substation.json +++ b/data/fields/substation.json @@ -4,14 +4,14 @@ "label": "Type", "strings": { "options": { - "transmission": "High Voltage Transmission", + "transmission": "High-Voltage Transmission", "distribution": "Regional Distribution", "minor_distribution": "Local Distribution", "industrial": "Industrial", "generation": "Generation", "transition": "Overground/Underground Transition", "traction": "Traction System Supply", - "converter": "High Voltage AC/DC Converter", + "converter": "High-Voltage AC/DC Converter", "compensation": "Reactive Power Compensation" } }, diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 0a671e28..37b9666e 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1409,7 +1409,7 @@ en: # fuel:=GTL_diesel GTL_diesel: GTL Diesel # fuel:=HGV_diesel - HGV_diesel: HGV Diesel + HGV_diesel: Truck Diesel # fuel:=LH2 LH2: Liquid Hydrogen # fuel:=adblue @@ -1417,7 +1417,7 @@ en: #canister': fuel:=adblue:canister adblue:canister: AdBlue / AUS 32 (sold in canisters) # fuel:=biodiesel - biodiesel: Bio Diesel + biodiesel: Biodiesel # fuel:=cng cng: Compressed Natural Gas (CNG) # fuel:=diesel @@ -3534,7 +3534,7 @@ en: # substation=compensation compensation: Reactive Power Compensation # substation=converter - converter: High Voltage AC/DC Converter + converter: High-Voltage AC/DC Converter # substation=distribution distribution: Regional Distribution # substation=generation @@ -3548,7 +3548,7 @@ en: # substation=transition transition: Overground/Underground Transition # substation=transmission - transmission: High Voltage Transmission + transmission: High-Voltage Transmission supervised: # supervised=* label: Supervised From 7b1b56ff3882d7e31ce51426fb837c1e7ddc63cb Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Wed, 19 Oct 2022 13:20:39 -0300 Subject: [PATCH 56/77] Add terms to bed, clothes and wedding shops (#618) --- data/presets/shop/bed.json | 6 ++++++ data/presets/shop/clothes.json | 1 + data/presets/shop/clothes/wedding.json | 1 + 3 files changed, 8 insertions(+) diff --git a/data/presets/shop/bed.json b/data/presets/shop/bed.json index 9dc74458..bb6bba8c 100644 --- a/data/presets/shop/bed.json +++ b/data/presets/shop/bed.json @@ -7,5 +7,11 @@ "tags": { "shop": "bed" }, + "terms": [ + "bed", + "duvet", + "mattress", + "pillow" + ], "name": "Bedding/Mattress Store" } diff --git a/data/presets/shop/clothes.json b/data/presets/shop/clothes.json index de623feb..4df642d4 100644 --- a/data/presets/shop/clothes.json +++ b/data/presets/shop/clothes.json @@ -19,6 +19,7 @@ "clothes", "dresses", "fashion", + "outfits", "pants", "shirts", "shorts", diff --git a/data/presets/shop/clothes/wedding.json b/data/presets/shop/clothes/wedding.json index 4bfc896f..2c4fd939 100644 --- a/data/presets/shop/clothes/wedding.json +++ b/data/presets/shop/clothes/wedding.json @@ -20,6 +20,7 @@ "bridesmaid", "groom", "groomsman", + "marriage outfits", "tuxedo", "wedding dress", "wedding gown" From 7a9a9d5e391a2f08b1a74588eeb0e6edd56eec31 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Wed, 19 Oct 2022 16:21:02 +0000 Subject: [PATCH 57/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@7b1b56ff3882d7e31ce51426fb837c1e7ddc6?= =?UTF-8?q?3cb=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, 3 insertions(+), 2 deletions(-) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 37b9666e..a7ca9f10 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -9725,6 +9725,7 @@ en: shop/bed: # shop=bed | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Bedding/Mattress Store + # 'terms: bed,duvet,mattress,pillow' terms: shop/beverages: # shop=beverages | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -9834,7 +9835,7 @@ en: shop/clothes: # shop=clothes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Clothing Store - # 'terms: blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear' + # 'terms: blouses,boutique,bras,clothes,dresses,fashion,outfits,pants,shirts,shorts,skirts,slacks,socks,suits,underwear' terms: shop/clothes/second_hand: # shop=clothes + second_hand=only | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -9854,7 +9855,7 @@ en: shop/clothes/wedding: # shop=clothes + clothes=wedding | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Wedding Clothes Store - # 'terms: boutique,bridal,bride,bridegroom,bridesmaid,groom,groomsman,tuxedo,wedding dress,wedding gown' + # 'terms: boutique,bridal,bride,bridegroom,bridesmaid,groom,groomsman,marriage outfits,tuxedo,wedding dress,wedding gown' terms: shop/clothes/workwear: # shop=clothes + clothes=workwear | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). From 2529d5b46f9f853a5003f5e4f52f212eec8f268c Mon Sep 17 00:00:00 2001 From: Marc-marc-marc <31963329+Marc-marc-marc@users.noreply.github.com> Date: Fri, 21 Oct 2022 08:52:28 +0200 Subject: [PATCH 58/77] generator:method=solar -> generator:source=solar (#620) --- data/deprecated.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/deprecated.json b/data/deprecated.json index f64eeaec..19a9f42e 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -678,6 +678,10 @@ "old": {"generator:source": "photovoltaic"}, "replace": {"generator:source": "solar", "generator:method": "photovoltaic"} }, + { + "old": {"generator:method": "solar"}, + "replace": {"generator:source": "solar"} + }, { "old": {"golf": "faiway"}, "replace": {"golf": "fairway"} From 0bc065ad994b36c482c29c6c71a385832f825e60 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 21 Oct 2022 09:42:13 +0200 Subject: [PATCH 59/77] add more octance values for fuel types, closes #621 these can be found for example in various US states, see see https://en.wikipedia.org/wiki/List_of_U.S._states_by_standard_octane_ratings --- data/fields/fuel/fuel_multi.json | 4 ++++ interim/source_strings.yaml | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/data/fields/fuel/fuel_multi.json b/data/fields/fuel/fuel_multi.json index 63d33e85..09d9b597 100644 --- a/data/fields/fuel/fuel_multi.json +++ b/data/fields/fuel/fuel_multi.json @@ -9,10 +9,14 @@ "HGV_diesel": "Truck Diesel", "biodiesel": "Biodiesel", "octane_80": "Gasoline (80 Octane)", + "octane_85": "Gasoline (85 Octane)", "octane_87": "Gasoline (87 Octane)", + "octane_88": "Gasoline (88 Octane)", "octane_89": "Gasoline (89 Octane)", + "octane_90": "Gasoline (90 Octane)", "octane_91": "Gasoline (91 Octane)", "octane_92": "Gasoline (92 Octane)", + "octane_93": "Gasoline (93 Octane)", "octane_95": "Gasoline (95 Octane)", "octane_98": "Gasoline (98 Octane)", "octane_100": "Gasoline (100 Octane)", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index a7ca9f10..22894b08 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1434,14 +1434,22 @@ en: octane_100: Gasoline (100 Octane) # fuel:=octane_80 octane_80: Gasoline (80 Octane) + # fuel:=octane_85 + octane_85: Gasoline (85 Octane) # fuel:=octane_87 octane_87: Gasoline (87 Octane) + # fuel:=octane_88 + octane_88: Gasoline (88 Octane) # fuel:=octane_89 octane_89: Gasoline (89 Octane) + # fuel:=octane_90 + octane_90: Gasoline (90 Octane) # fuel:=octane_91 octane_91: Gasoline (91 Octane) # fuel:=octane_92 octane_92: Gasoline (92 Octane) + # fuel:=octane_93 + octane_93: Gasoline (93 Octane) # fuel:=octane_95 octane_95: Gasoline (95 Octane) # fuel:=octane_98 From 84c4405c12b162f53d03c798671a9ed56791dae5 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 21 Oct 2022 09:48:27 +0200 Subject: [PATCH 60/77] also add octane value of 97 to allowed fuel types this one is common in Malaysia and Chile, see https://taginfo.openstreetmap.org/keys/fuel%3Aoctane_97#map, https://en.wikipedia.org/wiki/Octane_rating --- data/fields/fuel/fuel_multi.json | 1 + interim/source_strings.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/data/fields/fuel/fuel_multi.json b/data/fields/fuel/fuel_multi.json index 09d9b597..35d6248c 100644 --- a/data/fields/fuel/fuel_multi.json +++ b/data/fields/fuel/fuel_multi.json @@ -18,6 +18,7 @@ "octane_92": "Gasoline (92 Octane)", "octane_93": "Gasoline (93 Octane)", "octane_95": "Gasoline (95 Octane)", + "octane_97": "Gasoline (97 Octane)", "octane_98": "Gasoline (98 Octane)", "octane_100": "Gasoline (100 Octane)", "e10": "E10 Gasoline", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 22894b08..28be94af 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1452,6 +1452,8 @@ en: octane_93: Gasoline (93 Octane) # fuel:=octane_95 octane_95: Gasoline (95 Octane) + # fuel:=octane_97 + octane_97: Gasoline (97 Octane) # fuel:=octane_98 octane_98: Gasoline (98 Octane) # fuel:=propane From eea7bc60692657d454a71374428a0c533317f498 Mon Sep 17 00:00:00 2001 From: archpdx Date: Sat, 22 Oct 2022 02:36:03 -0700 Subject: [PATCH 61/77] Add presets for `office=property_mangagement` and `office=union` (#622) --- data/presets/office/property_management.json | 14 ++++++++++++++ data/presets/office/union.json | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 data/presets/office/property_management.json create mode 100644 data/presets/office/union.json diff --git a/data/presets/office/property_management.json b/data/presets/office/property_management.json new file mode 100644 index 00000000..1c53b31b --- /dev/null +++ b/data/presets/office/property_management.json @@ -0,0 +1,14 @@ +{ + "icon": "maki-suitcase", + "geometry": [ + "point", + "area" + ], + "tags": { + "office": "property_management" + }, + "terms": [ + "property rental" + ], + "name": "Property Management / Leasing Office" +} diff --git a/data/presets/office/union.json b/data/presets/office/union.json new file mode 100644 index 00000000..fad61a7a --- /dev/null +++ b/data/presets/office/union.json @@ -0,0 +1,14 @@ +{ + "icon": "maki-suitcase", + "geometry": [ + "point", + "area" + ], + "tags": { + "office": "union" + }, + "terms": [ + "trade union" + ], + "name": "Labor Union Office" +} From 557408972f5b05d3a3014c4f371bcfbd0e435821 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Sat, 22 Oct 2022 09:36:24 +0000 Subject: [PATCH 62/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@eea7bc60692657d454a71374428a0c533317f?= =?UTF-8?q?498=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 28be94af..a73080cd 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -8847,6 +8847,11 @@ en: name: Private Investigator Office # 'terms: pi,private eye,private detective' terms: + office/property_management: + # office=property_management | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Property Management / Leasing Office + # 'terms: property rental' + terms: office/quango: # office=quango | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Quasi-NGO Office @@ -8890,6 +8895,11 @@ en: office/travel_agent: # office=travel_agent | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Travel Agency + office/union: + # office=union | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Labor Union Office + # 'terms: trade union' + terms: office/water_utility: # office=water_utility | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Water Utility Office From 597d82d300b7592a78ac5ea435bb0a6fe47c77db Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 24 Oct 2022 18:16:45 +0200 Subject: [PATCH 63/77] add cuisine tag as optional field to supermarket preset, closes #623 --- data/presets/shop/supermarket.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/presets/shop/supermarket.json b/data/presets/shop/supermarket.json index 8d42dbfc..97a54a89 100644 --- a/data/presets/shop/supermarket.json +++ b/data/presets/shop/supermarket.json @@ -2,6 +2,7 @@ "icon": "maki-grocery", "moreFields": [ "{shop}", + "cuisine", "diet_multi", "organic" ], From c927169a24c5a73a0288bedef3114667805bfe77 Mon Sep 17 00:00:00 2001 From: Evan Carroll Date: Tue, 25 Oct 2022 06:51:14 -0500 Subject: [PATCH 64/77] Add "community_centre:for" tag to LGBTQ+ Community Center preset (#625) * Add community_centre:for LGBTQ+ Community Center * move "community_centre:for" to auto-added tags this makes the validator show suggestions to add an eventually missing `community_centre:for=lgbtq` tag to features already tagged with `amenity=community_centre` + `lgbtq=primary`. Co-authored-by: Martin Raifer --- data/presets/amenity/community_centre/lgbtq.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/presets/amenity/community_centre/lgbtq.json b/data/presets/amenity/community_centre/lgbtq.json index f6fbef8d..7a27a549 100644 --- a/data/presets/amenity/community_centre/lgbtq.json +++ b/data/presets/amenity/community_centre/lgbtq.json @@ -16,5 +16,10 @@ "amenity": "community_centre", "lgbtq": "primary" }, + "addTags": { + "amenity": "community_centre", + "lgbtq": "primary", + "community_centre:for": "lgbtq" + }, "name": "LGBTQ+ Community Center" } From 3ecad3ec4d6163a9ff640988464a9958f4d20927 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Wed, 26 Oct 2022 14:16:11 +0200 Subject: [PATCH 65/77] recycling field should be case sensitive for `recycling:PET` (see https://wiki.openstreetmap.org/wiki/Key%3Arecycling%3APET) --- data/fields/recycling_accepts.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/fields/recycling_accepts.json b/data/fields/recycling_accepts.json index 870ae585..e2b25fae 100644 --- a/data/fields/recycling_accepts.json +++ b/data/fields/recycling_accepts.json @@ -2,6 +2,7 @@ "key": "recycling:", "type": "multiCombo", "label": "Accepts", + "caseSensitive": true, "strings": { "options": { "glass_bottles": "Glass Bottles and Jars", From 3795ec014040d24cafb42a6b3efc9b8f437803c5 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 27 Oct 2022 10:55:30 +0200 Subject: [PATCH 66/77] add preset for industrial brewery using the tag combination `man_made=works` + `product=beer` fallback preset for features tagged as `industrial=brewery` --- data/presets/craft/brewery.json | 2 +- data/presets/landuse/industrial/_brewery.json | 27 ++++++++++++++++ data/presets/man_made/works/brewery.json | 31 +++++++++++++++++++ interim/source_strings.yaml | 11 +++++-- 4 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 data/presets/landuse/industrial/_brewery.json create mode 100644 data/presets/man_made/works/brewery.json diff --git a/data/presets/craft/brewery.json b/data/presets/craft/brewery.json index b0676a85..19b9ad8e 100644 --- a/data/presets/craft/brewery.json +++ b/data/presets/craft/brewery.json @@ -23,5 +23,5 @@ "tags": { "craft": "brewery" }, - "name": "Brewery" + "name": "Craft Brewery" } diff --git a/data/presets/landuse/industrial/_brewery.json b/data/presets/landuse/industrial/_brewery.json new file mode 100644 index 00000000..5bf0e6f2 --- /dev/null +++ b/data/presets/landuse/industrial/_brewery.json @@ -0,0 +1,27 @@ +{ + "icon": "temaki-storage_fermenter", + "fields": [ + "{man_made/works/brewery}", + "product" + ], + "moreFields": [ + "{man_made/works/brewery}" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "industrial": "brewery" + }, + "addTags": { + "landuse": "industrial" + }, + "reference": { + "key": "industrial", + "value": "brewery" + }, + "searchable": false, + "matchScore": 0.9, + "name": "{man_made/works/brewery}" +} diff --git a/data/presets/man_made/works/brewery.json b/data/presets/man_made/works/brewery.json new file mode 100644 index 00000000..68751527 --- /dev/null +++ b/data/presets/man_made/works/brewery.json @@ -0,0 +1,31 @@ +{ + "icon": "temaki-storage_fermenter", + "fields": [ + "{man_made/works}", + "website" + ], + "moreFields": [ + "{man_made/works}", + "min_age" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "alcohol", + "beer", + "bier", + "booze", + "cider" + ], + "tags": { + "man_made": "works", + "product": "beer" + }, + "reference": { + "key": "product", + "value": "beer" + }, + "name": "Industrial Brewery" +} diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index a73080cd..5c265fbf 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6172,9 +6172,9 @@ en: terms: craft/brewery: # craft=brewery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Brewery + name: Craft Brewery # 'terms: alcohol,beer,beverage,bier,booze,cider' - terms: + terms: craft/carpenter: # craft=carpenter | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Carpenter @@ -7329,6 +7329,8 @@ en: name: Industrial Area # 'terms: depot,factory,manufacturing' terms: + landuse/industrial/brewery: + # industrial=brewery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). landuse/industrial/scrap_yard: # industrial=scrap_yard | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Scrap Yard @@ -8335,6 +8337,11 @@ en: name: Factory # 'terms: assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery' terms: + man_made/works/brewery: + # man_made=works + product=beer | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Industrial Brewery + # 'terms: alcohol,beer,bier,booze,cider' + terms: man_made/yes: # man_made=yes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Man-Made Feature (Unspecified Type) From b91bbcecc47e95ae3b792dacbbbb6312ed01d355 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 27 Oct 2022 12:55:40 +0200 Subject: [PATCH 67/77] add building field to School preset see https://github.com/openstreetmap/iD/issues/9341 --- data/presets/amenity/school.json | 3 ++- data/presets/leisure/sports_centre.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/presets/amenity/school.json b/data/presets/amenity/school.json index 5438f492..fbb5800c 100644 --- a/data/presets/amenity/school.json +++ b/data/presets/amenity/school.json @@ -8,7 +8,8 @@ "grades", "religion", "denomination", - "website" + "website", + "building_area" ], "moreFields": [ "capacity", diff --git a/data/presets/leisure/sports_centre.json b/data/presets/leisure/sports_centre.json index 8da82505..694dc211 100644 --- a/data/presets/leisure/sports_centre.json +++ b/data/presets/leisure/sports_centre.json @@ -3,7 +3,7 @@ "fields": [ "name", "sport", - "building", + "building_area", "address", "fee", "opening_hours", From 15a02ada3e36819c0cfb3d700af6dfc6ae04abaa Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 27 Oct 2022 18:42:16 +0200 Subject: [PATCH 68/77] refine power generation presets (#624) * add values of the "generator:method" tag https://wiki.openstreetmap.org/w/index.php?title=Key:generator:method&oldid=2315464 * add strings for power generation sources and method and refine some presets accordingly --- data/fields/generator/method.json | 20 +++- data/fields/generator/method/hydro.json | 16 +++ data/fields/generator/source.json | 23 +++- data/fields/plant/method.json | 4 +- data/fields/plant/method/hydro.json | 16 +++ data/fields/plant/method/solar.json | 15 +++ data/fields/plant/method/waste.json | 15 +++ data/fields/plant/output.json | 18 ++++ data/fields/plant/output/electricity.json | 8 +- data/fields/plant/source.json | 3 +- .../presets/power/generator/source/hydro.json | 2 +- .../power/generator/source/nuclear.json | 1 - data/presets/power/plant.json | 3 +- data/presets/power/plant/source/coal.json | 3 +- data/presets/power/plant/source/gas.json | 3 +- data/presets/power/plant/source/hydro.json | 8 +- .../plant/source/method/photovoltaic.json | 46 ++++++++ data/presets/power/plant/source/oil.json | 3 +- data/presets/power/plant/source/solar.json | 26 +++-- data/presets/power/plant/source/waste.json | 4 +- data/presets/power/plant/source/wind.json | 2 +- interim/source_strings.yaml | 102 +++++++++++++++++- 22 files changed, 308 insertions(+), 33 deletions(-) create mode 100644 data/fields/generator/method/hydro.json create mode 100644 data/fields/plant/method/hydro.json create mode 100644 data/fields/plant/method/solar.json create mode 100644 data/fields/plant/method/waste.json create mode 100644 data/fields/plant/output.json create mode 100644 data/presets/power/plant/source/method/photovoltaic.json diff --git a/data/fields/generator/method.json b/data/fields/generator/method.json index 211e4b15..de107f68 100644 --- a/data/fields/generator/method.json +++ b/data/fields/generator/method.json @@ -1,5 +1,23 @@ { "key": "generator:method", "type": "combo", - "label": "Method" + "label": "Method", + "strings": { + "options": { + "fission": "Fission", + "fusion": "Fusion", + "wind_turbine": "Wind Turbine", + "water-storage": "Reservoir", + "water-pumped-storage": "Pumped-Storage", + "run-of-the-river": "Run-of-the-River", + "barrage": "Tidal Barrage", + "stream": "Tidal Stream", + "thermal": "Solar Thermal", + "photovoltaic": "Photovoltaic", + "combustion": "Combustion", + "gasification": "Gasification", + "anaerobic_digestion": "Anaerobic Digestion" + } + }, + "autoSuggestions": false } diff --git a/data/fields/generator/method/hydro.json b/data/fields/generator/method/hydro.json new file mode 100644 index 00000000..1695d6e7 --- /dev/null +++ b/data/fields/generator/method/hydro.json @@ -0,0 +1,16 @@ +{ + "key": "generator:method", + "type": "combo", + "label": "{generator/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "water-storage", + "water-pumped-storage", + "run-of-the-river" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "generator:source", + "value": "hydro" + } +} diff --git a/data/fields/generator/source.json b/data/fields/generator/source.json index 43016ad3..ab366f77 100644 --- a/data/fields/generator/source.json +++ b/data/fields/generator/source.json @@ -1,5 +1,26 @@ { "key": "generator:source", "type": "combo", - "label": "Source" + "label": "Source", + "strings": { + "options": { + "nuclear": "Nuclear Power", + "wind": "Wind", + "hydro": "Hydropower", + "tidal": "Tidal Power", + "wave": "Wave Power", + "geothermal": "Geothermal Energy", + "solar": "Solar Radiation", + "coal": "Coal", + "gas": "Natural Gas", + "biomass": "Plant Matter", + "biofuel": "Plant Based Fuels", + "biogas": "Biogas", + "oil": "Oil", + "diesel": "Diesel", + "gasoline": "Gasoline", + "waste": "Waste", + "battery": "Battery" + } + } } diff --git a/data/fields/plant/method.json b/data/fields/plant/method.json index fd91bc1f..aec4d661 100644 --- a/data/fields/plant/method.json +++ b/data/fields/plant/method.json @@ -1,5 +1,7 @@ { "key": "plant:method", "type": "combo", - "label": "Generation Method" + "label": "Generation Method", + "stringsCrossReference": "{generator/method}", + "autoSuggestions": false } diff --git a/data/fields/plant/method/hydro.json b/data/fields/plant/method/hydro.json new file mode 100644 index 00000000..eb69df91 --- /dev/null +++ b/data/fields/plant/method/hydro.json @@ -0,0 +1,16 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "{plant/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "water-storage", + "water-pumped-storage", + "run-of-the-river" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "plant:source", + "value": "hydro" + } +} diff --git a/data/fields/plant/method/solar.json b/data/fields/plant/method/solar.json new file mode 100644 index 00000000..0c404eb9 --- /dev/null +++ b/data/fields/plant/method/solar.json @@ -0,0 +1,15 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "{plant/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "thermal", + "photovoltaic" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "plant:source", + "value": "solar" + } +} diff --git a/data/fields/plant/method/waste.json b/data/fields/plant/method/waste.json new file mode 100644 index 00000000..c67ef7e3 --- /dev/null +++ b/data/fields/plant/method/waste.json @@ -0,0 +1,15 @@ +{ + "key": "plant:method", + "type": "combo", + "label": "{plant/method}", + "stringsCrossReference": "{generator/method}", + "options": [ + "combustion", + "gasification" + ], + "autoSuggestions": false, + "prerequisiteTag": { + "key": "plant:source", + "value": "waste" + } +} diff --git a/data/fields/plant/output.json b/data/fields/plant/output.json new file mode 100644 index 00000000..ca33f096 --- /dev/null +++ b/data/fields/plant/output.json @@ -0,0 +1,18 @@ +{ + "key": "plant:output", + "type": "multiCombo", + "label": "Form of Power Output", + "strings": { + "options": { + "electricity": "Electricity", + "hot_water": "Hot Water", + "hot_air": "Hot Air", + "cold_water": "Cold Water", + "cold_air": "Cold Air", + "compressed_air": "Compressed Air", + "steam": "Steam", + "vacuum": "Vacuum" + } + }, + "autoSuggestions": false +} diff --git a/data/fields/plant/output/electricity.json b/data/fields/plant/output/electricity.json index 8e903cf8..8cedd173 100644 --- a/data/fields/plant/output/electricity.json +++ b/data/fields/plant/output/electricity.json @@ -1,7 +1,11 @@ { "key": "plant:output:electricity", "type": "typeCombo", - "label": "Power Output", + "label": "Electric Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW...", - "snake_case": false + "snake_case": false, + "prerequisiteTag": { + "key": "plant:output:electricity", + "valueNot": "no" + } } diff --git a/data/fields/plant/source.json b/data/fields/plant/source.json index 63d3a713..fdee95d1 100644 --- a/data/fields/plant/source.json +++ b/data/fields/plant/source.json @@ -1,5 +1,6 @@ { "key": "plant:source", "type": "combo", - "label": "Energy Source" + "label": "Energy Source", + "stringsCrossReference": "{generator/source}" } diff --git a/data/presets/power/generator/source/hydro.json b/data/presets/power/generator/source/hydro.json index 399da533..1b289ad7 100644 --- a/data/presets/power/generator/source/hydro.json +++ b/data/presets/power/generator/source/hydro.json @@ -3,7 +3,7 @@ "fields": [ "ref", "operator", - "generator/method", + "generator/method/hydro", "generator/type", "generator/output/electricity" ], diff --git a/data/presets/power/generator/source/nuclear.json b/data/presets/power/generator/source/nuclear.json index f6825735..66ffd6d0 100644 --- a/data/presets/power/generator/source/nuclear.json +++ b/data/presets/power/generator/source/nuclear.json @@ -3,7 +3,6 @@ "fields": [ "ref", "operator", - "generator/method", "generator/type", "generator/output/electricity" ], diff --git a/data/presets/power/plant.json b/data/presets/power/plant.json index 35bb7e0a..abed3c92 100644 --- a/data/presets/power/plant.json +++ b/data/presets/power/plant.json @@ -3,10 +3,11 @@ "fields": [ "name", "operator", - "address", "plant/source", "plant/method", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/coal.json b/data/presets/power/plant/source/coal.json index bbfd55ed..c872b2d4 100644 --- a/data/presets/power/plant/source/coal.json +++ b/data/presets/power/plant/source/coal.json @@ -3,8 +3,9 @@ "fields": [ "name", "operator", - "address", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/gas.json b/data/presets/power/plant/source/gas.json index cbe8a961..e02d939c 100644 --- a/data/presets/power/plant/source/gas.json +++ b/data/presets/power/plant/source/gas.json @@ -3,8 +3,9 @@ "fields": [ "name", "operator", - "address", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/hydro.json b/data/presets/power/plant/source/hydro.json index d7521441..0521085f 100644 --- a/data/presets/power/plant/source/hydro.json +++ b/data/presets/power/plant/source/hydro.json @@ -1,7 +1,13 @@ { "icon": "maki-dam", "fields": [ - "{power/plant}" + "name", + "operator", + "plant/source", + "plant/method/hydro", + "plant/output/electricity", + "address", + "start_date" ], "moreFields": [ "{power/plant}" diff --git a/data/presets/power/plant/source/method/photovoltaic.json b/data/presets/power/plant/source/method/photovoltaic.json new file mode 100644 index 00000000..d120fd02 --- /dev/null +++ b/data/presets/power/plant/source/method/photovoltaic.json @@ -0,0 +1,46 @@ +{ + "icon": "fas-solar-panel", + "fields": [ + "name", + "operator", + "plant/method/solar", + "plant/output/electricity", + "address", + "start_date" + ], + "moreFields": [ + "{power/plant}" + ], + "geometry": [ + "area" + ], + "tags": { + "power": "plant", + "plant:source": "solar", + "plant:method": "photovoltaic" + }, + "addTags": { + "power": "plant", + "plant:source": "solar", + "plant:method": "photovoltaic", + "plant:output:electricity": "*" + }, + "removeTags": { + "power": "plant", + "plant:method": "*", + "plant:source": "solar", + "plant:output:electricity": "*", + "landuse": "industrial" + }, + "reference": { + "key": "plant:method", + "value": "photovoltaic" + }, + "terms": [ + "photovoltaic power station", + "solar panels", + "solar park", + "utility-scale solar" + ], + "name": "Solar Farm" +} diff --git a/data/presets/power/plant/source/oil.json b/data/presets/power/plant/source/oil.json index d6d80108..b21ec284 100644 --- a/data/presets/power/plant/source/oil.json +++ b/data/presets/power/plant/source/oil.json @@ -3,8 +3,9 @@ "fields": [ "name", "operator", - "address", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/solar.json b/data/presets/power/plant/source/solar.json index 26efb8e5..62ef1d79 100644 --- a/data/presets/power/plant/source/solar.json +++ b/data/presets/power/plant/source/solar.json @@ -1,7 +1,13 @@ { "icon": "fas-solar-panel", "fields": [ - "{power/plant}" + "name", + "operator", + "plant/method/solar", + "plant/output", + "plant/output/electricity", + "address", + "start_date" ], "moreFields": [ "{power/plant}" @@ -15,26 +21,18 @@ }, "addTags": { "power": "plant", - "plant:source": "solar", - "plant:method": "photovoltaic", - "plant:output:electricity": "*" + "plant:source": "solar" }, "removeTags": { "power": "plant", - "plant:method": "*", "plant:source": "solar", + "plant:method": "*", "plant:output:electricity": "*", "landuse": "industrial" }, "reference": { - "key": "plant:method", - "value": "photovoltaic" + "key": "plant:source", + "value": "solar" }, - "terms": [ - "photovoltaic power station", - "solar panels", - "solar park", - "utility-scale solar" - ], - "name": "Solar Farm" + "name": "Solar Power Plant" } diff --git a/data/presets/power/plant/source/waste.json b/data/presets/power/plant/source/waste.json index e57ae6de..adadc6f8 100644 --- a/data/presets/power/plant/source/waste.json +++ b/data/presets/power/plant/source/waste.json @@ -3,8 +3,10 @@ "fields": [ "name", "operator", - "address", + "plant/method/waste", + "plant/output", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/data/presets/power/plant/source/wind.json b/data/presets/power/plant/source/wind.json index 86076bef..fd41a958 100644 --- a/data/presets/power/plant/source/wind.json +++ b/data/presets/power/plant/source/wind.json @@ -3,8 +3,8 @@ "fields": [ "name", "operator", - "address", "plant/output/electricity", + "address", "start_date" ], "moreFields": [ diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 5c265fbf..bff8d0bb 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1483,6 +1483,35 @@ en: generator/method: # generator:method=* label: Method + options: + # generator:method=anaerobic_digestion + anaerobic_digestion: Anaerobic Digestion + # generator:method=barrage + barrage: Tidal Barrage + # generator:method=combustion + combustion: Combustion + # generator:method=fission + fission: Fission + # generator:method=fusion + fusion: Fusion + # generator:method=gasification + gasification: Gasification + # generator:method=photovoltaic + photovoltaic: Photovoltaic + # generator:method=run-of-the-river + run-of-the-river: Run-of-the-River + # generator:method=stream + stream: Tidal Stream + # generator:method=thermal + thermal: Solar Thermal + # generator:method=water-pumped-storage + water-pumped-storage: Pumped-Storage + # generator:method=water-storage + water-storage: Reservoir + # generator:method=wind_turbine + wind_turbine: Wind Turbine + generator/method/hydro: + # generator:method=* generator/output/electricity: # generator:output:electricity=* label: Power Output @@ -1491,6 +1520,41 @@ en: generator/source: # generator:source=* label: Source + options: + # generator:source=battery + battery: Battery + # generator:source=biofuel + biofuel: Plant Based Fuels + # generator:source=biogas + biogas: Biogas + # generator:source=biomass + biomass: Plant Matter + # generator:source=coal + coal: Coal + # generator:source=diesel + diesel: Diesel + # generator:source=gas + gas: Natural Gas + # generator:source=gasoline + gasoline: Gasoline + # generator:source=geothermal + geothermal: Geothermal Energy + # generator:source=hydro + hydro: Hydropower + # generator:source=nuclear + nuclear: Nuclear Power + # generator:source=oil + oil: Oil + # generator:source=solar + solar: Solar Radiation + # generator:source=tidal + tidal: Tidal Power + # generator:source=waste + waste: Waste + # generator:source=wave + wave: Wave Power + # generator:source=wind + wind: Wind generator/type: # generator:type=* label: Type @@ -2733,9 +2797,35 @@ en: plant/method: # plant:method=* label: Generation Method + plant/method/hydro: + # plant:method=* + plant/method/solar: + # plant:method=* + plant/method/waste: + # plant:method=* + plant/output: + # plant:output=* + label: Form of Power Output + options: + # plant:output=cold_air + cold_air: Cold Air + # plant:output=cold_water + cold_water: Cold Water + # plant:output=compressed_air + compressed_air: Compressed Air + # plant:output=electricity + electricity: Electricity + # plant:output=hot_air + hot_air: Hot Air + # plant:output=hot_water + hot_water: Hot Water + # plant:output=steam + steam: Steam + # plant:output=vacuum + vacuum: Vacuum plant/output/electricity: # plant:output:electricity=* - label: Power Output + label: Electric Power Output # plant/output/electricity field placeholder placeholder: 500 MW, 1000 MW, 2000 MW... plant/source: @@ -9248,6 +9338,11 @@ en: name: Hydroelectric Power Station # 'terms: dam,power plant,run-of-the-river,tidal,water turbine' terms: + power/plant/source/method/photovoltaic: + # power=plant + plant:source=solar + plant:method=photovoltaic | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Solar Farm + # 'terms: photovoltaic power station,solar panels,solar park,utility-scale solar' + terms: power/plant/source/nuclear: # power=plant + plant:source=nuclear | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Nuclear Power Plant @@ -9260,9 +9355,8 @@ en: terms: power/plant/source/solar: # power=plant + plant:source=solar | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Solar Farm - # 'terms: photovoltaic power station,solar panels,solar park,utility-scale solar' - terms: + name: Solar Power Plant + terms: power/plant/source/waste: # power=plant + plant:source=waste | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Waste Incineration Power Plant From d2e8e87320c0e5b084bded615f0aa0408ff68c9d Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 31 Oct 2022 18:54:35 +0100 Subject: [PATCH 69/77] drop default "yes" for the dispensing field, closes #627 --- data/fields/dispensing.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/fields/dispensing.json b/data/fields/dispensing.json index b400f24a..0ffee90b 100644 --- a/data/fields/dispensing.json +++ b/data/fields/dispensing.json @@ -1,6 +1,5 @@ { "key": "dispensing", "type": "check", - "label": "Dispenses Prescriptions", - "default": "yes" + "label": "Dispenses Prescriptions" } From d7dc30d2b9a3dcaeeb15f63f9996db38a1269725 Mon Sep 17 00:00:00 2001 From: archpdx Date: Tue, 1 Nov 2022 00:44:27 -0700 Subject: [PATCH 70/77] Add American Handball Court preset (#628) --- .../leisure/pitch/american_handball.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 data/presets/leisure/pitch/american_handball.json diff --git a/data/presets/leisure/pitch/american_handball.json b/data/presets/leisure/pitch/american_handball.json new file mode 100644 index 00000000..7e73ebca --- /dev/null +++ b/data/presets/leisure/pitch/american_handball.json @@ -0,0 +1,19 @@ +{ + "icon": "temaki-wall", + "geometry": [ + "area", + "point" + ], + "tags": { + "leisure": "pitch", + "sport": "american_handball" + }, + "reference": { + "key": "sport", + "value": "american_handball" + }, + "terms": [ + "wallball" + ], + "name": "American Handball Court" +} From eeb8ed3d6d392072c15e32e8ca5303d126737f75 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Tue, 1 Nov 2022 07:45:00 +0000 Subject: [PATCH 71/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@d7dc30d2b9a3dcaeeb15f63f9996db38a1269?= =?UTF-8?q?725=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 bff8d0bb..360d9d5c 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -7782,6 +7782,11 @@ en: name: American Football Field # 'terms: football,gridiron' terms: + leisure/pitch/american_handball: + # leisure=pitch + sport=american_handball | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: American Handball Court + # 'terms: wallball' + terms: leisure/pitch/archery: # leisure=pitch + sport=archery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Archery Range From d558c36ece70a753175189a04b6065cdee9a6609 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 1 Nov 2022 11:18:49 +0100 Subject: [PATCH 72/77] mention wiki and similar as "related projects" in readme closes #629 --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b7739589..81d2187a 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,9 @@ It includes presets, fields, deprecations, and more. ## Background -OpenStreetMap itself does not have a formal tagging [schema](https://en.wikipedia.org/wiki/Database_schema), -but editing tools need to know how tags are used in order to facilitate mapping. +OpenStreetMap itself does not have a formal rigid [database schema](https://en.wikipedia.org/wiki/Database_schema), +but relies on a [tagging](https://wiki.openstreetmap.org/wiki/Tags) [folksonomy](https://en.wikipedia.org/wiki/Folksonomy) instead. +Editing tools need to know how tags are used in order to facilitate mapping. This Tagging Schema fills that need, but with a number of caveats: - This isn't authoritative or definitive @@ -39,7 +40,9 @@ makes it easier to use this data with Android or other Java platforms. ## Related Projects -iD also incorporates preset data from the [name-suggestion-index](https://github.com/osmlab/name-suggestion-index). +* The [OpenStreetMap wiki](https://wiki.openstreetmap.org/wiki/Map_features) documents the current usage of tags, and hosts discussions about proposed new tags. +* +* iD also incorporates preset data from the [name-suggestion-index](https://github.com/osmlab/name-suggestion-index). ## Contributing From ee90c2f8514c4aeac50377db27c603b32bb0924b Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 1 Nov 2022 11:34:07 +0100 Subject: [PATCH 73/77] add related projects see #629 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81d2187a..5a551a31 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ makes it easier to use this data with Android or other Java platforms. ## Related Projects * The [OpenStreetMap wiki](https://wiki.openstreetmap.org/wiki/Map_features) documents the current usage of tags, and hosts discussions about proposed new tags. -* * iD also incorporates preset data from the [name-suggestion-index](https://github.com/osmlab/name-suggestion-index). +* Other editors also include their own models of interpretations of OSM tags. See for example [Vespucci's](https://github.com/simonpoole/beautified-JOSM-preset) or [JOSM's](https://josm.openstreetmap.de/wiki/Presets) tagging presets. ## Contributing From 0c8be6bf01c2e5b8e7361da8550e2c22b7768cc1 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 4 Nov 2022 10:03:47 +0100 Subject: [PATCH 74/77] add "Bridge" alias for man_made=bridge, closes #632 also reverts lowered match score from https://github.com/openstreetmap/iD/commit/67f7995559b6eddb98f756b0cddc583b70d9092c --- data/presets/man_made/bridge.json | 4 +++- interim/source_strings.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/presets/man_made/bridge.json b/data/presets/man_made/bridge.json index d104ab59..d3e1be72 100644 --- a/data/presets/man_made/bridge.json +++ b/data/presets/man_made/bridge.json @@ -31,5 +31,7 @@ "value": "bridge" }, "name": "Bridge Area", - "matchScore": 0.85 + "aliases": [ + "Bridge" + ] } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 360d9d5c..540c9b86 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -8081,7 +8081,7 @@ en: name: Breakwater terms: man_made/bridge: - # man_made=bridge | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + # man_made=bridge | Bridge | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Bridge Area terms: man_made/bunker_silo: From f8b134f2a726a804300c29efb4b52039bbc9f939 Mon Sep 17 00:00:00 2001 From: archpdx Date: Mon, 7 Nov 2022 02:49:50 -0800 Subject: [PATCH 75/77] Add Tree Stump Preset and update ATM icon (#630) --- data/presets/amenity/atm.json | 2 +- data/presets/natural/tree_stump.json | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 data/presets/natural/tree_stump.json diff --git a/data/presets/amenity/atm.json b/data/presets/amenity/atm.json index a615a6a2..1732e5f8 100644 --- a/data/presets/amenity/atm.json +++ b/data/presets/amenity/atm.json @@ -1,5 +1,5 @@ { - "icon": "maki-bank", + "icon": "temaki-atm2", "fields": [ "operator", "network", diff --git a/data/presets/natural/tree_stump.json b/data/presets/natural/tree_stump.json new file mode 100644 index 00000000..222c8826 --- /dev/null +++ b/data/presets/natural/tree_stump.json @@ -0,0 +1,23 @@ +{ + "icon": "temaki-tree_stump", + "geometry": [ + "area", + "point" + ], + "moreFields": [ + "leaf_type_singular", + "leaf_cycle_singular", + "denotation", + "height", + "circumference", + "{natural/tree}" + ], + "tags": { + "natural": "tree_stump" + }, + "terms": [ + "cut tree", + "removed tree" + ], + "name": "Tree Stump" +} From 6832df0ec7866398a4ce37d763f86e33d7102d09 Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 7 Nov 2022 10:50:21 +0000 Subject: [PATCH 76/77] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openst?= =?UTF-8?q?reetmap/id-tagging-schema@f8b134f2a726a804300c29efb4b52039bbc9f?= =?UTF-8?q?939=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 540c9b86..c9c824ca 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -599,6 +599,8 @@ en: label: Circumference (at Breast Height) # circumference field placeholder placeholder: 1 m, 20 cm, 30"… + # 'terms: dbh,diameter at breast height' + terms: '[translate with synonyms or related terms for ''Circumference (at Breast Height)'', separated by commas]' clothes: # clothes=* label: Clothes @@ -948,6 +950,7 @@ en: denotation: # denotation=* label: Denotation + terms: '[translate with synonyms or related terms for ''Denotation'', separated by commas]' departures_board: # departures_board=* label: Departures/Arrivals Board @@ -2063,6 +2066,7 @@ en: semi_deciduous: Semi-Deciduous # leaf_cycle=semi_evergreen semi_evergreen: Semi-Evergreen + terms: '[translate with synonyms or related terms for ''Leaf Cycle'', separated by commas]' leaf_type: # leaf_type=* label: Leaf Type @@ -2086,6 +2090,7 @@ en: leafless: Leafless # leaf_type=needleleaved needleleaved: Needleleaved + terms: '[translate with synonyms or related terms for ''Leaf Type'', separated by commas]' leisure: # leisure=* label: Type @@ -8628,6 +8633,11 @@ en: name: Tree Row # 'terms: tree line' terms: + natural/tree_stump: + # natural=tree_stump | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Tree Stump + # 'terms: cut tree,removed tree' + terms: natural/valley: # natural=valley | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Valley From aaeffb0e4e84f5c40883f5ea8bf101ee4010c1c5 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 7 Nov 2022 12:44:37 +0100 Subject: [PATCH 77/77] add access field to: Park, Nat. Res., Sports Center/Club (closes #631) --- data/presets/club/sport.json | 4 ++++ data/presets/leisure/nature_reserve.json | 1 + data/presets/leisure/park.json | 1 + data/presets/leisure/sports_centre.json | 1 + 4 files changed, 7 insertions(+) diff --git a/data/presets/club/sport.json b/data/presets/club/sport.json index 28cc79b0..194051ba 100644 --- a/data/presets/club/sport.json +++ b/data/presets/club/sport.json @@ -5,6 +5,10 @@ "sport", "{club}" ], + "moreFields": [ + "{club}", + "access_simple" + ], "geometry": [ "point", "area" diff --git a/data/presets/leisure/nature_reserve.json b/data/presets/leisure/nature_reserve.json index dff9b32b..08776234 100644 --- a/data/presets/leisure/nature_reserve.json +++ b/data/presets/leisure/nature_reserve.json @@ -11,6 +11,7 @@ "opening_hours" ], "moreFields": [ + "access_simple", "dog", "email", "fax", diff --git a/data/presets/leisure/park.json b/data/presets/leisure/park.json index 30be50ad..707b87cb 100644 --- a/data/presets/leisure/park.json +++ b/data/presets/leisure/park.json @@ -7,6 +7,7 @@ "opening_hours" ], "moreFields": [ + "access_simple", "dog", "email", "fax", diff --git a/data/presets/leisure/sports_centre.json b/data/presets/leisure/sports_centre.json index 694dc211..d3c162e3 100644 --- a/data/presets/leisure/sports_centre.json +++ b/data/presets/leisure/sports_centre.json @@ -11,6 +11,7 @@ "charge_fee" ], "moreFields": [ + "access_simple", "email", "fax", "gnis/feature_id-US",