Update ash_animator/basemaps.py

ash_animator/basemaps.py

@@ -1,70 +1,53 @@
-
 import os
 import hashlib
 from PIL import Image
 import matplotlib.pyplot as plt
-
-import os
-import sys
+import contextily as ctx
+from mpl_toolkits.basemap import Basemap
+import cartopy.crs as ccrs
+import cartopy.feature as cfeature
 
 def get_cache_dir(app_name):
     if os.name == 'nt':
-        # Windows: Use LOCALAPPDATA or fallback
+        # Windows: Use LOCALAPPDATA or fallback to cwd
         return os.path.join(os.getenv('LOCALAPPDATA', os.getcwd()), f"{app_name}_cache")
     else:
-        # Unix: Attempt to use root-level /code/app_name_cache
+        # Unix: Try /code/app_name_cache, fallback to /tmp
         base_dir = "/code"
         cache_path = os.path.join(base_dir, f"{app_name}_cache")
         try:
             os.makedirs(cache_path, exist_ok=True)
-            os.chmod(cache_path, 0o777)  # Make it writable by all (if necessary)
+            os.chmod(cache_path, 0o777)
         except PermissionError:
             print(f"[PermissionError] Cannot write to {cache_path}. Falling back to /tmp.")
             cache_path = os.path.join("/tmp", f"{app_name}_cache")
             os.makedirs(cache_path, exist_ok=True)
         return cache_path
 
+# Define cache dirs
 CTX_TILE_CACHE_DIR = get_cache_dir("contextily")
 BASEMAP_TILE_CACHE_DIR = get_cache_dir("basemap")
 CARTOPY_CACHE_DIR = get_cache_dir("cartopy")
 
+# Set environment variables for Cartopy
 os.environ["CARTOPY_USER_BACKGROUNDS"] = CARTOPY_CACHE_DIR
 os.environ["CARTOPY_CACHE_DIR"] = CARTOPY_CACHE_DIR
 
-
+# Ensure cache dirs exist
 os.makedirs(CTX_TILE_CACHE_DIR, exist_ok=True)
 os.makedirs(BASEMAP_TILE_CACHE_DIR, exist_ok=True)
 
-
-import contextily as ctx
-from mpl_toolkits.basemap import Basemap
-import cartopy.crs as ccrs
-import cartopy.feature as cfeature
-
 def draw_etopo_basemap(ax, mode="basemap", zoom=11):
     """
     Draws a high-resolution basemap background on the provided Cartopy GeoAxes.
-
     Parameters
     ----------
     ax : matplotlib.axes._subplots.AxesSubplot
         The matplotlib Axes object (with Cartopy projection) to draw the map background on.
-
     mode : str, optional
-        The basemap mode to use:
-        - "stock": Default stock image from Cartopy.
-        - "contextily": Web tile background (CartoDB Voyager), with caching.
-        - "basemap": High-resolution shaded relief using Basemap, with caching.
-        Default is "basemap".
-
+        The basemap mode to use: "stock", "contextily", "basemap".
     zoom : int, optional
-        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.
+        Tile zoom level for contextily.
     """
     try:
         if mode == "stock":
@@ -73,17 +56,11 @@ def draw_etopo_basemap(ax, mode="basemap", zoom=11):
         elif mode == "contextily":
             extent = ax.get_extent(crs=ccrs.PlateCarree())
             ax.set_extent(extent, crs=ccrs.PlateCarree())
-            ctx.add_basemap(
-                ax,
-                crs=ccrs.PlateCarree(),
-                source=ctx.providers.CartoDB.Voyager,
-                zoom=zoom                
-            )
+            ctx.add_basemap(ax, crs=ccrs.PlateCarree(),
+                            source=ctx.providers.CartoDB.Voyager, 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")
@@ -92,7 +69,6 @@ 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())
@@ -100,18 +76,12 @@ 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)  # 'h' = high resolution
+                            resolution='f', ax=temp_ax)
 
                 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())