reorganised some labels in our map style and added trees

TUM-Dev · Oct 28, 2024 · 20aefba · 20aefba
1 parent f83d74f
commit 20aefba
Showing 1 changed file with 39 additions and 33 deletions.
diff --git a/map/styles/navigatum-basemap.json b/map/styles/navigatum-basemap.json
@@ -12,10 +12,7 @@
       "url": "https://nav.tum.de/tiles/recreational_nodes",
       "minzoom": 17
     },
-    "nav": {
-      "type": "vector",
-      "url": "https://nav.tum.de/tiles/openmaptiles"
-    },
+    "nav": {"type": "vector", "url": "https://nav.tum.de/tiles/openmaptiles"},
     "natural_earth_shaded_relief": {
       "maxzoom": 6,
       "tileSize": 256,
@@ -73,23 +70,12 @@
       }
     },
     {
-      "id": "landuse_residential",
+      "id": "landcover_sand",
       "type": "fill",
       "source": "nav",
-      "source-layer": "landuse",
-      "maxzoom": 8,
-      "filter": ["==", ["get", "class"], "residential"],
-      "paint": {
-        "fill-color": [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          9,
-          "hsla(0,3%,85%,0.84)",
-          12,
-          "hsla(35,57%,88%,0.49)"
-        ]
-      }
+      "source-layer": "landcover",
+      "filter": ["==", ["get", "class"], "sand"],
+      "paint": {"fill-color": "rgba(247, 239, 195, 1)"}
     },
     {
       "id": "landcover_wood",
@@ -127,6 +113,34 @@
         "fill-opacity": 0.8
       }
     },
+    {
+      "id": "landcover_trees",
+      "type": "circle",
+      "source": "recreational",
+      "source-layer": "recreational_nodes",
+      "minzoom": 17,
+      "filter": ["==", ["get", "natural"], "tree"],
+      "paint": {"circle-color": "rgba(92, 134, 64, 0.79)", "circle-radius": 10}
+    },
+    {
+      "id": "landuse_residential",
+      "type": "fill",
+      "source": "nav",
+      "source-layer": "landuse",
+      "maxzoom": 8,
+      "filter": ["==", ["get", "class"], "residential"],
+      "paint": {
+        "fill-color": [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          9,
+          "hsla(0,3%,85%,0.84)",
+          12,
+          "hsla(35,57%,88%,0.49)"
+        ]
+      }
+    },
     {
       "id": "landuse_pitch",
       "type": "fill",
@@ -238,21 +252,13 @@
       }
     },
     {
-      "id": "water",
+      "id": "waterway_water",
       "type": "fill",
       "source": "nav",
       "source-layer": "water",
       "filter": ["!=", ["get", "brunnel"], "tunnel"],
       "paint": {"fill-color": "rgb(158,189,255)"}
     },
-    {
-      "id": "landcover_sand",
-      "type": "fill",
-      "source": "nav",
-      "source-layer": "landcover",
-      "filter": ["==", ["get", "class"], "sand"],
-      "paint": {"fill-color": "rgba(247, 239, 195, 1)"}
-    },
     {
       "id": "aeroway_fill",
       "type": "fill",
@@ -2379,7 +2385,7 @@
       }
     },
     {
-      "id": "state",
+      "id": "admin_state",
       "type": "symbol",
       "source": "nav",
       "source-layer": "place",
@@ -2399,7 +2405,7 @@
       }
     },
     {
-      "id": "country_3",
+      "id": "admin_country_3",
       "type": "symbol",
       "source": "nav",
       "source-layer": "place",
@@ -2424,7 +2430,7 @@
       }
     },
     {
-      "id": "country_2",
+      "id": "admin_country_2",
       "type": "symbol",
       "source": "nav",
       "source-layer": "place",
@@ -2449,7 +2455,7 @@
       }
     },
     {
-      "id": "country_1",
+      "id": "admin_country_1",
       "type": "symbol",
       "source": "nav",
       "source-layer": "place",
@@ -2474,7 +2480,7 @@
       }
     },
     {
-      "id": "continent",
+      "id": "admin_continent",
       "type": "symbol",
       "source": "nav",
       "source-layer": "place",