From c5cbd54b85fc6788159fd90f6c24e9a9a109ab26 Mon Sep 17 00:00:00 2001
From: tsinn <tim@greeninfo.org>
Date: Wed, 5 Feb 2025 13:52:54 -0500
Subject: [PATCH] Rearranging layers in style JSON

https://github.com/OpenHistoricalMap/issues/issues/956
---
 main/main.json | 105 ++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 57 deletions(-)

diff --git a/main/main.json b/main/main.json
index 7ce47d04..a22949e0 100644
--- a/main/main.json
+++ b/main/main.json
@@ -358,6 +358,54 @@
         ]
       }
     },
+    {
+      "id": "landuse_areas_z12_watercover",
+      "type": "fill",
+      "source": "osm",
+      "source-layer": "landuse_areas",
+      "minzoom": 11,
+      "maxzoom": 24,
+      "layout": {"visibility": "visible"},
+      "paint": {
+        "fill-color": [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          12,
+          [
+            "match",
+            ["get", "type"],
+            "salt_pond",
+            "rgba(236, 240, 241, 1)",
+            "glacier",
+            "rgba(219, 244, 249, 1)",
+            "reservoir",
+            "rgba(144, 204, 203, 1)",
+            "swimming_pool",
+            "rgba(144, 204, 203, 1)",
+            "wetland",
+            "rgba(228, 242, 227, 1)",
+            "transparent"
+          ]
+        ]
+      }
+    },
+    {
+      "id": "wetlands_z11-pattern",
+      "type": "fill",
+      "source": "osm",
+      "source-layer": "landuse_areas",
+      "minzoom": 11,
+      "maxzoom": 24,
+      "filter": ["==", ["get", "type"], "wetland"],
+      "layout": {"visibility": "visible"},
+      "paint": {
+        "fill-color": "rgba(255, 255, 255, 1)",
+        "fill-pattern": {
+          "stops": [[12, "cattails_space_60px"], [14, "cattails_space_70px"]]
+        }
+      }
+    },
     {
       "id": "landuse_areas_z12_glacier-outline",
       "type": "line",
@@ -574,47 +622,6 @@
         ]
       }
     },
-    {
-      "id": "landuse_areas_z12_watercover",
-      "type": "fill",
-      "source": "osm",
-      "source-layer": "landuse_areas",
-      "minzoom": 11,
-      "maxzoom": 24,
-      "layout": {"visibility": "visible"},
-      "paint": {
-        "fill-color": [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          12,
-          [
-            "match",
-            ["get", "type"],
-            "salt_pond",
-            "rgba(236, 240, 241, 1)",
-            "glacier",
-            "rgba(219, 244, 249, 1)",
-            "reservoir",
-            "rgba(144, 204, 203, 1)",
-            "swimming_pool",
-            "rgba(144, 204, 203, 1)",
-            "transparent"
-          ]
-        ]
-      }
-    },
-    {
-      "id": "landuse_areas_z11_wetland_watercover",
-      "type": "fill",
-      "source": "osm",
-      "source-layer": "landuse_areas",
-      "minzoom": 11,
-      "maxzoom": 24,
-      "filter": ["all", ["==", "type", "wetland"]],
-      "layout": {"visibility": "visible"},
-      "paint": {"fill-color": "rgba(228, 242, 227, 1)"}
-    },
     {
       "id": "water_areas-ne",
       "type": "fill",
@@ -671,22 +678,6 @@
         "fill-outline-color": "rgba(226, 223, 215, 1)"
       }
     },
-    {
-      "id": "wetlands_z11-pattern",
-      "type": "fill",
-      "source": "osm",
-      "source-layer": "landuse_areas",
-      "minzoom": 11,
-      "maxzoom": 24,
-      "filter": ["==", ["get", "type"], "wetland"],
-      "layout": {"visibility": "visible"},
-      "paint": {
-        "fill-color": "rgba(255, 255, 255, 1)",
-        "fill-pattern": {
-          "stops": [[12, "cattails_space_60px"], [14, "cattails_space_70px"]]
-        }
-      }
-    },
     {
       "id": "water_lines_stream_no_name",
       "type": "line",