ERAM Framework #375

checkandmate1 · 2024-09-16T20:41:40Z

New title for improved flight plan processing!

Completed:

Fix why arrival data blocks get automatically added to the STARSComputer, causing all arrivals to start as PDBs.
Remove STARSComputer & ERAMComputer reliance on Aircraft.
Derive the facility from the controller instead of using ctx.ControlClient.TRACON for sim.State STARSComputer calls in pkg/panes/stars.

TODO:

Fix the bug where Exit will occasionally be blank.
Map the airspace so ERAM can see all of the different facilities the aircraft will travel through and attach the proper coordination fixes (This is being done in ERAM-Processing #390)
Certain facilities (specified in the configuration file), will automatically associate flight plans to LDBs squawking the same code as a stored flight plan, associating them, and giving them a white FDB with a C tag.

More to come!

…into improve-stars

pkg/sim/nas.go

pkg/panes/stars/datablock.go

…into improve-stars

…ed track representation (color and brite), etc

mmp

(A few more comments after another pass through.)

pkg/aviation/aviation.go

pkg/aviation/db.go

pkg/panes/stars/commands.go

pkg/sim/nas.go

pkg/sim/sim.go

pkg/panes/stars/commands.go

mmp

More comments about the STARS code. I will try to spend more time with the nas.go stuff in the next few days.

mmp · 2024-10-27T22:15:27Z

pkg/panes/stars/commands.go

@@ -534,7 +552,13 @@ func (sp *STARSPane) executeSTARSCommand(cmd string, ctx *panes.Context) (status
 		if ac := lookupAircraft(cmd); ac == nil {
 			status.err = ErrSTARSCommandFormat
 		} else {
-			sp.initiateTrack(ctx, ac.Callsign)
+			fp, err := ctx.ControlClient.STARSComputer(ctx.ControlClient.Callsign).GetFlightPlan(ac.Callsign) // TODO: change this so that it's the inputted squawk/ callsign.
+			if err != nil {


Is logging the error the right thing to do in this case? i.e. is it expected that there may not always be a flight plan, or does this case mean there's an error in the code elsewhere? If it's valid that there may be no flight plan then I assume a STARS error should be displayed to the user instead?

mmp · 2024-10-27T22:18:51Z

pkg/panes/stars/commands.go

+	comp := ctx.ControlClient.STARSComputer(ctx.ControlClient.Callsign)
+	trk := comp.TrackInformation[callsign]
+	if trk.TrackOwner == ctx.ControlClient.Callsign {
+		trk.TempAltitude = alt


Won't this get clobbered within a second when the state update is received from the server? If it's not maintained in stars.AircraftState (presumably so that other controllers can see it, I think this will need a new RPC call, etc.)

mmp · 2024-10-27T22:19:10Z

pkg/panes/stars/commands.go

+	if comp.TrackInformation[callsign] != nil {
+		// This is a track that is already being tracked
+		sp.previewAreaOutput = ErrSTARSIllegalTrack.Error()
+		fmt.Printf("%v: Track %s is already being tracked: %v\n", comp.Identifier, callsign, comp.TrackInformation[callsign])


Please delete printf

mmp · 2024-10-27T22:21:01Z

pkg/panes/stars/commands.go

+		fmt.Printf("%v: Track %s is already being tracked: %v\n", comp.Identifier, callsign, comp.TrackInformation[callsign])
+		return
+	}
+	comp.TrackInformation[callsign] = &sim.TrackInformation{


I'm ok with limited reading of globals out of the computers structs (similar to what's done elsewhere for e.g., sim.State.Aircraft, but setting them should probably be done through a method they provide, since the STARS code shouldn't have to potentially worry about any additional housekeeping with changing them.

Also, same question as above about whether it's valid to be setting this value here since I think a sim state update will clobber it.

mmp · 2024-10-27T22:21:23Z

pkg/panes/stars/commands.go

@@ -2641,7 +2710,12 @@ func (sp *STARSPane) executeSTARSClickedCommand(ctx *panes.Context, cmd string,
 					if ctrl && shift {
 						// initiate track, CRC style
 						status.clear = true
-						sp.initiateTrack(ctx, ac.Callsign)
+						fp, err := ctx.ControlClient.STARSComputer(ctx.ControlClient.Callsign).GetFlightPlan(ac.Callsign)
+						if err != nil {


Same questions as above about what an error return value implies here.

mmp · 2024-10-27T22:40:04Z

pkg/panes/stars/track.go

+		if ac := ctx.ControlClient.Aircraft[callsign]; comp.TrackInformation[ac.Callsign] == nil && sp.AutoTrackDepartures && ac.DepartureContactController == ctx.ControlClient.Callsign && sim.InAcquisitionArea(ac) {
+			fp, err := comp.GetFlightPlan(ac.Squawk.String())
+			if err != nil {
+				ctx.Lg.Errorf("GetFlightPlan(%s): %v", ac.Squawk, err)


The usual error logging question.

mmp · 2024-10-27T22:40:30Z

pkg/panes/stars/track.go

@@ -669,6 +759,45 @@ func (sp *STARSPane) drawGhosts(ghosts []*av.GhostAircraft, ctx *panes.Context,
 	ld.GenerateCommands(cb)
 }

+func (sp *STARSPane) drawUnsupportedTrack(data *sim.UnsupportedTrack, ctx *panes.Context, transforms ScopeTransformations, td *renderer.TextDrawBuilder,
+	cb *renderer.CommandBuffer) {
+	// set color and brightness to white/100 for now.


Stale comments, this line and next?

mmp · 2024-10-27T23:03:17Z

pkg/panes/stars/datablock.go

 	transforms.LoadWindowViewingMatrices(cb)
 	td.GenerateCommands(cb)
 }

+func (sp *STARSPane) getUnsupportedDatablock(data *sim.UnsupportedTrack, ctx *panes.Context) datablock {


how about ut in place of data? ("Data" kind of describes anything and everything.)

mmp · 2024-10-27T23:04:42Z

pkg/panes/stars/datablock.go

+	}
+
+	if fp.AircraftType != "" {
+		formatDBText(db.field5[1][:], fp.AircraftType, color, false)


For the other datablock types, fp.AircraftType needs to be cleaned up a bit just to get the base type without any extras like H/. Is that also necessary here?
e.g.

actype = trk.FlightPlan.TypeWithoutSuffix() if strings.Index(actype, "/") == 1 { actype = actype[2:] }

mmp · 2024-10-27T23:10:04Z

pkg/panes/stars/datablock.go

+	if fp.AircraftType != "" {
+		formatDBText(db.field5[1][:], fp.AircraftType, color, false)
+	}
+	if data.SP1 != "" {


For the scratchpads, presumably you will want to pad them with spaces to 3 or 4 characters, based on AllowLongScratchpad in STARSFacilityAdaptation? After you merge master, check out the updated version of the fmt3 helper function used to do that for the other datablock types; that len([]rune(s)) part is important since the triangle symbol may be in scratchpads and len(s) of a string gives the length in bytes, not in characters.

checkandmate1 and others added 16 commits September 16, 2024 16:32

Change the way STARSComputer and ERAMComputer work

9bdd3a4

Merge branch 'mmp:master' into improve-stars

53d8604

Merge branch 'mmp:master' into improve-stars

b122f21

Revert changing STARS/ERAMComputer because I did it wrong .-.

9ae4f61

Merge branch 'improve-stars' of https://github.com/checkandmate1/vice …

8460c43

…into improve-stars

Add squawks to IC

d904616

Seperate ERAM and STARS ICs

623eabf

Merge branch 'mmp:master' into improve-stars

eae3a11

Merge branch 'mmp:master' into improve-stars

d28d5f7

starting to get there...

d215828

Merge branch 'mmp:master' into improve-stars

148eab7

gofmt

b5afb98

Delete unncessesary funcs and update autotrack

e21791e

Refactor handling of automated acceptance of aircraft.

5469d4f

Minor changes

b856bd4

Lots of work...

26166fe

checkandmate1 commented Sep 27, 2024

View reviewed changes

pkg/sim/nas.go Outdated Show resolved Hide resolved

checkandmate1 and others added 6 commits September 27, 2024 00:43

Reduced even more reliance on Aircraft

7c4f851

Merge branch 'mmp:master' into improve-stars

e0a39f0

Temp altitude

98c83fa

Fix the issue of some handoffs not going through and keep LDB

35b260d

Merge branch 'mmp:master' into improve-stars

f6c898e

gofmt

b6a911b

checkandmate1 commented Sep 28, 2024

View reviewed changes

pkg/panes/stars/datablock.go Show resolved Hide resolved

checkandmate1 added 6 commits September 28, 2024 02:49

Scratchpad fix

bccc414

Delete print

8b6d658

Verify controlller facility.

7fcfa0c

gofmt

bace83a

Use track info for ControlClient AcceptHandoff

6512180

Merge branch 'master' into improve-stars

1fb93ca

checkandmate1 and others added 14 commits September 30, 2024 22:06

Merge branch 'mmp:master' into improve-stars

6928343

Update ewr.json

44a884d

Merge branch 'improve-stars' of https://github.com/checkandmate1/vice …

6731ce4

…into improve-stars

Minor touches

234c6e3

AcceptUnsupportedTrack, unsupported track selection, better unsupport…

8a5eb1d

…ed track representation (color and brite), etc

More unsupported track stuff

c08f5e9

Use correct ERAM identifiers for requestFP

e16a2ac

Unsupported track handoff updates and cancel unsupported handoff

7c9d948

Removed unnecessary print statements

9aaa6ca

Better unsupported DB formatting, handoffs, commands, etc

9f3cffd

gofmt

95f26c9

Callsign parameters

4f840e9

Delete from ContainedPlans after an unsupported track is made

efb3801

More unsupported DB formatting

607ce68

checkandmate1 mentioned this pull request Oct 4, 2024

ERAM-Processing #390

Draft

checkandmate1 added 2 commits October 5, 2024 00:22

Minor tweaks/ fixes

1ebebf5

Merge branch 'master' into improve-stars

3d14cb6

mmp reviewed Oct 5, 2024

View reviewed changes

pkg/panes/stars/commands.go Show resolved Hide resolved

checkandmate1 and others added 10 commits October 7, 2024 15:54

Fix crash while slewing aircraft

2dbe146

Add back nav.FlightState.Summary and gofmt

623ab32

Add ERAMComputer AcceptHandoff

92acdf6

Some error handling

7f5d85f

Remove redudant Unassign() method

516a9c0

Organize Sim code into NAS methods

2d37a56

gofmt

9da997f

Merge branch 'master' into improve-stars

93f647b

Merge branch 'master' into improve-stars

92b9e75

Merge branch 'mmp:master' into improve-stars

d47828f

mmp reviewed Oct 27, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ERAM Framework #375

ERAM Framework #375

checkandmate1 commented Sep 16, 2024 •

edited

Loading

mmp left a comment

mmp left a comment

mmp Oct 27, 2024

mmp Oct 27, 2024

mmp Oct 27, 2024

mmp Oct 27, 2024

mmp Oct 27, 2024

mmp Oct 27, 2024

mmp Oct 27, 2024

mmp Oct 27, 2024

mmp Oct 27, 2024

mmp Oct 27, 2024

ERAM Framework #375

Are you sure you want to change the base?

ERAM Framework #375

Conversation

checkandmate1 commented Sep 16, 2024 • edited Loading

mmp left a comment

Choose a reason for hiding this comment

mmp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

checkandmate1 commented Sep 16, 2024 •

edited

Loading