make astroplan look for the next sunrise/sunset from the given time i…

…n get_daynight_ratio
atmorling · May 17, 2024 · 0e1ca74 · 0e1ca74
1 parent 29f6fda
commit 0e1ca74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ecoscope/base/base.py b/ecoscope/base/base.py
@@ -416,6 +416,7 @@ def get_daynight_ratio(self, n_grid_points=150) -> pd.Series:
                 .sun_rise_time(
                     astropy.time.Time(night_day_df.segment_start),
                     n_grid_points=n_grid_points,
+                    which="next",
                 )
                 .datetime,
                 utc=True,
@@ -435,6 +436,7 @@ def get_daynight_ratio(self, n_grid_points=150) -> pd.Series:
                 .sun_set_time(
                     astropy.time.Time(day_night_df.segment_start),
                     n_grid_points=n_grid_points,
+                    which="next",
                 )
                 .datetime,
                 utc=True,

diff --git a/tests/test_base.py b/tests/test_base.py
@@ -148,14 +148,12 @@ def test_sampling(movebank_relocations):
     gpd.testing.assert_geodataframe_equal(downsampled_relocs_int, expected_downsample_int, check_less_precise=True)
 
 
-@pytest.mark.skip(reason="Skipped pending rework https://github.com/wildlife-dynamics/ecoscope/issues/152")
-@pytest.mark.filterwarnings("ignore:Target with index", 'ignore: ERFA function "utctai"')
 def test_daynight_ratio(movebank_relocations):
     trajectory = ecoscope.base.Trajectory.from_relocations(movebank_relocations)
     expected = pd.Series(
         [
             2.212816,
-            0.638830,
+            0.656435,
         ],
         index=pd.Index(["Habiba", "Salif Keita"], name="groupby_col"),
     )