From 25ab170a2b2f4e1ad3a5866685c0eda08eb0e00e Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Sat, 23 Sep 2023 14:54:07 +0200
Subject: [PATCH] Disable presets, add meat option (#1582 #1584)

---
 .../vending_machine/vending_machine.json      | 20 +++++++++++++++++++
 .../vending_machine/vending_machine.json      |  3 ++-
 langs/layers/ca.json                          | 10 +++++-----
 langs/layers/de.json                          |  9 ++++++---
 langs/layers/en.json                          | 11 ++++++----
 langs/layers/fr.json                          |  4 ++--
 langs/layers/nl.json                          | 10 ++++++++--
 7 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json
index f3bdcef84..bbfcf09d5 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -241,6 +241,14 @@
           },
           "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",
           "then": {
@@ -433,6 +441,10 @@
             "if": "vending=potatoes",
             "then": "circle:white;./assets/layers/vending_machine/potato.svg"
           },
+          {
+            "if": "vending=meat",
+            "then": "./assets/layers/id_presets/temaki-meat.svg"
+          },
           {
             "if": "vending=flowers",
             "then": "circle:white;./assets/layers/id_presets/maki-florist.svg"
@@ -768,6 +780,14 @@
           },
           "osmTags": "vending~i~.*potatoes.*"
         },
+        {
+          "question": {
+            "en": "Sale of meat",
+            "nl": "Verkoop van vlees",
+            "de": "Verkauf von Fleisch"
+          },
+          "osmTags": "vending~i~.*meat.*"
+        },
         {
           "question": {
             "en": "Sale of flowers",
diff --git a/assets/themes/vending_machine/vending_machine.json b/assets/themes/vending_machine/vending_machine.json
index 7f053f2d2..d34a960bf 100644
--- a/assets/themes/vending_machine/vending_machine.json
+++ b/assets/themes/vending_machine/vending_machine.json
@@ -36,7 +36,8 @@
               "vending!~(parking_tickets|elongated_coin|public_transport_tickets)"
             ]
           }
-        }
+        },
+        "=presets": []
       }
     },
     {
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index 3d8ccb9d3..dee218cc2 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -7938,7 +7938,7 @@
                     "15": {
                         "question": "Venda de patates"
                     },
-                    "16": {
+                    "17": {
                         "question": "Venda de flors"
                     }
                 }
@@ -8019,16 +8019,16 @@
                     "14": {
                         "then": "Es venen papes"
                     },
-                    "15": {
+                    "16": {
                         "then": "Es venen flors"
                     },
-                    "16": {
+                    "17": {
                         "then": "Es venen tiquets d'aparcament"
                     },
-                    "17": {
+                    "18": {
                         "then": "Es venen cèntims premsats"
                     },
-                    "18": {
+                    "19": {
                         "then": "Es venen bitllets de transport públic"
                     }
                 },
diff --git a/langs/layers/de.json b/langs/layers/de.json
index c69e5f461..2990d5b59 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -9760,6 +9760,9 @@
                         "question": "Verkauf von Kartoffeln"
                     },
                     "16": {
+                        "question": "Verkauf von Fleisch"
+                    },
+                    "17": {
                         "question": "Verkauf von Blumen"
                     }
                 }
@@ -9840,13 +9843,13 @@
                     "14": {
                         "then": "Kartoffeln werden verkauft"
                     },
-                    "15": {
+                    "16": {
                         "then": "Blumen werden verkauft"
                     },
-                    "16": {
+                    "17": {
                         "then": "Parkscheine werden verkauft"
                     },
-                    "18": {
+                    "19": {
                         "then": "Fahrscheine werden verkauft"
                     }
                 },
diff --git a/langs/layers/en.json b/langs/layers/en.json
index dba18196c..cecb797c1 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -9870,7 +9870,7 @@
                     "15": {
                         "question": "Sale of potatoes"
                     },
-                    "16": {
+                    "17": {
                         "question": "Sale of flowers"
                     }
                 }
@@ -9952,15 +9952,18 @@
                         "then": "Potatoes are sold"
                     },
                     "15": {
-                        "then": "Flowers are sold"
+                        "then": "Meat is sold"
                     },
                     "16": {
-                        "then": "Parking tickets are sold"
+                        "then": "Flowers are sold"
                     },
                     "17": {
-                        "then": "Pressed pennies are sold"
+                        "then": "Parking tickets are sold"
                     },
                     "18": {
+                        "then": "Pressed pennies are sold"
+                    },
+                    "19": {
                         "then": "Public transport tickets are sold"
                     }
                 },
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 21915cd19..e58849563 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -6586,7 +6586,7 @@
                     "15": {
                         "question": "Vente de pommes de terre"
                     },
-                    "16": {
+                    "17": {
                         "question": "Vente de fleurs"
                     }
                 }
@@ -6667,7 +6667,7 @@
                     "14": {
                         "then": "Vent des pommes de terre"
                     },
-                    "15": {
+                    "16": {
                         "then": "Vent des fleurs"
                     }
                 },
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 3961df739..2089e0b5e 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -9059,6 +9059,9 @@
                         "question": "Verkoop van aardappelen"
                     },
                     "16": {
+                        "question": "Verkoop van vlees"
+                    },
+                    "17": {
                         "question": "Verkoop van bloemen"
                     }
                 }
@@ -9140,12 +9143,15 @@
                         "then": "Aardappelen worden verkocht"
                     },
                     "15": {
-                        "then": "Bloemen worden verkocht"
+                        "then": "Vlees wordt verkocht"
                     },
                     "16": {
+                        "then": "Bloemen worden verkocht"
+                    },
+                    "17": {
                         "then": "Parkeerkaarten worden verkocht"
                     },
-                    "18": {
+                    "19": {
                         "then": "Openbaar vervoerkaartjes worden verkocht"
                     }
                 },