Merge remote-tracking branch 'refs/remotes/upstream/version-1-prep' into version-1-prep

Author: leosaffin

huracanpy/_accessor.py

@@ -16,6 +16,8 @@
 from .utils.category import get_category, get_pressure_cat, get_sshs_cat
 from .utils.translation import get_distance, get_translation_speed
 from .utils.interp import interp_time
+from . import plot
+from . import diags
 
 
 @xr.register_dataset_accessor("hrcn")
@@ -414,11 +416,30 @@ def interp_time(self, freq="1h", track_id_name="track_id", prog_bar=False):
             self._dataset, freq=freq, track_id_name=track_id_name, prog_bar=prog_bar
         )
 
+    # ==== plot ====
+    def plot_tracks(
+        self, lon_name="lon", lat_name="lat", intensity_var_name=None, **kwargs
+    ):
+        if intensity_var_name in list(self._dataset.variables):
+            intensity_var = self._dataset[intensity_var_name]
+        else:
+            intensity_var = None
+
+        return plot.tracks(
+            self._dataset[lon_name], self._dataset[lat_name], intensity_var, **kwargs
+        )
 
-#
-#    # interp
-#    def interp_time(self, freq="1h", track_id_name="track_id", prog_bar=False,):
-#        return interp_time(self._dataset, freq, track_id_name, prog_bar)
+    def plot_density(
+        self, lon_name="lon", lat_name="lat", density_kws=dict(), **kwargs
+    ):
+        d = self.get_density(**density_kws)
+        return plot.density(d, **kwargs)
+
+    # ==== diags ====
+    def get_density(self, lon_name="lon", lat_name="lat", method="histogram", **kwargs):
+        return diags.density(
+            self._dataset[lon_name], self._dataset[lat_name], method=method, **kwargs
+        )
 
 
 # track density

tests/test_accessor.py

@@ -36,13 +36,13 @@ def test_accessor():
         continent_acc != continent_fct
     ), "accessor output differs from function output"
     ## - ace
-    ace_acc = data.hrcn.get_ace(wind_name="wind")
-    ace_fct = huracanpy.utils.ace.get_ace(data.wind)
+    ace_acc = data.hrcn.get_ace(wind_name="wind10")
+    ace_fct = huracanpy.utils.ace.get_ace(data.wind10)
     assert not any(ace_acc != ace_fct), "accessor output differs from function output"
 
     ## - pace
-    pace_acc, model_acc = data.hrcn.get_pace(pressure_name="pressure", wind_name="wind")
-    pace_fct, model_fct = huracanpy.utils.ace.get_pace(data.pressure, data.wind)
+    pace_acc = data.hrcn.get_pace(pressure_name="slp", wind_name="wind10")
+    pace_fct, model_fct = huracanpy.utils.ace.get_pace(data.slp, data.wind10)
     assert not any(pace_acc != pace_fct), "accessor output differs from function output"
 
     ## - time components
@@ -65,13 +65,13 @@ def test_accessor():
     assert all(season_acc == season_fct), "Season component does not match"
 
     ## - SSHS category
-    sshs_acc = data.hrcn.get_sshs_cat(wind_name="wind")
-    sshs_fct = huracanpy.utils.categories.get_sshs_cat(data.wind)
+    sshs_acc = data.hrcn.get_sshs_cat(wind_name="wind10")
+    sshs_fct = huracanpy.utils.category.get_sshs_cat(data.wind10)
     assert all(sshs_acc == sshs_fct), "SSHS category output does not match"
 
     ## - Pressure category
     pressure_cat_acc = data.hrcn.get_pressure_cat(slp_name="slp")
-    pressure_cat_fct = huracanpy.utils.categories.get_pressure_cat(data.slp)
+    pressure_cat_fct = huracanpy.utils.category.get_pressure_cat(data.slp)
     assert all(
         pressure_cat_acc == pressure_cat_fct
     ), "Pressure category output does not match"