From 471f792c4d9d9c57dc6024a1aabf76da4bd21406 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Thu, 16 Mar 2023 16:28:24 +0100
Subject: [PATCH] Formatting, fix build

---
 assets/layers/map/map.json                     | 10 +++++++---
 assets/svg/license_info.json                   | 18 +++++++++---------
 assets/tagRenderings/questions.json            | 18 ++++++++----------
 assets/themes/advertising/advertising.json     | 13 +++++++------
 .../mapcomplete-changes.json                   |  2 +-
 langs/themes/en.json                           |  2 +-
 6 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json
index 4cb7a9dda..48c869318 100644
--- a/assets/layers/map/map.json
+++ b/assets/layers/map/map.json
@@ -44,7 +44,9 @@
   "tagRenderings": [
     "images",
     {
-      "labels": ["map"],
+      "labels": [
+        "map"
+      ],
       "question": {
         "en": "On which data is this map based?",
         "nl": "Op welke data is deze kaart gebaseerd?",
@@ -88,7 +90,9 @@
     },
     {
       "id": "map-attribution",
-      "labels": ["map"],
+      "labels": [
+        "map"
+      ],
       "question": {
         "en": "Is the OpenStreetMap-attribution given?",
         "nl": "Is de attributie voor OpenStreetMap aanwezig?",
@@ -274,4 +278,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json
index e93451e89..eadb7dba0 100644
--- a/assets/svg/license_info.json
+++ b/assets/svg/license_info.json
@@ -87,6 +87,14 @@
     ],
     "sources": []
   },
+  {
+    "path": "blocked.svg",
+    "license": "CC0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
+  },
   {
     "path": "brick_wall_raw.svg",
     "license": "CC0",
@@ -111,14 +119,6 @@
     ],
     "sources": []
   },
-  {
-    "path": "blocked.svg",
-    "license": "CC0",
-    "authors": [
-      "Pieter Vander Vennet"
-    ],
-    "sources": []
-  },
   {
     "path": "bug.svg",
     "license": "MIT",
@@ -1405,4 +1405,4 @@
       "https://www.wikipedia.org/"
     ]
   }
-]
+]
\ No newline at end of file
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index dcd0ce41c..2c15ce77e 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -1937,7 +1937,7 @@
       "pl": "Nazwa sieci to <b>{internet_access:ssid}</b>"
     }
   },
-  "luminous_or_lit":   {
+  "luminous_or_lit": {
     "question": {
       "en": "Is this object lit or does it emit light?"
     },
@@ -1950,13 +1950,11 @@
           ]
         },
         "then": {
-          "en":"This object both emits light and is lighted by an external light source"
+          "en": "This object both emits light and is lighted by an external light source"
         }
       },
       {
-        "if":
-        "luminous=yes"
-      ,
+        "if": "luminous=yes",
         "then": {
           "en": "This object emits light"
         },
@@ -1965,10 +1963,10 @@
         ]
       },
       {
-        "if":
-        "lit=yes"
-      ,
-        "then":{"en": "This object is lit externally, e.g. by a spotlight or other lights"},
+        "if": "lit=yes",
+        "then": {
+          "en": "This object is lit externally, e.g. by a spotlight or other lights"
+        },
         "addExtraTags": [
           "luminous=no"
         ]
@@ -1986,4 +1984,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/assets/themes/advertising/advertising.json b/assets/themes/advertising/advertising.json
index 71cc5c2fd..d43512516 100644
--- a/assets/themes/advertising/advertising.json
+++ b/assets/themes/advertising/advertising.json
@@ -427,8 +427,7 @@
                 "path": "./assets/themes/advertising/trivision.svg"
               },
               "#": "Only applicable to billboards",
-              "hideInAnswer":                   "advertising!=billboard"
-              
+              "hideInAnswer": "advertising!=billboard"
             },
             {
               "if": "animated=winding_posters",
@@ -462,7 +461,8 @@
           ]
         },
         {
-          "builtin":  "luminous_or_lit",
+          "id": "luminous_or_lit_advertising",
+          "builtin": "luminous_or_lit",
           "override": {
             "+mappings": [
               {
@@ -663,7 +663,9 @@
             "key": "ref"
           },
           "condition": {
-            "and": ["advertising!=sign"]
+            "and": [
+              "advertising!=sign"
+            ]
           }
         }
       ],
@@ -935,7 +937,6 @@
             "./assets/themes/advertising/Times square.jpg"
           ]
         },
-
         {
           "tags": [
             "advertising=tarp"
@@ -1035,4 +1036,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 98962045a..fa56481d1 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -116,7 +116,7 @@
             "mappings": [
               {
                 "if": "theme=advertising",
-                "then": "./assets/themes/advertising/icon.svg"
+                "then": "./assets/themes/advertising/poster_box.svg"
               },
               {
                 "if": "theme=aed",
diff --git a/langs/themes/en.json b/langs/themes/en.json
index f413148b0..b8593fd6b 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -83,7 +83,7 @@
                         },
                         "question": "Does this advertisement cycle through multiple messages?"
                     },
-                    "luminous_or_lit": {
+                    "luminous_or_lit_advertising": {
                         "override": {
                             "+mappings": {
                                 "0": {