oafuncs 0.0.98.33__py3-none-any.whl → 0.0.98.34__py3-none-any.whl

oafuncs/_script/plot_dataset.py

@@ -91,7 +91,7 @@ def plot_2d(data: xr.DataArray, output_path: str, data_range: Optional[Tuple[flo
         lon_lat_ratio = np.abs(np.max(lon_range) - np.min(lon_range)) / (np.max(lat_range) - np.min(lat_range))
         figsize = (10, 10 / lon_lat_ratio)
         fig, ax = plt.subplots(figsize=figsize, subplot_kw={"projection": ccrs.PlateCarree()})
-        oafuncs.oa_draw.add_cartopy(ax, lon_range, lat_range)
+        oafuncs.oa_draw.setup_map(ax, lon_range, lat_range)
     else:
         fig, ax = plt.subplots(figsize=(10, 8))
 

oafuncs/oa_cmap.py

@@ -3,8 +3,9 @@ from typing import List, Optional, Union
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 import numpy as np
+import random
 
-__all__ = ["show", "to_color", "create", "get"]
+__all__ = ["show", "to_color", "create", "get", "random_color"]
 
 
 # ** 将cmap用填色图可视化（官网摘抄函数）
@@ -304,6 +305,14 @@ def get(colormap_name: Optional[str] = None, show_available: bool = False) -> Op
             return mpl.colormaps.get_cmap("rainbow")  # 默认返回 'rainbow'
 
 
+# ** 生成随机颜色
+def random_color():
+    """Generate a random color in hexadecimal format."""
+    r = random.randint(0, 255)
+    g = random.randint(0, 255)
+    b = random.randint(0, 255)
+    return f"#{r:02x}{g:02x}{b:02x}"
+
 if __name__ == "__main__":
     # ** 测试自制cmap
     colors = ["#C2B7F3", "#B3BBF2", "#B0CBF1", "#ACDCF0", "#A8EEED"]

oafuncs/oa_draw.py

@@ -231,58 +231,7 @@ def setup_map(
     right_labels: bool = False,
     top_labels: bool = False,
 ) -> plt.Axes:
-    """Setup a complete cartopy map with customizable features.
-
-    Args:
-        axes (plt.Axes): The axes to setup as a map.
-        longitude_data (np.ndarray, optional): Array of longitudes to set map extent.
-        latitude_data (np.ndarray, optional): Array of latitudes to set map extent.
-        map_projection (ccrs.Projection, optional): Coordinate reference system. Defaults to PlateCarree.
-
-        show_land (bool, optional): Whether to show land features. Defaults to True.
-        show_ocean (bool, optional): Whether to show ocean features. Defaults to True.
-        show_coastline (bool, optional): Whether to show coastlines. Defaults to True.
-        show_borders (bool, optional): Whether to show country borders. Defaults to False.
-        land_color (str, optional): Color of land. Defaults to "lightgrey".
-        ocean_color (str, optional): Color of oceans. Defaults to "lightblue".
-        coastline_linewidth (float, optional): Line width for coastlines. Defaults to 0.5.
-
-        show_gridlines (bool, optional): Whether to show gridlines. Defaults to False.
-        longitude_ticks (list[float], optional): Longitude tick positions.
-        latitude_ticks (list[float], optional): Latitude tick positions.
-        tick_decimals (int, optional): Number of decimal places for tick labels. Defaults to 0.
-
-        grid_color (str, optional): Gridline color. Defaults to "k".
-        grid_alpha (float, optional): Gridline transparency. Defaults to 0.5.
-        grid_style (str, optional): Gridline style. Defaults to "--".
-        grid_width (float, optional): Gridline width. Defaults to 0.5.
-
-        show_labels (bool, optional): Whether to show coordinate labels. Defaults to True.
-        left_labels (bool, optional): Show labels on left side. Defaults to True.
-        bottom_labels (bool, optional): Show labels on bottom. Defaults to True.
-        right_labels (bool, optional): Show labels on right side. Defaults to False.
-        top_labels (bool, optional): Show labels on top. Defaults to False.
-
-    Returns:
-        plt.Axes: The configured map axes.
-
-    Examples:
-        >>> # Basic map setup
-        >>> ax = setup_map(ax)
-
-        >>> # Map with gridlines and custom extent
-        >>> ax = setup_map(ax, longitude_data=lon, latitude_data=lat, show_gridlines=True)
-
-        >>> # Customized map
-        >>> ax = setup_map(
-        ...     ax,
-        ...     show_gridlines=True,
-        ...     longitude_ticks=[0, 30, 60],
-        ...     latitude_ticks=[-30, 0, 30],
-        ...     land_color='wheat',
-        ...     ocean_color='lightcyan'
-        ... )
-    """
+    """Setup a complete cartopy map with customizable features."""
     from matplotlib import ticker as mticker
 
     # Add map features
@@ -327,14 +276,14 @@ def setup_map(
             current_extent = axes.get_extent(crs=map_projection)
             lon_range = current_extent[1] - current_extent[0]
             # Generate reasonable tick spacing
-            tick_spacing = 5 if lon_range <= 30 else (10 if lon_range <= 90 else 20)
+            tick_spacing = 1 if lon_range <= 10 else (5 if lon_range <= 30 else (10 if lon_range <= 90 else 20))
             longitude_ticks = np.arange(np.ceil(current_extent[0] / tick_spacing) * tick_spacing, current_extent[1] + tick_spacing, tick_spacing)
 
         if latitude_ticks is None:
             current_extent = axes.get_extent(crs=map_projection)
             lat_range = current_extent[3] - current_extent[2]
             # Generate reasonable tick spacing
-            tick_spacing = 5 if lat_range <= 30 else (10 if lat_range <= 90 else 20)
+            tick_spacing = 1 if lat_range <= 10 else (5 if lat_range <= 30 else (10 if lat_range <= 90 else 20))
             latitude_ticks = np.arange(np.ceil(current_extent[2] / tick_spacing) * tick_spacing, current_extent[3] + tick_spacing, tick_spacing)
 
         # Set tick positions and formatters
@@ -343,12 +292,18 @@ def setup_map(
         axes.xaxis.set_major_formatter(lon_formatter)
         axes.yaxis.set_major_formatter(lat_formatter)
 
+        # Control label visibility based on input parameters
+        axes.tick_params(axis="x", labelbottom=bottom_labels, labeltop=top_labels)
+        axes.tick_params(axis="y", labelleft=left_labels, labelright=right_labels)
+
     # 只要传入经纬度数据就自动设置范围
     # 范围必须在cartopy添加地图特征之后设置，因为添加特征可能会改变axes的范围
     if longitude_data is not None and latitude_data is not None:
         # 过滤掉NaN，避免极端值影响
-        lon_valid = np.asarray(longitude_data)[~np.isnan(longitude_data)]
-        lat_valid = np.asarray(latitude_data)[~np.isnan(latitude_data)]
+        lon_data = np.asarray(longitude_data)
+        lat_data = np.asarray(latitude_data)
+        lon_valid = lon_data[~np.isnan(lon_data)]
+        lat_valid = lat_data[~np.isnan(lat_data)]
         if lon_valid.size > 0 and lat_valid.size > 0:
             lon_min, lon_max = np.min(lon_valid), np.max(lon_valid)
             lat_min, lat_max = np.min(lat_valid), np.max(lat_valid)

{oafuncs-0.0.98.33.dist-info → oafuncs-0.0.98.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.33
+Version: 0.0.98.34
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.98.33.dist-info → oafuncs-0.0.98.34.dist-info}/RECORD

@@ -1,8 +1,8 @@
 oafuncs/__init__.py,sha256=T_-VtnWWllV3Q91twT5Yt2sUapeA051QbPNnBxmg9nw,1456
-oafuncs/oa_cmap.py,sha256=KKEM3Dx0RYYFdLaj0eX6p1iQ1IcKR0RZmt7a3bMGO3Y,13609
+oafuncs/oa_cmap.py,sha256=LL2JSIofwVRymgEILjMCB4Iuz7hOYF-QemfNkaZqbk0,13880
 oafuncs/oa_data.py,sha256=Wp7Yn6n-WNddAp1UtwK5CSEdGSrzzgOH5gtaOHBaxtw,8065
 oafuncs/oa_date.py,sha256=aU2wVIWXyWoRiSQ9dg8sHvShFTxw86RrgbV3Q6tDjD4,6841
-oafuncs/oa_draw.py,sha256=oPW1dlL0dKIfx4u18djBJfokhZAAAV7t-280DU4MblQ,15967
+oafuncs/oa_draw.py,sha256=37Zok96Pn7aIpNqZ082cSycT8dSccgwHzScXZXNnfik,13701
 oafuncs/oa_file.py,sha256=fLb0gRhq2AiPl-5ASDHMrx6Z267FmhqNcTV7CdCxTdI,16934
 oafuncs/oa_help.py,sha256=0J5VaZX-cB0c090KxgmktQJBc0o00FsY-4wB8l5y00k,4178
 oafuncs/oa_nc.py,sha256=TMrrPBdPz1IJ-7dMOD_gzzTbG6FHSgm-ZfdlvoJDtcY,15245
@@ -18,7 +18,7 @@ oafuncs/_script/netcdf_modify.py,sha256=XDlAEToe_lwfAetkBSENqU5df-wnH7MGuxNTjG1g
 oafuncs/_script/netcdf_write.py,sha256=GvyUyUhzMonzSp3y4pT8ZAfbQrsh5J3dLnmINYJKhuE,21422
 oafuncs/_script/parallel.py,sha256=07-BJVHxXJNlrOrhrSGt7qCZiKWq6dBvNDBA1AANYnI,8861
 oafuncs/_script/parallel_test.py,sha256=0GBqZOX7IaCOKF2t1y8N8YYu53GJ33OkfsWgpvZNqM4,372
-oafuncs/_script/plot_dataset.py,sha256=4jhUZNIc2DLHnk5GH0rotzhOq0cAMmB7rhMJKorYObo,16329
+oafuncs/_script/plot_dataset.py,sha256=QrA4vOCzWbAJp3hf5YYzgIRUZdJB5_ugepgyT_YfnaY,16327
 oafuncs/_script/replace_file_content.py,sha256=wIwvaISFNYWG58BLZHZP9ZgbC5OhoZ-cpR3y25U1EUM,5601
 oafuncs/oa_down/User_Agent-list.txt,sha256=pHaMlElMvZ8TG4vf4BqkZYKqe0JIGkr4kCN0lM1Y9FQ,514295
 oafuncs/oa_down/__init__.py,sha256=IT6oTqaxuV_mC6AwBut0HtkmnVtEu1MyX0x0oS7TKoA,218
@@ -38,8 +38,8 @@ oafuncs/oa_sign/__init__.py,sha256=JSx1fcWpmNhQBvX_Bmq3xysfSkkFMrjbJASxV_V6aqE,1
 oafuncs/oa_sign/meteorological.py,sha256=3MSjy7HTcvz2zsITkjUMr_0Y027Gas1LFE9pk99990k,6110
 oafuncs/oa_sign/ocean.py,sha256=3uYEzaq-27yVy23IQoqy-clhWu1I_fhPFBAQyT-OF4M,5562
 oafuncs/oa_sign/scientific.py,sha256=moIl2MEY4uitbXoD596JmXookXGQtQsS-8_1NBBTx84,4689
-oafuncs-0.0.98.33.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.33.dist-info/METADATA,sha256=SSKQ7VF-hVUtg_YT91r5QfPfL_sAMlIF5Cz0jPuTAbI,4326
-oafuncs-0.0.98.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oafuncs-0.0.98.33.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.33.dist-info/RECORD,,
+oafuncs-0.0.98.34.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.34.dist-info/METADATA,sha256=fUtjS8AeoOMXC6t8r1_JbgOrKytjNumx_gD89e3Sb30,4326
+oafuncs-0.0.98.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oafuncs-0.0.98.34.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.34.dist-info/RECORD,,