diff --git a/assets/layers/vending_machine/fruits.svg b/assets/layers/vending_machine/fruits.svg
new file mode 100644
index 000000000..48478b6c4
--- /dev/null
+++ b/assets/layers/vending_machine/fruits.svg
@@ -0,0 +1,1034 @@
+
+
+
\ No newline at end of file
diff --git a/assets/layers/vending_machine/fruits.svg.license b/assets/layers/vending_machine/fruits.svg.license
new file mode 100644
index 000000000..854d8a8df
--- /dev/null
+++ b/assets/layers/vending_machine/fruits.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: OpenClipart; frankes
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/vending_machine/license_info.json b/assets/layers/vending_machine/license_info.json
index f910585c2..105c31a4b 100644
--- a/assets/layers/vending_machine/license_info.json
+++ b/assets/layers/vending_machine/license_info.json
@@ -29,6 +29,17 @@
"https://fontawesome.com/icons/egg?f=classic&s=solid"
]
},
+ {
+ "path": "fruits.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "OpenClipart",
+ "frankes"
+ ],
+ "sources": [
+ "https://openclipart.org/detail/244990/fruits-coloured"
+ ]
+ },
{
"path": "honey.svg",
"license": "CC-BY-4.0",
@@ -70,6 +81,17 @@
"https://fontawesome.com/icons/smoking?f=classic&s=solid"
]
},
+ {
+ "path": "strawberry.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "OpenClipart",
+ "baroquon"
+ ],
+ "sources": [
+ "https://openclipart.org/detail/23540/strawberry"
+ ]
+ },
{
"path": "utensils.svg",
"license": "CC-BY-4.0",
diff --git a/assets/layers/vending_machine/strawberry.svg b/assets/layers/vending_machine/strawberry.svg
new file mode 100644
index 000000000..22a799862
--- /dev/null
+++ b/assets/layers/vending_machine/strawberry.svg
@@ -0,0 +1,524 @@
+
+
+
\ No newline at end of file
diff --git a/assets/layers/vending_machine/strawberry.svg.license b/assets/layers/vending_machine/strawberry.svg.license
new file mode 100644
index 000000000..c079331f2
--- /dev/null
+++ b/assets/layers/vending_machine/strawberry.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: OpenClipart; baroquon
+SPDX-License-Identifier: CC0-1.0
\ 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 abac1967f..81f189a99 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -251,6 +251,22 @@
},
"icon": "./assets/layers/id_presets/temaki-meat.svg"
},
+ {
+ "if": "vending=fruit",
+ "then": {
+ "en": "Fruit is sold",
+ "nl": "Fruit wordt verkocht"
+ },
+ "icon": "./assets/layers/vending_machine/fruits.svg"
+ },
+ {
+ "if": "vending=strawberries",
+ "then": {
+ "en": "Strawberries are sold",
+ "nl": "Aardbeien worden verkocht"
+ },
+ "icon": "./assets/layers/vending_machine/strawberry.svg"
+ },
{
"if": "vending=flowers",
"then": {
@@ -415,7 +431,8 @@
"ca": "Aquest és el número al qual podeu trucar en cas de problemes amb la màquina expenedora"
}
}
- }
+ },
+ "website"
],
"calculatedTags": [
"_vending_count=feat.properties.vending.split(';').length"
@@ -495,6 +512,14 @@
"if": "vending=meat",
"then": "./assets/layers/id_presets/temaki-meat.svg"
},
+ {
+ "if": "vending=fruit",
+ "then": "./assets/layers/vending_machine/fruits.svg"
+ },
+ {
+ "if": "vending=strawberries",
+ "then": "./assets/layers/vending_machine/strawberry.svg"
+ },
{
"if": "vending=flowers",
"then": "circle:white;./assets/layers/id_presets/maki-florist.svg"
@@ -631,6 +656,33 @@
},
"then": "circle:white;./assets/layers/vending_machine/potato.svg"
},
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*meat.*"
+ ]
+ },
+ "then": "./assets/layers/id_presets/temaki-meat.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*fruit.*"
+ ]
+ },
+ "then": "./assets/layers/vending_machine/fruits.svg"
+ },
+ {
+ "if": {
+ "and": [
+ "_vending_count>1",
+ "vending~.*strawberries.*"
+ ]
+ },
+ "then": "./assets/layers/vending_machine/strawberry.svg"
+ },
{
"if": {
"and": [
@@ -843,6 +895,20 @@
},
"osmTags": "vending~i~.*meat.*"
},
+ {
+ "question": {
+ "en": "Sale of fruit",
+ "nl": "Verkoop van fruit"
+ },
+ "osmTags": "vending~i~.*fruit.*"
+ },
+ {
+ "question": {
+ "en": "Sale of strawberries",
+ "nl": "Verkoop van aardbeien"
+ },
+ "osmTags": "vending~i~.*strawberries.*"
+ },
{
"question": {
"en": "Sale of flowers",
@@ -917,4 +983,4 @@
"enableRelocation": true
},
"deletion": true
-}
+}
\ No newline at end of file
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index 0c9569ad1..a85f6ac85 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -8809,20 +8809,20 @@
"15": {
"question": "Venda de patates"
},
- "17": {
- "question": "Venda de flors"
- },
- "17": {
- "question": "Venda d'aparcament"
- },
- "18": {
- "question": "Venda de monedes premsades"
+ "16": {
+ "question": "Venda de productes carnis"
},
"19": {
- "question": "Venda de bitllets de transport públic"
+ "question": "Venda de flors"
},
"20": {
- "question": "Venda de productes carnis"
+ "question": "Venda d'aparcament"
+ },
+ "21": {
+ "question": "Venda de monedes premsades"
+ },
+ "22": {
+ "question": "Venda de bitllets de transport públic"
}
}
}
@@ -8907,6 +8907,21 @@
},
"14": {
"then": "Es venen papes"
+ },
+ "15": {
+ "then": "Es venen productes carnis"
+ },
+ "18": {
+ "then": "Es venen flors"
+ },
+ "19": {
+ "then": "Es venen tiquets d'aparcament"
+ },
+ "20": {
+ "then": "Es venen cèntims premsats"
+ },
+ "21": {
+ "then": "Es venen bitllets de transport públic"
}
},
"question": "Que ven aquesta màquina expenedora?",
@@ -9102,6 +9117,9 @@
},
"6": {
"then": "Una paperera per a plàstic"
+ },
+ "7": {
+ "then": "Una paperera per a paper"
}
},
"question": "Quin tipus de paperera és aquesta?"
@@ -9243,4 +9261,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/langs/layers/de.json b/langs/layers/de.json
index b1ac89f3f..5b824dc79 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -9793,7 +9793,7 @@
"16": {
"question": "Verkauf von Fleisch"
},
- "17": {
+ "19": {
"question": "Verkauf von Blumen"
}
}
@@ -9874,13 +9874,13 @@
"14": {
"then": "Kartoffeln werden verkauft"
},
- "16": {
+ "18": {
"then": "Blumen werden verkauft"
},
- "17": {
+ "19": {
"then": "Parkscheine werden verkauft"
},
- "19": {
+ "21": {
"then": "Fahrscheine werden verkauft"
}
},
@@ -10077,6 +10077,9 @@
},
"6": {
"then": "Der Abfalleimer ist für Plastik"
+ },
+ "7": {
+ "then": "Der Abfalleimer ist für Papier"
}
},
"question": "Um was für einen Abfalleimer handelt es sich?"
@@ -10218,4 +10221,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index de19f0bac..05e1c5e78 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -10049,30 +10049,36 @@
"question": "Sale of meat"
},
"17": {
- "question": "Sale of flowers"
+ "question": "Sale of fruit"
},
"18": {
- "question": "Sale of parking tickets"
+ "question": "Sale of strawberries"
},
"19": {
- "question": "Sale of pressed pennies"
+ "question": "Sale of flowers"
},
"20": {
- "question": "Sale of public transport tickets"
+ "question": "Sale of parking tickets"
},
"21": {
- "question": "Sale of bicycle lights"
+ "question": "Sale of pressed pennies"
},
"22": {
- "question": "Sale of gloves"
+ "question": "Sale of public transport tickets"
},
"23": {
- "question": "Sale of bicycle repair kits"
+ "question": "Sale of bicycle lights"
},
"24": {
- "question": "Sale of bicycle pumps"
+ "question": "Sale of gloves"
},
"25": {
+ "question": "Sale of bicycle repair kits"
+ },
+ "26": {
+ "question": "Sale of bicycle pumps"
+ },
+ "27": {
"question": "Sale of bicycle locks"
}
}
@@ -10163,30 +10169,36 @@
"then": "Meat is sold"
},
"16": {
- "then": "Flowers are sold"
+ "then": "Fruit is sold"
},
"17": {
- "then": "Parking tickets are sold"
+ "then": "Strawberries are sold"
},
"18": {
- "then": "Pressed pennies are sold"
+ "then": "Flowers are sold"
},
"19": {
- "then": "Public transport tickets are sold"
+ "then": "Parking tickets are sold"
},
"20": {
- "then": "Bicycle lights are sold"
+ "then": "Pressed pennies are sold"
},
"21": {
- "then": "Gloves are sold"
+ "then": "Public transport tickets are sold"
},
"22": {
- "then": "Bicycle repair kits are sold"
+ "then": "Bicycle lights are sold"
},
"23": {
- "then": "Bicycle pumps are sold"
+ "then": "Gloves are sold"
},
"24": {
+ "then": "Bicycle repair kits are sold"
+ },
+ "25": {
+ "then": "Bicycle pumps are sold"
+ },
+ "26": {
"then": "Bicycle locks are sold"
}
},
@@ -10383,6 +10395,9 @@
},
"6": {
"then": "A waste basket for plastic"
+ },
+ "7": {
+ "then": "A waste basket for paper"
}
},
"question": "What kind of waste basket is this?"
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index b5db38d70..195888cee 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -6576,7 +6576,7 @@
"15": {
"question": "Vente de pommes de terre"
},
- "17": {
+ "19": {
"question": "Vente de fleurs"
}
}
@@ -6657,7 +6657,7 @@
"14": {
"then": "Vent des pommes de terre"
},
- "16": {
+ "18": {
"then": "Vent des fleurs"
}
},
@@ -6827,6 +6827,9 @@
},
"6": {
"then": "Une poubelle pour plastiques"
+ },
+ "7": {
+ "then": "Une poubelle pour papier"
}
},
"question": "De quel type de poubelle s'agit-il ?"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index fd87201ba..45b40274c 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -9084,21 +9084,27 @@
"question": "Verkoop van vlees"
},
"17": {
+ "question": "Verkoop van fruit"
+ },
+ "18": {
+ "question": "Verkoop van aardbeien"
+ },
+ "19": {
"question": "Verkoop van bloemen"
},
- "21": {
+ "23": {
"question": "Verkoop van fietslampjes"
},
- "22": {
+ "24": {
"question": "Verkoop van handschoenen"
},
- "23": {
+ "25": {
"question": "Verkoop van fietsreparatiesets"
},
- "24": {
+ "26": {
"question": "Verkoop van fietspompen"
},
- "25": {
+ "27": {
"question": "Verkoop van fietssloten"
}
}
@@ -9183,27 +9189,33 @@
"then": "Vlees wordt verkocht"
},
"16": {
- "then": "Bloemen worden verkocht"
+ "then": "Fruit wordt verkocht"
},
"17": {
- "then": "Parkeerkaarten worden verkocht"
+ "then": "Aardbeien worden verkocht"
+ },
+ "18": {
+ "then": "Bloemen worden verkocht"
},
"19": {
- "then": "Openbaar vervoerkaartjes worden verkocht"
- },
- "20": {
- "then": "Fietslampjes worden verkocht"
+ "then": "Parkeerkaarten worden verkocht"
},
"21": {
- "then": "Handschoenen worden verkocht"
+ "then": "Openbaar vervoerkaartjes worden verkocht"
},
"22": {
- "then": "Fietsreparatiesets worden verkocht"
+ "then": "Fietslampjes worden verkocht"
},
"23": {
- "then": "Fietspompen worden verkocht"
+ "then": "Handschoenen worden verkocht"
},
"24": {
+ "then": "Fietsreparatiesets worden verkocht"
+ },
+ "25": {
+ "then": "Fietspompen worden verkocht"
+ },
+ "26": {
"then": "Fietssloten worden verkocht"
}
},
@@ -9412,6 +9424,9 @@
},
"6": {
"then": "Een vuilnisbak voor plastic"
+ },
+ "7": {
+ "then": "Een vuilnisbak voor papier"
}
},
"question": "Wat voor soort vuilnisbak is dit?"
@@ -9542,4 +9557,4 @@
}
}
}
-}
+}
\ No newline at end of file