From 684075d9675236d0880ab0126896665b83d7ca46 Mon Sep 17 00:00:00 2001
From: Paul Norman <penorman@mac.com>
Date: Sun, 14 Jun 2026 13:08:33 -0700
Subject: [PATCH] Switch from Versatiles Colorful to SVWD03

The SVWD03 style shows off more of what Shortbread has.
---
 app/assets/javascripts/leaflet.shortbread.js | 15 +--------------
 config/layers.yml                            |  6 ++----
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/leaflet.shortbread.js b/app/assets/javascripts/leaflet.shortbread.js
index b7b316130..4940bd127 100644
--- a/app/assets/javascripts/leaflet.shortbread.js
+++ b/app/assets/javascripts/leaflet.shortbread.js
@@ -1,22 +1,9 @@
 L.OSM.Shortbread = L.OSM.MaplibreGL.extend({
   onAdd: function (map) {
     L.OSM.MaplibreGL.prototype.onAdd.call(this, map);
-    const styleURL = "https://vector.openstreetmap.org/styles/shortbread/" + this.options.styleName;
-    this.getMaplibreMap().setStyle(styleURL);
+    this.getMaplibreMap().setStyle("https://vector.openstreetmap.org/styles/svwd/svwd03style.json");
   },
   onRemove: function (map) {
     L.OSM.MaplibreGL.prototype.onRemove.call(this, map);
   }
 });
-
-L.OSM.ShortbreadColorful = L.OSM.Shortbread.extend({
-  options: {
-    styleName: "colorful.json"
-  }
-});
-
-L.OSM.ShortbreadEclipse = L.OSM.Shortbread.extend({
-  options: {
-    styleName: "eclipse.json"
-  }
-});
diff --git a/config/layers.yml b/config/layers.yml
index acf5424aa..c924c6679 100644
--- a/config/layers.yml
+++ b/config/layers.yml
@@ -102,8 +102,7 @@
         id: "osm_france"
         href: "https://openstreetmap.fr/"
 
-- leafletOsmId: "ShortbreadColorful"
-  leafletOsmDarkId: "ShortbreadEclipse"
+- leafletOsmId: "Shortbread"
   code: "S"
   layerId: "shortbread"
   nameId: "shortbread"
@@ -111,8 +110,7 @@
   canEmbed: true
   maxZoom: 23
   isVectorStyle: true
-  styleUrl: "https://vector.openstreetmap.org/styles/shortbread/colorful.json"
-  styleUrlDark: "https://vector.openstreetmap.org/styles/shortbread/eclipse.json"
+  styleUrl: "https://vector.openstreetmap.org/styles/svwd/svwd03style.json"
   credit:
     id: "make_a_donation"
     href: "https://supporting.openstreetmap.org"
-- 
2.47.3