weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Unit hotgroups saved to sessiondata

Browse Source
This commit is contained in:
Davide Passoni 2024-12-19 15:43:27 +01:00
parent 1c86ba1d4c
commit 71e47bce0b
7 changed files with 244 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
frontend/react/src/events.ts
View File

@ -14,10 +14,10 @@ import { Unit } from "./unit/unit";
import { LatLng } from "leaflet";
export class BaseOlympusEvent {
static on(callback: () => void) {
static on(callback: () => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback();
});
}, {once: singleShot});
}
static dispatch() {
@ -27,10 +27,10 @@ export class BaseOlympusEvent {
}
export class BaseUnitEvent {
static on(callback: (unit: Unit) => void) {
static on(callback: (unit: Unit) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.unit);
});
}, {once: singleShot});
}
static dispatch(unit: Unit) {
@ -42,10 +42,10 @@ export class BaseUnitEvent {
/************** App events ***************/
export class AppStateChangedEvent {
static on(callback: (state: OlympusState, subState: OlympusSubState) => void) {
static on(callback: (state: OlympusState, subState: OlympusSubState) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.state, ev.detail.subState);
});
}, {once: singleShot});
}
static dispatch(state: OlympusState, subState: OlympusSubState) {
@ -57,10 +57,10 @@ export class AppStateChangedEvent {
}
export class ConfigLoadedEvent {
static on(callback: (config: OlympusConfig) => void) {
static on(callback: (config: OlympusConfig) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail);
});
}, {once: singleShot});
}
static dispatch(config: OlympusConfig) {
@ -71,10 +71,10 @@ export class ConfigLoadedEvent {
}
export class ServerStatusUpdatedEvent {
static on(callback: (serverStatus: ServerStatus) => void) {
static on(callback: (serverStatus: ServerStatus) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.serverStatus);
});
}, {once: singleShot});
}
static dispatch(serverStatus: ServerStatus) {
@ -86,10 +86,10 @@ export class ServerStatusUpdatedEvent {
export class UnitDatabaseLoadedEvent extends BaseOlympusEvent {}
export class InfoPopupEvent {
static on(callback: (messages: string[]) => void) {
static on(callback: (messages: string[]) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.messages);
});
}, {once: singleShot});
}
static dispatch(messages: string[]) {
@ -99,10 +99,10 @@ export class InfoPopupEvent {
}
export class ShortcutsChangedEvent {
static on(callback: (shortcuts: { [key: string]: Shortcut }) => void) {
static on(callback: (shortcuts: { [key: string]: Shortcut }) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.shortcuts);
});
}, {once: singleShot});
}
static dispatch(shortcuts: { [key: string]: Shortcut }) {
@ -112,10 +112,10 @@ export class ShortcutsChangedEvent {
}
export class ShortcutChangedEvent {
static on(callback: (shortcut: Shortcut) => void) {
static on(callback: (shortcut: Shortcut) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.shortcut);
});
}, {once: singleShot});
}
static dispatch(shortcut: Shortcut) {
@ -125,10 +125,10 @@ export class ShortcutChangedEvent {
}
export class BindShortcutRequestEvent {
static on(callback: (shortcut: Shortcut) => void) {
static on(callback: (shortcut: Shortcut) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.shortcut);
});
}, {once: singleShot});
}
static dispatch(shortcut: Shortcut) {
@ -138,10 +138,10 @@ export class BindShortcutRequestEvent {
}
export class ModalEvent {
static on(callback: (modal: boolean) => void) {
static on(callback: (modal: boolean) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.modal);
});
}, {once: singleShot});
}
static dispatch(modal: boolean) {
@ -151,10 +151,10 @@ export class ModalEvent {
}
export class SessionDataChangedEvent {
static on(callback: (sessionData: SessionData) => void) {
static on(callback: (sessionData: SessionData) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.sessionData);
});
}, {once: singleShot});
}
static dispatch(sessionData: SessionData) {
@ -168,10 +168,10 @@ export class SessionDataLoadedEvent extends SessionDataChangedEvent {}
/************** Map events ***************/
export class MouseMovedEvent {
static on(callback: (latlng: LatLng, elevation: number) => void) {
static on(callback: (latlng: LatLng, elevation: number) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.latlng, ev.detail.elevation);
});
}, {once: singleShot});
}
static dispatch(latlng: LatLng, elevation?: number) {
@ -181,10 +181,10 @@ export class MouseMovedEvent {
}
export class HiddenTypesChangedEvent {
static on(callback: (hiddenTypes: MapHiddenTypes) => void) {
static on(callback: (hiddenTypes: MapHiddenTypes) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.hiddenTypes);
});
}, {once: singleShot});
}
static dispatch(hiddenTypes: MapHiddenTypes) {
@ -194,10 +194,10 @@ export class HiddenTypesChangedEvent {
}
export class MapOptionsChangedEvent {
static on(callback: (mapOptions: MapOptions) => void) {
static on(callback: (mapOptions: MapOptions) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.mapOptions);
});
}, {once: singleShot});
}
static dispatch(mapOptions: MapOptions) {
@ -207,10 +207,10 @@ export class MapOptionsChangedEvent {
}
export class MapSourceChangedEvent {
static on(callback: (source: string) => void) {
static on(callback: (source: string) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.source);
});
}, {once: singleShot});
}
static dispatch(source: string) {
@ -220,10 +220,10 @@ export class MapSourceChangedEvent {
}
export class CoalitionAreaSelectedEvent {
static on(callback: (coalitionArea: CoalitionCircle | CoalitionPolygon | null) => void) {
static on(callback: (coalitionArea: CoalitionCircle | CoalitionPolygon | null) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.coalitionArea);
});
}, {once: singleShot});
}
static dispatch(coalitionArea: CoalitionCircle | CoalitionPolygon | null) {
@ -235,10 +235,10 @@ export class CoalitionAreaSelectedEvent {
export class CoalitionAreaChangedEvent extends CoalitionAreaSelectedEvent {}
export class CoalitionAreasChangedEvent {
static on(callback: (coalitionAreas: (CoalitionCircle | CoalitionPolygon)[]) => void) {
static on(callback: (coalitionAreas: (CoalitionCircle | CoalitionPolygon)[]) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.coalitionAreas);
});
}, {once: singleShot});
}
static dispatch(coalitionAreas: (CoalitionCircle | CoalitionPolygon)[]) {
@ -248,10 +248,10 @@ export class CoalitionAreasChangedEvent {
}
export class AirbaseSelectedEvent {
static on(callback: (airbase: Airbase | null) => void) {
static on(callback: (airbase: Airbase | null) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.airbase);
});
}, {once: singleShot});
}
static dispatch(airbase: Airbase | null) {
@ -261,10 +261,10 @@ export class AirbaseSelectedEvent {
}
export class SelectionEnabledChangedEvent {
static on(callback: (enabled: boolean) => void) {
static on(callback: (enabled: boolean) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.enabled);
});
}, {once: singleShot});
}
static dispatch(enabled: boolean) {
@ -274,10 +274,10 @@ export class SelectionEnabledChangedEvent {
};
export class PasteEnabledChangedEvent {
static on(callback: (enabled: boolean) => void) {
static on(callback: (enabled: boolean) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.enabled);
});
}, {once: singleShot});
}
static dispatch(enabled: boolean) {
@ -287,10 +287,10 @@ export class PasteEnabledChangedEvent {
};
export class ContactsUpdatedEvent {
static on(callback: () => void) {
static on(callback: () => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback();
});
}, {once: singleShot});
}
static dispatch() {
@ -300,10 +300,10 @@ export class ContactsUpdatedEvent {
}
export class ContextActionSetChangedEvent {
static on(callback: (contextActionSet: ContextActionSet | null) => void) {
static on(callback: (contextActionSet: ContextActionSet | null) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.contextActionSet);
});
}, {once: singleShot});
}
static dispatch(contextActionSet: ContextActionSet | null) {
@ -313,10 +313,10 @@ export class ContextActionSetChangedEvent {
}
export class ContextActionChangedEvent {
static on(callback: (contextAction: ContextAction | null) => void) {
static on(callback: (contextAction: ContextAction | null) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.contextAction);
});
}, {once: singleShot});
}
static dispatch(contextAction: ContextAction | null) {
@ -326,10 +326,10 @@ export class ContextActionChangedEvent {
}
export class CopiedUnitsEvents {
static on(callback: (unitsData: UnitData[]) => void) {
static on(callback: (unitsData: UnitData[]) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.unitsData);
});
}, {once: singleShot});
}
static dispatch(unitsData: UnitData[]) {
@ -348,12 +348,14 @@ export class UnitSelectedEvent extends BaseUnitEvent {}
export class UnitDeselectedEvent extends BaseUnitEvent {}
export class UnitDeadEvent extends BaseUnitEvent {}
export class SelectionClearedEvent extends BaseOlympusEvent {}
export class UnitsRefreshed extends BaseOlympusEvent {}
export class WeaponsRefreshed extends BaseOlympusEvent {}
export class SelectedUnitsChangedEvent {
static on(callback: (selectedUnits: Unit[]) => void) {
static on(callback: (selectedUnits: Unit[]) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail);
});
}, {once: singleShot});
}
static dispatch(selectedUnits: Unit[]) {
@ -364,10 +366,10 @@ export class SelectedUnitsChangedEvent {
}
export class UnitExplosionRequestEvent {
static on(callback: (units: Unit[]) => void) {
static on(callback: (units: Unit[]) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.units);
});
}, {once: singleShot});
}
static dispatch(units: Unit[]) {
@ -377,10 +379,10 @@ export class UnitExplosionRequestEvent {
}
export class FormationCreationRequestEvent {
static on(callback: (leader: Unit, wingmen: Unit[]) => void) {
static on(callback: (leader: Unit, wingmen: Unit[]) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.leader, ev.detail.wingmen);
});
}, {once: singleShot});
}
static dispatch(leader: Unit, wingmen: Unit[]) {
@ -390,10 +392,10 @@ export class FormationCreationRequestEvent {
}
export class MapContextMenuRequestEvent {
static on(callback: (latlng: L.LatLng) => void) {
static on(callback: (latlng: L.LatLng) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.latlng);
});
}, {once: singleShot});
}
static dispatch(latlng: L.LatLng) {
@ -403,10 +405,10 @@ export class MapContextMenuRequestEvent {
}
export class UnitContextMenuRequestEvent {
static on(callback: (unit: Unit) => void) {
static on(callback: (unit: Unit) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.unit);
});
}, {once: singleShot});
}
static dispatch(unit: Unit) {
@ -416,10 +418,10 @@ export class UnitContextMenuRequestEvent {
}
export class SpawnContextMenuRequestEvent {
static on(callback: (latlng: L.LatLng) => void) {
static on(callback: (latlng: L.LatLng) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.latlng);
});
}, {once: singleShot});
}
static dispatch(latlng: L.LatLng) {
@ -429,10 +431,10 @@ export class SpawnContextMenuRequestEvent {
}
export class HotgroupsChangedEvent {
static on(callback: (hotgroups: { [key: number]: Unit[] }) => void) {
static on(callback: (hotgroups: { [key: number]: Unit[] }) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.hotgroups);
});
}, {once: singleShot});
}
static dispatch(hotgroups: { [key: number]: Unit[] }) {
@ -442,10 +444,10 @@ export class HotgroupsChangedEvent {
}
export class StarredSpawnsChangedEvent {
static on(callback: (starredSpawns: { [key: number]: SpawnRequestTable }) => void) {
static on(callback: (starredSpawns: { [key: number]: SpawnRequestTable }) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.starredSpawns);
});
}, {once: singleShot});
}
static dispatch(starredSpawns: { [key: number]: SpawnRequestTable }) {
@ -455,10 +457,10 @@ export class StarredSpawnsChangedEvent {
}
export class AWACSReferenceChangedEvent {
static on(callback: (unit: Unit | null) => void) {
static on(callback: (unit: Unit | null) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail);
});
}, {once: singleShot});
}
static dispatch(unit: Unit | null) {
@ -469,10 +471,10 @@ export class AWACSReferenceChangedEvent {
/************** Command mode events ***************/
export class CommandModeOptionsChangedEvent {
static on(callback: (options: CommandModeOptions) => void) {
static on(callback: (options: CommandModeOptions) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail);
});
}, {once: singleShot});
}
static dispatch(options: CommandModeOptions) {
@ -483,10 +485,10 @@ export class CommandModeOptionsChangedEvent {
/************** Audio backend events ***************/
export class AudioSourcesChangedEvent {
static on(callback: (audioSources: AudioSource[]) => void) {
static on(callback: (audioSources: AudioSource[]) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.audioSources);
});
}, {once: singleShot});
}
static dispatch(audioSources: AudioSource[]) {
@ -497,10 +499,10 @@ export class AudioSourcesChangedEvent {
}
export class AudioSinksChangedEvent {
static on(callback: (audioSinks: AudioSink[]) => void) {
static on(callback: (audioSinks: AudioSink[]) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.audioSinks);
});
}, {once: singleShot});
}
static dispatch(audioSinks: AudioSink[]) {
@ -511,10 +513,10 @@ export class AudioSinksChangedEvent {
}
export class SRSClientsChangedEvent {
static on(callback: () => void) {
static on(callback: () => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback();
});
}, {once: singleShot});
}
static dispatch() {
@ -524,10 +526,10 @@ export class SRSClientsChangedEvent {
}
export class AudioManagerStateChangedEvent {
static on(callback: (state: boolean) => void) {
static on(callback: (state: boolean) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.state);
});
}, {once: singleShot});
}
static dispatch(state: boolean) {
@ -537,10 +539,10 @@ export class AudioManagerStateChangedEvent {
}
export class AudioManagerDevicesChangedEvent {
static on(callback: (devices: MediaDeviceInfo[]) => void) {
static on(callback: (devices: MediaDeviceInfo[]) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.devices);
});
}, {once: singleShot});
}
static dispatch(devices: MediaDeviceInfo[]) {
@ -550,10 +552,10 @@ export class AudioManagerDevicesChangedEvent {
}
export class AudioManagerInputChangedEvent {
static on(callback: (input: MediaDeviceInfo) => void) {
static on(callback: (input: MediaDeviceInfo) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.input);
});
}, {once: singleShot});
}
static dispatch(input: MediaDeviceInfo) {
@ -563,10 +565,10 @@ export class AudioManagerInputChangedEvent {
}
export class AudioManagerOutputChangedEvent {
static on(callback: (output: MediaDeviceInfo) => void) {
static on(callback: (output: MediaDeviceInfo) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.output);
});
}, {once: singleShot});
}
static dispatch(output: MediaDeviceInfo) {
@ -577,10 +579,10 @@ export class AudioManagerOutputChangedEvent {
/************** Mission data events ***************/
export class BullseyesDataChanged {
static on(callback: (bullseyes: { [name: string]: Bullseye }) => void) {
static on(callback: (bullseyes: { [name: string]: Bullseye }) => void, singleShot = false) {
document.addEventListener(this.name, (ev: CustomEventInit) => {
callback(ev.detail.bullseyes);
});
}, {once: singleShot});
}
static dispatch(bullseyes: { [name: string]: Bullseye }) {

1
frontend/react/src/interfaces.ts
View File

@ -51,6 +51,7 @@ export interface SessionData {
| { type: 'circle', label: string; latlng: { lat: number; lng: number }; radius: number; coalition: Coalition }
| { type: 'polygon', label: string; latlngs: { lat: number; lng: number }[]; coalition: Coalition }
)[];
hotgroups?: {[key: string]: number[]}
}
export interface ProfileOptions {

22
frontend/react/src/map/coalitionarea/coalitionareamanager.ts
View File

@ -48,15 +48,21 @@ export class CoalitionAreasManager {
const localSessionData = JSON.parse(JSON.stringify(sessionData)) as SessionData;
this.#areas.forEach((area) => this.deleteCoalitionArea(area));
localSessionData.coalitionAreas?.forEach((options) => {
if (options.type === 'circle') {
let newCircle = new CoalitionCircle(new LatLng(options.latlng.lat, options.latlng.lng), { radius: options.radius }, false);
newCircle.setCoalition(options.coalition);
newCircle.setLabelText(options.label);
newCircle.setSelected(false);
this.#areas.push(newCircle);
} else if (options.type === 'polygon') {
if (options.type === "circle") {
if (options.latlng.lat !== 0 && options.latlng.lng) {
let newCircle = new CoalitionCircle(new LatLng(options.latlng.lat, options.latlng.lng), { radius: options.radius }, false);
newCircle.setCoalition(options.coalition);
newCircle.setLabelText(options.label);
newCircle.setSelected(false);
this.#areas.push(newCircle);
}
} else if (options.type === "polygon") {
if (options.latlngs.length >= 3) {
let newPolygon = new CoalitionPolygon(options.latlngs.map((latlng) => new LatLng(latlng.lat, latlng.lng)), {}, false);
let newPolygon = new CoalitionPolygon(
options.latlngs.map((latlng) => new LatLng(latlng.lat, latlng.lng)),
{},
false
);
newPolygon.setCoalition(options.coalition);
newPolygon.setLabelText(options.label);
newPolygon.setSelected(false);

12
frontend/react/src/server/servermanager.ts
View File

@ -582,7 +582,7 @@ export class ServerManager {
window.setInterval(() => {
if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE) {
this.getUnits((buffer: ArrayBuffer) => {
var time = getApp().getUnitsManager()?.update(buffer);
var time = getApp().getUnitsManager()?.update(buffer, false);
return time;
}, false);
}
@ -593,7 +593,7 @@ export class ServerManager {
window.setInterval(() => {
if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE) {
this.getWeapons((buffer: ArrayBuffer) => {
var time = getApp().getWeaponsManager()?.update(buffer);
var time = getApp().getWeaponsManager()?.update(buffer, false);
return time;
}, false);
}
@ -605,7 +605,7 @@ export class ServerManager {
() => {
if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE) {
this.getUnits((buffer: ArrayBuffer) => {
var time = getApp().getUnitsManager()?.update(buffer);
var time = getApp().getUnitsManager()?.update(buffer, true);
return time;
}, true);
}
@ -636,7 +636,7 @@ export class ServerManager {
window.setInterval(() => {
if (!this.getPaused() && getApp().getMissionManager().getCommandModeOptions().commandMode != NONE) {
this.getWeapons((buffer: ArrayBuffer) => {
var time = getApp().getWeaponsManager()?.update(buffer);
var time = getApp().getWeaponsManager()?.update(buffer, true);
return time;
}, true);
}
@ -664,12 +664,12 @@ export class ServerManager {
});
this.getWeapons((buffer: ArrayBuffer) => {
var time = getApp().getWeaponsManager()?.update(buffer);
var time = getApp().getWeaponsManager()?.update(buffer, true);
return time;
}, true);
this.getUnits((buffer: ArrayBuffer) => {
var time = getApp().getUnitsManager()?.update(buffer);
var time = getApp().getUnitsManager()?.update(buffer, true);
return time;
}, true);
}

186
frontend/react/src/sessiondata.ts
View File

@ -4,7 +4,15 @@ import { FileSource } from "./audio/filesource";
import { RadioSink } from "./audio/radiosink";
import { UnitSink } from "./audio/unitsink";
import { OlympusState } from "./constants/constants";
import { AudioSinksChangedEvent, AudioSourcesChangedEvent, CoalitionAreasChangedEvent, SessionDataChangedEvent, SessionDataLoadedEvent, SessionDataSavedEvent } from "./events";
import {
AudioSinksChangedEvent,
AudioSourcesChangedEvent,
CoalitionAreasChangedEvent,
HotgroupsChangedEvent,
SessionDataChangedEvent,
SessionDataLoadedEvent,
SessionDataSavedEvent,
} from "./events";
import { SessionData } from "./interfaces";
import { CoalitionCircle } from "./map/coalitionarea/coalitioncircle";
import { CoalitionPolygon } from "./map/coalitionarea/coalitionpolygon";
@ -16,95 +24,109 @@ export class SessionDataManager {
#saveSessionDataTimeout: number | null = null;
constructor() {
AudioSinksChangedEvent.on((audioSinks) => {
if (getApp().getAudioManager().isRunning()) {
this.#sessionData.radios = audioSinks
.filter((sink) => sink instanceof RadioSink)
.map((radioSink) => {
return {
frequency: radioSink.getFrequency(),
modulation: radioSink.getModulation(),
pan: radioSink.getPan()
};
});
SessionDataLoadedEvent.on(() => {
/* Wait for all the loading to be completed before enabling session data saving */
window.setTimeout(() => {
AudioSinksChangedEvent.on((audioSinks) => {
if (getApp().getAudioManager().isRunning()) {
this.#sessionData.radios = audioSinks
.filter((sink) => sink instanceof RadioSink)
.map((radioSink) => {
return {
frequency: radioSink.getFrequency(),
modulation: radioSink.getModulation(),
pan: radioSink.getPan(),
};
});
this.#sessionData.unitSinks = audioSinks
.filter((sink) => sink instanceof UnitSink)
.map((unitSink) => {
return {
ID: unitSink.getUnit().ID,
};
});
this.#sessionData.unitSinks = audioSinks
.filter((sink) => sink instanceof UnitSink)
.map((unitSink) => {
return {
ID: unitSink.getUnit().ID,
};
});
this.#sessionData.connections = [];
let counter = 0;
let sources = getApp().getAudioManager().getSources();
let sinks = getApp().getAudioManager().getSinks();
sources.forEach((source, idx) => {
counter++;
source.getConnectedTo().forEach((sink) => {
if (sinks.indexOf(sink as AudioSink) !== undefined) {
this.#sessionData.connections?.push([idx, sinks.indexOf(sink as AudioSink)]);
}
});
this.#sessionData.connections = [];
let counter = 0;
let sources = getApp().getAudioManager().getSources();
let sinks = getApp().getAudioManager().getSinks();
sources.forEach((source, idx) => {
counter++;
source.getConnectedTo().forEach((sink) => {
if (sinks.indexOf(sink as AudioSink) !== undefined) {
this.#sessionData.connections?.push([idx, sinks.indexOf(sink as AudioSink)]);
}
});
});
this.#saveSessionData();
}
});
this.#saveSessionData();
}
});
AudioSourcesChangedEvent.on((audioSources) => {
if (getApp().getAudioManager().isRunning()) {
this.#sessionData.fileSources = audioSources
.filter((sink) => sink instanceof FileSource)
.map((fileSource) => {
return { filename: fileSource.getFilename(), volume: fileSource.getVolume() };
});
AudioSourcesChangedEvent.on((audioSources) => {
if (getApp().getAudioManager().isRunning()) {
this.#sessionData.fileSources = audioSources
.filter((sink) => sink instanceof FileSource)
.map((fileSource) => {
return { filename: fileSource.getFilename(), volume: fileSource.getVolume() };
});
this.#sessionData.connections = [];
let counter = 0;
let sources = getApp().getAudioManager().getSources();
let sinks = getApp().getAudioManager().getSinks();
sources.forEach((source, idx) => {
counter++;
source.getConnectedTo().forEach((sink) => {
if (sinks.indexOf(sink as AudioSink) !== undefined) {
this.#sessionData.connections?.push([idx, sinks.indexOf(sink as AudioSink)]);
}
});
});
this.#sessionData.connections = [];
let counter = 0;
let sources = getApp().getAudioManager().getSources();
let sinks = getApp().getAudioManager().getSinks();
sources.forEach((source, idx) => {
counter++;
source.getConnectedTo().forEach((sink) => {
if (sinks.indexOf(sink as AudioSink) !== undefined) {
this.#sessionData.connections?.push([idx, sinks.indexOf(sink as AudioSink)]);
}
});
this.#saveSessionData();
}
});
this.#saveSessionData();
}
CoalitionAreasChangedEvent.on(() => {
this.#sessionData.coalitionAreas = [];
getApp()
.getCoalitionAreasManager()
.getAreas()
.forEach((area) => {
if (area instanceof CoalitionCircle) {
this.#sessionData.coalitionAreas?.push({
type: "circle",
latlng: { lat: area.getLatLng().lat, lng: area.getLatLng().lng },
coalition: area.getCoalition(),
label: area.getLabelText(),
radius: area.getRadius(),
});
} else if (area instanceof CoalitionPolygon) {
this.#sessionData.coalitionAreas?.push({
type: "polygon",
latlngs: (area.getLatLngs()[0] as LatLng[]).map((latlng) => {
return { lat: latlng.lat, lng: latlng.lng };
}),
coalition: area.getCoalition(),
label: area.getLabelText(),
});
}
});
this.#saveSessionData();
});
HotgroupsChangedEvent.on((hotgroups) => {
this.#sessionData.hotgroups = {};
Object.keys(hotgroups).forEach((hotgroup) => {
(this.#sessionData.hotgroups as { [key: string]: number[] })[hotgroup] = hotgroups[hotgroup].map((unit) => unit.ID);
});
this.#saveSessionData();
});
}, 200);
});
CoalitionAreasChangedEvent.on(() => {
this.#sessionData.coalitionAreas = []
getApp().getCoalitionAreasManager().getAreas().forEach((area) => {
if (area instanceof CoalitionCircle) {
this.#sessionData.coalitionAreas?.push(
{
type: 'circle',
latlng: {lat: area.getLatLng().lat, lng: area.getLatLng().lng},
coalition: area.getCoalition(),
label: area.getLabelText(),
radius: area.getRadius()
}
)
} else if (area instanceof CoalitionPolygon) {
this.#sessionData.coalitionAreas?.push(
{
type: 'polygon',
latlngs: (area.getLatLngs()[0] as LatLng[]).map((latlng) => {return {lat: latlng.lat, lng: latlng.lng}}),
coalition: area.getCoalition(),
label: area.getLabelText()
}
)
}
})
this.#saveSessionData();
})
}
loadSessionData(sessionHash?: string) {
@ -146,7 +168,7 @@ export class SessionDataManager {
#saveSessionData() {
if (getApp().getState() === OlympusState.SERVER) return;
SessionDataChangedEvent.dispatch(this.#sessionData);
if (this.#saveSessionDataTimeout) window.clearTimeout(this.#saveSessionDataTimeout);

43
frontend/react/src/unit/unitsmanager.ts
View File

@ -21,12 +21,13 @@ import {
HotgroupsChangedEvent,
SelectedUnitsChangedEvent,
SelectionClearedEvent,
SessionDataLoadedEvent,
UnitDeselectedEvent,
UnitSelectedEvent,
UnitsRefreshed,
} from "../events";
import { UnitDatabase } from "./databases/unitdatabase";
import * as turf from "@turf/turf";
import * as turfC from "@turf/clusters";
/** The UnitsManager handles the creation, update, and control of units. Data is strictly updated by the server ONLY. This means that any interaction from the user will always and only
* result in a command to the server, executed by means of a REST PUT request. Any subsequent change in data will be reflected only when the new data is sent back by the server. This strategy allows
@ -45,7 +46,7 @@ export class UnitsManager {
#unitDatabase: UnitDatabase;
#protectionCallback: (units: Unit[]) => void = (units) => {};
#AWACSReference: Unit | null = null;
#clusters: {[key: number]: Unit[]} = {};
#clusters: { [key: number]: Unit[] } = {};
constructor() {
this.#unitDatabase = new UnitDatabase();
@ -63,6 +64,18 @@ export class UnitsManager {
UnitSelectedEvent.on((unit) => this.#onUnitSelection(unit));
UnitDeselectedEvent.on((unit) => this.#onUnitDeselection(unit));
SessionDataLoadedEvent.on((sessionData) => {
UnitsRefreshed.on(() => {
const localSessionData = JSON.parse(JSON.stringify(sessionData));
Object.keys(localSessionData.hotgroups).forEach((hotgroup) => {
localSessionData.hotgroups[hotgroup].forEach((ID) => {
let unit = this.getUnitByID(ID);
if (unit) this.addToHotgroup(Number(hotgroup), [unit]);
});
});
}, true);
});
getApp()
.getShortcutManager()
.addShortcut("selectAll", {
@ -194,7 +207,7 @@ export class UnitsManager {
* @param buffer The arraybuffer, encoded according to the ICD defined in: TODO Add reference to ICD
* @returns The decoded updateTime of the data update.
*/
update(buffer: ArrayBuffer) {
update(buffer: ArrayBuffer, fullUpdate: boolean) {
/* Extract the data from the arraybuffer. Since data is encoded dynamically (not all data is always present, but rather only the data that was actually updated since the last request).
No a prori casting can be performed. On the contrary, the array is decoded incrementally, depending on the DataIndexes of the data. The actual data decoding is performed by the Unit class directly.
Every time a piece of data is decoded the decoder seeker is incremented. */
@ -281,6 +294,8 @@ export class UnitsManager {
/* Compute the base clusters */
this.#clusters = this.computeClusters();
if (fullUpdate) UnitsRefreshed.dispatch();
return updateTime;
}
@ -1236,7 +1251,7 @@ export class UnitsManager {
); /* Can be applied to humans too */
getApp().addInfoMessage(`${this.#copiedUnits.length} units copied`);
CopiedUnitsEvents.dispatch(this.#copiedUnits)
CopiedUnitsEvents.dispatch(this.#copiedUnits);
}
/*********************** Unit manipulation functions ************************/
@ -1288,13 +1303,12 @@ export class UnitsManager {
var units: { ID: number; location: LatLng }[] = [];
let markers: TemporaryUnitMarker[] = [];
groups[groupName].forEach((unit: UnitData) => {
var position = location ? new LatLng(
location.lat + unit.position.lat - avgLat,
location.lng + unit.position.lng - avgLng
) : new LatLng(
getApp().getMap().getMouseCoordinates().lat + unit.position.lat - avgLat,
getApp().getMap().getMouseCoordinates().lng + unit.position.lng - avgLng
);
var position = location
? new LatLng(location.lat + unit.position.lat - avgLat, location.lng + unit.position.lng - avgLng)
: new LatLng(
getApp().getMap().getMouseCoordinates().lat + unit.position.lat - avgLat,
getApp().getMap().getMouseCoordinates().lng + unit.position.lng - avgLng
);
markers.push(getApp().getMap().addTemporaryMarker(position, unit.name, unit.coalition));
units.push({ ID: unit.ID, location: position });
});
@ -1571,12 +1585,11 @@ export class UnitsManager {
//@ts-ignore
var clustered = turf.clustersDbscan(geojson, distance, { minPoints: 1 });
let clusters: {[key: number]: Unit[]} = {};
let clusters: { [key: number]: Unit[] } = {};
clustered.features.forEach((feature, idx) => {
if (clusters[feature.properties.cluster] === undefined)
clusters[feature.properties.cluster] = [] as Unit[];
if (clusters[feature.properties.cluster] === undefined) clusters[feature.properties.cluster] = [] as Unit[];
clusters[feature.properties.cluster].push(units[idx]);
})
});
return clusters;
}

7
frontend/react/src/weapon/weaponsmanager.ts
View File

@ -3,7 +3,7 @@ import { Weapon } from "./weapon";
import { DataIndexes } from "../constants/constants";
import { DataExtractor } from "../server/dataextractor";
import { Contact } from "../interfaces";
import { CommandModeOptionsChangedEvent } from "../events";
import { CommandModeOptionsChangedEvent, WeaponsRefreshed } from "../events";
/** The WeaponsManager handles the creation and update of weapons. Data is strictly updated by the server ONLY. */
export class WeaponsManager {
@ -55,7 +55,7 @@ export class WeaponsManager {
* @param buffer The arraybuffer, encoded according to the ICD defined in: TODO Add reference to ICD
* @returns The decoded updateTime of the data update.
*/
update(buffer: ArrayBuffer) {
update(buffer: ArrayBuffer, fullUpdate: boolean) {
/* Extract the data from the arraybuffer. Since data is encoded dynamically (not all data is always present, but rather only the data that was actually updated since the last request).
No a prori casting can be performed. On the contrary, the array is decoded incrementally, depending on the DataIndexes of the data. The actual data decoding is performed by the Weapon class directly.
Every time a piece of data is decoded the decoder seeker is incremented. */
@ -82,6 +82,9 @@ export class WeaponsManager {
/* Update the data of the weapon */
this.#weapons[ID]?.setData(dataExtractor);
}
if (fullUpdate) WeaponsRefreshed.dispatch();
return updateTime;
}