Lots of styling tweaks, add filter links between layers

assets/layers/gps_location/gps_location.json

@@ -8,7 +8,7 @@
   },
   "mapRendering": [
     {
-      "icon": "crosshair:#00f",
+      "icon": "crosshair:var(--catch-detail-color)",
       "iconSize": "40,40,center",
       "location": [
         "point",

assets/layers/nature_reserve/nature_reserve.json

@@ -151,8 +151,9 @@
             ]
           },
           "then": {
-            "nl": "<img src=\"./assets/layers/nature_reserve/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door Natuurpunt"
-          }
+            "nl": "Dit gebied wordt beheerd door Natuurpunt"
+          },
+          "icon": "./assets/layers/nature_reserve/Natuurpunt.jpg"
         },
         {
           "if": {
@@ -161,8 +162,9 @@
             ]
           },
           "then": {
-            "nl": "<img src=\"./assets/layers/nature_reserve/Natuurpunt.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door {operator}"
+            "nl": "Dit gebied wordt beheerd door {operator}"
           },
+          "icon": "./assets/layers/nature_reserve/Natuurpunt.jpg",
           "hideInAnswer": true
         },
         {
@@ -172,8 +174,9 @@
             ]
           },
           "then": {
-            "nl": "<img src=\"./assets/layers/nature_reserve/ANB.jpg\" style=\"width:1.5em\">Dit gebied wordt beheerd door het Agentschap Natuur en Bos"
-          }
+            "nl": "Dit gebied wordt beheerd door het Agentschap Natuur en Bos"
+          },
+          "icon": "./assets/layers/nature_reserve/ANB.jpg"
         }
       ],
       "id": "Operator tag"

assets/themes/natuurpunt/natuurpunt.css

@@ -1,9 +1,11 @@
 :root {
     --subtle-detail-color: #007759;
     --subtle-detail-color-contrast: #ffffff;
-    --subtle-detail-color-light-contrast: lightgrey;
+    --subtle-detail-color-light-contrast: white;
 
-    --catch-detail-color: #0fff00;
+    --unsubtle-detail-color: #b34f26;
+    --unsubtle-detail-color-contrast: #ffffff;
+    --catch-detail-color: #FE6F32;
     --catch-detail-color-contrast: #ffffff;
     --alert-color: #fee4d1;
     --background-color: white;
@@ -31,7 +33,21 @@ body {
 	font-family: 'Open Sans Regular', sans-serif;
 }
 
-h1 h2 h3 h4 {
+.layer-toggle .alert {
+    background: unset !important;
+    padding: 0 !important;
+}
+
+.layer-toggle svg path {
+    fill: var(--foreground-color) !important;
+}
+
+.layer-toggle .alert::before {
+    content: " - "
+}
+
+
+h1, h2, h3, h4 {
     font-family: 'Amaranth', sans-serif;
 }
 
@@ -43,4 +59,4 @@ h1 h2 h3 h4 {
 .tab-non-active svg path {
     fill: white !important;
     stroke: white !important;
-}
+}

assets/themes/natuurpunt/natuurpunt.json

@@ -30,6 +30,7 @@
   "startLat": 51.20875,
   "startLon": 3.22435,
   "startZoom": 15,
+  "lockLocation": [[2.1,50.40],[ 6.4,51.54]],
   "widenFactor": 2,
   "socialImage": "",
   "defaultBackgroundId": "CartoDB.Positron",
@@ -64,7 +65,10 @@
               "render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
             }
           }
-        ]
+        ],
+        "=filter": {
+          "sameAs": "nature_reserve_centerpoints"
+        }
       }
     },
     {
@@ -183,7 +187,12 @@
         "source": {
           "geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/natuurpunt_cache/natuurpunt_{layer}_{z}_{x}_{y}.geojson",
           "geoJsonZoomLevel": 12,
-          "isOsmCache": true
+          "isOsmCache": true,
+              "osmTags": {
+                "+and": [
+                  "operator~.*[nN]atuurpunt.*"
+                ]
+              }
         },
         "mapRendering": [
           {
@@ -313,7 +322,7 @@
       }
     },
     {
-      "builtin": "gps_location_history",
+      "builtin": "gps_track",
       "override": {
         "name": null
       }