Update ash_animator/basemaps.py

ash_animator/basemaps.py

@@ -1,40 +1,23 @@
+
 import os
 import hashlib
-import tempfile
 import contextily as ctx
 from mpl_toolkits.basemap import Basemap
-
-
-import os
-import tempfile
-
-def get_cache_dir(app_name):
-    return os.path.join(tempfile.gettempdir(), f"{app_name}_cache")
-
-
-# Define and create cache directories
-CTX_TILE_CACHE_DIR = get_cache_dir("contextily")
-BASEMAP_TILE_CACHE_DIR = get_cache_dir("basemap")
-CARTOPY_CACHE_DIR = get_cache_dir("cartopy")
-
-os.environ["XDG_CACHE_HOME"] = CTX_TILE_CACHE_DIR
-os.environ["CARTOPY_USER_BACKGROUNDS"] = CARTOPY_CACHE_DIR
-os.environ["CARTOPY_CACHE_DIR"] = CARTOPY_CACHE_DIR
-
-if not os.path.exists(CTX_TILE_CACHE_DIR):
-    os.makedirs(CTX_TILE_CACHE_DIR, exist_ok=True)
-if not os.path.exists(BASEMAP_TILE_CACHE_DIR):
-    os.makedirs(BASEMAP_TILE_CACHE_DIR, exist_ok=True)
-if not os.path.exists(CARTOPY_CACHE_DIR):
-    os.makedirs(CARTOPY_CACHE_DIR, exist_ok=True)
-
-
 import cartopy.crs as ccrs
 import cartopy.feature as cfeature
-import cartopy.io.shapereader as shpreader
 from PIL import Image
 import matplotlib.pyplot as plt
 
+# Define cache directories
+# Optional: Set tile cache directory (must be done before contextily downloads tiles)
+os.environ["XDG_CACHE_HOME"] = os.path.expanduser("~/.contextily_cache")
+
+CTX_TILE_CACHE_DIR = os.path.expanduser("~/.contextily_cache")
+BASEMAP_TILE_CACHE_DIR = os.path.expanduser("~/.basemap_cache")
+
+os.makedirs(CTX_TILE_CACHE_DIR, exist_ok=True)
+os.makedirs(BASEMAP_TILE_CACHE_DIR, exist_ok=True)
+
 def draw_etopo_basemap(ax, mode="basemap", zoom=11):
     """
     Draws a high-resolution basemap background on the provided Cartopy GeoAxes.
@@ -52,7 +35,13 @@ def draw_etopo_basemap(ax, mode="basemap", zoom=11):
         Default is "basemap".
 
     zoom : int, optional
-        Tile zoom level (only for "contextily"). Higher = more detail. Default is 11.
+        Tile zoom level (only for "contextily"). Higher = more detail. Default is 7.
+
+    Notes
+    -----
+    - Uses high resolution for Basemap (resolution='h') and saves figure at 300 DPI.
+    - Cached images are reused using extent-based hashing to avoid re-rendering.
+    - Basemap is deprecated; Cartopy with web tiles is recommended for new projects.
     """
     try:
         if mode == "stock":
@@ -65,11 +54,13 @@ def draw_etopo_basemap(ax, mode="basemap", zoom=11):
                 ax,
                 crs=ccrs.PlateCarree(),
                 source=ctx.providers.CartoDB.Voyager,
-                zoom=zoom
+                zoom=zoom                
             )
 
         elif mode == "basemap":
             extent = ax.get_extent(crs=ccrs.PlateCarree())
+
+            # Create a hash key for this extent
             extent_str = f"{extent[0]:.4f}_{extent[1]:.4f}_{extent[2]:.4f}_{extent[3]:.4f}"
             cache_key = hashlib.md5(extent_str.encode()).hexdigest()
             cache_file = os.path.join(BASEMAP_TILE_CACHE_DIR, f"{cache_key}_highres.png")
@@ -78,6 +69,7 @@ def draw_etopo_basemap(ax, mode="basemap", zoom=11):
                 img = Image.open(cache_file)
                 ax.imshow(img, extent=extent, transform=ccrs.PlateCarree())
             else:
+                # Create a high-resolution temporary figure
                 temp_fig, temp_ax = plt.subplots(figsize=(12, 9),
                                                  subplot_kw={'projection': ccrs.PlateCarree()})
                 temp_ax.set_extent(extent, crs=ccrs.PlateCarree())
@@ -85,12 +77,18 @@ def draw_etopo_basemap(ax, mode="basemap", zoom=11):
                 m = Basemap(projection='cyl',
                             llcrnrlon=extent[0], urcrnrlon=extent[1],
                             llcrnrlat=extent[2], urcrnrlat=extent[3],
-                            resolution='f', ax=temp_ax)
+                            resolution='f', ax=temp_ax)  # 'h' = high resolution
+
                 m.shadedrelief()
+                # m.drawcoastlines(linewidth=0.1)
+                # m.drawcountries(linewidth=0.1)
+                # m.drawmapboundary()
 
+                # Save high-DPI figure for clarity
                 temp_fig.savefig(cache_file, dpi=300, bbox_inches='tight', pad_inches=0)
                 plt.close(temp_fig)
 
+                # Load and display the cached image
                 img = Image.open(cache_file)
                 ax.imshow(img, extent=extent, transform=ccrs.PlateCarree())