[mock_uss] Clean up mock_uss flight planning #311
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mickmis
approved these changes
Nov 3, 2023
Comment on lines
227
to
247
| volumes = [v.to_f3548v21() for v in flight_info.basic_information.area] | ||
| off_nominal_volumes = [] | ||
| usage_state = flight_info.basic_information.usage_state | ||
| if usage_state == AirspaceUsageState.Planned: | ||
| state = f3548_v21.OperationalIntentState.Accepted | ||
| elif usage_state == AirspaceUsageState.InUse: | ||
| uas_state = flight_info.basic_information.uas_state | ||
| if uas_state == UasState.Nominal: | ||
| state = f3548_v21.OperationalIntentState.Activated | ||
| elif uas_state == UasState.OffNominal: | ||
| state = f3548_v21.OperationalIntentState.Nonconforming | ||
| off_nominal_volumes = volumes | ||
| volumes = [] | ||
| elif uas_state == UasState.Contingent: | ||
| state = f3548_v21.OperationalIntentState.Contingent | ||
| off_nominal_volumes = volumes | ||
| volumes = [] | ||
| else: | ||
| raise ValueError(f"Unknown uas_state '{uas_state}'") | ||
| else: | ||
| raise ValueError(f"Unknown usage_state '{usage_state}'") |
There was a problem hiding this comment.
nit: this seems duplicate with
Factor those away?
There was a problem hiding this comment.
Sounds good -- they were different enough I didn't notice, but I think I have some common logic that simplifies both places now.
github-actions bot
added a commit
that referenced
this pull request
Nov 3, 2023
* Clean up mock_uss flight planning * Factor common functionality into business object ef76e72
github-actions bot
added a commit
to openskies-sh/monitoring
that referenced
this pull request
Nov 5, 2023
* Clean up mock_uss flight planning * Factor common functionality into business object ef76e72
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR works toward reoganizing mock_uss flight planning routines to better encapsulate functionality. F3548-21 things are moved to f3548v21/flight_planning.py and out of scd_injection/routes_injection.py. Some of the scd-injection-API-focused routines are adjusted to use API-independent FlightInfo and FlightRecord instead.
One apparent bug is fixed in conflict_equal_priority_not_permitted.py -- Nonconforming necessarily means the flight plan is active (aircraft is flying) and not merely Planned, so the expected response is updated to ReadyToFly, which mock_uss currently indicates.