From 5ff9e8b1acee44f3de3c0299e3e7bb0274c93022 Mon Sep 17 00:00:00 2001
From: Nitin Magima <nitin.magima@gmail.com>
Date: Fri, 22 May 2026 11:23:52 -0400
Subject: [PATCH 1/3] Replace basemaps with boundary-free ESRI tiles

---
 fbfmaproom/fbflayout.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fbfmaproom/fbflayout.py b/fbfmaproom/fbflayout.py
index 997c4730..cc91691a 100644
--- a/fbfmaproom/fbflayout.py
+++ b/fbfmaproom/fbflayout.py
@@ -79,16 +79,18 @@ def map_layout():
                 [
                     dlf.BaseLayer(
                         dlf.TileLayer(
-                            url="https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png",
+                            url="https://server.arcgisonline.com/ArcGIS/rest/services/World_Terrain_Base/MapServer/tile/{z}/{y}/{x}",
+                            attribution="Tiles &copy; Esri",
                         ),
-                        name="Street",
+                        name="Terrain",
                         checked=True,
                     ),
                     dlf.BaseLayer(
                         dlf.TileLayer(
-                            url="https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png"
+                            url="https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
+                            attribution="Tiles &copy; Esri",
                         ),
-                        name="Topo",
+                        name="Satellite",
                         checked=False,
                     ),
                     dlf.Overlay(

From d108592560e44154db963b1b68eb4dac28ef8de9 Mon Sep 17 00:00:00 2001
From: Nitin Magima <nitin.magima@gmail.com>
Date: Fri, 22 May 2026 11:27:23 -0400
Subject: [PATCH 2/3] Replace basemaps with boundary-free ESRI tiles

---
 fbfmaproom/fbflayout.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fbfmaproom/fbflayout.py b/fbfmaproom/fbflayout.py
index cc91691a..4a2b942b 100644
--- a/fbfmaproom/fbflayout.py
+++ b/fbfmaproom/fbflayout.py
@@ -83,7 +83,7 @@ def map_layout():
                             attribution="Tiles &copy; Esri",
                         ),
                         name="Terrain",
-                        checked=True,
+                        checked=False,
                     ),
                     dlf.BaseLayer(
                         dlf.TileLayer(
@@ -91,7 +91,7 @@ def map_layout():
                             attribution="Tiles &copy; Esri",
                         ),
                         name="Satellite",
-                        checked=False,
+                        checked=True,
                     ),
                     dlf.Overlay(
                         dlf.GeoJSON(

From 0896170012af6d959822cb74b0b63b15f4a628da Mon Sep 17 00:00:00 2001
From: Nitin Magima <nitin.magima@gmail.com>
Date: Fri, 12 Jun 2026 13:33:26 -0400
Subject: [PATCH 3/3] Use CartoDB Street basemap as alternative to Satellite

---
 fbfmaproom/fbflayout.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fbfmaproom/fbflayout.py b/fbfmaproom/fbflayout.py
index 4a2b942b..122b57ab 100644
--- a/fbfmaproom/fbflayout.py
+++ b/fbfmaproom/fbflayout.py
@@ -79,10 +79,9 @@ def map_layout():
                 [
                     dlf.BaseLayer(
                         dlf.TileLayer(
-                            url="https://server.arcgisonline.com/ArcGIS/rest/services/World_Terrain_Base/MapServer/tile/{z}/{y}/{x}",
-                            attribution="Tiles &copy; Esri",
+                            url="https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png",
                         ),
-                        name="Terrain",
+                        name="Street",
                         checked=False,
                     ),
                     dlf.BaseLayer(