diff --git a/NEXT_RELEASE_NOTES.md b/NEXT_RELEASE_NOTES.md
index a2dc4302f9..ff55ff5629 100644
--- a/NEXT_RELEASE_NOTES.md
+++ b/NEXT_RELEASE_NOTES.md
@@ -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))
\ No newline at end of file
diff --git a/monitoring/uss_qualifier/configurations/dev/library/resources.yaml b/monitoring/uss_qualifier/configurations/dev/library/resources.yaml
index 7431467a5a..3a21a4fb90 100644
--- a/monitoring/uss_qualifier/configurations/dev/library/resources.yaml
+++ b/monitoring/uss_qualifier/configurations/dev/library/resources.yaml
@@ -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:
@@ -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
+ path: file://./test_data/che/rid/zurich.kml
flight_start_delay: 5s
# ===== NetRID data generation/simulation/storage =====
diff --git a/monitoring/uss_qualifier/configurations/dev/uspace.yaml b/monitoring/uss_qualifier/configurations/dev/uspace.yaml
index 8843511548..4113d54311 100644
--- a/monitoring/uss_qualifier/configurations/dev/uspace.yaml
+++ b/monitoring/uss_qualifier/configurations/dev/uspace.yaml
@@ -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'}
@@ -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
@@ -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
diff --git a/monitoring/uss_qualifier/test_data/che/rid/foca.kml b/monitoring/uss_qualifier/test_data/che/rid/zurich.kml
similarity index 57%
rename from monitoring/uss_qualifier/test_data/che/rid/foca.kml
rename to monitoring/uss_qualifier/test_data/che/rid/zurich.kml
index 4f1a5e0021..6b4b2d4a81 100644
--- a/monitoring/uss_qualifier/test_data/che/rid/foca.kml
+++ b/monitoring/uss_qualifier/test_data/che/rid/zurich.kml
@@ -9,7 +9,7 @@
highlight
- #s_ylw-pushpin_hl
+ #s_ylw-pushpin_hl0
@@ -19,17 +19,27 @@
highlight
- #s_ylw-pushpin_hl0
+ #s_ylw-pushpin_hl
+
+
+
+
+ normal
+ #s_ylw-pushpin1
+
+
+ highlight
+ #s_ylw-pushpin_hl00
normal
- #sn_ylw-pushpin2
+ #sn_ylw-pushpin
highlight
- #sh_ylw-pushpin3
+ #sh_ylw-pushpin
@@ -42,44 +52,44 @@
#sh_ylw-pushpin2
-
+
normal
- #sn_ylw-pushpin
+ #sn_ylw-pushpin10
highlight
- #sh_ylw-pushpin4
+ #sh_ylw-pushpin1
normal
- #sn_ylw-pushpin3
+ #sn_ylw-pushpin20
highlight
- #sh_ylw-pushpin
+ #sh_ylw-pushpin00
-
+
normal
- #sn_ylw-pushpin1
+ #sn_ylw-pushpin2
highlight
#sh_ylw-pushpin0
-
+
normal
- #sn_ylw-pushpin10
+ #sn_ylw-pushpin3
highlight
- #sh_ylw-pushpin1
+ #sh_ylw-pushpin3
-
-
+
+
-
-
-
-
-
-
-
- FOCA
+ zurich
1
- flight: east
+ flight: south u
1
- serial_number: 36ZN8ZAJFH6N3
-operation_description: Bend west
-operator_id: OP-000002che
-registration_number: HB.2H6ZWKO1Y0XR6
-aircraft_type: HybridLift
-operator_name: Participant 2
+ serial_number: 1AKGAAN8G70R7JS
+aircraft_type: Helicopter
+operation_description: U-turn south of takeoff
+operator_id: CHE-RP-f39mqfitkh9e5
+operator_name: Jane Doe
timestamp_accuracy: 1.0
speed_accuracy: SA3mps
sample_rate: 1.0
accuracy_h: HAUnknown
-accuracy_v: VAUnknown
-eu_classification_category: EUCategoryUndefined
-eu_classification_class: EUClassUndefined
+accuracy_v: VAUnknown
- operator_location
-
- 7.4743375085138
- 46.97598043567073
- 0
- 6.946716271432776e-09
- 25.84884382032374
- 570.9710034910739
- relativeToSeaFloor
-
- #m_ylw-pushpin
-
- 1
- 7.474417342784633,46.9751484438416,0
-
+ U turn south
+ #msn_ylw-pushpin10
+
+ 1
+
+ 8.488086010193248,47.37068005363017,0.0 8.48812954746956,47.370587242025366,0.0 8.488096461986222,47.37048552808266,0.0 8.488058869601295,47.370437593647054,0.0 8.487992713476777,47.37035616148304,0.0 8.48798464448449,47.370333056885144,0.0 8.487973904140395,47.3703023046547,0.0 8.487966840917556,47.370266323893794,0.0 8.487962372282103,47.37023816260832,0.0 8.487967675859187,47.370207342634934,0.0 8.487976559973054,47.370171398603745,0.0 8.48799807719684,47.37014036227894,0.0 8.488019499902185,47.37010942090538,0.0 8.488053429665532,47.37008339144921,0.0 8.488089449646983,47.37006527181478,0.0 8.488121925894466,47.370052282478674,0.0 8.48815088026746,47.37004440849303,0.0 8.48827518488533,47.36999864947174,0.0 8.48831139751754,47.369972421106304,0.0 8.48835375032042,47.36995426515459,0.0 8.4883924829112,47.3699319376166,0.0 8.488426644184889,47.369913985083514,0.0 8.48846068845649,47.36989610981006,0.0 8.488495983730138,47.369878322762034,0.0 8.48853439095125,47.369864919157145,0.0 8.488562728428482,47.36985722273458,0.0 8.488595159283255,47.369853852306214,0.0 8.488636589108003,47.369849906174295,0.0 8.48867952953342,47.36985020494702,0.0 8.488708578938505,47.36984763686421,0.0
+
+
alt: Takeoff
#m_ylw-pushpin0
+
+ 1
+ absolute
+
+
+
+ 8.487599206246548,47.370506331316705,496.0 8.48773686257555,47.370357145137795,496.0 8.488527190331814,47.37084454793311,496.0 8.488389720684472,47.371003666625,496.0 8.487599206246548,47.370506331316705,496.0
+
+
+
+
+
+
+ alt: High
+ #msn_ylw-pushpin
1
1
@@ -352,15 +359,15 @@ eu_classification_class: EUClassUndefined
- 7.472264658898067,46.97573885336122,579 7.47410439568508,46.97479820248051,579 7.474654629758324,46.97523053565534,579 7.472874569618096,46.97617920191733,579 7.472264658898067,46.97573885336122,579
+ 8.48957979534743,47.369927140429084,551.0 8.490587218626521,47.37027611497966,551.0 8.490661563415705,47.37107682800347,551.0 8.489204440074536,47.370663517599084,551.0 8.48957979534743,47.369927140429084,551.0
- alt: Inflight
- #msn_ylw-pushpin1
+ alt: Low
+ #msn_ylw-pushpin
1
1
@@ -368,7 +375,7 @@ eu_classification_class: EUClassUndefined
- 7.47505552952185,46.9751441303546,620 7.474832413733106,46.9747757027712,620 7.476547961572313,46.97470176488257,620 7.476834228778014,46.97597378619886,620 7.474862952573642,46.97589043394234,620 7.474615166283556,46.97556288233153,620 7.47505552952185,46.9751441303546,620
+ 8.491850511360857,47.36774777095399,521.0 8.493236481345823,47.37021642084468,521.0 8.490620125766261,47.369968081354884,521.0 8.48962145300232,47.368391591949525,521.0 8.491850511360857,47.36774777095399,521.0
@@ -376,89 +383,82 @@ eu_classification_class: EUClassUndefined
speed: Departure (5)
- #msn_ylw-pushpin3
+ #msn_ylw-pushpin20
1
- 7.471790873930129,46.97591851903989,0 7.473998362410919,46.97465144785095,0 7.474988375791753,46.97522139166636,0 7.472548986238838,46.97669778720039,0 7.471790873930129,46.97591851903989,0
+ 8.487627177694923,47.37022567192925,0.0 8.488541433192031,47.370700520846526,0.0 8.488146211772209,47.371136886332906,0.0 8.487235428789324,47.37064948552166,0.0 8.487627177694923,47.37022567192925,0.0
- speed: Inflight (30)
- #msn_ylw-pushpin0
+ speed: Enroute (30)
+ #msn_ylw-pushpin20
1
- 7.474790718475878,46.97613046173251,0 7.475389284691591,46.97463514947513,0 7.477808120886172,46.97501679175125,0 7.47682266903491,46.97700535966474,0 7.474790718475878,46.97613046173251,0
+ 8.489638509156725,47.367439591965365,0.0 8.492925998859539,47.37003155923135,0.0 8.49104344194709,47.371956544316674,0.0 8.488021081836711,47.369439356682854,0.0 8.489638509156725,47.367439591965365,0.0
- Head east
- #msn_ylw-pushpin10
-
- 1
-
- 7.474534277281919,46.97521574697621,0 7.474556547704485,46.97521982068638,0 7.474957304164382,46.9753469844937,0 7.474985669507877,46.97535466613251,0 7.475031496039646,46.9753740852827,0 7.475071382310072,46.97538566876687,0 7.475105732475365,46.97539733790264,0 7.47514573639746,46.97540895676139,0 7.475174243175198,46.97541656405258,0 7.475196886069178,46.97542022764583,0 7.475242496767576,46.97543159400197,0 7.475248086865021,46.97543150407605,0 7.475293411861577,46.97543881566052,0 7.475343972591539,46.97544194923743,0 7.475371838966307,46.97544141420438,0 7.475405612488586,46.97544480096376,0 7.475433525724728,46.97544438405501,0 7.475461420027576,46.97544396014096,0 7.475528468634662,46.97544662463638,0 7.475567312776345,46.97544583208186,0 7.475595475145502,46.97544931528337,0 7.475617665309389,46.97544888372465,0 7.475650859295168,46.97544814613946,0 7.475673380492536,46.97545162867681,0 7.47569587256608,46.97545507353406,0 7.475739967719768,46.97545397288839,0 7.475784214599209,46.97545311968328,0 7.475811757237977,46.97545248628067,0 7.475855656359515,46.97545132585306,0 7.475883006239956,46.97545054033077,0 7.475915785258915,46.97544958949968,0 7.47594849487731,46.97544860351594,0 7.475964845987635,46.9754481218383,0 7.47599219249935,46.97544743946248,0 7.476024979438433,46.97544662140207,0 7.476057735389965,46.97544580429223,0 7.476079554909616,46.97544525987053,0 7.476095467460732,46.97544099100161,0 7.476132608397679,46.97543225310868,0 7.476143429106667,46.97543192863066,0 7.476159239872764,46.9754276354077,0 7.476180416601834,46.97542317851106,0 7.476222728480694,46.97541429251051,0 7.476243865210861,46.9754098755318,0 7.47627035799243,46.975405308547,0 7.476296814502232,46.97540074735076,0 7.476317424611132,46.97539256974741,0 7.476343381135782,46.97538427160077,0 7.47637022692849,46.97538354126809,0 7.476396266507123,46.97537538893339,0 7.476401192356632,46.97537150246065,0
-
-
+ operator_location
+ #m_ylw-pushpin1
+
+ 1
+ 8.487908591798265,47.37085983569079,0.0
+
- flight: southwest
+ flight: circle
1
- serial_number: VF0M3GRU
-operation_description: Bend west
-operator_id: OP-000001che
-registration_number: HB.5JWWG00T0VFHC
-aircraft_type: HybridLift
-operator_name: Participant 1
+ serial_number: ULYK563L5G
+aircraft_type: Helicopter
+operation_description: Circle flight
+operator_id: CHE-RP-iwetcg7ucfopc
+operator_name: John Doe
timestamp_accuracy: 1.0
speed_accuracy: SA3mps
sample_rate: 1.0
accuracy_h: HAUnknown
-accuracy_v: VAUnknown
-eu_classification_category: EUCategoryUndefined
-eu_classification_class: EUClassUndefined
+accuracy_v: VAUnknown
- Head west
+ South
#msn_ylw-pushpin10
1
- 7.473182841512227,46.97538740682475,0 7.473152426005473,46.97536514025042,0 7.473130353905447,46.97534383086064,0 7.472913045577315,46.97518309381994,0 7.472880826833721,46.97517784067801,0 7.472825719969949,46.9751621964885,0 7.472801714199657,46.97515846833628,0 7.472752854082905,46.97515687624123,0 7.472719953106761,46.97515819723682,0 7.472695112265797,46.97516042213321,0 7.472645589241935,46.97516455846677,0 7.472598117894962,46.97515750480149,0 7.472564271326214,46.9751652886166,0 7.472548428677202,46.97516321590446,0 7.472506563101375,46.97517039944852,0 7.472456395329898,46.97517778803513,0 7.472413895787653,46.97518961839103,0 7.472370828782211,46.97520305973935,0 7.472327722916634,46.97521654965743,0 7.472300315125697,46.97523219965375,0 7.472264874789351,46.97524711221332,0 7.472229791001497,46.97526109864661,0 7.472194690735923,46.97527509196595,0 7.472176469686753,46.9752852418904,0 7.472122791116204,46.97531001722265,0 7.472069900903375,46.97532952247039,0 7.472034236996787,46.97534443248747,0 7.471997121733265,46.97536570236166,0 7.471953215196978,46.97538010842371,0 7.471937201352487,46.97537853153688,0 7.471882555712714,46.97540446340999,0 7.471854565924627,46.9754204254029,0 7.47181132180688,46.97543342171337,0 7.471774528509131,46.97545369210648,0 7.471747566437017,46.97546781771371,0
+ 8.488229854920197,47.37074558658443,0.0 8.488329471365594,47.370817837505804,0.0 8.488375471496616,47.37084917525504,0.0 8.488421911721352,47.37088057176483,0.0 8.488456791062694,47.370907107576116,0.0 8.488519008377102,47.370935098462986,0.0 8.488581245669442,47.37096309822762,0.0 8.488647221360685,47.371003666692424,0.0 8.48878573903851,47.371065588974794,0.0 8.4888116351726,47.3710910227504,0.0 8.488825848236209,47.37113965697517,0.0 8.488843658918347,47.37119784355049,0.0 8.488861648775275,47.37125596075003,0.0 8.488870643430166,47.371285017030544,0.0 8.48888532292006,47.37133349567566,0.0 8.488888431723344,47.37140544348874,0.0 8.488881475041415,47.371448736079756,0.0 8.488854363332072,47.37150754532702,0.0 8.488812856615459,47.37157081371983,0.0 8.48877499150027,47.371644036289254,0.0 8.4887471867464,47.371693159220264,0.0
-
- operator_location
-
- 7.472845491119807
- 46.97487050176967
- 0
- -6.47638885984279
- 14.04972938772355
- 771.3164629198244
- relativeToSeaFloor
-
- #m_ylw-pushpin
-
- 1
- 7.473299945677152,46.97532952984159,0
-
-
alt: Takeoff
#m_ylw-pushpin0
+
+ 1
+ absolute
+
+
+
+ 8.487599206246548,47.370506331316705,529.0 8.48773686257555,47.370357145137795,529.0 8.488527190331814,47.37084454793311,529.0 8.488389720684472,47.371003666625,529.0 8.487599206246548,47.370506331316705,529.0
+
+
+
+
+
+
+ alt: High
+ #msn_ylw-pushpin3
1
1
@@ -466,15 +466,15 @@ eu_classification_class: EUClassUndefined
- 7.472264658898067,46.97573885336122,579 7.47410439568508,46.97479820248051,579 7.474654629758324,46.97523053565534,579 7.472874569618096,46.97617920191733,579 7.472264658898067,46.97573885336122,579
+ 8.489267459600915,47.37166062967849,655.0 8.489977536459923,47.370984073534544,655.0 8.493313619548607,47.37238015512596,655.0 8.491518892767237,47.374387522193466,655.0 8.489267459600915,47.37166062967849,655.0
- alt: Inflight
- #msn_ylw-pushpin
+ alt: Low
+ #msn_ylw-pushpin0
1
1
@@ -482,7 +482,7 @@ eu_classification_class: EUClassUndefined
- 7.473822812386882,46.97460180552483,620 7.473065728806914,46.97502256206563,620 7.47170445133253,46.97581172976297,620 7.47117647062084,46.97535718350248,620 7.473364670210465,46.9742204364775,620 7.473822812386882,46.97460180552483,620
+ 8.490488970874699,47.375428562929855,570.0 8.491780618890493,47.378005797139494,570.0 8.4887685286589,47.378074018769155,570.0 8.487453168467146,47.37563485906732,570.0 8.490488970874699,47.375428562929855,570.0
@@ -490,32 +490,40 @@ eu_classification_class: EUClassUndefined
speed: Departure (5)
- #msn_ylw-pushpin3
+ #msn_ylw-pushpin2
1
- 7.471790873930129,46.97591851903989,0 7.473998362410919,46.97465144785095,0 7.474988375791753,46.97522139166636,0 7.472548986238838,46.97669778720039,0 7.471790873930129,46.97591851903989,0
+ 8.487706170711212,47.36995718766655,0.0 8.488846636784208,47.37042600425997,0.0 8.488196425088466,47.371282684720995,0.0 8.487065280715347,47.37068957178074,0.0 8.487706170711212,47.36995718766655,0.0
- speed: Inflight (30)
+ speed: Enroute (30)
#msn_ylw-pushpin2
1
- 7.470919448256408,46.97532148433913,0 7.473362671620912,46.97412587253532,0 7.473925696548092,46.97458707203987,0 7.471712848654708,46.9758362502149,0 7.470919448256408,46.97532148433913,0
+ 8.488098610981899,47.371873583853734,0.0 8.493152274264935,47.37332523922927,0.0 8.494160531251842,47.37729110145004,0.0 8.489590109282963,47.37815602158183,0.0 8.48515942299658,47.37523070910003,0.0 8.488098610981899,47.371873583853734,0.0
+
+ operator_location
+ #m_ylw-pushpin
+
+ 1
+ 8.487979542766373,47.370902783740675,0.0
+
+