midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disable presets, add meat option (#1582 #1584)

Browse source
This commit is contained in:
Robin van der Linde 2023-09-23 14:54:07 +02:00
parent fc6160c760
commit 25ab170a2b
No known key found for this signature in database
GPG key ID: 53956B3252478F0D
7 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
assets/layers/vending_machine/vending_machine.json
View file

@ -241,6 +241,14 @@
}, },
"icon": "./assets/layers/vending_machine/potato.svg" "icon": "./assets/layers/vending_machine/potato.svg"
}, },
{
"if": "vending=meat",
"then": {
"en": "Meat is sold",
"nl": "Vlees wordt verkocht"
},
"icon": "./assets/layers/id_presets/temaki-meat.svg"
},
{ {
"if": "vending=flowers", "if": "vending=flowers",
"then": { "then": {
@ -433,6 +441,10 @@
"if": "vending=potatoes", "if": "vending=potatoes",
"then": "circle:white;./assets/layers/vending_machine/potato.svg" "then": "circle:white;./assets/layers/vending_machine/potato.svg"
}, },
{
"if": "vending=meat",
"then": "./assets/layers/id_presets/temaki-meat.svg"
},
{ {
"if": "vending=flowers", "if": "vending=flowers",
"then": "circle:white;./assets/layers/id_presets/maki-florist.svg" "then": "circle:white;./assets/layers/id_presets/maki-florist.svg"
@ -768,6 +780,14 @@
}, },
"osmTags": "vending~i~.*potatoes.*" "osmTags": "vending~i~.*potatoes.*"
}, },
{
"question": {
"en": "Sale of meat",
"nl": "Verkoop van vlees",
"de": "Verkauf von Fleisch"
},
"osmTags": "vending~i~.*meat.*"
},
{ {
"question": { "question": {
"en": "Sale of flowers", "en": "Sale of flowers",

3
assets/themes/vending_machine/vending_machine.json
View file

@ -36,7 +36,8 @@
"vending!~(parking_tickets|elongated_coin|public_transport_tickets)" "vending!~(parking_tickets|elongated_coin|public_transport_tickets)"
] ]
} }
} },
"=presets": []
} }
}, },
{ {

10
langs/layers/ca.json
View file

@ -7938,7 +7938,7 @@
"15": { "15": {
"question": "Venda de patates" "question": "Venda de patates"
}, },
"16": { "17": {
"question": "Venda de flors" "question": "Venda de flors"
} }
} }
@ -8019,16 +8019,16 @@
"14": { "14": {
"then": "Es venen papes" "then": "Es venen papes"
}, },
"15": { "16": {
"then": "Es venen flors" "then": "Es venen flors"
}, },
"16": { "17": {
"then": "Es venen tiquets d'aparcament" "then": "Es venen tiquets d'aparcament"
}, },
"17": { "18": {
"then": "Es venen cèntims premsats" "then": "Es venen cèntims premsats"
}, },
"18": { "19": {
"then": "Es venen bitllets de transport públic" "then": "Es venen bitllets de transport públic"
} }
}, },

9
langs/layers/de.json
View file

@ -9760,6 +9760,9 @@
"question": "Verkauf von Kartoffeln" "question": "Verkauf von Kartoffeln"
}, },
"16": { "16": {
"question": "Verkauf von Fleisch"
},
"17": {
"question": "Verkauf von Blumen" "question": "Verkauf von Blumen"
} }
} }
@ -9840,13 +9843,13 @@
"14": { "14": {
"then": "Kartoffeln werden verkauft" "then": "Kartoffeln werden verkauft"
}, },
"15": { "16": {
"then": "Blumen werden verkauft" "then": "Blumen werden verkauft"
}, },
"16": { "17": {
"then": "Parkscheine werden verkauft" "then": "Parkscheine werden verkauft"
}, },
"18": { "19": {
"then": "Fahrscheine werden verkauft" "then": "Fahrscheine werden verkauft"
} }
}, },

11
langs/layers/en.json
View file

@ -9870,7 +9870,7 @@
"15": { "15": {
"question": "Sale of potatoes" "question": "Sale of potatoes"
}, },
"16": { "17": {
"question": "Sale of flowers" "question": "Sale of flowers"
} }
} }
@ -9952,15 +9952,18 @@
"then": "Potatoes are sold" "then": "Potatoes are sold"
}, },
"15": { "15": {
"then": "Flowers are sold" "then": "Meat is sold"
}, },
"16": { "16": {
"then": "Parking tickets are sold" "then": "Flowers are sold"
}, },
"17": { "17": {
"then": "Pressed pennies are sold" "then": "Parking tickets are sold"
}, },
"18": { "18": {
"then": "Pressed pennies are sold"
},
"19": {
"then": "Public transport tickets are sold" "then": "Public transport tickets are sold"
} }
}, },

4
langs/layers/fr.json
View file

@ -6586,7 +6586,7 @@
"15": { "15": {
"question": "Vente de pommes de terre" "question": "Vente de pommes de terre"
}, },
"16": { "17": {
"question": "Vente de fleurs" "question": "Vente de fleurs"
} }
} }
@ -6667,7 +6667,7 @@
"14": { "14": {
"then": "Vent des pommes de terre" "then": "Vent des pommes de terre"
}, },
"15": { "16": {
"then": "Vent des fleurs" "then": "Vent des fleurs"
} }
}, },

10
langs/layers/nl.json
View file

@ -9059,6 +9059,9 @@
"question": "Verkoop van aardappelen" "question": "Verkoop van aardappelen"
}, },
"16": { "16": {
"question": "Verkoop van vlees"
},
"17": {
"question": "Verkoop van bloemen" "question": "Verkoop van bloemen"
} }
} }
@ -9140,12 +9143,15 @@
"then": "Aardappelen worden verkocht" "then": "Aardappelen worden verkocht"
}, },
"15": { "15": {
"then": "Bloemen worden verkocht" "then": "Vlees wordt verkocht"
}, },
"16": { "16": {
"then": "Bloemen worden verkocht"
},
"17": {
"then": "Parkeerkaarten worden verkocht" "then": "Parkeerkaarten worden verkocht"
}, },
"18": { "19": {
"then": "Openbaar vervoerkaartjes worden verkocht" "then": "Openbaar vervoerkaartjes worden verkocht"
} }
}, },