From 144d203a5b49659d26787628693ce085f1ea4bed Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Mon, 25 Sep 2023 09:24:55 +0200 Subject: [PATCH] Standardize tagging, add items and translations --- .../bicycle_tube_vending_machine.json | 121 ++++++++++-------- .../vending_machine/vending_machine.json | 72 ++++++++++- langs/layers/en.json | 81 +++++++++++- langs/layers/nl.json | 48 ++++++- 4 files changed, 263 insertions(+), 59 deletions(-) diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json index bff0c569a..da66c7c34 100644 --- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json +++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json @@ -32,7 +32,9 @@ "mappings": [ { "if": "name~*", - "then": "Bicycle tube vending machine {name}" + "then": { + "en": "Bicycle tube vending machine {name}" + } } ] }, @@ -70,8 +72,7 @@ }, "tags": [ "amenity=vending_machine", - "vending=bicycle_tube", - "vending:bicycle_tube=yes" + "vending=bicycle_tube" ] } ], @@ -176,65 +177,62 @@ "id": "Still in use?" }, { - "question": "How much does a bicycle tube cost?", - "render": "A bicycle tube costs {charge}", + "question": { + "en": "How much does a bicycle tube cost?" + }, + "render": { + "en": "A bicycle tube costs {charge}" + }, "freeform": { "key": "charge" }, "id": "bicycle_tube_vending_machine-charge" }, + "payment-options-split", { - "id": "vending-machine-payment-methods", - "question": "How can one pay at this tube vending machine?", - "mappings": [ - { - "if": "payment:coins=yes", - "ifnot": "payment:coins=no", - "then": "Payment with coins is possible" - }, - { - "if": "payment:notes=yes", - "ifnot": "payment:notes=no", - "then": "Payment with notes is possible" - }, - { - "if": "payment:cards=yes", - "ifnot": "payment:cards=no", - "then": "Payment with cards is possible" - } - ], - "multiAnswer": true - }, - { - "question": "Which brand of tubes are sold here?", + "question": { + "en": "Which brand of tubes are sold here?" + }, "freeform": { "key": "brand" }, - "render": "{brand} tubes are sold here", + "render": { + "en": "{brand} tubes are sold here" + }, "mappings": [ { "if": "brand=Continental", - "then": "Continental tubes are sold here" + "then": { + "en": "Continental tubes are sold here" + } }, { "if": "brand=Schwalbe", - "then": "Schwalbe tubes are sold here" + "then": { + "en": "Schwalbe tubes are sold here" + } } ], "multiAnswer": true, "id": "bicycle_tube_vending_machine-brand" }, { - "question": "Who maintains this vending machine?", + "question": { + "en": "Who maintains this vending machine?" + }, "render": "This vending machine is maintained by {operator}", "mappings": [ { "if": "operator=Schwalbe", - "then": "Maintained by Schwalbe" + "then": { + "en": "Maintained by Schwalbe" + } }, { "if": "operator=Continental", - "then": "Maintained by Continental" + "then": { + "en": "Maintained by Continental" + } } ], "freeform": { @@ -243,33 +241,52 @@ "id": "bicycle_tube_vending_machine-operator" }, { - "id": "bicycle_tube_vending_maching-other-items", - "question": "Are other bicycle bicycle accessories sold here?", + "id": "other-items-vending", + "question": { + "en": "Are other biycle accessories sold here?" + }, "mappings": [ { - "if": "vending:bicycle_light=yes", - "ifnot": "vending:bicycle_light=no", - "then": "Bicycle lights are sold here" + "if": "vending=bicycle_tube", + "then": { + "en": "Bicycle inner tubes are sold here", + "nl": "Fietsbinnenbanden worden hier verkocht" + } }, { - "if": "vending:gloves=yes", - "ifnot": "vending:gloves=no", - "then": "Gloves are sold here" + "if": "vending=bicycle_light", + "then": { + "en": "Bicycle lights are sold here", + "nl": "Fietslampjes worden hier verkocht" + } }, { - "if": "vending:bicycle_repair_kit=yes", - "ifnot": "vending:bicycle_repair_kit=no", - "then": "Bicycle repair kits are sold here" + "if": "vending=gloves", + "then": { + "en": "Gloves are sold here", + "nl": "Handschoenen worden hier verkocht" + } }, { - "if": "vending:bicycle_pump=yes", - "ifnot": "vending:bicycle_pump=no", - "then": "Bicycle pumps are sold here" + "if": "vending=bicycle_repair_kit", + "then": { + "en": "Bicycle repair kits are sold here", + "nl": "Fietsreparatiesets worden hier verkocht" + } }, { - "if": "vending:bicycle_lock=yes", - "ifnot": "vending:bicycle_lock=no", - "then": "Bicycle locks are sold here" + "if": "vending=bicycle_pump", + "then": { + "en": "Bicycle pumps are sold here", + "nl": "Fietspompen worden hier verkocht" + } + }, + { + "if": "vending=bicycle_lock", + "then": { + "en": "Bicycle locks are sold here", + "nl": "Fietssloten worden hier verkocht" + } } ], "multiAnswer": true @@ -322,4 +339,4 @@ "cs": "Vrstva zobrazující automaty na cyklistické duše (buď speciální automaty na cyklistické duše, nebo klasické automaty s cyklistickými dušemi a případně dalšími předměty souvisejícími s jízdními koly, jako jsou světla, rukavice, zámky, ...)", "ca": "Una capa que mostra màquines expenedores per a tubs de bicicleta (ja siguin màquines expenedores de tubs de bicicleta o màquines expenedores clàssiques amb tubs de bicicleta i opcionalment objectes addicionals relacionats amb la bicicleta com ara llums, guants, panys, ...)" } -} +} \ No newline at end of file diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json index deb56d624..98ce6dbfd 100644 --- a/assets/layers/vending_machine/vending_machine.json +++ b/assets/layers/vending_machine/vending_machine.json @@ -290,12 +290,39 @@ "icon": "./assets/themes/stations/public_transport_tickets.svg" }, { - "if": "vending=meat", + "if": "vending=bicycle_light", "then": { - "en": "Meat products are being sold", - "nl": "Vleesproducten worden verkocht" - }, - "icon": "./assets/layers/id_presets/temaki-meat.svg" + "en": "Bicycle lights are sold", + "nl": "Fietslampjes worden verkocht" + } + }, + { + "if": "vending=gloves", + "then": { + "en": "Gloves are sold", + "nl": "Handschoenen worden verkocht" + } + }, + { + "if": "vending=bicycle_repair_kit", + "then": { + "en": "Bicycle repair kits are sold", + "nl": "Fietsreparatiesets worden verkocht" + } + }, + { + "if": "vending=bicycle_pump", + "then": { + "en": "Bicycle pumps are sold", + "nl": "Fietspompen worden verkocht" + } + }, + { + "if": "vending=bicycle_lock", + "then": { + "en": "Bicycle locks are sold", + "nl": "Fietssloten worden verkocht" + } } ], "multiAnswer": true @@ -839,6 +866,41 @@ "question": { "en": "Sale of public transport tickets" } + }, + { + "osmTags": "vending=bicycle_light", + "question": { + "en": "Sale of bicycle lights", + "nl": "Verkoop van fietslampjes" + } + }, + { + "osmTags": "vending=gloves", + "question": { + "en": "Sale of gloves", + "nl": "Verkoop van handschoenen" + } + }, + { + "osmTags": "vending=bicycle_repair_kit", + "question": { + "en": "Sale of bicycle repair kits", + "nl": "Verkoop van fietsreparatiesets" + } + }, + { + "osmTags": "vending=bicycle_pump", + "question": { + "en": "Sale of bicycle pumps", + "nl": "Verkoop van fietspompen" + } + }, + { + "osmTags": "vending=bicycle_lock", + "question": { + "en": "Sale of bicycle locks", + "nl": "Verkoop van fietssloten" + } } ] } diff --git a/langs/layers/en.json b/langs/layers/en.json index d76fa43e5..884b1f437 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -1034,9 +1034,61 @@ }, "question": "Is this vending machine still operational?", "render": "The operational status is {operational_status}" + }, + "bicycle_tube_vending_machine-brand": { + "mappings": { + "0": { + "then": "Continental tubes are sold here" + }, + "1": { + "then": "Schwalbe tubes are sold here" + } + }, + "question": "Which brand of tubes are sold here?", + "render": "{brand} tubes are sold here" + }, + "bicycle_tube_vending_machine-charge": { + "question": "How much does a bicycle tube cost?", + "render": "A bicycle tube costs {charge}" + }, + "bicycle_tube_vending_machine-operator": { + "mappings": { + "0": { + "then": "Maintained by Schwalbe" + }, + "1": { + "then": "Maintained by Continental" + } + }, + "question": "Who maintains this vending machine?" + }, + "other-items-vending": { + "mappings": { + "0": { + "then": "Bicycle lights are sold here" + }, + "1": { + "then": "Gloves are sold here" + }, + "2": { + "then": "Bicycle repair kits are sold here" + }, + "3": { + "then": "Bicycle pumps are sold here" + }, + "4": { + "then": "Bicycle locks are sold here" + } + }, + "question": "Are other biycle accessories sold here?" } }, "title": { + "mappings": { + "0": { + "then": "Bicycle tube vending machine {name}" + } + }, "render": "Bicycle tube vending machine" } }, @@ -9910,6 +9962,21 @@ }, "20": { "question": "Sale of public transport tickets" + }, + "21": { + "question": "Sale of bicycle lights" + }, + "22": { + "question": "Sale of gloves" + }, + "23": { + "question": "Sale of bicycle repair kits" + }, + "24": { + "question": "Sale of bicycle pumps" + }, + "25": { + "question": "Sale of bicycle locks" } } } @@ -10011,7 +10078,19 @@ "then": "Public transport tickets are sold" }, "20": { - "then": "Meat products are being sold" + "then": "Bicycle lights are sold" + }, + "21": { + "then": "Gloves are sold" + }, + "22": { + "then": "Bicycle repair kits are sold" + }, + "23": { + "then": "Bicycle pumps are sold" + }, + "24": { + "then": "Bicycle locks are sold" } }, "question": "What does this vending machine sell?", diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 817c577ec..c710940f9 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -930,6 +930,25 @@ }, "question": "Is deze verkoopsautomaat nog steeds werkende?", "render": "Deze verkoopsautomaat is {operational_status}" + }, + "other-items-vending": { + "mappings": { + "0": { + "then": "Fietslampjes worden hier verkocht" + }, + "1": { + "then": "Handschoenen worden hier verkocht" + }, + "2": { + "then": "Fietsreparatiesets worden hier verkocht" + }, + "3": { + "then": "Fietspompen worden hier verkocht" + }, + "4": { + "then": "Fietssloten worden hier verkocht" + } + } } }, "title": { @@ -9056,6 +9075,21 @@ }, "17": { "question": "Verkoop van bloemen" + }, + "21": { + "question": "Verkoop van fietslampjes" + }, + "22": { + "question": "Verkoop van handschoenen" + }, + "23": { + "question": "Verkoop van fietsreparatiesets" + }, + "24": { + "question": "Verkoop van fietspompen" + }, + "25": { + "question": "Verkoop van fietssloten" } } } @@ -9148,7 +9182,19 @@ "then": "Openbaar vervoerkaartjes worden verkocht" }, "20": { - "then": "Vleesproducten worden verkocht" + "then": "Fietslampjes worden verkocht" + }, + "21": { + "then": "Handschoenen worden verkocht" + }, + "22": { + "then": "Fietsreparatiesets worden verkocht" + }, + "23": { + "then": "Fietspompen worden verkocht" + }, + "24": { + "then": "Fietssloten worden verkocht" } }, "question": "Wat verkoopt deze verkoopautomaat?",