Move is_night to Orbit class

dorado/scheduling/models.py

@@ -14,8 +14,6 @@
 from astropy_healpix import HEALPix
 import numpy as np
 
-from .constraints import OrbitNightConstraint
-
 
 class SurveyModel():
     def __init__(self,
@@ -49,22 +47,6 @@ def __init__(self,
             (self.number_of_orbits * self.mission.orbit.period /
              self.time_step_duration).to_value(u.dimensionless_unscaled))
 
-    def is_night(self, time):
-        """Determine if the spacecraft is in orbit night.
-
-        Parameters
-        ----------
-        time : :class:`astropy.time.Time`
-            The time of the observation.
-
-        Returns
-        -------
-        bool, :class:`np.ndarray`
-            True when the spacecraft is in orbit night, False otherwise.
-        """
-        return OrbitNightConstraint().compute_constraint(
-            time, Observer(self.mission.orbit(time).earth_location))
-
     def _observable(self, time, location):
         return is_event_observable(
             self.mission.constraints,

dorado/scheduling/orbit.py

@@ -6,12 +6,15 @@
 # SPDX-License-Identifier: NASA-1.3
 #
 """Spacecraft orbit."""
+from astroplan import Observer
 from astropy.coordinates import SkyCoord, TEME
 from astropy import units as u
 from astropy.utils.data import get_readable_fileobj
 import numpy as np
 from sgp4.api import Satrec, SGP4_ERRORS
 
+from .constraints import OrbitNightConstraint
+
 __all__ = ('Orbit',)
 
 
@@ -110,3 +113,19 @@ def __call__(self, time):
         else:
             coord = coord[0]
         return coord
+
+    def is_night(self, time):
+        """Determine if the spacecraft is in orbit night.
+
+        Parameters
+        ----------
+        time : :class:`astropy.time.Time`
+            The time of the observation.
+
+        Returns
+        -------
+        bool, :class:`np.ndarray`
+            True when the spacecraft is in orbit night, False otherwise.
+        """
+        return OrbitNightConstraint().compute_constraint(
+            time, Observer(self(time).earth_location))