Merge branch 'develop'

assets/layers/indoors/indoors.json

@@ -218,6 +218,14 @@
     }
   ],
   "tagRenderings": [
+    {"id":"sotm-events",
+      "render": {
+        "special": {
+          "type": "giggity",
+          "giggityUrl":"https://sotm.osmz.ru/sotmeu2023.xml"
+        }
+      }
+    },
     "images",
     "level",
     {

assets/layers/usersettings/usersettings.json

@@ -688,6 +688,7 @@
       "mappings": [
         {
           "if": "mapcomplete-show_debug=yes",
+          "icon": "./assets/svg/debug.svg",
           "then": {
             "en": "Show debug info",
             "de": "Debug-Informationen anzeigen",
@@ -720,6 +721,11 @@
         }
       ]
     },
+    {
+      "id":"debug-gps",
+      "condition": "mapcomplete-show_debug=yes",
+      "render": "{gps_all_tags()}"
+    },
     {
       "id": "debug",
       "condition": "mapcomplete-show_debug=yes",

assets/themes/facadegardens/facadegardens.json

@@ -579,11 +579,81 @@
         "enableImproveAccuracy": true,
         "enableRelocation": false
       },
-      "pointRendering": [],
-      "lineRendering": [
-        {}
-      ]
+      "pointRendering": [
+        {
+          "marker": [
+            {
+              "icon": "circle",
+              "color": "white"
+            },
+            {
+              "icon": {
+                "render": "./assets/themes/facadegardens/geveltuin.svg",
+                "mappings": [
+                  {
+                    "if": {
+                      "and": [
+                        "direct_sunlight=yes"
+                      ]
+                    },
+                    "then": "./assets/themes/facadegardens/zon.svg"
+                  },
+                  {
+                    "if": {
+                      "and": [
+                        "direct_sunlight=partial"
+                      ]
+                    },
+                    "then": "./assets/themes/facadegardens/halfzon.svg"
+                  },
+                  {
+                    "if": {
+                      "and": [
+                        "direct_sunlight=no"
+                      ]
+                    },
+                    "then": "./assets/themes/facadegardens/schaduw.svg"
+                  }
+                ]
+              }
+            }
+          ],
+          "iconBadges": [
+            {
+              "if": "plant~.*vine.*",
+              "then": "circle:white;./assets/themes/facadegardens/klimplant.svg"
+            },
+            {
+              "if": "plant~.*groundcover.*",
+              "then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg"
+            },
+            {
+              "if": "edible=true",
+              "then": "circle:white;./assets/themes/facadegardens/eetbaar.svg"
+            },
+            {
+              "if": "rain_barel=yes",
+              "then": "circle:white;./assets/themes/facadegardens/gevelton.svg"
+            },
+            {
+              "if": "plant~.*shrub.*",
+              "then": "circle:white;./assets/themes/facadegardens/struik.svg"
+            },
+            {
+              "if": "plant~.*flower.*",
+              "then": "circle:white;./assets/themes/facadegardens/bloei.svg"
+            }
+          ],
+          "iconSize": "50,50",
+          "location": [
+            "point",
+            "centroid"
+          ],
+          "anchor": "center"
+        }
+      ],
+      "lineRendering": []
     }
   ],
   "widenFactor": 1.5
-}
+}