Add ice cream to vending_machine layer

This commit is contained in:
Robin van der Linde 2024-09-24 23:21:02 +02:00
parent f15f381539
commit f830870ca3
Signed by untrusted user: Robin-van-der-Linde
GPG key ID: 53956B3252478F0D
10 changed files with 216 additions and 176 deletions

View file

@ -143,6 +143,10 @@
{ {
"if": "vending=condoms", "if": "vending=condoms",
"then": "./assets/layers/vending_machine/condom.svg" "then": "./assets/layers/vending_machine/condom.svg"
},
{
"if": "vending=ice_cream",
"then": "./assets/layers/ice_cream/ice_cream.svg"
} }
] ]
} }
@ -336,6 +340,15 @@
] ]
}, },
"then": "circle:white;./assets/themes/stations/public_transport_tickets.svg" "then": "circle:white;./assets/themes/stations/public_transport_tickets.svg"
},
{
"if": {
"and": [
"_vending_count>1",
"vending~.*ice_cream.*"
]
},
"then": "circle:white;./assets/layers/ice_cream/ice_cream.svg"
} }
] ]
} }
@ -530,6 +543,14 @@
}, },
"icon": "./assets/layers/vending_machine/egg.svg" "icon": "./assets/layers/vending_machine/egg.svg"
}, },
{
"if": "vending=ice_cream",
"then": {
"en": "Ice cream is sold",
"nl": "IJs wordt verkocht"
},
"icon": "./assets/layers/ice_cream/ice_cream.svg"
},
{ {
"if": "vending=cheese", "if": "vending=cheese",
"then": { "then": {
@ -1186,6 +1207,13 @@
}, },
"osmTags": "vending~i~.*eggs.*" "osmTags": "vending~i~.*eggs.*"
}, },
{
"question": {
"en": "Sale of ice cream",
"nl": "Verkoop van ijs"
},
"osmTags": "vending~i~.*ice_cream.*"
},
{ {
"question": { "question": {
"en": "Sale of cheese", "en": "Sale of cheese",

View file

@ -9098,52 +9098,52 @@
"12": { "12": {
"question": "Venda d'ous" "question": "Venda d'ous"
}, },
"13": { "14": {
"question": "Venda de formatge" "question": "Venda de formatge"
}, },
"14": { "15": {
"question": "Venda de mel" "question": "Venda de mel"
}, },
"15": { "16": {
"question": "Venda de patates" "question": "Venda de patates"
}, },
"16": { "17": {
"question": "Venda de productes carnis" "question": "Venda de productes carnis"
}, },
"17": { "18": {
"question": "Venda de fruites" "question": "Venda de fruites"
}, },
"18": {
"question": "Venda de maduixes"
},
"19": { "19": {
"question": "Venda de flors" "question": "Venda de maduixes"
}, },
"2": { "2": {
"question": "Venda de llaminadures" "question": "Venda de llaminadures"
}, },
"20": { "20": {
"question": "Venda de tiquets d'aparcament" "question": "Venda de flors"
}, },
"21": { "21": {
"question": "Venda de monedes premsades" "question": "Venda de tiquets d'aparcament"
}, },
"22": { "22": {
"question": "Venda de bitllets de transport públic" "question": "Venda de monedes premsades"
}, },
"23": { "23": {
"question": "Venda de llums de bicicletes" "question": "Venda de bitllets de transport públic"
}, },
"24": { "24": {
"question": "Venda de guants" "question": "Venda de llums de bicicletes"
}, },
"25": { "25": {
"question": "Venda de kits de reparació de bicicletes" "question": "Venda de guants"
}, },
"26": { "26": {
"question": "Venda de bombes de bicicletes" "question": "Venda de kits de reparació de bicicletes"
}, },
"27": { "27": {
"question": "Venda de bombes de bicicletes"
},
"28": {
"question": "Venda de cadenat per a bicicletes" "question": "Venda de cadenat per a bicicletes"
}, },
"3": { "3": {
@ -9265,52 +9265,52 @@
"11": { "11": {
"then": "Es venen ous" "then": "Es venen ous"
}, },
"12": { "13": {
"then": "Es ven formatge" "then": "Es ven formatge"
}, },
"13": { "14": {
"then": "Es ven mel" "then": "Es ven mel"
}, },
"14": { "15": {
"then": "Es venen papes" "then": "Es venen papes"
}, },
"15": { "16": {
"then": "Es venen productes carnis" "then": "Es venen productes carnis"
}, },
"16": { "17": {
"then": "Es ven fruita" "then": "Es ven fruita"
}, },
"17": { "18": {
"then": "Es venen maduixes" "then": "Es venen maduixes"
}, },
"18": {
"then": "Es venen flors"
},
"19": { "19": {
"then": "Es venen tiquets d'aparcament" "then": "Es venen flors"
}, },
"2": { "2": {
"then": "Es ven menjar" "then": "Es ven menjar"
}, },
"20": { "20": {
"then": "Es venen cèntims premsats" "then": "Es venen tiquets d'aparcament"
}, },
"21": { "21": {
"then": "Es venen bitllets de transport públic" "then": "Es venen cèntims premsats"
}, },
"22": { "22": {
"then": "Es venen llums per a bicicletes" "then": "Es venen bitllets de transport públic"
}, },
"23": { "23": {
"then": "Es venen guants" "then": "Es venen llums per a bicicletes"
}, },
"24": { "24": {
"then": "Es venen kits de reparació de bicicletes" "then": "Es venen guants"
}, },
"25": { "25": {
"then": "Es venen bombes de bicicletes" "then": "Es venen kits de reparació de bicicletes"
}, },
"26": { "26": {
"then": "Es venen bombes de bicicletes"
},
"27": {
"then": "Es venen cadenats per a bicicletes" "then": "Es venen cadenats per a bicicletes"
}, },
"3": { "3": {

View file

@ -9116,52 +9116,52 @@
"12": { "12": {
"question": "Prodej vajec" "question": "Prodej vajec"
}, },
"13": { "14": {
"question": "Prodej sýrů" "question": "Prodej sýrů"
}, },
"14": { "15": {
"question": "Prodej medu" "question": "Prodej medu"
}, },
"15": { "16": {
"question": "Prodej brambor" "question": "Prodej brambor"
}, },
"16": { "17": {
"question": "Prodej masa" "question": "Prodej masa"
}, },
"17": { "18": {
"question": "Prodej ovoce" "question": "Prodej ovoce"
}, },
"18": {
"question": "Prodej jahod"
},
"19": { "19": {
"question": "Prodej květin" "question": "Prodej jahod"
}, },
"2": { "2": {
"question": "Prodej sladkostí" "question": "Prodej sladkostí"
}, },
"20": { "20": {
"question": "Prodej parkovacích lístků" "question": "Prodej květin"
}, },
"21": { "21": {
"question": "Prodej pamětních mincí/lisované mince" "question": "Prodej parkovacích lístků"
}, },
"22": { "22": {
"question": "Prodej jízdenek MHD" "question": "Prodej pamětních mincí/lisované mince"
}, },
"23": { "23": {
"question": "Prodej světel na kolo" "question": "Prodej jízdenek MHD"
}, },
"24": { "24": {
"question": "Prodej rukavic" "question": "Prodej světel na kolo"
}, },
"25": { "25": {
"question": "Prodej sad na opravu jízdních kol" "question": "Prodej rukavic"
}, },
"26": { "26": {
"question": "Prodej pump na kolo" "question": "Prodej sad na opravu jízdních kol"
}, },
"27": { "27": {
"question": "Prodej pump na kolo"
},
"28": {
"question": "Prodej zámků na kola" "question": "Prodej zámků na kola"
}, },
"3": { "3": {
@ -9280,52 +9280,52 @@
"11": { "11": {
"then": "Prodává vejce" "then": "Prodává vejce"
}, },
"12": { "13": {
"then": "Prodává sýr" "then": "Prodává sýr"
}, },
"13": { "14": {
"then": "Prodává med" "then": "Prodává med"
}, },
"14": { "15": {
"then": "Prodává brambory" "then": "Prodává brambory"
}, },
"15": { "16": {
"then": "Prodává maso" "then": "Prodává maso"
}, },
"16": { "17": {
"then": "Prodává ovoce" "then": "Prodává ovoce"
}, },
"17": { "18": {
"then": "Prodává jahody" "then": "Prodává jahody"
}, },
"18": {
"then": "Prodává květiny"
},
"19": { "19": {
"then": "Prodává parkovací lístky" "then": "Prodává květiny"
}, },
"2": { "2": {
"then": "Prodává jídlo" "then": "Prodává jídlo"
}, },
"20": { "20": {
"then": "Prodává pamětní mince/lisované" "then": "Prodává parkovací lístky"
}, },
"21": { "21": {
"then": "Prodává lístky na MHD" "then": "Prodává pamětní mince/lisované"
}, },
"22": { "22": {
"then": "Prodává světla na kolo" "then": "Prodává lístky na MHD"
}, },
"23": { "23": {
"then": "Prodává rukavice" "then": "Prodává světla na kolo"
}, },
"24": { "24": {
"then": "Prodává sady na opravu jízdních kol" "then": "Prodává rukavice"
}, },
"25": { "25": {
"then": "Prodává pumpy na kolo" "then": "Prodává sady na opravu jízdních kol"
}, },
"26": { "26": {
"then": "Prodává pumpy na kolo"
},
"27": {
"then": "Prodává zámky na kolo" "then": "Prodává zámky na kolo"
}, },
"3": { "3": {

View file

@ -11814,52 +11814,52 @@
"12": { "12": {
"question": "Verkauf von Eiern" "question": "Verkauf von Eiern"
}, },
"13": { "14": {
"question": "Verkauf von Käse" "question": "Verkauf von Käse"
}, },
"14": { "15": {
"question": "Verkauf von Honig" "question": "Verkauf von Honig"
}, },
"15": { "16": {
"question": "Verkauf von Kartoffeln" "question": "Verkauf von Kartoffeln"
}, },
"16": { "17": {
"question": "Verkauf von Fleisch" "question": "Verkauf von Fleisch"
}, },
"17": { "18": {
"question": "Verkauf von Obst" "question": "Verkauf von Obst"
}, },
"18": {
"question": "Verkauf von Erdbeeren"
},
"19": { "19": {
"question": "Verkauf von Blumen" "question": "Verkauf von Erdbeeren"
}, },
"2": { "2": {
"question": "Verkauf von Süßigkeiten" "question": "Verkauf von Süßigkeiten"
}, },
"20": { "20": {
"question": "Verkauf von Parkscheinen" "question": "Verkauf von Blumen"
}, },
"21": { "21": {
"question": "Verkauf von Souvenirmünzen" "question": "Verkauf von Parkscheinen"
}, },
"22": { "22": {
"question": "Verkauf von Fahrscheinen" "question": "Verkauf von Souvenirmünzen"
}, },
"23": { "23": {
"question": "Verkauf von Fahrradlampen" "question": "Verkauf von Fahrscheinen"
}, },
"24": { "24": {
"question": "Verkauf von Fahrradhandschuhen" "question": "Verkauf von Fahrradlampen"
}, },
"25": { "25": {
"question": "Verkauf von Fahrrad-Reparatursets" "question": "Verkauf von Fahrradhandschuhen"
}, },
"26": { "26": {
"question": "Verkauf von Fahrradpumpen" "question": "Verkauf von Fahrrad-Reparatursets"
}, },
"27": { "27": {
"question": "Verkauf von Fahrradpumpen"
},
"28": {
"question": "Verkauf von Fahrradschlössern" "question": "Verkauf von Fahrradschlössern"
}, },
"3": { "3": {
@ -11984,52 +11984,52 @@
"11": { "11": {
"then": "Eier werden verkauft" "then": "Eier werden verkauft"
}, },
"12": { "13": {
"then": "Käse wird verkauft" "then": "Käse wird verkauft"
}, },
"13": { "14": {
"then": "Honig wird verkauft" "then": "Honig wird verkauft"
}, },
"14": { "15": {
"then": "Kartoffeln werden verkauft" "then": "Kartoffeln werden verkauft"
}, },
"15": { "16": {
"then": "Fleisch wird verkauft" "then": "Fleisch wird verkauft"
}, },
"16": { "17": {
"then": "Obst wird verkauft" "then": "Obst wird verkauft"
}, },
"17": { "18": {
"then": "Erdbeeren werden verkauft" "then": "Erdbeeren werden verkauft"
}, },
"18": {
"then": "Blumen werden verkauft"
},
"19": { "19": {
"then": "Parkscheine werden verkauft" "then": "Blumen werden verkauft"
}, },
"2": { "2": {
"then": "Lebensmittel werden verkauft" "then": "Lebensmittel werden verkauft"
}, },
"20": { "20": {
"then": "Souvenirmünzen werden verkauft" "then": "Parkscheine werden verkauft"
}, },
"21": { "21": {
"then": "Fahrscheine werden verkauft" "then": "Souvenirmünzen werden verkauft"
}, },
"22": { "22": {
"then": "Fahrradlampen werden verkauft" "then": "Fahrscheine werden verkauft"
}, },
"23": { "23": {
"then": "Fahrradhandschuhe werden verkauft" "then": "Fahrradlampen werden verkauft"
}, },
"24": { "24": {
"then": "Fahrrad-Reparaturset werden verkauft" "then": "Fahrradhandschuhe werden verkauft"
}, },
"25": { "25": {
"then": "Fahrradpumpen werden verkauft" "then": "Fahrrad-Reparaturset werden verkauft"
}, },
"26": { "26": {
"then": "Fahrradpumpen werden verkauft"
},
"27": {
"then": "Fahrradschlösser werden verkauft" "then": "Fahrradschlösser werden verkauft"
}, },
"3": { "3": {

View file

@ -11891,51 +11891,54 @@
"question": "Sale of eggs" "question": "Sale of eggs"
}, },
"13": { "13": {
"question": "Sale of cheese" "question": "Sale of ice cream"
}, },
"14": { "14": {
"question": "Sale of honey" "question": "Sale of cheese"
}, },
"15": { "15": {
"question": "Sale of potatoes" "question": "Sale of honey"
}, },
"16": { "16": {
"question": "Sale of meat" "question": "Sale of potatoes"
}, },
"17": { "17": {
"question": "Sale of fruit" "question": "Sale of meat"
}, },
"18": { "18": {
"question": "Sale of strawberries" "question": "Sale of fruit"
}, },
"19": { "19": {
"question": "Sale of flowers" "question": "Sale of strawberries"
}, },
"2": { "2": {
"question": "Sale of sweets" "question": "Sale of sweets"
}, },
"20": { "20": {
"question": "Sale of parking tickets" "question": "Sale of flowers"
}, },
"21": { "21": {
"question": "Sale of pressed pennies" "question": "Sale of parking tickets"
}, },
"22": { "22": {
"question": "Sale of public transport tickets" "question": "Sale of pressed pennies"
}, },
"23": { "23": {
"question": "Sale of bicycle lights" "question": "Sale of public transport tickets"
}, },
"24": { "24": {
"question": "Sale of gloves" "question": "Sale of bicycle lights"
}, },
"25": { "25": {
"question": "Sale of bicycle repair kits" "question": "Sale of gloves"
}, },
"26": { "26": {
"question": "Sale of bicycle pumps" "question": "Sale of bicycle repair kits"
}, },
"27": { "27": {
"question": "Sale of bicycle pumps"
},
"28": {
"question": "Sale of bicycle locks" "question": "Sale of bicycle locks"
}, },
"3": { "3": {
@ -12061,51 +12064,54 @@
"then": "Eggs are sold" "then": "Eggs are sold"
}, },
"12": { "12": {
"then": "Cheese is sold" "then": "Ice cream is sold"
}, },
"13": { "13": {
"then": "Honey is sold" "then": "Cheese is sold"
}, },
"14": { "14": {
"then": "Potatoes are sold" "then": "Honey is sold"
}, },
"15": { "15": {
"then": "Meat is sold" "then": "Potatoes are sold"
}, },
"16": { "16": {
"then": "Fruit is sold" "then": "Meat is sold"
}, },
"17": { "17": {
"then": "Strawberries are sold" "then": "Fruit is sold"
}, },
"18": { "18": {
"then": "Flowers are sold" "then": "Strawberries are sold"
}, },
"19": { "19": {
"then": "Parking tickets are sold" "then": "Flowers are sold"
}, },
"2": { "2": {
"then": "Food is sold" "then": "Food is sold"
}, },
"20": { "20": {
"then": "Pressed pennies are sold" "then": "Parking tickets are sold"
}, },
"21": { "21": {
"then": "Public transport tickets are sold" "then": "Pressed pennies are sold"
}, },
"22": { "22": {
"then": "Bicycle lights are sold" "then": "Public transport tickets are sold"
}, },
"23": { "23": {
"then": "Gloves are sold" "then": "Bicycle lights are sold"
}, },
"24": { "24": {
"then": "Bicycle repair kits are sold" "then": "Gloves are sold"
}, },
"25": { "25": {
"then": "Bicycle pumps are sold" "then": "Bicycle repair kits are sold"
}, },
"26": { "26": {
"then": "Bicycle pumps are sold"
},
"27": {
"then": "Bicycle locks are sold" "then": "Bicycle locks are sold"
}, },
"3": { "3": {

View file

@ -4990,19 +4990,19 @@
}, },
"vending": { "vending": {
"mappings": { "mappings": {
"22": { "23": {
"then": "Las luces para bicicletas se venden aquí" "then": "Las luces para bicicletas se venden aquí"
}, },
"23": { "24": {
"then": "Los guantes se venden aquí" "then": "Los guantes se venden aquí"
}, },
"24": { "25": {
"then": "Los kits de reparación de bicicletas se venden aquí" "then": "Los kits de reparación de bicicletas se venden aquí"
}, },
"25": { "26": {
"then": "Las bombas para bicicletas se venden aquí" "then": "Las bombas para bicicletas se venden aquí"
}, },
"26": { "27": {
"then": "Aquí se venden candados para bicicletas" "then": "Aquí se venden candados para bicicletas"
}, },
"8": { "8": {

View file

@ -7208,21 +7208,21 @@
"12": { "12": {
"question": "Vente d'œufs" "question": "Vente d'œufs"
}, },
"13": { "14": {
"question": "Vente de fromage" "question": "Vente de fromage"
}, },
"14": { "15": {
"question": "Vente de miel" "question": "Vente de miel"
}, },
"15": { "16": {
"question": "Vente de pommes de terre" "question": "Vente de pommes de terre"
}, },
"19": {
"question": "Vente de fleurs"
},
"2": { "2": {
"question": "Ventre de confiseries" "question": "Ventre de confiseries"
}, },
"20": {
"question": "Vente de fleurs"
},
"3": { "3": {
"question": "Ventre de nourriture" "question": "Ventre de nourriture"
}, },
@ -7306,16 +7306,16 @@
"11": { "11": {
"then": "Vent des œufs" "then": "Vent des œufs"
}, },
"12": { "13": {
"then": "Vent du fromage" "then": "Vent du fromage"
}, },
"13": { "14": {
"then": "Vent du miel" "then": "Vent du miel"
}, },
"14": { "15": {
"then": "Vent des pommes de terre" "then": "Vent des pommes de terre"
}, },
"18": { "19": {
"then": "Vent des fleurs" "then": "Vent des fleurs"
}, },
"2": { "2": {

View file

@ -9380,42 +9380,45 @@
"question": "Verkoop van eieren" "question": "Verkoop van eieren"
}, },
"13": { "13": {
"question": "Verkoop van kaas" "question": "Verkoop van ijs"
}, },
"14": { "14": {
"question": "Verkoop van honing" "question": "Verkoop van kaas"
}, },
"15": { "15": {
"question": "Verkoop van aardappelen" "question": "Verkoop van honing"
}, },
"16": { "16": {
"question": "Verkoop van vlees" "question": "Verkoop van aardappelen"
}, },
"17": { "17": {
"question": "Verkoop van fruit" "question": "Verkoop van vlees"
}, },
"18": { "18": {
"question": "Verkoop van aardbeien" "question": "Verkoop van fruit"
}, },
"19": { "19": {
"question": "Verkoop van bloemen" "question": "Verkoop van aardbeien"
}, },
"2": { "2": {
"question": "Verkoop van snoep" "question": "Verkoop van snoep"
}, },
"23": { "20": {
"question": "Verkoop van fietslampjes" "question": "Verkoop van bloemen"
}, },
"24": { "24": {
"question": "Verkoop van handschoenen" "question": "Verkoop van fietslampjes"
}, },
"25": { "25": {
"question": "Verkoop van fietsreparatiesets" "question": "Verkoop van handschoenen"
}, },
"26": { "26": {
"question": "Verkoop van fietspompen" "question": "Verkoop van fietsreparatiesets"
}, },
"27": { "27": {
"question": "Verkoop van fietspompen"
},
"28": {
"question": "Verkoop van fietssloten" "question": "Verkoop van fietssloten"
}, },
"3": { "3": {
@ -9535,48 +9538,51 @@
"then": "Eieren worden verkocht" "then": "Eieren worden verkocht"
}, },
"12": { "12": {
"then": "Kaas wordt verkocht" "then": "IJs wordt verkocht"
}, },
"13": { "13": {
"then": "Honing wordt verkocht" "then": "Kaas wordt verkocht"
}, },
"14": { "14": {
"then": "Aardappelen worden verkocht" "then": "Honing wordt verkocht"
}, },
"15": { "15": {
"then": "Vlees wordt verkocht" "then": "Aardappelen worden verkocht"
}, },
"16": { "16": {
"then": "Fruit wordt verkocht" "then": "Vlees wordt verkocht"
}, },
"17": { "17": {
"then": "Aardbeien worden verkocht" "then": "Fruit wordt verkocht"
}, },
"18": { "18": {
"then": "Bloemen worden verkocht" "then": "Aardbeien worden verkocht"
}, },
"19": { "19": {
"then": "Parkeerkaarten worden verkocht" "then": "Bloemen worden verkocht"
}, },
"2": { "2": {
"then": "Eten wordt verkocht" "then": "Eten wordt verkocht"
}, },
"21": { "20": {
"then": "Openbaar vervoerkaartjes worden verkocht" "then": "Parkeerkaarten worden verkocht"
}, },
"22": { "22": {
"then": "Fietslampjes worden verkocht" "then": "Openbaar vervoerkaartjes worden verkocht"
}, },
"23": { "23": {
"then": "Handschoenen worden verkocht" "then": "Fietslampjes worden verkocht"
}, },
"24": { "24": {
"then": "Fietsreparatiesets worden verkocht" "then": "Handschoenen worden verkocht"
}, },
"25": { "25": {
"then": "Fietspompen worden verkocht" "then": "Fietsreparatiesets worden verkocht"
}, },
"26": { "26": {
"then": "Fietspompen worden verkocht"
},
"27": {
"then": "Fietssloten worden verkocht" "then": "Fietssloten worden verkocht"
}, },
"3": { "3": {

View file

@ -2025,19 +2025,19 @@
}, },
"vending": { "vending": {
"mappings": { "mappings": {
"22": { "23": {
"then": "Luzes para bicicleta são vendidas aqui" "then": "Luzes para bicicleta são vendidas aqui"
}, },
"23": { "24": {
"then": "Luvas são vendidas aqui" "then": "Luvas são vendidas aqui"
}, },
"24": { "25": {
"then": "Kits para reparo de bicicleta são vendidos aqui" "then": "Kits para reparo de bicicleta são vendidos aqui"
}, },
"25": { "26": {
"then": "Bombas de ar para bicicleta são vendidas aqui" "then": "Bombas de ar para bicicleta são vendidas aqui"
}, },
"26": { "27": {
"then": "Cadeados para bicicleta são vendidos aqui" "then": "Cadeados para bicicleta são vendidos aqui"
}, },
"8": { "8": {

View file

@ -1690,19 +1690,19 @@
}, },
"vending": { "vending": {
"mappings": { "mappings": {
"22": { "23": {
"then": "Luzes para bicicleta são vendidas aqui" "then": "Luzes para bicicleta são vendidas aqui"
}, },
"23": { "24": {
"then": "Luvas são vendidas aqui" "then": "Luvas são vendidas aqui"
}, },
"24": { "25": {
"then": "Kits para reparo de bicicleta são vendidos aqui" "then": "Kits para reparo de bicicleta são vendidos aqui"
}, },
"25": { "26": {
"then": "Bombas de ar para bicicleta são vendidas aqui" "then": "Bombas de ar para bicicleta são vendidas aqui"
}, },
"26": { "27": {
"then": "Cadeados para bicicleta são vendidos aqui" "then": "Cadeados para bicicleta são vendidos aqui"
}, },
"8": { "8": {