From 03a4012e8b635b6fa1da477dd51361024fb79592 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 30 Jan 2023 01:37:52 +0100
Subject: [PATCH] Use lowercase-letter for the svgs, some small technical fixes

---
 assets/themes/advertising/advertising.json    | 19 +++++------
 .../{Billboard.svg => billboard.svg}          |  0
 .../advertising/{Board.svg => board.svg}      |  0
 .../advertising/{Column.svg => column.svg}    |  0
 assets/themes/advertising/license_info.json   | 32 ++++++++++---------
 ...ewspaper_kiosk.svg => newspaper_kiosk.svg} |  0
 .../{Poster_box.svg => poster_box.svg}        |  0
 .../advertising/{Totem.svg => totem.svg}      |  0
 .../mapcomplete-changes.json                  |  4 +++
 9 files changed, 31 insertions(+), 24 deletions(-)
 rename assets/themes/advertising/{Billboard.svg => billboard.svg} (100%)
 rename assets/themes/advertising/{Board.svg => board.svg} (100%)
 rename assets/themes/advertising/{Column.svg => column.svg} (100%)
 rename assets/themes/advertising/{Newspaper_kiosk.svg => newspaper_kiosk.svg} (100%)
 rename assets/themes/advertising/{Poster_box.svg => poster_box.svg} (100%)
 rename assets/themes/advertising/{Totem.svg => totem.svg} (100%)

diff --git a/assets/themes/advertising/advertising.json b/assets/themes/advertising/advertising.json
index f9eaec998..e7d0d411e 100644
--- a/assets/themes/advertising/advertising.json
+++ b/assets/themes/advertising/advertising.json
@@ -210,7 +210,7 @@
                 "en": "This is a billboard"
               },
               "icon": {
-                "path": "./assets/themes/advertising/Billboard.svg",
+                "path": "./assets/themes/advertising/billboard.svg",
                 "class": "medium"
               }
             },
@@ -226,7 +226,7 @@
                 "en": "This is a board"
               },
               "icon": {
-                "path": "./assets/themes/advertising/Board.svg",
+                "path": "./assets/themes/advertising/board.svg",
                 "class": "medium"
               }
             },
@@ -566,6 +566,7 @@
           ]
         },
         {
+          "id": "message_type",
           "render": {
             "*": " {message}"
             },
@@ -689,6 +690,7 @@
             ]
         },
         {
+          "id": "Sides",
           "render": {
             "ca": "Pots veure publicitat per {sides} costats",
             "es": "Puedes ver publicidad por {sides} lados",
@@ -701,8 +703,7 @@
             },
             "freeform": {
             "key": "sides"
-            },
-            "mappings": []
+            }
         }
       ],
       "mapRendering": [
@@ -720,15 +721,15 @@
                     "advertising=billboard"
                   ]
                 },
-                "then": "./assets/themes/advertising/Billboard.svg"
+                "then": "./assets/themes/advertising/billboard.svg"
               },
               {
                 "if": "advertising=board",
-                "then": "./assets/themes/advertising/Board.svg"
+                "then": "./assets/themes/advertising/board.svg"
               },
               {
                 "if": "advertising=column",
-                "then": "./assets/themes/advertising/Column.svg"
+                "then": "./assets/themes/advertising/column.svg"
               },
               {
                 "if": "advertising=flag",
@@ -736,7 +737,7 @@
               },
               {
                 "if": "advertising=poster_box",
-                "then": "./assets/themes/advertising/Poster_box.svg"
+                "then": "./assets/themes/advertising/poster_box.svg"
               },
               {
                 "if": "advertising=screen",
@@ -756,7 +757,7 @@
               },
               {
                 "if": "advertising=totem",
-                "then": "./assets/themes/advertising/Totem.svg"
+                "then": "./assets/themes/advertising/totem.svg"
               },
               {
                 "if": "advertising=wall_painting",
diff --git a/assets/themes/advertising/Billboard.svg b/assets/themes/advertising/billboard.svg
similarity index 100%
rename from assets/themes/advertising/Billboard.svg
rename to assets/themes/advertising/billboard.svg
diff --git a/assets/themes/advertising/Board.svg b/assets/themes/advertising/board.svg
similarity index 100%
rename from assets/themes/advertising/Board.svg
rename to assets/themes/advertising/board.svg
diff --git a/assets/themes/advertising/Column.svg b/assets/themes/advertising/column.svg
similarity index 100%
rename from assets/themes/advertising/Column.svg
rename to assets/themes/advertising/column.svg
diff --git a/assets/themes/advertising/license_info.json b/assets/themes/advertising/license_info.json
index f7803bcdb..6467b932b 100644
--- a/assets/themes/advertising/license_info.json
+++ b/assets/themes/advertising/license_info.json
@@ -1,6 +1,6 @@
 [
   {
-    "path": "Billboard.svg",
+    "path": "billboard.svg",
     "license": "CC BY-SA 3.0",
     "authors": [
       "Barnes38"
@@ -10,7 +10,7 @@
     ]
   },
   {
-    "path": "Board.svg",
+    "path": "board.svg",
     "license": "CC BY-SA 3.0",
     "authors": [
       "Barnes38"
@@ -20,7 +20,7 @@
     ]
   },
   {
-    "path": "Column.svg",
+    "path": "column.svg",
     "license": "CC BY-SA 3.0",
     "authors": [
       "Barnes38"
@@ -30,7 +30,17 @@
     ]
   },
   {
-    "path": "Newspaper_kiosk.svg",
+    "path": "icon.svg",
+    "license": "CC-BY-SA 4.0",
+    "authors": [
+      "Panier Avide"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Advertising_icon.svg"
+    ]
+  },
+  {
+    "path": "newspaper_kiosk.svg",
     "license": "CC BY-SA 3.0",
     "authors": [
       "Barnes38"
@@ -40,7 +50,7 @@
     ]
   },
   {
-    "path": "Poster_box.svg",
+    "path": "poster_box.svg",
     "license": "CC BY-SA 3.0",
     "authors": [
       "Barnes38"
@@ -50,7 +60,7 @@
     ]
   },
   {
-    "path": "Totem.svg",
+    "path": "totem.svg",
     "license": "CC BY-SA 3.0",
     "authors": [
       "Barnes38"
@@ -58,13 +68,5 @@
     "sources": [
       "https://wiki.openstreetmap.org/wiki/File:Totem.svg"
     ]
-  },
-  {
-    "path": "icon.svg",
-    "license": "CC-BY-SA 4.0",
-    "authors": [
-      "Panier Avide"
-    ],
-    "sources": ["https://commons.wikimedia.org/wiki/File:Advertising_icon.svg"]
   }
-]
+]
\ No newline at end of file
diff --git a/assets/themes/advertising/Newspaper_kiosk.svg b/assets/themes/advertising/newspaper_kiosk.svg
similarity index 100%
rename from assets/themes/advertising/Newspaper_kiosk.svg
rename to assets/themes/advertising/newspaper_kiosk.svg
diff --git a/assets/themes/advertising/Poster_box.svg b/assets/themes/advertising/poster_box.svg
similarity index 100%
rename from assets/themes/advertising/Poster_box.svg
rename to assets/themes/advertising/poster_box.svg
diff --git a/assets/themes/advertising/Totem.svg b/assets/themes/advertising/totem.svg
similarity index 100%
rename from assets/themes/advertising/Totem.svg
rename to assets/themes/advertising/totem.svg
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 137bb9260..a60eac52d 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -114,6 +114,10 @@
           "icon": {
             "render": "teardrop:#00cc00",
             "mappings": [
+              {
+                "if": "theme=advertising",
+                "then": "./assets/themes/advertising/icon.svg"
+              },
               {
                 "if": "theme=aed",
                 "then": "./assets/themes/aed/aed.svg"