Fix removing drawn feature bug (#1805)

* Fix removing drawn feature bug * Fix basemap and docs build error
gee-community · Oct 31, 2023 · ddc512c · ddc512c
1 parent c348245
commit ddc512c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
@@ -12,7 +12,7 @@ jobs:
                   fetch-depth: 0
             - uses: actions/setup-python@v4
               with:
-                  python-version: 3.9
+                  python-version: "3.11"
             - name: Install GDAL
               run: |
                   python -m pip install --upgrade pip

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -12,7 +12,7 @@ jobs:
                   fetch-depth: 0
             - uses: actions/setup-python@v4
               with:
-                  python-version: 3.9
+                  python-version: "3.11"
             - name: Install GDAL
               run: |
                   python -m pip install --upgrade pip

diff --git a/geemap/geemap.py b/geemap/geemap.py
@@ -2479,6 +2479,8 @@ def remove_drawn_features(self):
         """Removes user-drawn geometries from the map"""
         if self._draw_control is not None:
             self._draw_control.reset()
+        if "Drawn Features" in self.ee_layers:
+            self.ee_layers.pop("Drawn Features")
 
     def remove_last_drawn(self):
         """Removes last user-drawn geometry from the map"""

diff --git a/geemap/plotlymap.py b/geemap/plotlymap.py
@@ -717,7 +717,7 @@ def add_heatmap_demo(self, **kwargs):
             **kwargs,
         )
 
-        self.add_basemap("Stamen.Terrain")
+        self.add_basemap("Esri.WorldTopoMap")
         self.add_trace(heatmap)
 
     def add_gdf(

diff --git a/geemap/toolbar.py b/geemap/toolbar.py
@@ -4928,7 +4928,7 @@ def plotly_basemap_gui(canvas, map_min_width="78%", map_max_width="98%"):
 
     map_widget.layout.width = map_min_width
 
-    value = "Stamen.Terrain"
+    value = "Esri.WorldTopoMap"
     m.add_basemap(value)
 
     dropdown = widgets.Dropdown(

diff --git a/tests/test_basemaps.py b/tests/test_basemaps.py
@@ -51,7 +51,7 @@ def test_xyz_to_leaflet_sources(self):
         expected_keys = {
             "custom_xyz": "OpenStreetMap",
             "custom_wms": "USGS NAIP Imagery",
-            "xyzservices_xyz": "Stamen.Terrain",
+            "xyzservices_xyz": "Esri.WorldTopoMap",
         }
         for _, expected_name in expected_keys.items():
             self.assertIn(expected_name, self.tiles)