From 86d0e5dc745805772f248d67eddfec88095657a6 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Sat, 23 Sep 2023 23:42:58 +0200
Subject: [PATCH] Themes: vending machines: add meat as option, add operator
 phone number, add 'condom' icon, fix #1584

---
 assets/layers/vending_machine/condom.svg      |  9 +++
 .../layers/vending_machine/condom.svg.license |  2 +
 .../layers/vending_machine/license_info.json  | 10 ++++
 .../vending_machine/vending_machine.json      | 55 ++++++++++++++++++-
 4 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 assets/layers/vending_machine/condom.svg
 create mode 100644 assets/layers/vending_machine/condom.svg.license

diff --git a/assets/layers/vending_machine/condom.svg b/assets/layers/vending_machine/condom.svg
new file mode 100644
index 0000000000..3d2c88a755
--- /dev/null
+++ b/assets/layers/vending_machine/condom.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="23.578 0 52.845 100" enable-background="new 23.578 0 52.845 100" xml:space="preserve"><g><g><g><path d="M67.671,100H32.329c-4.826,0-8.751-3.925-8.751-8.752c0-3.762,2.385-6.978,5.723-8.212V26.423
+				c0-8.142,4.747-15.439,12.019-18.792C41.871,3.333,45.554,0,50,0c4.445,0,8.131,3.332,8.681,7.632
+				c7.271,3.352,12.02,10.649,12.02,18.792v56.613c3.337,1.234,5.723,4.451,5.723,8.211C76.423,96.075,72.498,100,67.671,100z
+				 M32.329,88.555c-1.485,0-2.694,1.208-2.694,2.693c0,1.486,1.208,2.694,2.694,2.694h35.342c1.485,0,2.693-1.208,2.693-2.694
+				c0-1.485-1.208-2.693-2.693-2.693h-3.029V26.423c0-6.291-4.006-11.866-9.968-13.875l-2.432-0.818l0.41-2.535
+				c0.028-0.178,0.041-0.322,0.041-0.442c0-1.486-1.208-2.695-2.693-2.695s-2.694,1.208-2.694,2.695
+				c0,0.122,0.014,0.265,0.042,0.438l0.414,2.538l-2.437,0.822c-5.962,2.009-9.967,7.584-9.967,13.875v62.131h-3.029V88.555z"></path></g><g><path d="M46.718,68.833c-1.673,0-3.03-1.356-3.03-3.029V49.984c0-1.673,1.357-3.03,3.03-3.03c1.673,0,3.03,1.357,3.03,3.03
+				v15.819C49.747,67.477,48.391,68.833,46.718,68.833z"></path></g><g><path d="M46.718,43.084c-1.673,0-3.03-1.357-3.03-3.03V26.423c0-1.672,1.357-3.029,3.03-3.029c1.673,0,3.03,1.356,3.03,3.029
+				v13.631C49.747,41.728,48.391,43.084,46.718,43.084z"></path></g></g></g></svg>
\ No newline at end of file
diff --git a/assets/layers/vending_machine/condom.svg.license b/assets/layers/vending_machine/condom.svg.license
new file mode 100644
index 0000000000..7ac182ac73
--- /dev/null
+++ b/assets/layers/vending_machine/condom.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText:  	Jesus Jezzini De Anda
+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 c1b4502001..f910585c2d 100644
--- a/assets/layers/vending_machine/license_info.json
+++ b/assets/layers/vending_machine/license_info.json
@@ -1,4 +1,14 @@
 [
+  {
+    "path": "condom.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      " \tJesus Jezzini De Anda"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Condom_-_The_Noun_Project.svg"
+    ]
+  },
   {
     "path": "cow.svg",
     "license": "CC-BY-4.0",
diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json
index f3bdcef84e..5597a2e21d 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -130,7 +130,8 @@
             "de": "Kondome werden verkauft",
             "fr": "Vent des préservatifs",
             "ca": "Es venen preservatius"
-          }
+          },
+          "icon": "./assets/layers/vending_machine/condom.svg"
         },
         {
           "if": "vending=coffee",
@@ -279,6 +280,14 @@
             "ca": "Es venen bitllets de transport públic"
           },
           "icon": "./assets/themes/stations/public_transport_tickets.svg"
+        },
+        {
+          "if": "vending=meat",
+          "then": {
+            "en": "Meat products are being sold",
+            "nl": "Vleesproducten worden hier verkocht"
+          },
+          "icon": "./assets/layers/id_presets/temaki-meat.svg"
         }
       ],
       "multiAnswer": true
@@ -357,7 +366,18 @@
         }
       ]
     },
-    "level"
+    "level",
+    {
+      "builtin": ["phone"],
+      "override": {
+        "question": {
+          "en": "What is the phone number of the operator of this vending machine?"
+        },
+        "questionHint": {
+          "en": "This is the number you can call in case of problems with the vending machine"
+        }
+      }
+    }
   ],
   "calculatedTags": [
     "_vending_count=feat.properties.vending.split(';').length"
@@ -436,6 +456,11 @@
           {
             "if": "vending=flowers",
             "then": "circle:white;./assets/layers/id_presets/maki-florist.svg"
+          },
+          {
+            "if": "vending=condoms",
+            "then": "circle:white;./assets/layers/vending_machine/condom.svg"
+
           }
         ]
       },
@@ -777,6 +802,30 @@
             "ca": "Venda de flors"
           },
           "osmTags": "vending~i~.*flowers.*"
+        },
+        {
+          "osmTags": "vending~i~.*parking_tickets.*",
+          "question": {
+            "en": "Sale of parking"
+          }
+        },
+        {
+          "osmTags": "vending=elongated_coin",
+          "question": {
+            "en": "Sale of pressed pennies"
+          }
+        },
+        {
+          "osmTags": "vending~i~.*public_transport_tickets.*",
+          "question": {
+            "en": "Sale of public transport tickets"
+          }
+        },
+        {
+          "osmTags": "vending=meat",
+          "question": {
+            "en": "Sale of meat products"
+          }
         }
       ]
     }
@@ -786,4 +835,4 @@
     "enableRelocation": true
   },
   "deletion": true
-}
\ No newline at end of file
+}