open-space-toolkit-astrodynamics 16.7.1__py39-none-manylinux2014_x86_64.whl → 16.7.3__py39-none-manylinux2014_x86_64.whl

{open_space_toolkit_astrodynamics-16.7.1.dist-info → open_space_toolkit_astrodynamics-16.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: open-space-toolkit-astrodynamics
-Version: 16.7.1
+Version: 16.7.3
 Summary: Orbit, attitude, access.
 Author: Open Space Collective
 Author-email: contact@open-space-collective.org

{open_space_toolkit_astrodynamics-16.7.1.dist-info → open_space_toolkit_astrodynamics-16.7.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
 ostk/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
-ostk/astrodynamics/OpenSpaceToolkitAstrodynamicsPy.cpython-39-x86_64-linux-gnu.so,sha256=3_OBMoc6Pxt8REFzfQwqZtv1btU4TBUBswozZiMZG1Y,2980256
+ostk/astrodynamics/OpenSpaceToolkitAstrodynamicsPy.cpython-39-x86_64-linux-gnu.so,sha256=Twmz5G1ykkUVE8kEwccYyUoXqljAqLO-e6THUV0xzCc,2980256
 ostk/astrodynamics/__init__.py,sha256=3gWyqFIbhAfcdeMhmfBPQPlPQTmaOzm-6flkJe745Zk,251
-ostk/astrodynamics/__init__.pyi,sha256=XWkCMyodZw1DS4P7xFaFRjo6q8qPYVWJU6caKIQsBok,32224
-ostk/astrodynamics/access.pyi,sha256=t2CF0TU6_6ow_rkV_I4rVKap7ZIdC4jYKL3WkTDHRXg,25157
+ostk/astrodynamics/__init__.pyi,sha256=tsr8hkEyFBjbprq2pxcxhxzWZPwfL2JBa3mSNfThIDw,32224
+ostk/astrodynamics/access.pyi,sha256=pp2t81kKH4sP4BcGb8nAZHmpwhISjFODMpbZ4ucLFAw,25157
 ostk/astrodynamics/converters.py,sha256=luPh30qMp9bzEkN7hUccmxlLf7zRp_AzqmBe8IUjPhU,3314
 ostk/astrodynamics/converters.pyi,sha256=HrZFyizkc6Hv_K38ZKZ80fX_bAxd6keA_NFWNQygvbs,1745
 ostk/astrodynamics/dataframe.py,sha256=v-36rBHKdf7kQw1jdvJWrvkR-ZjW5DKRchtTEJWhdxk,25012
-ostk/astrodynamics/display.py,sha256=LZESZgx2wlrFO4cwAGMb3VPJfdtcjNgCgKFrqot0NYU,6339
+ostk/astrodynamics/display.py,sha256=D9PrX1G-XmXk2j3Jl7Na7q52PTc4WKWB1-oRFJPT6w0,8606
 ostk/astrodynamics/dynamics.pyi,sha256=gZ95KoGex4SB-1z6yMrngkZN1Ir9X6bEmrZgdLxq1ZE,13270
 ostk/astrodynamics/eclipse.pyi,sha256=Q8fzdukA7fyxbUM3wjEXAHukT-Ovl4FM00NbjsMPnUM,3211
 ostk/astrodynamics/estimator.pyi,sha256=MnahWzp8aACxrNKWlYRsgQr5zpBxogNr-yPm7hJob5k,14000
 ostk/astrodynamics/event_condition.pyi,sha256=2c_1Sq7tkYKeAA_aRWBi43KDQXXxu6EMSmUpEWz_Fa4,45814
 ostk/astrodynamics/guidance_law.pyi,sha256=rVmbpV2Y5FsIXejaInxINS67nVHmTIxVEkhaDIn17SA,12171
-ostk/astrodynamics/libopen-space-toolkit-astrodynamics.so.16,sha256=t_qeaFkF1EQVdxB4zBfGjMZDsANcsQP2Eb4bm-fKZTQ,127462728
+ostk/astrodynamics/libopen-space-toolkit-astrodynamics.so.16,sha256=lyI6yjgxxfXRXbY2uOmW5YtETg3vCjEUtZbZLd2zsII,130575872
 ostk/astrodynamics/solver.pyi,sha256=dRdR9RLqwSaBBX_ZRmpeBv06WvM_BFNo3WUdNzorYTY,17805
 ostk/astrodynamics/utilities.py,sha256=y8mr3M46J5z-GhS1oIEnuEJA6otwcyJ9YDhvn_5JxHM,6976
 ostk/astrodynamics/viewer.py,sha256=SlKyOWKjaF3V9HFB3I7ZgHy7n_GLeHTWM9q2wXkpxe8,27077
@@ -34,7 +34,7 @@ ostk/astrodynamics/test/conftest.py,sha256=stmQOt7UXjBlXKJzNN6RkS2miv1xXSOX-YNpF
 ostk/astrodynamics/test/test_access.py,sha256=MCBsUPtuVm7NgHZR0z0DpWnPZ_qBu4aRhLI2PnRNUYs,3940
 ostk/astrodynamics/test/test_converters.py,sha256=mFpDD0YM8o356lj91GGIwYdMk2ut6xZFV3uYcgZepMY,8744
 ostk/astrodynamics/test/test_dataframe.py,sha256=NddmwnV8R1QgTD_iLXn_h0xK2kP5Qk22Oh93hF6KjT0,38300
-ostk/astrodynamics/test/test_display.py,sha256=CQEz66OZna6W8_ZIEVCPKAH-cM9YjzCOGpoINqC8m40,3840
+ostk/astrodynamics/test/test_display.py,sha256=jQ94OeLPlcKzzSLgLTujr9ew9T2uwGZMijS_jHBJAGA,6529
 ostk/astrodynamics/test/test_event_condition.py,sha256=fQ-rVYpQsa7xacxRMBOQDyn61CuAGX1QBOGZxGWR0_s,2204
 ostk/astrodynamics/test/test_import.py,sha256=py_hALBR0IYuUzv9dfgQZzrrLHJIpnyKvt3Oi1XBqCg,1251
 ostk/astrodynamics/test/test_root_solver.py,sha256=hQ8O6g-WP49gZH_H3Rdufv0F0gQorpzJyIcjBGGUQ34,1831
@@ -138,8 +138,8 @@ ostk/astrodynamics/trajectory/orbit/model/kepler.pyi,sha256=KL-FwPbG4OUkPjhQb1Pa
 ostk/astrodynamics/trajectory/orbit/model/sgp4.pyi,sha256=OhFzoPPQHlYy7m3LiZ8TXF89M4uBTfNk6tGsBEp0sjI,14235
 ostk/astrodynamics/trajectory/state/__init__.pyi,sha256=bq__Fii35czVrTeNxc9eQVjXdqwbbQxUdNQWK3vLrMo,17649
 ostk/astrodynamics/trajectory/state/coordinate_subset.pyi,sha256=kYMfMwEjCqO1NepMYFT4QS6kIPBkVL6sGCLeLbogcMw,10176
-open_space_toolkit_astrodynamics-16.7.1.dist-info/METADATA,sha256=XO8JRdEPgLt74YCe3W0vBpqU3tW5zeDVLgbrpbNytZA,1913
-open_space_toolkit_astrodynamics-16.7.1.dist-info/WHEEL,sha256=Lf7t-kOlAeOyExg08NFEPC9xn1Q2CLFgwDRGfj0NsM4,109
-open_space_toolkit_astrodynamics-16.7.1.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
-open_space_toolkit_astrodynamics-16.7.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-open_space_toolkit_astrodynamics-16.7.1.dist-info/RECORD,,
+open_space_toolkit_astrodynamics-16.7.3.dist-info/METADATA,sha256=H13jmIAfCL_DeIh7ndH-8RXPpwKaXmWkhBkMGDbgNlE,1913
+open_space_toolkit_astrodynamics-16.7.3.dist-info/WHEEL,sha256=Lf7t-kOlAeOyExg08NFEPC9xn1Q2CLFgwDRGfj0NsM4,109
+open_space_toolkit_astrodynamics-16.7.3.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
+open_space_toolkit_astrodynamics-16.7.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+open_space_toolkit_astrodynamics-16.7.3.dist-info/RECORD,,

ostk/astrodynamics/__init__.pyi

@@ -5,8 +5,8 @@ from ostk.astrodynamics.trajectory import State as PyState
 from ostk import core as OpenSpaceToolkitCorePy
 from ostk.core import container
 from ostk.core import filesystem
-from ostk.core import type
 import ostk.core.type
+from ostk.core import type
 from ostk import io as OpenSpaceToolkitIOPy
 from ostk.io import URL
 from ostk.io import ip
@@ -19,13 +19,13 @@ from ostk import physics as OpenSpaceToolkitPhysicsPy
 from ostk.physics import Environment
 from ostk.physics import Manager
 from ostk.physics import Unit
-import ostk.physics.coordinate
 from ostk.physics import coordinate
+import ostk.physics.coordinate
 import ostk.physics.coordinate.spherical
 from ostk.physics import environment
 import ostk.physics.environment.object
-import ostk.physics.time
 from ostk.physics import time
+import ostk.physics.time
 from ostk.physics import unit
 import ostk.physics.unit
 import typing

ostk/astrodynamics/access.pyi

@@ -491,7 +491,7 @@ class VisibilityCriterion:
                         Creates a visibility criterion from an elevation interval.
         
                         Args:
-                            elevation_interval (RealInterval): The elevation interval in radians.
+                            elevation_interval (RealInterval): The elevation interval in degrees.
         
                         Returns:
                             VisibilityCriterion: The visibility criterion instance.

ostk/astrodynamics/display.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import warnings
 from typing import Any
 
 import pandas as pd
@@ -10,13 +11,11 @@ import plotly.graph_objs as go
 
 from ostk.mathematics.object import RealInterval
 
-from ostk.physics.coordinate import Position
 from ostk.physics.coordinate import Frame
 from ostk.physics.coordinate.spherical import LLA
 from ostk.physics.environment.object import Celestial
 from ostk.physics.time import Duration
 from ostk.physics.time import Instant
-from ostk.physics.unit import Length
 
 from ostk.astrodynamics import Access
 from ostk.astrodynamics import Trajectory
@@ -81,7 +80,9 @@ DEFAULT_LAYOUT_3D: go.Layout = go.Layout(
 
 
 def convert_to_ground_track_plotting_data(
-    longitude: list, latitude: list, color: str = DEFAULT_COLOR
+    longitude: list,
+    latitude: list,
+    color: str = DEFAULT_COLOR,
 ) -> go.Scattergeo:
     return go.Scattergeo(
         lon=longitude,
@@ -94,18 +95,25 @@ def convert_to_ground_track_plotting_data(
     )
 
 
-def create_plotly_figure(data: Any, layout: go.Layout) -> go.Figure:
+def create_plotly_figure(
+    data: Any,
+    layout: go.Layout,
+) -> go.Figure:
     return go.Figure(
         data=data,
         layout=layout,
     )
 
 
-def create_2d_map(data: Any) -> go.Figure:
+def create_2d_map(
+    data: Any,
+) -> go.Figure:
     return create_plotly_figure(data, DEFAULT_LAYOUT_2D)
 
 
-def create_3d_globe(data: Any) -> go.Figure:
+def create_3d_globe(
+    data: Any,
+) -> go.Figure:
     return create_plotly_figure(data, DEFAULT_LAYOUT_3D)
 
 
@@ -121,36 +129,27 @@ class AccessesPlot:
         interval: RealInterval,
         trajectory_step: Duration,
         access_step: Duration,
-        ground_station_lla: LLA,
-        color: str,
+        ground_station_lla: LLA | None = None,
+        color: str | None = None,
     ):
+        self._data = []
         self._earth = earth
         self._trajectory_grid: list[Instant] = interval.generate_grid(trajectory_step)
-        self._access_step: Instant = access_step
-        self._ned_frame: Frame = self._earth.get_frame_at(
-            ground_station_lla, self._earth.FrameType.NED
-        )
-        self._ground_station_position_ned: Position = Position(
-            [0.0, 0.0, 0.0],
-            Length.Unit.Meter,
-            self._ned_frame,
-        )
-        self._data = []
-        self._data.append(
-            dict(
-                type="scattergeo",
-                lon=[float(ground_station_lla.get_longitude().in_degrees())],
-                lat=[float(ground_station_lla.get_latitude().in_degrees())],
-                mode="markers",
-                marker=dict(
-                    size=10,
-                    color=color,
-                ),
+        self._access_step: Duration = access_step
+
+        if ground_station_lla is not None and color is not None:
+            warnings.warn(
+                "Ground station and color are deprecated; use add_ground_station instead.",
+                DeprecationWarning,
+                stacklevel=2,
             )
-        )
+            self.add_ground_station(ground_station_lla, color)
 
     def _generate_and_append_data(
-        self, data: list[list[float]], trajectory: Trajectory, grid: list[Instant]
+        self,
+        data: list[list[float]],
+        trajectory: Trajectory,
+        grid: list[Instant],
     ) -> None:
         for state in trajectory.get_states_at(grid):
             lla: LLA = LLA.cartesian(
@@ -168,7 +167,10 @@ class AccessesPlot:
             )
 
     def _append_line(
-        self, df: pd.DataFrame, width: int, rgb: list[int], alpha: float
+        self,
+        df: pd.DataFrame,
+        width: int,
+        rgb: str,
     ) -> None:
         self._data.append(
             dict(
@@ -178,30 +180,56 @@ class AccessesPlot:
                 mode="lines",
                 line=dict(
                     width=width,
-                    color=f"rgba({str(rgb[0])},{str(rgb[1])},{str(rgb[2])},{str(alpha)})",
+                    color=rgb,
                 ),
             )
         )
 
-    def add_satellite(
-        self, trajectory: Trajectory, accesses: list[Access], rgb: list[int]
+    def add_ground_station(
+        self,
+        ground_station_lla: LLA,
+        color: str | tuple[int, int, int],
     ) -> None:
         """
-        Add a satellite trajectory to the plot, including a highligh ot the interference
-        accesses.
+        Add a ground station to the plot.
+
+        Args:
+            ground_station_lla (LLA): The ground station location.
+            color (str | tuple[int, int, int]): The color of the ground station.
         """
+        if isinstance(color, (tuple, list)):
+            color = f"rgba({str(color[0])},{str(color[1])},{str(color[2])},1.0)"
 
-        # Satellite trajectory
-        satellite_trajectory_data: list[list[float]] = []
-        self._generate_and_append_data(
-            satellite_trajectory_data, trajectory, self._trajectory_grid
-        )
-        satellite_trajectory_df: pd.Dataframe = pd.DataFrame(
-            satellite_trajectory_data, columns=["Longitude", "Latitude"]
+        self._data.append(
+            dict(
+                type="scattergeo",
+                lon=[float(ground_station_lla.get_longitude().in_degrees())],
+                lat=[float(ground_station_lla.get_latitude().in_degrees())],
+                mode="markers",
+                marker=dict(
+                    size=10,
+                    color=color,
+                ),
+            )
         )
-        self._append_line(satellite_trajectory_df, 1, rgb, 0.1)
 
-        # Satellite accesses
+    def add_accesses(
+        self,
+        trajectory: Trajectory,
+        accesses: list[Access],
+        rgb: str | tuple[int, int, int],
+    ) -> None:
+        """
+        Add accesses to the plot.
+
+        Args:
+            trajectory (Trajectory): The satellite trajectory.
+            accesses (list[Access]): The list of accesses.
+            rgb (str | tuple[int, int, int]): The color of the accesses, as a string or tuple of RGB values.
+        """
+        if isinstance(rgb, (tuple, list)):
+            rgb = f"rgba({str(rgb[0])},{str(rgb[1])},{str(rgb[2])},1.0)"
+
         for access in accesses:
             satellite_access_data: list[list[float]] = []
             self._generate_and_append_data(
@@ -209,10 +237,66 @@ class AccessesPlot:
                 trajectory,
                 access.get_interval().generate_grid(self._access_step),
             )
-            satellite_access_df: pd.Dataframe = pd.DataFrame(
-                satellite_access_data, columns=["Longitude", "Latitude"]
+            satellite_access_df: pd.DataFrame = pd.DataFrame(
+                satellite_access_data,
+                columns=["Longitude", "Latitude"],
+            )
+            self._append_line(
+                satellite_access_df,
+                2,
+                rgb,
             )
-            self._append_line(satellite_access_df, 2, rgb, 1.0)
+
+    def add_satellite(
+        self,
+        trajectory: Trajectory,
+        accesses: list[Access] | None = None,
+        rgb: str | tuple[int, int, int] | None = None,
+        opacity: float = 0.3,
+    ) -> None:
+        """
+        Add a satellite trajectory to the plot. If `accesses` is provided (deprecated),
+        they will be plotted and a deprecation warning will be emitted.
+
+        Args:
+            trajectory (Trajectory): The satellite trajectory.
+            accesses (list[Access] | None, optional): (Deprecated) Accesses to plot; use add_accesses().
+            rgb (str | tuple[int, int, int] | None, optional): The color of the satellite, as a string or tuple of RGB values.
+            opacity (float, optional): Opacity of the satellite trajectory line.
+        """
+        if rgb is None:
+            rgb = f"rgba(255, 0, 0, {opacity})"
+
+        elif isinstance(rgb, (tuple, list)):
+            rgb = f"rgba({str(rgb[0])},{str(rgb[1])},{str(rgb[2])},{opacity})"
+
+        if accesses is not None:
+            warnings.warn(
+                "Passing accesses to add_satellite() is deprecated; use add_accesses() instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            self.add_accesses(
+                trajectory,
+                accesses,
+                rgb,
+            )
+
+        satellite_trajectory_data: list[list[float]] = []
+        self._generate_and_append_data(
+            satellite_trajectory_data,
+            trajectory,
+            self._trajectory_grid,
+        )
+        satellite_trajectory_df: pd.DataFrame = pd.DataFrame(
+            satellite_trajectory_data,
+            columns=["Longitude", "Latitude"],
+        )
+        self._append_line(
+            satellite_trajectory_df,
+            1,
+            rgb,
+        )
 
     def show(self):
         """

ostk/astrodynamics/test/test_display.py

@@ -1,10 +1,9 @@
 # Apache License 2.0
 
-from ostk.mathematics.object import RealInterval
+import pytest
 
 from ostk.physics import Environment
 from ostk.physics.coordinate import Position
-from ostk.physics.coordinate import Frame
 from ostk.physics.coordinate.spherical import LLA
 from ostk.physics.environment.object import Celestial
 from ostk.physics.time import DateTime
@@ -20,99 +19,207 @@ from ostk.astrodynamics.access import Generator as AccessGenerator
 from ostk.astrodynamics.trajectory import Orbit
 from ostk.astrodynamics.trajectory.orbit.model import SGP4
 from ostk.astrodynamics.trajectory.orbit.model.sgp4 import TLE
+from ostk.astrodynamics import Access
 from ostk.astrodynamics.access import AccessTarget
 from ostk.astrodynamics.access import VisibilityCriterion
 
 
-class TestDisplay:
-    def test_accesses_plot(self):
-        start_instant: Instant = Instant.date_time(
-            DateTime(2023, 1, 3, 0, 0, 0),
-            Scale.UTC,
-        )
-        duration: Duration = Duration.hours(1.0)
-        step: Duration = Duration.seconds(10.0)
-        tolerance: Duration = Duration.seconds(1.0)
-
-        ground_station_lla: LLA = LLA(
-            Angle.degrees(70.0),
-            Angle.degrees(160.0),
-            Length.meters(0.0),
-        )
-
-        tle_1 = TLE(
-            "1 55076U 23001BV  23146.17959645  .00004328  00000-0  23719-3 0  9993",
-            "2 55076  97.4793 205.9529 0016244  89.9523 270.3571 15.14609100 21723",
-        )
-
-        tle_2 = TLE(
-            "1 48915U 21059AN  23146.32782040  .00004955  00000-0  24678-3 0  9999",
-            "2 48915  97.5954 279.7041 0010303 354.9434   5.1694 15.18004448105867",
-        )
-
-        environment: Environment = Environment.default()
-        earth: Celestial = environment.access_celestial_object_with_name("Earth")
-
-        visibility_criterion: VisibilityCriterion = (
-            VisibilityCriterion.from_line_of_sight(environment)
-        )
-
-        access_target: AccessTarget = AccessTarget.from_position(
-            visibility_criterion,
-            Position.meters(
-                ground_station_lla.to_cartesian(
-                    earth.get_equatorial_radius(),
-                    earth.get_flattening(),
-                ),
-                Frame.ITRF(),
-            ),
-        )
-
-        stop_instant: Instant = start_instant + duration
-        search_interval: RealInterval = Interval.closed(start_instant, stop_instant)
-
-        orbit_1: Orbit = Orbit(SGP4(tle_1), earth)
-        orbit_2: Orbit = Orbit(SGP4(tle_2), earth)
-
-        generator = AccessGenerator(
-            environment=environment,
-            step=step,
-            tolerance=tolerance,
-        )
-
-        accesses_1 = generator.compute_accesses(
-            interval=search_interval,
-            access_target=access_target,
-            to_trajectory=orbit_1,
-        )
-
-        assert len(accesses_1) > 0
+@pytest.fixture
+def environment() -> Environment:
+    return Environment.default()
+
+
+@pytest.fixture
+def earth(environment: Environment) -> Celestial:
+    return environment.access_celestial_object_with_name("Earth")
+
+
+@pytest.fixture
+def search_interval() -> Interval:
+    start_instant: Instant = Instant.date_time(
+        DateTime(2023, 1, 3, 0, 0, 0),
+        Scale.UTC,
+    )
+    duration: Duration = Duration.hours(1.0)
+    stop_instant: Instant = start_instant + duration
+    return Interval.closed(start_instant, stop_instant)
+
+
+@pytest.fixture
+def access_plot() -> display.AccessesPlot:
+    return display.AccessesPlot(
+        earth=earth,
+        interval=search_interval,
+        trajectory_step=Duration.minutes(5.0),
+        access_step=Duration.seconds(10.0),
+    )
+
+
+@pytest.fixture
+def satellite_1_trajectory(earth: Celestial) -> Orbit:
+    tle_1 = TLE(
+        "1 55076U 23001BV  23146.17959645  .00004328  00000-0  23719-3 0  9993",
+        "2 55076  97.4793 205.9529 0016244  89.9523 270.3571 15.14609100 21723",
+    )
+    return Orbit(SGP4(tle_1), earth)
+
+
+@pytest.fixture
+def satellite_2_trajectory(earth: Celestial) -> Orbit:
+    tle_2 = TLE(
+        "1 48915U 21059AN  23146.32782040  .00004955  00000-0  24678-3 0  9999",
+        "2 48915  97.5954 279.7041 0010303 354.9434   5.1694 15.18004448105867",
+    )
+    return Orbit(SGP4(tle_2), earth)
+
+
+@pytest.fixture
+def ground_station_lla() -> LLA:
+    return LLA(
+        Angle.degrees(70.0),
+        Angle.degrees(160.0),
+        Length.meters(0.0),
+    )
+
+
+@pytest.fixture
+def access_target(
+    environment: Environment,
+    ground_station_lla: LLA,
+) -> AccessTarget:
+    return AccessTarget.from_position(
+        VisibilityCriterion.from_line_of_sight(environment),
+        Position.from_lla(
+            ground_station_lla,
+            environment.access_celestial_object_with_name("Earth"),
+        ),
+    )
+
+
+@pytest.fixture
+def access_generator(environment: Environment) -> AccessGenerator:
+    return AccessGenerator(
+        environment=environment,
+        step=Duration.seconds(10.0),
+        tolerance=Duration.seconds(1.0),
+    )
+
+
+@pytest.fixture
+def satellite_1_accesses(
+    satellite_1_trajectory: Orbit,
+    environment: Environment,
+    search_interval: Interval,
+    access_target: AccessTarget,
+    access_generator: AccessGenerator,
+) -> list[Access]:
+    return access_generator.compute_accesses(
+        interval=search_interval,
+        access_target=access_target,
+        to_trajectory=satellite_1_trajectory,
+    )
+
+
+@pytest.fixture
+def satellite_2_accesses(
+    satellite_2_trajectory: Orbit,
+    environment: Environment,
+    search_interval: Interval,
+    access_target: AccessTarget,
+    access_generator: AccessGenerator,
+) -> list[Access]:
+    return access_generator.compute_accesses(
+        interval=search_interval,
+        access_target=access_target,
+        to_trajectory=satellite_2_trajectory,
+    )
 
-        accesses_2 = generator.compute_accesses(
-            interval=search_interval,
-            access_target=access_target,
-            to_trajectory=orbit_2,
-        )
 
-        assert len(accesses_2) > 0
+class TestDisplay:
+    def test_accesses_plot(
+        self,
+        environment: Environment,
+        earth: Celestial,
+        search_interval: Interval,
+        access_target: AccessTarget,
+        ground_station_lla: LLA,
+        satellite_1_trajectory: Orbit,
+        satellite_2_trajectory: Orbit,
+        satellite_1_accesses: list[Access],
+        satellite_2_accesses: list[Access],
+    ):
 
         accesses_plot = display.AccessesPlot(
             earth=earth,
             interval=search_interval,
             trajectory_step=Duration.minutes(5.0),
             access_step=Duration.seconds(10.0),
-            ground_station_lla=ground_station_lla,
-            color="green",
         )
 
         accesses_plot.add_satellite(
-            trajectory=orbit_1,
-            accesses=accesses_1,
+            trajectory=satellite_1_trajectory,
             rgb=[180, 0, 0],
         )
 
         accesses_plot.add_satellite(
-            trajectory=orbit_2,
-            accesses=accesses_2,
+            trajectory=satellite_2_trajectory,
             rgb=[0, 0, 180],
         )
+
+        accesses_plot.add_accesses(
+            trajectory=satellite_1_trajectory,
+            accesses=satellite_1_accesses,
+            rgb=[180, 0, 0],
+        )
+
+        accesses_plot.add_accesses(
+            trajectory=satellite_2_trajectory,
+            accesses=satellite_2_accesses,
+            rgb=[0, 0, 180],
+        )
+
+        accesses_plot.add_ground_station(
+            ground_station_lla,
+            color="green",
+        )
+
+    def test_accesses_plot_backwards_compatibility(
+        self,
+        environment: Environment,
+        earth: Celestial,
+        search_interval: Interval,
+        access_target: AccessTarget,
+        satellite_1_trajectory: Orbit,
+        satellite_2_trajectory: Orbit,
+        satellite_1_accesses: list[Access],
+        satellite_2_accesses: list[Access],
+        ground_station_lla: LLA,
+    ):
+        with pytest.warns(
+            DeprecationWarning,
+            match="Ground station and color are deprecated",
+        ):
+            accesses_plot = display.AccessesPlot(
+                earth=earth,
+                interval=search_interval,
+                trajectory_step=Duration.minutes(5.0),
+                access_step=Duration.seconds(10.0),
+                ground_station_lla=ground_station_lla,
+                color="green",
+            )
+
+        with pytest.warns(
+            DeprecationWarning,
+            match="Passing accesses to add_satellite\(\) is deprecated.*",
+        ):
+            accesses_plot.add_satellite(
+                trajectory=satellite_1_trajectory,
+                accesses=satellite_1_accesses,
+                rgb=[180, 0, 0],
+            )
+
+            accesses_plot.add_satellite(
+                trajectory=satellite_2_trajectory,
+                accesses=satellite_2_accesses,
+                rgb=[0, 0, 180],
+            )