ERAM Framework

pkg/aviation/aviation.go

@@ -1303,6 +1303,17 @@ func (p *SquawkCodePool) IsAssigned(code Squawk) bool {
 	return false
 }
 
+func (p *SquawkCodePool) Unassign(code Squawk) error {
+	if idx, bit, err := p.indices(code); err == nil {
+		if p.AssignedBits[idx]&(1<<bit) != 0 {
+			p.AssignedBits[idx] &^= (1 << bit) // Clear the bit
+			return nil
+		}
+		return fmt.Errorf("squawk code %d is not assigned", code)
+	}
+	return fmt.Errorf("invalid squawk code %d", code)
+}
+
 func (p *SquawkCodePool) Return(code Squawk) error {
 	if !p.IsAssigned(code) {
 		return ErrSquawkCodeUnassigned

pkg/aviation/db.go

@@ -1074,6 +1074,7 @@ func (ea ERAMAdaptation) FixForRouteAndAltitude(route string, altitude string) *
 			}
 		}
 	}
+
 	return nil
 }
 

pkg/panes/messages.go

@@ -42,10 +42,11 @@ type MessagesPane struct {
 	messages       []Message
 
 	// Command-input-related
-	input         CLIInput
-	history       []CLIInput
-	historyOffset int // for up arrow / downarrow. Note: counts from the end! 0 when not in history
-	savedInput    CLIInput
+	input          CLIInput
+	history        []CLIInput
+	historyOffset  int // for up arrow / downarrow. Note: counts from the end! 0 when not in history
+	savedInput     CLIInput
+	nextController map[string]string // Callsign -> NextController
 }
 
 func init() {
@@ -75,6 +76,7 @@ func (mp *MessagesPane) Activate(r renderer.Renderer, p platform.Platform, event
 		mp.scrollbar = NewVerticalScrollBar(4, true)
 	}
 	mp.events = eventStream.Subscribe()
+	mp.nextController = make(map[string]string)
 }
 
 func (mp *MessagesPane) LoadedSim(ss sim.State, pl platform.Platform, lg *log.Logger) {}
@@ -280,7 +282,8 @@ func (mp *MessagesPane) runCommands(ctx *Context) {
 
 	if ok {
 		if ac := ctx.ControlClient.AircraftFromPartialCallsign(callsign); ac != nil {
-			ctx.ControlClient.RunAircraftCommands(ac.Callsign, cmd,
+
+			ctx.ControlClient.RunAircraftCommands(ac.Callsign, cmd, mp.nextController[ac.Callsign],
 				func(errorString string, remainingCommands string) {
 					if errorString != "" {
 						mp.messages = append(mp.messages, Message{contents: errorString, error: true})
@@ -412,6 +415,10 @@ func (mp *MessagesPane) processEvents(ctx *Context) {
 					ctx.KeyboardFocus.Take(mp)
 				}
 			}
+		case sim.AcceptedHandoffEvent:
+			mp.nextController[event.Callsign] = event.ToController
+		case sim.HandoffControllEvent:
+			delete(mp.nextController, event.Callsign) // clear the next controller
 		}
 	}
 

pkg/panes/stars/commands.go

@@ -244,7 +244,7 @@ func (sp *STARSPane) executeSTARSCommand(cmd string, ctx *panes.Context) (status
 				return ctx.ControlClient.Aircraft[sp.TabListAircraft[idx]]
 			}
 
-			if trk := ctx.ControlClient.STARSComputer().LookupTrackIndex(idx); trk != nil {
+			if trk := ctx.ControlClient.STARSComputer(ctx.ControlClient.Callsign).LookupTrackIndex(idx); trk != nil {
 				// May be nil, but this is our last option
 				return ctx.ControlClient.Aircraft[trk.Identifier]
 			}
@@ -510,7 +510,7 @@ func (sp *STARSPane) executeSTARSCommand(cmd string, ctx *panes.Context) (status
 				return
 			} else {
 				// Is it an abbreviated flight plan?
-				fp, err := sim.MakeSTARSFlightPlanFromAbbreviated(cmd, ctx.ControlClient.STARSComputer(),
+				fp, err := sim.MakeSTARSFlightPlanFromAbbreviated(cmd, ctx.ControlClient.STARSComputer(ctx.ControlClient.Callsign),
 					ctx.ControlClient.STARSFacilityAdaptation)
 				if fp != nil {
 					ctx.ControlClient.UploadFlightPlan(fp, sim.LocalNonEnroute, nil,
@@ -529,7 +529,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 {
+				ctx.Lg.Errorf("Error getting flight plan for %s: %v", ac.Callsign, err)
+				return
+			}
+
+			sp.initiateTrack(ctx, ac.Callsign, fp)
 			status.clear = true
 		}
 		return
@@ -2309,7 +2315,7 @@ func (sp *STARSPane) setScratchpad(ctx *panes.Context, callsign string, contents
 	}
 
 	trk := sp.getTrack(ctx, ac)
-	if trk != nil && trk.TrackOwner == "" {
+	if trk == nil || trk.TrackOwner == "" {
 		// This is because /OK can be used for associated tracks that are
 		// not owned by this TCP. But /OK cannot be used for unassociated
 		// tracks. So might as well weed them out now.
@@ -2386,12 +2392,19 @@ func (sp *STARSPane) setGlobalLeaderLine(ctx *panes.Context, callsign string, di
 		func(err error) { sp.displayError(err, ctx) })
 }
 
-func (sp *STARSPane) initiateTrack(ctx *panes.Context, callsign string) {
-	// TODO: should we actually be looking up the flight plan on the server
-	// side anyway?
-	fp, err := ctx.ControlClient.STARSComputer().GetFlightPlan(callsign)
-	if err != nil {
-		// TODO: do what here?
+func (sp *STARSPane) initiateTrack(ctx *panes.Context, callsign string, fp *sim.STARSFlightPlan) {
+
+	comp := ctx.ControlClient.STARSComputer(ctx.ControlClient.Callsign)
+	// Do the checking here as well as in pkg/sim/sim.go so that we can assure that the sim side sucseeds and the local calls can be made before.
+
+	if comp.TrackInformation[callsign] != nil {
+		// This is a track that is already being tracked
+		sp.previewAreaOutput = ErrSTARSIllegalTrack.Error()
+		return
+	}
+	comp.TrackInformation[callsign] = &sim.TrackInformation{
+		TrackOwner: ctx.ControlClient.Callsign,
+		FlightPlan: fp,
 	}
 	ctx.ControlClient.InitiateTrack(callsign, fp,
 		func(any) {
@@ -2613,7 +2626,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 {
+							ctx.Lg.Errorf("Error getting flight plan for %s: %v", ac.Callsign, err)
+							return
+						}
+						sp.initiateTrack(ctx, ac.Callsign, fp)
 						return
 					}
 				}
@@ -2662,7 +2680,9 @@ func (sp *STARSPane) executeSTARSClickedCommand(ctx *panes.Context, cmd string,
 			} else if cmd == "?" {
 				ctx.Lg.Info("print aircraft", slog.String("callsign", ac.Callsign),
 					slog.Any("aircraft", ac))
-				fmt.Println(spew.Sdump(ac) + "\n" + ac.Nav.FlightState.Summary())
+				comp := ctx.ControlClient.ERAMComputer(ctx.ControlClient.Callsign)
+				fmt.Println(spew.Sdump(ac)+"\n"+comp.FlightPlans[ac.Squawk].CoordinationFix, ac.FlightPlan.ArrivalAirport)
+				// fmt.Println(spew.Sdump(ac), )
 				status.clear = true
 				return
 			} else if cmd == "*F" {
@@ -2881,12 +2901,6 @@ func (sp *STARSPane) executeSTARSClickedCommand(ctx *panes.Context, cmd string,
 				return
 
 			} else if len(cmd) > 0 {
-				// If it matches the callsign, attempt to initiate track.
-				if cmd == ac.Callsign {
-					status.clear = true
-					sp.initiateTrack(ctx, ac.Callsign)
-					return
-				}
 
 				// See if cmd works as a sector id; if so, make it a handoff.
 				control := sp.lookupControllerForId(ctx, cmd, ac.Callsign)
@@ -2916,11 +2930,19 @@ func (sp *STARSPane) executeSTARSClickedCommand(ctx *panes.Context, cmd string,
 			}
 
 		case CommandModeInitiateControl:
-			if cmd != ac.Callsign {
+			_, err := av.ParseSquawk(cmd)
+			if cmd != ac.Callsign && err != nil || len(cmd) <= 1 {
 				status.err = ErrSTARSCommandFormat
 			} else {
 				status.clear = true
-				sp.initiateTrack(ctx, ac.Callsign)
+				fp, err := ctx.ControlClient.STARSComputer(ctx.ControlClient.Callsign).GetFlightPlan(cmd)
+
+				if err != nil {
+					ctx.Lg.Errorf("Error getting flight plan for %s: %v", ac.Callsign, err)
+					return
+				}
+
+				sp.initiateTrack(ctx, ac.Callsign, fp)
 			}
 			return