Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEXT_RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,5 @@ The release notes should contain at least the following sections:
## Optional migration tasks

## Important information

* The RID test data of the [U-Space test configuration](monitoring/uss_qualifier/configurations/dev/uspace.yaml) has been adjusted to cover the Zurich area. ([#1142](https://github.com/interuss/monitoring/pull/1142))
75 changes: 73 additions & 2 deletions monitoring/uss_qualifier/configurations/dev/library/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,77 @@ kentland_problematically_big_area:
- lat: 38
lng: -80

zurich_service_area:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.netrid.ServiceAreaResource
specification:
base_url: https://testdummy.interuss.org/interuss/monitoring/uss_qualifier/configurations/dev/library/resources/zurich_service_area
footprint:
- lat: 47.45237618874023
lng: 8.337401667996478
- lat: 47.38882810764797
lng: 8.343217430398902
- lat: 47.3643466256706
lng: 8.389932768382156
- lat: 47.36323038495268
lng: 8.536070011827881
- lat: 47.36909451406398
lng: 8.580678976356925
- lat: 47.4007874493574
lng: 8.57764881798931
- lat: 47.451319730511365
lng: 8.46442103543102
altitude_min: 0
altitude_max: 1000
reference_time: '2025-10-15T00:00:00.123456+00:00'
time_start: '2025-10-15T00:00:01.123456+00:00'
time_end: '2025-10-15T01:00:01.123456+00:00'

zurich_planning_area:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.PlanningAreaResource
specification:
base_url: https://testdummy.interuss.org/interuss/monitoring/uss_qualifier/configurations/dev/library/resources/zurich_planning_area
volume:
outline_polygon:
vertices:
- lat: 47.45237618874023
lng: 8.337401667996478
- lat: 47.38882810764797
lng: 8.343217430398902
- lat: 47.3643466256706
lng: 8.389932768382156
- lat: 47.36323038495268
lng: 8.536070011827881
- lat: 47.36909451406398
lng: 8.580678976356925
- lat: 47.4007874493574
lng: 8.57764881798931
- lat: 47.451319730511365
lng: 8.46442103543102
altitude_lower:
value: 0
reference: W84
units: M
altitude_upper:
value: 1000
reference: W84
units: M

zurich_problematically_big_area: # A huge (as in "too big") area for checks around area sizes
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.VerticesResource
specification:
vertices:
- lat: 48
lng: 9
- lat: 47
lng: 9
- lat: 47
lng: 8
- lat: 48
lng: 8

# ===== NetRID flights data =====

che_adjacent_circular_flights_data:
Expand All @@ -118,13 +189,13 @@ kentland_flights_data:
path: file://./test_data/usa/kentland/rid.kml
flight_start_delay: 5s

foca_flights_data:
zurich_flights_data:
$content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
resource_type: resources.netrid.FlightDataResource
specification:
kml_source:
kml_file:
path: file://./test_data/che/rid/foca.kml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete foca.kml? It does not appear to be referenced anywhere else.

path: file://./test_data/che/rid/zurich.kml
flight_start_delay: 5s

# ===== NetRID data generation/simulation/storage =====
Expand Down
16 changes: 8 additions & 8 deletions monitoring/uss_qualifier/configurations/dev/uspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ v1:
che_invalid_flight_auth_flights: {$ref: 'library/resources.yaml#/che_invalid_flight_auth_flights'}
che_non_conflicting_flights: {$ref: 'library/resources.yaml#/che_non_conflicting_flights'}
che_planning_area: {$ref: 'library/resources.yaml#/che_planning_area'}
foca_flights_data: {$ref: 'library/resources.yaml#/foca_flights_data'}
netrid_observation_evaluation_configuration: {$ref: 'library/resources.yaml#/netrid_observation_evaluation_configuration'}
utm_client_identity: {$ref: 'library/resources.yaml#/utm_client_identity'}
id_generator: {$ref: 'library/resources.yaml#/id_generator'}
kentland_service_area: {$ref: 'library/resources.yaml#/kentland_service_area'}
au_problematically_big_area: {$ref: 'library/resources.yaml#/au_problematically_big_area'}

zurich_service_area: {$ref: 'library/resources.yaml#/zurich_service_area'}
zurich_planning_area: {$ref: 'library/resources.yaml#/zurich_planning_area'}
zurich_problematically_big_area: {$ref: 'library/resources.yaml#/zurich_problematically_big_area'}
zurich_flights_data: {$ref: 'library/resources.yaml#/zurich_flights_data'}
utm_auth: {$ref: 'library/environment.yaml#/utm_auth'}
second_utm_auth: {$ref: 'library/environment.yaml#/second_utm_auth'}
mock_uss_instances_scdsc: {$ref: 'library/environment.yaml#/mock_uss_instances_scdsc'}
Expand Down Expand Up @@ -67,7 +67,7 @@ v1:
scd_dss: scd_dss
scd_dss_instances: scd_dss_instances

flights_data: foca_flights_data
flights_data: zurich_flights_data
service_providers: netrid_service_providers_v22a?
observers: netrid_observers_v22a
evaluation_configuration: netrid_observation_evaluation_configuration
Expand All @@ -76,9 +76,9 @@ v1:
utm_auth: utm_auth
second_utm_auth: second_utm_auth
id_generator: id_generator
service_area: kentland_service_area
planning_area: che_planning_area
problematically_big_area: au_problematically_big_area
service_area: zurich_service_area
planning_area: zurich_planning_area
problematically_big_area: zurich_problematically_big_area

test_exclusions: test_exclusions
uss_identification: uss_identification
Expand Down
Loading
Loading