diff --git a/assets/layers/elongated_coin/elongated_coin.json b/assets/layers/elongated_coin/elongated_coin.json
new file mode 100644
index 000000000..8e9dc7081
--- /dev/null
+++ b/assets/layers/elongated_coin/elongated_coin.json
@@ -0,0 +1,239 @@
+{
+ "id": "elongated_coin",
+ "name": {
+ "en": "Penny Presses",
+ "de": "Münzpressen"
+ },
+ "description": {
+ "en": "Layer showing penny presses.",
+ "de": "Ebene mit Münzpressen."
+ },
+ "source": {
+ "osmTags": {
+ "and": [
+ "amenity=vending_machine",
+ "vending=elongated_coin"
+ ]
+ }
+ },
+ "title": {
+ "render": {
+ "en": "Penny Press",
+ "de": "Münzpresse"
+ }
+ },
+ "tagRenderings": [
+ "images",
+ "opening_hours_24_7",
+ {
+ "id": "designs",
+ "question": {
+ "en": "How many designs are available?",
+ "de": "Wieviele Motive sind verfügbar?"
+ },
+ "freeform": {
+ "key": "coin:design_count",
+ "type": "pnat",
+ "placeholder": {
+ "en": "Number of designs (e.g. 5)",
+ "de": "Motivanzahl (z.B. 5)"
+ }
+ },
+ "render": {
+ "en": "This penny press has {coin:design_count} designs available.",
+ "de": "Die Münzpresse hat {coin:design_count} Motive zur Auswahl."
+ },
+ "mappings": [
+ {
+ "if": "coin:design_count=1",
+ "then": {
+ "en": "This penny press has one design available.",
+ "de": "Die Münzpresse hat ein Motiv zur Auswahl."
+ }
+ },
+ {
+ "if": "coin:design_count=2",
+ "then": {
+ "en": "This penny press has two designs available.",
+ "de": "Die Münzpresse hat zwei Motive zur Auswahl."
+ }
+ },
+ {
+ "if": "coin:design_count=3",
+ "then": {
+ "en": "This penny press has three designs available.",
+ "de": "Die Münzpresse hat drei Motive zur Auswahl."
+ }
+ },
+ {
+ "if": "coin:design_count=4",
+ "then": {
+ "en": "This penny press has four designs available.",
+ "de": "Die Münzpresse hat vier Motive zur Auswahl."
+ }
+ }
+ ]
+ },
+ "payment-options-split",
+ {
+ "id": "coin",
+ "question": {
+ "en": "What coin is used for pressing?",
+ "de": "Welche Münze wird zum Pressen verwendet?"
+ },
+ "freeform": {
+ "key": "coin:type",
+ "type": "string",
+ "placeholder": {
+ "en": "Coin type (e.g. 10cent)",
+ "de": "Münzenart (z.B. 10 Cent)"
+ }
+ },
+ "mappings": [
+ {
+ "if": "coin:type=2cent",
+ "then": {
+ "en": "This penny press uses a 2 cent coin for pressing.",
+ "de": "Die Münzpresse benötigt eine 2 Cent Münze um zu Pressen."
+ }
+ },
+ {
+ "if": "coin:type=5cent",
+ "then": {
+ "en": "This penny press uses a 5 cent coin for pressing.",
+ "de": "Die Münzpresse benötigt eine 5 Cent Münze um zu Pressen."
+ }
+ },
+ {
+ "if": "coin:type=10cent",
+ "then": {
+ "en": "This penny press uses a 10 cent coin for pressing.",
+ "de": "Die Münzpresse benötigt eine 10 Cent Münze um zu Pressen."
+ }
+ },
+ {
+ "if": "coin:type=25cent",
+ "then": {
+ "en": "This penny press uses a 25 cent coin for pressing.",
+ "de": "Die Münzpresse benötigt eine 25 Cent Münze um zu Pressen."
+ },
+ "hideInAnswer": "_currency!~.*USD.*"
+ },
+ {
+ "if": "coin:type=50cent",
+ "then": {
+ "en": "This penny press uses a 50 cent coin for pressing.",
+ "de": "Die Münzpresse benötigt eine 50 Cent Münze um zu Pressen."
+ },
+ "hideInAnswer": "_currency!~.*USD.*"
+ }
+ ],
+ "render": {
+ "en": "This penny press uses a {coin:type} coin for pressing.",
+ "de": "Die Münzpresse benötigt eine {coin:type} Münze um zu Pressen."
+ }
+ },
+ "website",
+ {
+ "id": "charge",
+ "question": {
+ "en": "How much does it cost to press a penny?",
+ "de": "Wieviel kostet es eine Münze zu Pressen?"
+ },
+ "freeform": {
+ "key": "charge",
+ "placeholder": {
+ "en": "Cost (e.g. 0.50 EUR)",
+ "de": "Einwurf (z.B. 0,5€)",
+ "fr": "Coût (par ex. 0.50 EUR)"
+ }
+ },
+ "mappings": [
+ {
+ "if": "charge=1 EUR",
+ "then": {
+ "en": "It costs 1 euro to press a penny.",
+ "de": "Eine Münze zu Pressen kostet 1 Euro."
+ },
+ "hideInAnswer": "_currency!~.*EUR.*"
+ },
+ {
+ "if": "charge=2 EUR",
+ "then": {
+ "en": "It costs 2 euros to press a penny.",
+ "de": "Eine Münze zu Pressen kostet 2€."
+ },
+ "hideInAnswer": "_currency!~.*EUR.*"
+ }
+ ],
+ "render": {
+ "en": "It costs {charge} to press a penny.",
+ "de": "Es kostet {charge}€ um eine Münze zu Pressen."
+ }
+ },
+ "denominations-coins",
+ {
+ "id": "indoor",
+ "question": {
+ "en": "Is the penny press indoors?",
+ "de": "Befindet sich die Münzpresse im Inneren?"
+ },
+ "mappings": [
+ {
+ "if": "indoor=yes",
+ "then": {
+ "en": "This penny press is located indoors.",
+ "de": "Die Münzpresse befindet sich im Inneren."
+ }
+ },
+ {
+ "if": "indoor=no",
+ "then": {
+ "en": "This penny press is located outdoors.",
+ "de": "Die Münzpresse befindet sich Draußen."
+ }
+ }
+ ]
+ },
+ "level",
+ "check_date"
+ ],
+ "mapRendering": [
+ {
+ "icon": "circle:#FFFFFF00;./assets/themes/elongated_coin/penny.svg",
+ "location": [
+ "point",
+ "centroid"
+ ],
+ "iconBadges": [
+ {
+ "if": "opening_hours~*",
+ "then": "icons.isOpen"
+ }
+ ]
+ }
+ ],
+ "presets": [
+ {
+ "title": {
+ "en": "a penny press",
+ "de": "Eine Münzpresse"
+ },
+ "tags": [
+ "amenity=vending_machine",
+ "vending=elongated_coin",
+ "payment:coins=yes"
+ ]
+ }
+ ],
+ "allowMove": {
+ "enableImproveAccuracy": true,
+ "enableRelocation": true
+ },
+ "deletion": true,
+ "filter": [
+ "open_now",
+ "accepts_debit_cards",
+ "accepts_credit_cards"
+ ]
+}
\ 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 ace99ea95..44906a2b5 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -205,6 +205,29 @@
"de": "Blumen werden verkauft"
},
"icon": "./assets/layers/id_presets/maki-florist.svg"
+ },
+ {
+ "if": "vending=parking_tickets",
+ "then": {
+ "en": "Parking tickets are sold",
+ "nl": "Parkeerkaarten worden verkocht"
+ },
+ "icon": "./assets/layers/parking_ticket_machine/parking_tickets.svg"
+ },
+ {
+ "if": "vending=elongated_coin",
+ "then": {
+ "en": "Pressed pennies are sold"
+ },
+ "icon": "./assets/themes/elongated_coin/penny.svg"
+ },
+ {
+ "if": "vending=public_transport_tickets",
+ "then": {
+ "en": "Public transport tickets are sold",
+ "nl": "Openbaar vervoerkaartjes worden verkocht"
+ },
+ "icon": "./assets/themes/stations/public_transport_tickets.svg"
}
],
"multiAnswer": true
@@ -483,6 +506,33 @@
]
},
"then": "circle:white;./assets/layers/id_presets/maki-florist.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*parking_tickets.*"
+ ]
+ },
+ "then": "circle:white;./assets/layers/parking_ticket_machine/parking_tickets.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*elongated_coin.*"
+ ]
+ },
+ "then": "circle:white;./assets/themes/elongated_coin/penny.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*public_transport_tickets.*"
+ ]
+ },
+ "then": "circle:white;./assets/themes/stations/public_transport_tickets.svg"
}
]
}
diff --git a/assets/themes/elongated_coin/elongated_coin.json b/assets/themes/elongated_coin/elongated_coin.json
index ede194c93..634356dae 100644
--- a/assets/themes/elongated_coin/elongated_coin.json
+++ b/assets/themes/elongated_coin/elongated_coin.json
@@ -10,245 +10,7 @@
},
"icon": "./assets/themes/elongated_coin/penny.svg",
"layers": [
- {
- "id": "elongated_coin",
- "name": {
- "en": "Penny Presses",
- "de": "Münzpressen"
- },
- "description": {
- "en": "Layer showing penny presses.",
- "de": "Ebene mit Münzpressen."
- },
- "source": {
- "osmTags": {
- "and": [
- "amenity=vending_machine",
- "vending=elongated_coin"
- ]
- }
- },
- "title": {
- "render": {
- "en": "Penny Press",
- "de": "Münzpresse"
- }
- },
- "tagRenderings": [
- "images",
- "opening_hours_24_7",
- {
- "id": "designs",
- "question": {
- "en": "How many designs are available?",
- "de": "Wieviele Motive sind verfügbar?"
- },
- "freeform": {
- "key": "coin:design_count",
- "type": "pnat",
- "placeholder": {
- "en": "Number of designs (e.g. 5)",
- "de": "Motivanzahl (z.B. 5)"
- }
- },
- "render": {
- "en": "This penny press has {coin:design_count} designs available.",
- "de": "Die Münzpresse hat {coin:design_count} Motive zur Auswahl."
- },
- "mappings": [
- {
- "if": "coin:design_count=1",
- "then": {
- "en": "This penny press has one design available.",
- "de": "Die Münzpresse hat ein Motiv zur Auswahl."
- }
- },
- {
- "if": "coin:design_count=2",
- "then": {
- "en": "This penny press has two designs available.",
- "de": "Die Münzpresse hat zwei Motive zur Auswahl."
- }
- },
- {
- "if": "coin:design_count=3",
- "then": {
- "en": "This penny press has three designs available.",
- "de": "Die Münzpresse hat drei Motive zur Auswahl."
- }
- },
- {
- "if": "coin:design_count=4",
- "then": {
- "en": "This penny press has four designs available.",
- "de": "Die Münzpresse hat vier Motive zur Auswahl."
- }
- }
- ]
- },
- "payment-options-split",
- {
- "id": "coin",
- "question": {
- "en": "What coin is used for pressing?",
- "de": "Welche Münze wird zum Pressen verwendet?"
- },
- "freeform": {
- "key": "coin:type",
- "type": "string",
- "placeholder": {
- "en": "Coin type (e.g. 10cent)",
- "de": "Münzenart (z.B. 10 Cent)"
- }
- },
- "mappings": [
- {
- "if": "coin:type=2cent",
- "then": {
- "en": "This penny press uses a 2 cent coin for pressing.",
- "de": "Die Münzpresse benötigt eine 2 Cent Münze um zu Pressen."
- }
- },
- {
- "if": "coin:type=5cent",
- "then": {
- "en": "This penny press uses a 5 cent coin for pressing.",
- "de": "Die Münzpresse benötigt eine 5 Cent Münze um zu Pressen."
- }
- },
- {
- "if": "coin:type=10cent",
- "then": {
- "en": "This penny press uses a 10 cent coin for pressing.",
- "de": "Die Münzpresse benötigt eine 10 Cent Münze um zu Pressen."
- }
- },
- {
- "if": "coin:type=25cent",
- "then": {
- "en": "This penny press uses a 25 cent coin for pressing.",
- "de": "Die Münzpresse benötigt eine 25 Cent Münze um zu Pressen."
- },
- "hideInAnswer": "_currency!~.*USD.*"
- },
- {
- "if": "coin:type=50cent",
- "then": {
- "en": "This penny press uses a 50 cent coin for pressing.",
- "de": "Die Münzpresse benötigt eine 50 Cent Münze um zu Pressen."
- },
- "hideInAnswer": "_currency!~.*USD.*"
- }
- ],
- "render": {
- "en": "This penny press uses a {coin:type} coin for pressing.",
- "de": "Die Münzpresse benötigt eine {coin:type} Münze um zu Pressen."
- }
- },
- "website",
- {
- "id": "charge",
- "question": {
- "en": "How much does it cost to press a penny?",
- "de": "Wieviel kostet es eine Münze zu Pressen?"
- },
- "freeform": {
- "key": "charge",
- "placeholder": {
- "en": "Cost (e.g. 0.50 EUR)",
- "de": "Einwurf (z.B. 0,5€)",
- "fr": "Coût (par ex. 0.50 EUR)"
- }
- },
- "mappings": [
- {
- "if": "charge=1 EUR",
- "then": {
- "en": "It costs 1 euro to press a penny.",
- "de": "Eine Münze zu Pressen kostet 1 Euro."
- },
- "hideInAnswer": "_currency!~.*EUR.*"
- },
- {
- "if": "charge=2 EUR",
- "then": {
- "en": "It costs 2 euros to press a penny.",
- "de": "Eine Münze zu Pressen kostet 2€."
- },
- "hideInAnswer": "_currency!~.*EUR.*"
- }
- ],
- "render": {
- "en": "It costs {charge} to press a penny.",
- "de": "Es kostet {charge}€ um eine Münze zu Pressen."
- }
- },
- "denominations-coins",
- {
- "id": "indoor",
- "question": {
- "en": "Is the penny press indoors?",
- "de": "Befindet sich die Münzpresse im Inneren?"
- },
- "mappings": [
- {
- "if": "indoor=yes",
- "then": {
- "en": "This penny press is located indoors.",
- "de": "Die Münzpresse befindet sich im Inneren."
- }
- },
- {
- "if": "indoor=no",
- "then": {
- "en": "This penny press is located outdoors.",
- "de": "Die Münzpresse befindet sich Draußen."
- }
- }
- ]
- },
- "level",
- "check_date"
- ],
- "mapRendering": [
- {
- "icon": "circle:#FFFFFF00;./assets/themes/elongated_coin/penny.svg",
- "location": [
- "point",
- "centroid"
- ],
- "iconBadges": [
- {
- "if": "opening_hours~*",
- "then": "icons.isOpen"
- }
- ]
- }
- ],
- "presets": [
- {
- "title": {
- "en": "a penny press",
- "de": "Eine Münzpresse"
- },
- "tags": [
- "amenity=vending_machine",
- "vending=elongated_coin",
- "payment:coins=yes"
- ]
- }
- ],
- "allowMove": {
- "enableImproveAccuracy": true,
- "enableRelocation": true
- },
- "deletion": true,
- "filter": [
- "open_now",
- "accepts_debit_cards",
- "accepts_credit_cards"
- ]
- }
+ "elongated_coin"
],
"startLat": 53.0565,
"startLon": 8.7492,
diff --git a/assets/themes/vending_machine/vending_machine.json b/assets/themes/vending_machine/vending_machine.json
index 177b7f314..ccf99528a 100644
--- a/assets/themes/vending_machine/vending_machine.json
+++ b/assets/themes/vending_machine/vending_machine.json
@@ -17,6 +17,46 @@
"startLon": 6.56511,
"startZoom": 19,
"layers": [
- "vending_machine"
+ "vending_machine",
+ {
+ "builtin": "vending_machine",
+ "override": {
+ "id": "all_vending_machine",
+ "name": null,
+ "filter": {
+ "sameAs": "vending_machine"
+ },
+ "minzoom": 18,
+ "source": {
+ "osmTags": {
+ "and": [
+ "amenity=vending_machine",
+ "vending!~(parking_tickets|elongated_coin|public_transport_tickets)"
+ ]
+ }
+ }
+ }
+ },
+ {
+ "builtin": "parking_ticket_machine",
+ "override": {
+ "name": null,
+ "minzoom": 18
+ }
+ },
+ {
+ "builtin": "elongated_coin",
+ "override": {
+ "name": null,
+ "minzoom": 18
+ }
+ },
+ {
+ "builtin": "ticket_machine",
+ "override": {
+ "name": null,
+ "minzoom": 18
+ }
+ }
]
}
\ No newline at end of file
diff --git a/langs/layers/da.json b/langs/layers/da.json
index 9cf0a4dcf..20e0d008f 100644
--- a/langs/layers/da.json
+++ b/langs/layers/da.json
@@ -2048,7 +2048,7 @@
}
}
},
- "7": {
+ "9": {
"options": {
"0": {
"question": "Gratis at bruge"
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 3b6a131a9..8f844fa1b 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -4224,6 +4224,91 @@
}
}
},
+ "elongated_coin": {
+ "description": "Ebene mit Münzpressen.",
+ "name": "Münzpressen",
+ "presets": {
+ "0": {
+ "title": "Eine Münzpresse"
+ }
+ },
+ "tagRenderings": {
+ "charge": {
+ "freeform": {
+ "placeholder": "Einwurf (z.B. 0,5€)"
+ },
+ "mappings": {
+ "0": {
+ "then": "Eine Münze zu Pressen kostet 1 Euro."
+ },
+ "1": {
+ "then": "Eine Münze zu Pressen kostet 2€."
+ }
+ },
+ "question": "Wieviel kostet es eine Münze zu Pressen?",
+ "render": "Es kostet {charge}€ um eine Münze zu Pressen."
+ },
+ "coin": {
+ "freeform": {
+ "placeholder": "Münzenart (z.B. 10 Cent)"
+ },
+ "mappings": {
+ "0": {
+ "then": "Die Münzpresse benötigt eine 2 Cent Münze um zu Pressen."
+ },
+ "1": {
+ "then": "Die Münzpresse benötigt eine 5 Cent Münze um zu Pressen."
+ },
+ "2": {
+ "then": "Die Münzpresse benötigt eine 10 Cent Münze um zu Pressen."
+ },
+ "3": {
+ "then": "Die Münzpresse benötigt eine 25 Cent Münze um zu Pressen."
+ },
+ "4": {
+ "then": "Die Münzpresse benötigt eine 50 Cent Münze um zu Pressen."
+ }
+ },
+ "question": "Welche Münze wird zum Pressen verwendet?",
+ "render": "Die Münzpresse benötigt eine {coin:type} Münze um zu Pressen."
+ },
+ "designs": {
+ "freeform": {
+ "placeholder": "Motivanzahl (z.B. 5)"
+ },
+ "mappings": {
+ "0": {
+ "then": "Die Münzpresse hat ein Motiv zur Auswahl."
+ },
+ "1": {
+ "then": "Die Münzpresse hat zwei Motive zur Auswahl."
+ },
+ "2": {
+ "then": "Die Münzpresse hat drei Motive zur Auswahl."
+ },
+ "3": {
+ "then": "Die Münzpresse hat vier Motive zur Auswahl."
+ }
+ },
+ "question": "Wieviele Motive sind verfügbar?",
+ "render": "Die Münzpresse hat {coin:design_count} Motive zur Auswahl."
+ },
+ "indoor": {
+ "mappings": {
+ "0": {
+ "then": "Die Münzpresse befindet sich im Inneren."
+ },
+ "1": {
+ "then": "Die Münzpresse befindet sich Draußen."
+ }
+ },
+ "question": "Befindet sich die Münzpresse im Inneren?"
+ }
+ },
+ "title": {
+ "render": "Münzpresse"
+ }
+ },
"entrance": {
"description": "Eine Ebene, die Eingänge anzeigt und die Möglichkeit bietet, weitere Daten zu erheben, die z. B. für Rollstuhlfahrer wichtig sind (aber auch für Radfahrer, Lieferpersonal, …)",
"name": "Eingänge",
@@ -4438,7 +4523,7 @@
}
}
},
- "3": {
+ "5": {
"options": {
"0": {
"question": "Mit und ohne Bild"
@@ -4451,14 +4536,14 @@
}
}
},
- "4": {
+ "6": {
"options": {
"0": {
"question": "Mit taktilem Pflaster"
}
}
},
- "5": {
+ "7": {
"options": {
"0": {
"question": "Mit oder ohne taktiles Pflaster"
@@ -4474,14 +4559,14 @@
}
}
},
- "6": {
+ "8": {
"options": {
"0": {
"question": "Bio-Produkte im Angebot"
}
}
},
- "7": {
+ "9": {
"options": {
"0": {
"question": "Nutzung kostenlos"
@@ -7030,6 +7115,15 @@
},
"questions": {
"tagRenderings": {
+ "check_date": {
+ "mappings": {
+ "0": {
+ "then": "Dieses Objekt wurde heute zuletzt kontrolliert"
+ }
+ },
+ "question": "Wann wurde dieses Objekt zuletzt kontrolliert?",
+ "render": "Dieses Objekt wurde zuletzt kontrolliert am {check_date}"
+ },
"denominations-coins": {
"mappings": {
"0": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 4c354d99e..75018983d 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -4224,6 +4224,91 @@
}
}
},
+ "elongated_coin": {
+ "description": "Layer showing penny presses.",
+ "name": "Penny Presses",
+ "presets": {
+ "0": {
+ "title": "a penny press"
+ }
+ },
+ "tagRenderings": {
+ "charge": {
+ "freeform": {
+ "placeholder": "Cost (e.g. 0.50 EUR)"
+ },
+ "mappings": {
+ "0": {
+ "then": "It costs 1 euro to press a penny."
+ },
+ "1": {
+ "then": "It costs 2 euros to press a penny."
+ }
+ },
+ "question": "How much does it cost to press a penny?",
+ "render": "It costs {charge} to press a penny."
+ },
+ "coin": {
+ "freeform": {
+ "placeholder": "Coin type (e.g. 10cent)"
+ },
+ "mappings": {
+ "0": {
+ "then": "This penny press uses a 2 cent coin for pressing."
+ },
+ "1": {
+ "then": "This penny press uses a 5 cent coin for pressing."
+ },
+ "2": {
+ "then": "This penny press uses a 10 cent coin for pressing."
+ },
+ "3": {
+ "then": "This penny press uses a 25 cent coin for pressing."
+ },
+ "4": {
+ "then": "This penny press uses a 50 cent coin for pressing."
+ }
+ },
+ "question": "What coin is used for pressing?",
+ "render": "This penny press uses a {coin:type} coin for pressing."
+ },
+ "designs": {
+ "freeform": {
+ "placeholder": "Number of designs (e.g. 5)"
+ },
+ "mappings": {
+ "0": {
+ "then": "This penny press has one design available."
+ },
+ "1": {
+ "then": "This penny press has two designs available."
+ },
+ "2": {
+ "then": "This penny press has three designs available."
+ },
+ "3": {
+ "then": "This penny press has four designs available."
+ }
+ },
+ "question": "How many designs are available?",
+ "render": "This penny press has {coin:design_count} designs available."
+ },
+ "indoor": {
+ "mappings": {
+ "0": {
+ "then": "This penny press is located indoors."
+ },
+ "1": {
+ "then": "This penny press is located outdoors."
+ }
+ },
+ "question": "Is the penny press indoors?"
+ }
+ },
+ "title": {
+ "render": "Penny Press"
+ }
+ },
"entrance": {
"description": "A layer showing entrances and offering capabilities to survey some advanced data which is important for e.g. wheelchair users (but also bicycle users, people who want to deliver, …)",
"name": "Entrance",
@@ -4439,6 +4524,20 @@
}
},
"3": {
+ "options": {
+ "0": {
+ "question": "Accepts debit cards"
+ }
+ }
+ },
+ "4": {
+ "options": {
+ "0": {
+ "question": "Accepts credit cards"
+ }
+ }
+ },
+ "5": {
"options": {
"0": {
"question": "With and without images"
@@ -4451,14 +4550,14 @@
}
}
},
- "4": {
+ "6": {
"options": {
"0": {
"question": "With tactile paving"
}
}
},
- "5": {
+ "7": {
"options": {
"0": {
"question": "With or without tactile paving"
@@ -4474,14 +4573,14 @@
}
}
},
- "6": {
+ "8": {
"options": {
"0": {
"question": "Has organic options"
}
}
},
- "7": {
+ "9": {
"options": {
"0": {
"question": "Free to use"
@@ -7036,6 +7135,15 @@
},
"questions": {
"tagRenderings": {
+ "check_date": {
+ "mappings": {
+ "0": {
+ "then": "This object was last checked today"
+ }
+ },
+ "question": "When was this object last checked?",
+ "render": "This object was last checked on {check_date}"
+ },
"denominations-coins": {
"mappings": {
"0": {
@@ -7219,6 +7327,9 @@
},
"question": "Is this object lit or does it emit light?"
},
+ "mastodon": {
+ "question": "What is the Mastodon-handle of {title()}?"
+ },
"multilevels": {
"override": {
"question": "What levels does this elevator go to?",
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index dd622158d..4dcce7098 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -2943,6 +2943,15 @@
}
}
},
+ "elongated_coin": {
+ "tagRenderings": {
+ "charge": {
+ "freeform": {
+ "placeholder": "Coût (par ex. 0.50 EUR)"
+ }
+ }
+ }
+ },
"entrance": {
"description": "Une couche montrant les entrées et offrant des capacités pour étudier certaines données avancées qui sont importantes, par exemple. les utilisateurs de fauteuils roulants (mais aussi les utilisateurs de vélos, les personnes qui veulent faire des livraisons, …)",
"name": "Entrée",
@@ -3154,14 +3163,14 @@
}
}
},
- "4": {
+ "6": {
"options": {
"0": {
"question": "Avec revêtement podotactile"
}
}
},
- "5": {
+ "7": {
"options": {
"0": {
"question": "Avec ou sans revêtement podotactile"
@@ -3177,7 +3186,7 @@
}
}
},
- "7": {
+ "9": {
"options": {
"0": {
"question": "Utilisation gratuite"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 8f3dcff9a..8349b2b9c 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -4323,7 +4323,7 @@
}
}
},
- "3": {
+ "5": {
"options": {
"0": {
"question": "Met en zonder afbeelding"
@@ -4336,14 +4336,14 @@
}
}
},
- "4": {
+ "6": {
"options": {
"0": {
"question": "Met voelbare bestrating"
}
}
},
- "5": {
+ "7": {
"options": {
"0": {
"question": "Met of zonder voelbare bestrating"
@@ -4359,14 +4359,14 @@
}
}
},
- "6": {
+ "8": {
"options": {
"0": {
"question": "Heeft biologische opties"
}
}
},
- "7": {
+ "9": {
"options": {
"0": {
"question": "Gratis toegankelijk"
@@ -6658,6 +6658,15 @@
},
"questions": {
"tagRenderings": {
+ "check_date": {
+ "mappings": {
+ "0": {
+ "then": "Dit object is vandaag voor het laatst gecontroleerd"
+ }
+ },
+ "question": "Wanneer is dit object voor het laatst gecontroleerd?",
+ "render": "Dit object is voor het laatst gecontroleerd op {check_date}"
+ },
"denominations-coins": {
"mappings": {
"0": {
diff --git a/langs/themes/de.json b/langs/themes/de.json
index 34b663c99..3d5b10817 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -609,93 +609,6 @@
},
"elongated_coin": {
"description": "Finde Münzpresse um deine eigenen Prägemünzen zu Pressen.",
- "layers": {
- "0": {
- "description": "Ebene mit Münzpressen.",
- "name": "Münzpressen",
- "presets": {
- "0": {
- "title": "Eine Münzpresse"
- }
- },
- "tagRenderings": {
- "charge": {
- "freeform": {
- "placeholder": "Einwurf (z.B. 0,5€)"
- },
- "mappings": {
- "0": {
- "then": "Eine Münze zu Pressen kostet 1 Euro."
- },
- "1": {
- "then": "Eine Münze zu Pressen kostet 2€."
- }
- },
- "question": "Wieviel kostet es eine Münze zu Pressen?",
- "render": "Es kostet {charge}€ um eine Münze zu Pressen."
- },
- "coin": {
- "freeform": {
- "placeholder": "Münzenart (z.B. 10 Cent)"
- },
- "mappings": {
- "0": {
- "then": "Die Münzpresse benötigt eine 2 Cent Münze um zu Pressen."
- },
- "1": {
- "then": "Die Münzpresse benötigt eine 5 Cent Münze um zu Pressen."
- },
- "2": {
- "then": "Die Münzpresse benötigt eine 10 Cent Münze um zu Pressen."
- },
- "3": {
- "then": "Die Münzpresse benötigt eine 25 Cent Münze um zu Pressen."
- },
- "4": {
- "then": "Die Münzpresse benötigt eine 50 Cent Münze um zu Pressen."
- }
- },
- "question": "Welche Münze wird zum Pressen verwendet?",
- "render": "Die Münzpresse benötigt eine {coin:type} Münze um zu Pressen."
- },
- "designs": {
- "freeform": {
- "placeholder": "Motivanzahl (z.B. 5)"
- },
- "mappings": {
- "0": {
- "then": "Die Münzpresse hat ein Motiv zur Auswahl."
- },
- "1": {
- "then": "Die Münzpresse hat zwei Motive zur Auswahl."
- },
- "2": {
- "then": "Die Münzpresse hat drei Motive zur Auswahl."
- },
- "3": {
- "then": "Die Münzpresse hat vier Motive zur Auswahl."
- }
- },
- "question": "Wieviele Motive sind verfügbar?",
- "render": "Die Münzpresse hat {coin:design_count} Motive zur Auswahl."
- },
- "indoor": {
- "mappings": {
- "0": {
- "then": "Die Münzpresse befindet sich im Inneren."
- },
- "1": {
- "then": "Die Münzpresse befindet sich Draußen."
- }
- },
- "question": "Befindet sich die Münzpresse im Inneren?"
- }
- },
- "title": {
- "render": "Münzpresse"
- }
- }
- },
"title": "Münzpressen"
},
"etymology": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 1f3d9c762..e4ffee2f2 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -609,93 +609,6 @@
},
"elongated_coin": {
"description": "Find penny presses to create your own elongated coins.",
- "layers": {
- "0": {
- "description": "Layer showing penny presses.",
- "name": "Penny Presses",
- "presets": {
- "0": {
- "title": "a penny press"
- }
- },
- "tagRenderings": {
- "charge": {
- "freeform": {
- "placeholder": "Cost (e.g. 0.50 EUR)"
- },
- "mappings": {
- "0": {
- "then": "It costs 1 euro to press a penny."
- },
- "1": {
- "then": "It costs 2 euros to press a penny."
- }
- },
- "question": "How much does it cost to press a penny?",
- "render": "It costs {charge} to press a penny."
- },
- "coin": {
- "freeform": {
- "placeholder": "Coin type (e.g. 10cent)"
- },
- "mappings": {
- "0": {
- "then": "This penny press uses a 2 cent coin for pressing."
- },
- "1": {
- "then": "This penny press uses a 5 cent coin for pressing."
- },
- "2": {
- "then": "This penny press uses a 10 cent coin for pressing."
- },
- "3": {
- "then": "This penny press uses a 25 cent coin for pressing."
- },
- "4": {
- "then": "This penny press uses a 50 cent coin for pressing."
- }
- },
- "question": "What coin is used for pressing?",
- "render": "This penny press uses a {coin:type} coin for pressing."
- },
- "designs": {
- "freeform": {
- "placeholder": "Number of designs (e.g. 5)"
- },
- "mappings": {
- "0": {
- "then": "This penny press has one design available."
- },
- "1": {
- "then": "This penny press has two designs available."
- },
- "2": {
- "then": "This penny press has three designs available."
- },
- "3": {
- "then": "This penny press has four designs available."
- }
- },
- "question": "How many designs are available?",
- "render": "This penny press has {coin:design_count} designs available."
- },
- "indoor": {
- "mappings": {
- "0": {
- "then": "This penny press is located indoors."
- },
- "1": {
- "then": "This penny press is located outdoors."
- }
- },
- "question": "Is the penny press indoors?"
- }
- },
- "title": {
- "render": "Penny Press"
- }
- }
- },
"title": "Penny Presses"
},
"etymology": {
@@ -945,12 +858,12 @@
"description": "This maps shows all the changes made with MapComplete",
"layers": {
"0": {
- "description": "Show all MapComplete changes",
+ "description": "Shows all MapComplete changes",
"filter": {
"0": {
"options": {
"0": {
- "question": "Theme name contains {search}"
+ "question": "Themename contains {search}"
}
}
},
@@ -1007,12 +920,12 @@
"name": "Changeset centers",
"tagRenderings": {
"contributor": {
- "question": "Which contributor made this change?",
+ "question": "What contributor did make this change?",
"render": "Change made by {user}"
},
"host": {
"question": "What host (website) was this change made with?",
- "render": "Change made with {host}"
+ "render": "Change with with {host}"
},
"locale": {
"question": "What locale (language) was this change made in?",
@@ -1044,7 +957,7 @@
}
}
},
- "shortDescription": "Show changes made with MapComplete",
+ "shortDescription": "Shows changes made by MapComplete",
"title": "Changes made with MapComplete"
},
"maproulette": {
diff --git a/langs/themes/fr.json b/langs/themes/fr.json
index 393f2d7a2..da27a8a8e 100644
--- a/langs/themes/fr.json
+++ b/langs/themes/fr.json
@@ -604,19 +604,6 @@
"description": "Sur cette carte, vous trouverez des informations concernant tous les types d'écoles et d'enseignement. Vous pouvez facilement ajouter plus d'informations",
"title": "Enseignement"
},
- "elongated_coin": {
- "layers": {
- "0": {
- "tagRenderings": {
- "charge": {
- "freeform": {
- "placeholder": "Coût (par ex. 0.50 EUR)"
- }
- }
- }
- }
- }
- },
"etymology": {
"description": "Retrouvez sur cette carte l’origine du nom d’un élément. Les rues, bâtiments, etc. proviennent d’OpenStreetMap et sont liés aux données venant de Wikidata. La fenêtre pop-up affiche l’article Wikipedia (s’il existe) ou l’infobox Wikidata de l’objet dont provient le nom. Si l’objet a sa propre page Wikipedia, elle sera aussi affichée.
Vous pouvez contribuer aussi ! Zoomez suffisamment et toutes les rues seront affichées. Cliquez sur l'une d'elles et une boîte de recherche Wikidata apparaîtra. En quelques clics, vous pouvez ajouter un lien étymologique. Vous devez disposer d’un compte OpenStreetMap gratuit.",
"layers": {