From d017d41c189b79886677c3c08f7165e12f541852 Mon Sep 17 00:00:00 2001 From: Michael Barroco Date: Wed, 13 Sep 2023 18:47:54 +0200 Subject: [PATCH] Replace monitorlib observation_api by uas_standards --- monitoring/mock_uss/riddp/clustering.py | 2 +- .../rid_automated_testing/observation_api.py | 40 +------------------ 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/monitoring/mock_uss/riddp/clustering.py b/monitoring/mock_uss/riddp/clustering.py index e0f6ce8332..78ec8d39a2 100644 --- a/monitoring/mock_uss/riddp/clustering.py +++ b/monitoring/mock_uss/riddp/clustering.py @@ -10,7 +10,7 @@ from implicitdict import ImplicitDict from monitoring.monitorlib.rid import RIDVersion -from monitoring.monitorlib.rid_automated_testing import observation_api +from uas_standards.interuss.automated_testing.rid.v1 import observation as observation_api class Point(object): diff --git a/monitoring/monitorlib/rid_automated_testing/observation_api.py b/monitoring/monitorlib/rid_automated_testing/observation_api.py index 6ae120ac71..45086671fd 100644 --- a/monitoring/monitorlib/rid_automated_testing/observation_api.py +++ b/monitoring/monitorlib/rid_automated_testing/observation_api.py @@ -1,39 +1 @@ -from typing import List, Optional - -from implicitdict import ImplicitDict -from uas_standards.astm.f3411 import v22a - - -# Mirrors of types defined in remote ID automated testing observation API - - -class Position(ImplicitDict): - lat: float - lng: float - alt: Optional[float] - - -class Path(ImplicitDict): - positions: List[Position] - - -class Cluster(ImplicitDict): - corners: List[Position] - area_sqm: float - number_of_flights: int - - -class Flight(ImplicitDict): - id: str - most_recent_position: Optional[Position] - recent_paths: Optional[List[Path]] - - -class GetDetailsResponse(v22a.api.RIDFlightDetails): - # TODO: Update automated_testing_interface instead of using the ASTM details response schema - pass - - -class GetDisplayDataResponse(ImplicitDict): - flights: List[Flight] = [] - clusters: List[Cluster] = [] +# Replaced by uas_standards definitions