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

Merge branch 'release-candidate' of https://github.com/Pax1601/DCSOlympus into release-candidate

Browse Source
This commit is contained in:
Pax1601
2025-10-23 18:07:35 +02:00
parent 2a9723b932 f565b9ee6e
commit bfd11c49af
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/react/src/map/map.ts
View File

@@ -443,7 +443,7 @@ export class Map extends L.Map {
ctrlKey: false, ctrlKey: false,
}); });
for (let contextActionName in ContextActions) { for (const contextActionName of Object.keys(ContextActions) as Array<keyof typeof ContextActions>) {
const contextAction = ContextActions[contextActionName] as ContextAction; const contextAction = ContextActions[contextActionName] as ContextAction;
if (contextAction.getOptions().code) { if (contextAction.getOptions().code) {
getApp() getApp()
@@ -631,13 +631,13 @@ export class Map extends L.Map {
return this.#spawnHeading; return this.#spawnHeading;
} }
addStarredSpawnRequestTable(key, spawnRequestTable: SpawnRequestTable, quickAccessName: string) { addStarredSpawnRequestTable(key: string, spawnRequestTable: SpawnRequestTable, quickAccessName: string) {
this.#starredSpawnRequestTables[key] = spawnRequestTable; this.#starredSpawnRequestTables[key] = spawnRequestTable;
this.#starredSpawnRequestTables[key].quickAccessName = quickAccessName; this.#starredSpawnRequestTables[key].quickAccessName = quickAccessName;
StarredSpawnsChangedEvent.dispatch(this.#starredSpawnRequestTables); StarredSpawnsChangedEvent.dispatch(this.#starredSpawnRequestTables);
} }
removeStarredSpawnRequestTable(key) { removeStarredSpawnRequestTable(key: string) {
if (key in this.#starredSpawnRequestTables) delete this.#starredSpawnRequestTables[key]; if (key in this.#starredSpawnRequestTables) delete this.#starredSpawnRequestTables[key];
StarredSpawnsChangedEvent.dispatch(this.#starredSpawnRequestTables); StarredSpawnsChangedEvent.dispatch(this.#starredSpawnRequestTables);
} }
@@ -678,7 +678,7 @@ export class Map extends L.Map {
} }
setHiddenType(key: string, value: boolean) { setHiddenType(key: string, value: boolean) {
this.#hiddenTypes[key] = value; this.#hiddenTypes[key as keyof MapHiddenTypes] = value;
HiddenTypesChangedEvent.dispatch(this.#hiddenTypes); HiddenTypesChangedEvent.dispatch(this.#hiddenTypes);
} }
@@ -788,13 +788,13 @@ export class Map extends L.Map {
return smokeMarker; return smokeMarker;
} }
setOption(key, value) { setOption<K extends keyof MapOptions>(key: K, value: MapOptions[K]) {
this.#options[key] = value; this.#options[key] = value;
MapOptionsChangedEvent.dispatch(this.#options, key); MapOptionsChangedEvent.dispatch(this.#options, key as keyof MapOptions);
} }
setOptions(options) { setOptions(options: Partial<MapOptions>) {
this.#options = { ...options }; this.#options = { ...this.#options, ...options } as MapOptions;
MapOptionsChangedEvent.dispatch(this.#options); MapOptionsChangedEvent.dispatch(this.#options);
} }
@@ -1071,7 +1071,7 @@ export class Map extends L.Map {
false, false,
undefined, undefined,
undefined, undefined,
(hash) => { (hash: string) => {
this.addTemporaryMarker( this.addTemporaryMarker(
e.latlng, e.latlng,
this.#spawnRequestTable?.unit.unitType ?? "unknown", this.#spawnRequestTable?.unit.unitType ?? "unknown",
@@ -1239,7 +1239,7 @@ export class Map extends L.Map {
this.#lastMouseCoordinates = e.latlng; this.#lastMouseCoordinates = e.latlng;
MouseMovedEvent.dispatch(e.latlng); MouseMovedEvent.dispatch(e.latlng);
getGroundElevation(e.latlng, (elevation) => { getGroundElevation(e.latlng, (elevation: number) => {
MouseMovedEvent.dispatch(e.latlng, elevation); MouseMovedEvent.dispatch(e.latlng, elevation);
}); });
@@ -1366,8 +1366,8 @@ export class Map extends L.Map {
.filter((unit) => !unit.getHuman()); .filter((unit) => !unit.getHuman());
Object.keys(this.#destinationPreviewMarkers).forEach((ID) => { Object.keys(this.#destinationPreviewMarkers).forEach((ID) => {
this.#destinationPreviewMarkers[ID].removeFrom(this); this.#destinationPreviewMarkers[parseInt(ID)].removeFrom(this);
delete this.#destinationPreviewMarkers[ID]; delete this.#destinationPreviewMarkers[parseInt(ID)];
}); });
if (this.#keepRelativePositions) { if (this.#keepRelativePositions) {
@@ -1385,7 +1385,7 @@ export class Map extends L.Map {
#moveDestinationPreviewMarkers() { #moveDestinationPreviewMarkers() {
if (this.#keepRelativePositions) { if (this.#keepRelativePositions) {
Object.entries(getApp().getUnitsManager().computeGroupDestination(this.#destinationRotationCenter, this.#destinationRotation)).forEach(([ID, latlng]) => { Object.entries(getApp().getUnitsManager().computeGroupDestination(this.#destinationRotationCenter, this.#destinationRotation)).forEach(([ID, latlng]) => {
this.#destinationPreviewMarkers[ID]?.setLatLng(latlng); this.#destinationPreviewMarkers[parseInt(ID)]?.setLatLng(latlng);
}); });
} else { } else {
Object.values(this.#destinationPreviewMarkers).forEach((marker) => { Object.values(this.#destinationPreviewMarkers).forEach((marker) => {