oafuncs 0.0.98.39__py3-none-any.whl → 0.0.98.40__py3-none-any.whl

oafuncs/oa_draw.py

@@ -247,44 +247,41 @@ def setup_map(
     from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter
     lon_formatter = LongitudeFormatter(zero_direction_label=False, number_format=f".{tick_decimals}f")
     lat_formatter = LatitudeFormatter(number_format=f".{tick_decimals}f")
-
-    # Handle gridlines and ticks
-    if show_gridlines:
-        # Add gridlines with labels
-        gl = axes.gridlines(crs=map_projection, draw_labels=show_labels, linewidth=grid_width, color=grid_color, alpha=grid_alpha, linestyle=grid_style)
-
-        # Configure label positions
-        gl.left_labels = left_labels
-        gl.bottom_labels = bottom_labels
-        gl.right_labels = right_labels
-        gl.top_labels = top_labels
-
-        # Set formatters
-        gl.xformatter = lon_formatter
-        gl.yformatter = lat_formatter
-
-        # Set custom tick positions if provided
-        if longitude_ticks is not None:
-            gl.xlocator = mticker.FixedLocator(np.array(longitude_ticks))
-        if latitude_ticks is not None:
-            gl.ylocator = mticker.FixedLocator(np.array(latitude_ticks))
-
-    elif show_labels:
+    
+        # 只要传入经纬度数据就自动设置范围
+    # 范围必须在cartopy添加地图特征之后设置，因为添加特征可能会改变axes的范围
+    if longitude_data is not None and latitude_data is not None:
+        # 过滤掉NaN，避免极端值影响
+        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)
+            axes.set_extent([lon_min, lon_max, lat_min, lat_max], crs=map_projection)
+        else:
+            # 若全是NaN则不设置范围
+            pass
+    
+    if show_labels:
         # Add tick labels without gridlines
         # Generate default tick positions based on current extent if not provided
         if longitude_ticks is None:
             current_extent = axes.get_extent(crs=map_projection)
             lon_range = current_extent[1] - current_extent[0]
             # Generate reasonable tick spacing
-            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)
+            tick_spacing = 1 if lon_range <= 10 else (5 if lon_range <= 30 else (15 if lon_range <= 90 else (30 if lon_range <= 180 else 60)))
+            longitude_ticks = np.arange(np.ceil(current_extent[0] / tick_spacing) * tick_spacing, current_extent[1] + 0.1, tick_spacing)
+            # print(f"[green]Longitude ticks set to:[/green] {longitude_ticks}")
 
         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 = 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)
+            tick_spacing = 1 if lat_range <= 10 else (5 if lat_range <= 30 else (15 if lat_range <= 90 else 30))
+            latitude_ticks = np.arange(np.ceil(current_extent[2] / tick_spacing) * tick_spacing, current_extent[3] + 0.1, tick_spacing)
+            # print(f"[green]Latitude ticks set to:[/green] {latitude_ticks}")
 
         # Set tick positions and formatters
         axes.set_xticks(longitude_ticks, crs=map_projection)
@@ -296,21 +293,27 @@ def setup_map(
         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_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)
-            axes.set_extent([lon_min, lon_max, lat_min, lat_max], crs=map_projection)
-        else:
-            # 若全是NaN则不设置范围
-            pass
+    # Handle gridlines and ticks
+    if show_gridlines:
+        # Add gridlines with labels
+        gl = axes.gridlines(crs=map_projection, draw_labels=show_labels, linewidth=grid_width, color=grid_color, alpha=grid_alpha, linestyle=grid_style)
+
+        # Configure label positions
+        gl.left_labels = left_labels
+        gl.bottom_labels = bottom_labels
+        gl.right_labels = right_labels
+        gl.top_labels = top_labels
+
+        # Set formatters
+        gl.xformatter = lon_formatter
+        gl.yformatter = lat_formatter
+
+        # Set custom tick positions if provided
+        if longitude_ticks is not None:
+            gl.xlocator = mticker.FixedLocator(np.array(longitude_ticks))
+        if latitude_ticks is not None:
+            gl.ylocator = mticker.FixedLocator(np.array(latitude_ticks))
+            
     return axes
 
 

{oafuncs-0.0.98.39.dist-info → oafuncs-0.0.98.40.dist-info}/METADATA

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

{oafuncs-0.0.98.39.dist-info → oafuncs-0.0.98.40.dist-info}/RECORD

@@ -2,7 +2,7 @@ oafuncs/__init__.py,sha256=T_-VtnWWllV3Q91twT5Yt2sUapeA051QbPNnBxmg9nw,1456
 oafuncs/oa_cmap.py,sha256=JwZMJ36uNwiCnzXqEtH2_PpeLtEaRaXP9YeGSl0PJSU,13886
 oafuncs/oa_data.py,sha256=u4H1ZazQf2jmGx3IAiaGxLjQHY9cQEMizRIaTQW4UiE,8075
 oafuncs/oa_date.py,sha256=aU2wVIWXyWoRiSQ9dg8sHvShFTxw86RrgbV3Q6tDjD4,6841
-oafuncs/oa_draw.py,sha256=zxwxmTsS6-s6YFvrVJTr06_O39y0ykVxtOrShgDM4Qg,13754
+oafuncs/oa_draw.py,sha256=zal0Y3RPpN0TCGN4Gw9qLtjQdT6V0ZqpSUBFVOPL0x4,13952
 oafuncs/oa_file.py,sha256=fLb0gRhq2AiPl-5ASDHMrx6Z267FmhqNcTV7CdCxTdI,16934
 oafuncs/oa_help.py,sha256=0J5VaZX-cB0c090KxgmktQJBc0o00FsY-4wB8l5y00k,4178
 oafuncs/oa_nc.py,sha256=mKNxQ9jPxfRH7xINyrX7tBhitG5gmOKm6Dn7stk5mdw,15279
@@ -37,8 +37,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.39.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.39.dist-info/METADATA,sha256=2hppaUc6XZv609HGI_ZRS8GRPARn1Q9MI8xgb4JBfhs,4326
-oafuncs-0.0.98.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oafuncs-0.0.98.39.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.39.dist-info/RECORD,,
+oafuncs-0.0.98.40.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.40.dist-info/METADATA,sha256=oD8heaDgtaCRU2T3HJZK1UXU7hnasx6dVk9WtC9TwQ4,4326
+oafuncs-0.0.98.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oafuncs-0.0.98.40.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.40.dist-info/RECORD,,