Merge branch 'main' into user-notifications-missing-fields

monitoring/mock_uss/interaction_logging/logger.py

@@ -80,7 +80,7 @@ def interaction_log_after_request(response):
     if (
         "/uss/v1/" in flask.request.url
         or "/uss/identification_service_areas/" in flask.request.url
-        or "/uss/flights/" in flask.request.url
+        or "/uss/flights" in flask.request.url
     ):
         query = describe_flask_query(flask.request, response, elapsed_s)
         log_interaction(QueryDirection.Incoming, query)

monitoring/monitorlib/geo.py

@@ -644,6 +644,17 @@ def egm96_geoid_offset(p: s2sphere.LatLng) -> float:
     return _egm96.ev(-lat, lng)
 
 
+def center_of_mass(in_points: List[LatLng]) -> LatLng:
+    """Compute the center of mass of a polygon defined by a list of points."""
+    if len(in_points) == 0:
+        raise ValueError("Cannot compute center of mass of empty polygon")
+
+    return LatLng.from_degrees(
+        sum([point.lat().degrees for point in in_points]) / len(in_points),
+        sum([point.lng().degrees for point in in_points]) / len(in_points),
+    )
+
+
 def generate_slight_overlap_area(in_points: List[LatLng]) -> List[LatLng]:
     """
     Takes a list of LatLng points and returns a list of LatLng points that represents
@@ -656,10 +667,7 @@ def generate_slight_overlap_area(in_points: List[LatLng]) -> List[LatLng]:
     overlap_corner = in_points[0]  # the spot that will have a tiny overlap
 
     # Compute the center of mass of the input polygon
-    center = LatLng.from_degrees(
-        sum([point.lat().degrees for point in in_points]) / len(in_points),
-        sum([point.lng().degrees for point in in_points]) / len(in_points),
-    )
+    center = center_of_mass(in_points)
 
     delta_lat = center.lat().degrees - overlap_corner.lat().degrees
     delta_lng = center.lng().degrees - overlap_corner.lng().degrees

monitoring/prober/infrastructure.py

@@ -100,7 +100,7 @@ def wrapper_default_scope(*args, **kwargs):
 resource_type_code_descriptions: Dict[ResourceType, str] = {}
 
 
-# Next code: 400
+# Next code: 401
 def register_resource_type(code: int, description: str) -> ResourceType:
     """Register that the specified code refers to the described resource.
 

monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml

@@ -234,6 +234,14 @@ mock_uss_instance_dp_v19:
       participant_id: mock_uss
       mock_uss_base_url: http://v19.riddp.uss3.localutm
 
+mock_uss_instance_sp_v19:
+  resource_type: resources.interuss.mock_uss.client.MockUSSResource
+  dependencies:
+      auth_adapter: utm_auth
+  specification:
+      participant_id: mock_uss
+      mock_uss_base_url: http://v19.ridsp.uss2.localutm
+
 mock_uss_instance_dp_v22a:
   resource_type: resources.interuss.mock_uss.client.MockUSSResource
   dependencies:
@@ -242,6 +250,14 @@ mock_uss_instance_dp_v22a:
       participant_id: mock_uss
       mock_uss_base_url: http://v22a.riddp.uss1.localutm
 
+mock_uss_instance_sp_v22a:
+  resource_type: resources.interuss.mock_uss.client.MockUSSResource
+  dependencies:
+      auth_adapter: utm_auth
+  specification:
+      participant_id: mock_uss
+      mock_uss_base_url: http://v22a.ridsp.uss1.localutm
+
 mock_uss_instance_uss6:
   resource_type: resources.interuss.mock_uss.client.MockUSSResource
   dependencies:

monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml

@@ -16,6 +16,7 @@ v1:
         netrid_dss_instances_v19: {$ref: 'library/environment.yaml#/netrid_dss_instances_v19'}
 
         mock_uss_instance_dp_v19: {$ref: 'library/environment.yaml#/mock_uss_instance_dp_v19'}
+        mock_uss_instance_sp_v19: {$ref: 'library/environment.yaml#/mock_uss_instance_sp_v19'}
 
         test_exclusions: { $ref: 'library/resources.yaml#/test_exclusions' }
     non_baseline_inputs:
@@ -30,7 +31,8 @@ v1:
           flights_data: kentland_flights_data
           service_providers: netrid_service_providers_v19
           observers: netrid_observers_v19
-          mock_uss: mock_uss_instance_dp_v19
+          mock_uss_dp: mock_uss_instance_dp_v19
+          mock_uss_sp: mock_uss_instance_sp_v19
           evaluation_configuration: netrid_observation_evaluation_configuration
           dss_instances: netrid_dss_instances_v19
           utm_client_identity: utm_client_identity

monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml

@@ -16,6 +16,7 @@ v1:
         netrid_dss_instances_v22a: {$ref: 'library/environment.yaml#/netrid_dss_instances_v22a'}
 
         mock_uss_instance_dp_v22a: {$ref: 'library/environment.yaml#/mock_uss_instance_dp_v22a'}
+        mock_uss_instance_sp_v22a: {$ref: 'library/environment.yaml#/mock_uss_instance_sp_v22a'}
 
         test_exclusions: { $ref: 'library/resources.yaml#/test_exclusions' }
     non_baseline_inputs:
@@ -30,7 +31,8 @@ v1:
           flights_data: kentland_flights_data
           service_providers: netrid_service_providers_v22a
           observers: netrid_observers_v22a
-          mock_uss: mock_uss_instance_dp_v22a
+          mock_uss_dp: mock_uss_instance_dp_v22a
+          mock_uss_sp: mock_uss_instance_sp_v22a
           evaluation_configuration: netrid_observation_evaluation_configuration
           dss_instances: netrid_dss_instances_v22a
           utm_client_identity: utm_client_identity

monitoring/uss_qualifier/configurations/dev/uspace.yaml

@@ -21,6 +21,7 @@ v1:
         mock_uss_instances_scdsc: {$ref: 'library/environment.yaml#/mock_uss_instances_scdsc'}
         mock_uss_instance_uss6: {$ref: 'library/environment.yaml#/mock_uss_instance_uss6'}
         mock_uss_instance_dp: {$ref: 'library/environment.yaml#/mock_uss_instance_dp_v22a'}
+        mock_uss_instance_sp: {$ref: 'library/environment.yaml#/mock_uss_instance_sp_v22a'}
         test_env_version_providers: {$ref: 'library/environment.yaml#/scd_version_providers'}
         prod_env_version_providers: {$ref: 'library/environment.yaml#/scd_version_providers'}
         all_flight_planners: {$ref: 'library/environment.yaml#/all_flight_planners'}
@@ -61,6 +62,7 @@ v1:
           flight_planners: all_flight_planners?
           mock_uss: mock_uss_instance_uss6
           mock_uss_dp: mock_uss_instance_dp
+          mock_uss_sp: mock_uss_instance_sp
           scd_dss: scd_dss
           scd_dss_instances: scd_dss_instances
 
@@ -95,6 +97,7 @@ v1:
                 flight_planners: flight_planners?
                 mock_uss: mock_uss
                 mock_uss_dp: mock_uss_dp
+                mock_uss_sp: mock_uss_sp
                 scd_dss: scd_dss
                 scd_dss_instances: scd_dss_instances