[uss_qualifier/rid] NET0470 OperatorID, UAS ID, Operator Location, Operator Altitude, Operational Status, Current Position, Height, Timestamp, Track, Speed checks

monitoring/mock_uss/riddp/clustering.py

@@ -10,7 +10,9 @@
 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):

monitoring/mock_uss/riddp/routes_observation.py

@@ -1,23 +1,29 @@
 from typing import Dict, List, Optional, Tuple
-
 import arrow
 import flask
 from loguru import logger
 import s2sphere
 from uas_standards.astm.f3411.v19.api import ErrorResponse
 from uas_standards.astm.f3411.v19.constants import Scope
-
+from uas_standards.astm.f3411.v22a.constants import (
+    MaxSpeed,
+    MinHeightResolution,
+    MinTrackDirectionResolution,
+)
 from monitoring.monitorlib import geo
 from monitoring.monitorlib.fetch import rid as fetch
-from monitoring.monitorlib.fetch.rid import Flight, FetchedISAs
+from monitoring.monitorlib.fetch.rid import Flight, FetchedISAs, Position
 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,
+)
 from monitoring.mock_uss import webapp
 from monitoring.mock_uss.auth import requires_scope
 from . import clustering, database, utm_client
 from .behavior import DisplayProviderBehavior
 from .config import KEY_RID_VERSION
 from .database import db
+from monitoring.monitorlib.formatting import _limit_resolution
 
 
 def _make_flight_observation(
@@ -55,10 +61,27 @@ def _make_flight_observation(
         paths.append(current_path)
 
     p = flight.most_recent_position
+    timestamp = p.time.replace(
+        microsecond=round(
+            _limit_resolution(p.time.microsecond, pow(10, 5))
+        )  # Microsecond is very strict on the expected size and format, thus the round.
+    )
+    current_state = observation_api.CurrentState(
+        timestamp=timestamp.isoformat(),
+        operational_status=flight.operational_status,
+        track=_limit_resolution(flight.track, MinTrackDirectionResolution),
+        speed=_limit_resolution(flight.speed, MaxSpeed),
+    )
+    h = p.get("height")
+    if h:
+        h.distance = _limit_resolution(h.distance, MinHeightResolution)
     return observation_api.Flight(
         id=flight.id,
-        most_recent_position=observation_api.Position(lat=p.lat, lng=p.lng, alt=p.alt),
+        most_recent_position=observation_api.Position(
+            lat=p.lat, lng=p.lng, alt=p.alt, height=h
+        ),
         recent_paths=[observation_api.Path(positions=path) for path in paths],
+        current_state=current_state,
     )
 
 
@@ -159,9 +182,35 @@ def riddp_display_data() -> Tuple[str, int]:
 @requires_scope([Scope.Read])
 def riddp_flight_details(flight_id: str) -> Tuple[str, int]:
     """Implements get flight details endpoint per automated testing API."""
-
     tx = db.value
-    if flight_id not in tx.flights:
-        return 'Flight "{}" not found'.format(flight_id), 404
+    flight_info = tx.flights.get(flight_id)
+    if not flight_info:
+        return f'Flight "{flight_id}" not found', 404
 
-    return flask.jsonify(observation_api.GetDetailsResponse())
+    rid_version: RIDVersion = webapp.config[KEY_RID_VERSION]
+    flight_details = fetch.flight_details(
+        flight_info.flights_url, flight_id, True, rid_version, utm_client
+    )
+    if rid_version == RIDVersion.f3411_19:
+        # TODO: Implement details for F3411-19
+        return flask.jsonify(
+            observation_api.GetDetailsResponse(operator=observation_api.Operator())
+        )
+    elif rid_version == RIDVersion.f3411_22a:
+        details = flight_details.details
+        result = observation_api.GetDetailsResponse(
+            operator=observation_api.Operator(
+                id=details.operator_id,
+                location=details.operator_location.position,
+                altitude=observation_api.OperatorAltitude(
+                    altitude=details.operator_location.get("altitude"),
+                    altitude_type=details.operator_location.get("altitude_type"),
+                ),
+            ),
+            uas=observation_api.UAS(
+                id=details.arbitrary_uas_id,
+            ),
+        )
+        return flask.jsonify(result)
+    else:
+        return f"Support for RID version {rid_version} not yet implemented", 501

monitoring/monitorlib/fetch/rid.py

@@ -10,6 +10,7 @@
 import uas_standards.astm.f3411.v22a.api
 import uas_standards.astm.f3411.v22a.constants
 import yaml
+from uas_standards.astm.f3411.v22a.api import RIDHeight
 from yaml.representer import Representer
 
 from monitoring.monitorlib import fetch, rid_v1, rid_v2, geo
@@ -149,17 +150,21 @@ class Position(ImplicitDict):
     time: datetime.datetime
     """Timestamp for the position."""
 
+    height: Optional[RIDHeight]
+
     @staticmethod
     def from_v19_rid_aircraft_position(
         p: v19.api.RIDAircraftPosition, t: v19.api.StringBasedDateTime
     ) -> Position:
-        return Position(lat=p.lat, lng=p.lng, alt=p.alt, time=t.datetime)
+        return Position(lat=p.lat, lng=p.lng, alt=p.alt, time=t.datetime, height=None)
 
     @staticmethod
     def from_v22a_rid_aircraft_position(
         p: v22a.api.RIDAircraftPosition, t: v22a.api.StringBasedDateTime
     ) -> Position:
-        return Position(lat=p.lat, lng=p.lng, alt=p.alt, time=t.datetime)
+        return Position(
+            lat=p.lat, lng=p.lng, alt=p.alt, time=t.datetime, height=p.get("height")
+        )
 
 
 class Flight(ImplicitDict):
@@ -211,7 +216,7 @@ def most_recent_position(
                 )
             else:
                 raise NotImplementedError(
-                    f"Cannot retrieve most recent position using RID version {self.rid_version}"
+                    f"Cannot retrieve most_recent_position using RID version {self.rid_version}"
                 )
         else:
             return None
@@ -230,7 +235,42 @@ def recent_positions(self) -> List[Position]:
             ]
         else:
             raise NotImplementedError(
-                f"Cannot retrieve recent positions using RID version {self.rid_version}"
+                f"Cannot retrieve recent_positions using RID version {self.rid_version}"
+            )
+
+    @property
+    def operational_status(self) -> v22a.api.RIDOperationalStatus:
+        if self.rid_version == RIDVersion.f3411_19:
+            return v22a.api.RIDOperationalStatus(
+                self.v19_value.current_state.operational_status
+            )
+        elif self.rid_version == RIDVersion.f3411_22a:
+            return self.v22a_value.current_state.operational_status
+        else:
+            raise NotImplementedError(
+                f"Cannot retrieve operational_status using RID version {self.rid_version}"
+            )
+
+    @property
+    def track(self):
+        if self.rid_version == RIDVersion.f3411_19:
+            return self.v19_value.current_state.track
+        elif self.rid_version == RIDVersion.f3411_22a:
+            return self.v22a_value.current_state.track
+        else:
+            raise NotImplementedError(
+                f"Cannot retrieve track using RID version {self.rid_version}"
+            )
+
+    @property
+    def speed(self):
+        if self.rid_version == RIDVersion.f3411_19:
+            return self.v19_value.current_state.speed
+        elif self.rid_version == RIDVersion.f3411_22a:
+            return self.v22a_value.current_state.speed
+        else:
+            raise NotImplementedError(
+                f"Cannot retrieve speed using RID version {self.rid_version}"
             )
 
     def errors(self) -> List[str]:
@@ -321,6 +361,57 @@ def raw(
     def id(self) -> str:
         return self.raw.id
 
+    @property
+    def operator_id(self) -> str:
+        if self.rid_version == RIDVersion.f3411_19:
+            return self.v19_value.operator_id
+        elif self.rid_version == RIDVersion.f3411_22a:
+            return self.v22a_value.operator_id
+        else:
+            raise NotImplementedError(
+                f"Cannot retrieve operator_id using RID version {self.rid_version}"
+            )
+
+    @property
+    def arbitrary_uas_id(self) -> Optional[str]:
+        """Returns a UAS id as a plain string without type hint.
+        If multiple are provided:
+        For v19, registration_number is returned if set, else it falls back to the serial_number.
+        For v20, the order of ASTM F3411-v19 Table 1 is used.
+        If no match, it returns None.
+        """
+        if self.rid_version == RIDVersion.f3411_19:
+            registration_number = self.v19_value.registration_number
+            if registration_number:
+                return registration_number
+            else:
+                return self.v19_value.serial_number
+        elif self.rid_version == RIDVersion.f3411_22a:
+            uas_id = self.v22a_value.uas_id
+            if uas_id.serial_number:
+                return uas_id.serial_number
+            elif uas_id.registration_id:
+                return uas_id.registration_id
+            elif uas_id.utm_id:
+                return uas_id.utm_id
+            elif uas_id.specific_session_id:
+                return uas_id.specific_session_id
+        else:
+            raise NotImplementedError(
+                f"Cannot retrieve plain_uas_id using RID version {self.rid_version}"
+            )
+
+    @property
+    def operator_location(self) -> v22a.api.OperatorLocation:
+        if self.rid_version == RIDVersion.f3411_19:
+            return v22a.api.OperatorLocation(position=self.v19_value.operator_location)
+        elif self.rid_version == RIDVersion.f3411_22a:
+            return self.v22a_value.operator_location
+        else:
+            raise NotImplementedError(
+                f"Cannot retrieve operator_location using RID version {self.rid_version}"
+            )
+
 
 class Subscription(ImplicitDict):
     """Version-independent representation of a F3411 subscription."""

monitoring/monitorlib/formatting.py

@@ -141,3 +141,8 @@ def make_datetime(t) -> datetime.datetime:
         return arrow.get(t).datetime
     else:
         raise ValueError("Could not convert {} to datetime".format(str(type(t))))
+
+
+def _limit_resolution(value: float, resolution: float):
+    """Change resolution of a value"""
+    return round(value / resolution) * resolution

monitoring/monitorlib/geo.py

@@ -50,6 +50,12 @@ class Altitude(ImplicitDict):
     reference: AltitudeDatum
     units: DistanceUnits
 
+    @staticmethod
+    def w84m(value: Optional[float]):
+        if not value:
+            return None
+        return Altitude(value=value, reference=AltitudeDatum.W84, units=DistanceUnits.M)
+
 
 class Volume3D(ImplicitDict):
     outline_circle: Optional[Circle] = None

monitoring/monitorlib/rid_automated_testing/observation_api.py

@@ -1,37 +1 @@
-from typing import List, Optional
-
-from implicitdict import ImplicitDict
-
-
-# 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(ImplicitDict):
-    pass
-
-
-class GetDisplayDataResponse(ImplicitDict):
-    flights: List[Flight] = []
-    clusters: List[Cluster] = []
+# Replaced by uas_standards package

monitoring/uss_qualifier/resources/netrid/observers.py

@@ -8,7 +8,9 @@
 from monitoring.monitorlib.fetch import QueryType
 from monitoring.monitorlib.infrastructure import UTMClientSession
 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,
+)
 from monitoring.uss_qualifier.resources.resource import Resource
 from monitoring.uss_qualifier.resources.communications import AuthAdapterResource
 
@@ -85,7 +87,8 @@ def observe_flight_details(
                 if query.status_code == 200
                 else None
             )
-        except ValueError:
+        except ValueError as e:
+            logger.error("Error parsing observation details response: {}", e)
             result = None
         return result, query
 

monitoring/uss_qualifier/resources/netrid/simulation/operator_flight_details.py

@@ -37,6 +37,7 @@ def generate_operation_description(self):
         return self.random.choice(operation_description)
 
     def generate_operator_location(self, centroid):
+        # TODO: Inject operator location altitude
         operator_location = LatLngPoint(lat=centroid.y, lng=centroid.x)
         return operator_location