weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix flight plan updates when waypoints are moved.

Browse Source 
The store serializes everything; we can't store references.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2055
This commit is contained in:
Dan Albert 2022-03-06 22:18:36 -08:00
parent 0afe1f69d4
commit b08b91ca2e
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/api/flightsSlice.ts
View File

@ -6,7 +6,7 @@ import { LatLng } from "leaflet";
interface FlightsState { interface FlightsState {
flights: { [id: string]: Flight }; flights: { [id: string]: Flight };
selected: Flight | null; selected: string | null;
} }
const initialState: FlightsState = { const initialState: FlightsState = {
@ -37,8 +37,7 @@ export const flightsSlice = createSlice({
state.selected = null; state.selected = null;
}, },
selectFlight: (state, action: PayloadAction<string>) => { selectFlight: (state, action: PayloadAction<string>) => {
const id = action.payload; state.selected = action.payload;
state.selected = state.flights[id];
}, },
updateFlightPositions: ( updateFlightPositions: (
state, state,
@ -77,5 +76,9 @@ export const {
} = flightsSlice.actions; } = flightsSlice.actions;
export const selectFlights = (state: RootState) => state.flights; export const selectFlights = (state: RootState) => state.flights;
export const selectSelectedFlight = (state: RootState) => {
const id = state.flights.selected;
return id ? state.flights.flights[id] : null;
};
export default flightsSlice.reducer; export default flightsSlice.reducer;

31
client/src/components/flightplanslayer/FlightPlansLayer.tsx
View File

@ -1,5 +1,5 @@
import { Flight } from "../../api/flight"; import { Flight } from "../../api/flight";
import { selectFlights } from "../../api/flightsSlice"; import { selectFlights, selectSelectedFlight } from "../../api/flightsSlice";
import { useAppSelector } from "../../app/hooks"; import { useAppSelector } from "../../app/hooks";
import FlightPlan from "../flightplan"; import FlightPlan from "../flightplan";
import { LayerGroup } from "react-leaflet"; import { LayerGroup } from "react-leaflet";
@ -8,26 +8,29 @@ interface FlightPlansLayerProps {
blue: boolean; blue: boolean;
} }
function SelectedFlightPlan(props: FlightPlansLayerProps) {
const flight = useAppSelector(selectSelectedFlight);
if (!flight) {
return <></>;
}
if (!props.blue) {
// We don't currently support playing as red, so nothing to draw.
return <></>;
}
return <FlightPlan key={flight.id} flight={flight} selected={true} />;
}
export default function FlightPlansLayer(props: FlightPlansLayerProps) { export default function FlightPlansLayer(props: FlightPlansLayerProps) {
const flightData = useAppSelector(selectFlights); const flightData = useAppSelector(selectFlights);
const isNotSelected = (flight: Flight) => { const isNotSelected = (flight: Flight) => {
if (flightData.selected == null) { if (flightData.selected == null) {
return true; return true;
} }
return flightData.selected.id !== flight.id; return flightData.selected !== flight.id;
}; };
const selectedFlight =
flightData.selected && flightData.selected.blue === props.blue ? (
<FlightPlan
key={flightData.selected.id}
flight={flightData.selected}
selected={true}
/>
) : (
<></>
);
return ( return (
<LayerGroup> <LayerGroup>
{Object.values(flightData.flights) {Object.values(flightData.flights)
@ -38,7 +41,7 @@ export default function FlightPlansLayer(props: FlightPlansLayerProps) {
<FlightPlan key={flight.id} flight={flight} selected={false} /> <FlightPlan key={flight.id} flight={flight} selected={false} />
); );
})} })}
{selectedFlight} <SelectedFlightPlan {...props} />
</LayerGroup> </LayerGroup>
); );
} }