Refactoring/612 refactor position

backend/src/exercise/patient-ticking.ts

@@ -5,6 +5,7 @@ import type {
     PersonnelType,
 } from 'digital-fuesim-manv-shared';
 import {
+    isOnMap,
     getElement,
     healthPointsDefaults,
     isAlive,
@@ -29,7 +30,7 @@ export function patientTick(
     return (
         Object.values(state.patients)
             // Only look at patients that are alive and have a position, i.e. are not in a vehicle
-            .filter((patient) => isAlive(patient.health) && patient.position)
+            .filter((patient) => isAlive(patient.health) && isOnMap(patient))
             .map((patient) => {
                 // update the time a patient is being treated, to check for pretriage later
                 const treatmentTime = Patient.isTreatedByPersonnel(patient)

frontend/src/app/pages/exercises/exercise/shared/core/drag-element.service.ts

@@ -175,10 +175,7 @@ export class DragElementService {
                     this.exerciseService.proposeAction(
                         {
                             type: '[Patient] Add patient',
-                            patient: {
-                                ...patient,
-                                position,
-                            },
+                            patient,
                         },
                         true
                     );

frontend/src/app/pages/exercises/exercise/shared/core/statistics/statistics.service.ts

@@ -1,17 +1,21 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
+import {
+    isNotInVehicle,
+    coordinatesOf,
+    isOnMap,
+    loopTroughTime,
+    uuid,
+    Viewport,
+    isNotInTransfer,
+} from 'digital-fuesim-manv-shared';
 import type {
+    Personnel,
     Client,
     ExerciseState,
     Patient,
     Vehicle,
 } from 'digital-fuesim-manv-shared';
-import {
-    loopTroughTime,
-    Personnel,
-    uuid,
-    Viewport,
-} from 'digital-fuesim-manv-shared';
 import { countBy } from 'lodash-es';
 import { ReplaySubject } from 'rxjs';
 import { ApiService } from 'src/app/core/api.service';
@@ -108,18 +112,27 @@ export class StatisticsService {
                     ),
                     Object.values(draftState.patients).filter(
                         (patient) =>
-                            patient.position &&
-                            Viewport.isInViewport(viewport, patient.position)
+                            isOnMap(patient) &&
+                            Viewport.isInViewport(
+                                viewport,
+                                coordinatesOf(patient)
+                            )
                     ),
                     Object.values(draftState.vehicles).filter(
                         (vehicle) =>
-                            vehicle.position &&
-                            Viewport.isInViewport(viewport, vehicle.position)
+                            isOnMap(vehicle) &&
+                            Viewport.isInViewport(
+                                viewport,
+                                coordinatesOf(vehicle)
+                            )
                     ),
                     Object.values(draftState.personnel).filter(
                         (personnel) =>
-                            personnel.position &&
-                            Viewport.isInViewport(viewport, personnel.position)
+                            isOnMap(personnel) &&
+                            Viewport.isInViewport(
+                                viewport,
+                                coordinatesOf(personnel)
+                            )
                     )
                 ),
             ])
@@ -148,8 +161,8 @@ export class StatisticsService {
             personnel: countBy(
                 personnel.filter(
                     (_personnel) =>
-                        !Personnel.isInVehicle(_personnel) &&
-                        _personnel.transfer === undefined
+                        isNotInVehicle(_personnel) &&
+                        isNotInTransfer(_personnel)
                 ),
                 (_personnel) => _personnel.personnelType
             ),

frontend/src/app/pages/exercises/exercise/shared/emergency-operations-center/send-alarm-group-interface/send-alarm-group-interface.component.ts

@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 import type { AlarmGroup, UUID } from 'digital-fuesim-manv-shared';
 import {
-    Position,
+    MapCoordinates,
     AlarmGroupStartPoint,
     createVehicleParameters,
     TransferPoint,
@@ -97,10 +97,13 @@ export class SendAlarmGroupInterfaceComponent implements OnDestroy {
                             this.store
                         ),
                         // TODO: This position is not correct but needs to be provided.
-                        // Here one should use a MetaPosition with the Transfer.
+                        // Here one should use a Position with the Transfer.
                         // But this is part of later Refactoring.
-                        // Also it is irrelevant, because the correctMetaPosition is set immediately after this is called.
-                        Position.create(0, 0)
+                        // We need the Transfer to be created before the Vehicle is created,
+                        // else we need to provide a Position that is immediately overwritten by the Add to Transfer Action.
+                        // This is done here
+                        // Good Thing is, it is irrelevant, because the correctPosition is set immediately after this is called.
+                        MapCoordinates.create(0, 0)
                     );
 
                     return [

frontend/src/app/pages/exercises/exercise/shared/exercise-map/feature-managers/material-feature-manager.ts

@@ -6,17 +6,14 @@ import type VectorLayer from 'ol/layer/Vector';
 import type OlMap from 'ol/Map';
 import type VectorSource from 'ol/source/Vector';
 import type { ExerciseService } from 'src/app/core/exercise.service';
-import type { WithPosition } from '../../utility/types/with-position';
 import { MaterialPopupComponent } from '../shared/material-popup/material-popup.component';
 import { PointGeometryHelper } from '../utility/point-geometry-helper';
 import { ImagePopupHelper } from '../utility/popup-helper';
 import { ImageStyleHelper } from '../utility/style-helper/image-style-helper';
 import { NameStyleHelper } from '../utility/style-helper/name-style-helper';
 import { MoveableFeatureManager } from './moveable-feature-manager';
 
-export class MaterialFeatureManager extends MoveableFeatureManager<
-    WithPosition<Material>
-> {
+export class MaterialFeatureManager extends MoveableFeatureManager<Material> {
     private readonly imageStyleHelper = new ImageStyleHelper(
         (feature) => (this.getElementFromFeature(feature) as Material).image
     );

frontend/src/app/pages/exercises/exercise/shared/exercise-map/feature-managers/patient-feature-manager.ts

@@ -11,17 +11,14 @@ import type { ExerciseService } from 'src/app/core/exercise.service';
 import type { AppState } from 'src/app/state/app.state';
 import { selectConfiguration } from 'src/app/state/application/selectors/exercise.selectors';
 import { selectStateSnapshot } from 'src/app/state/get-state-snapshot';
-import type { WithPosition } from '../../utility/types/with-position';
 import { PatientPopupComponent } from '../shared/patient-popup/patient-popup.component';
 import { PointGeometryHelper } from '../utility/point-geometry-helper';
 import { ImagePopupHelper } from '../utility/popup-helper';
 import { CircleStyleHelper } from '../utility/style-helper/circle-style-helper';
 import { ImageStyleHelper } from '../utility/style-helper/image-style-helper';
 import { MoveableFeatureManager } from './moveable-feature-manager';
 
-export class PatientFeatureManager extends MoveableFeatureManager<
-    WithPosition<Patient>
-> {
+export class PatientFeatureManager extends MoveableFeatureManager<Patient> {
     private readonly popupHelper = new ImagePopupHelper(this.olMap, this.layer);
 
     private readonly imageStyleHelper = new ImageStyleHelper((feature) => {

frontend/src/app/pages/exercises/exercise/shared/exercise-map/feature-managers/personnel-feature-manager.ts

@@ -6,17 +6,14 @@ import type VectorLayer from 'ol/layer/Vector';
 import type OlMap from 'ol/Map';
 import type VectorSource from 'ol/source/Vector';
 import type { ExerciseService } from 'src/app/core/exercise.service';
-import type { WithPosition } from '../../utility/types/with-position';
 import { PersonnelPopupComponent } from '../shared/personnel-popup/personnel-popup.component';
 import { PointGeometryHelper } from '../utility/point-geometry-helper';
 import { ImagePopupHelper } from '../utility/popup-helper';
 import { ImageStyleHelper } from '../utility/style-helper/image-style-helper';
 import { NameStyleHelper } from '../utility/style-helper/name-style-helper';
 import { MoveableFeatureManager } from './moveable-feature-manager';
 
-export class PersonnelFeatureManager extends MoveableFeatureManager<
-    WithPosition<Personnel>
-> {
+export class PersonnelFeatureManager extends MoveableFeatureManager<Personnel> {
     private readonly imageStyleHelper = new ImageStyleHelper(
         (feature) => (this.getElementFromFeature(feature) as Personnel).image
     );

frontend/src/app/pages/exercises/exercise/shared/exercise-map/feature-managers/simulated-region-feature-manager.ts

@@ -1,6 +1,6 @@
 import type { Store } from '@ngrx/store';
 import type { UUID, SimulatedRegion } from 'digital-fuesim-manv-shared';
-import { Position, Size } from 'digital-fuesim-manv-shared';
+import { MapCoordinates, Size } from 'digital-fuesim-manv-shared';
 import type { Feature, MapBrowserEvent } from 'ol';
 import type { Polygon } from 'ol/geom';
 import type VectorLayer from 'ol/layer/Vector';
@@ -69,7 +69,7 @@ export class SimulatedRegionFeatureManager
                     {
                         type: '[SimulatedRegion] Resize simulated region',
                         simulatedRegionId: element.id,
-                        targetPosition: Position.create(
+                        targetPosition: MapCoordinates.create(
                             topLeftCoordinate[0]!,
                             topLeftCoordinate[1]!
                         ),

frontend/src/app/pages/exercises/exercise/shared/exercise-map/feature-managers/vehicle-feature-manager.ts

@@ -7,17 +7,14 @@ import type VectorLayer from 'ol/layer/Vector';
 import type OlMap from 'ol/Map';
 import type VectorSource from 'ol/source/Vector';
 import type { ExerciseService } from 'src/app/core/exercise.service';
-import type { WithPosition } from '../../utility/types/with-position';
 import { VehiclePopupComponent } from '../shared/vehicle-popup/vehicle-popup.component';
 import { PointGeometryHelper } from '../utility/point-geometry-helper';
 import { ImagePopupHelper } from '../utility/popup-helper';
 import { ImageStyleHelper } from '../utility/style-helper/image-style-helper';
 import { NameStyleHelper } from '../utility/style-helper/name-style-helper';
 import { MoveableFeatureManager } from './moveable-feature-manager';
 
-export class VehicleFeatureManager extends MoveableFeatureManager<
-    WithPosition<Vehicle>
-> {
+export class VehicleFeatureManager extends MoveableFeatureManager<Vehicle> {
     private readonly imageStyleHelper = new ImageStyleHelper(
         (feature) => (this.getElementFromFeature(feature) as Vehicle).image
     );

frontend/src/app/pages/exercises/exercise/shared/exercise-map/feature-managers/viewport-feature-manager.ts

@@ -1,6 +1,6 @@
 import type { Store } from '@ngrx/store';
 import type { UUID } from 'digital-fuesim-manv-shared';
-import { Position, Size, Viewport } from 'digital-fuesim-manv-shared';
+import { MapCoordinates, Size, Viewport } from 'digital-fuesim-manv-shared';
 import type { Feature, MapBrowserEvent } from 'ol';
 import type { Coordinate } from 'ol/coordinate';
 import type { Polygon } from 'ol/geom';
@@ -77,7 +77,7 @@ export class ViewportFeatureManager
                     {
                         type: '[Viewport] Resize viewport',
                         viewportId: element.id,
-                        targetPosition: Position.create(
+                        targetPosition: MapCoordinates.create(
                             topLeftCoordinate[0]!,
                             topLeftCoordinate[1]!
                         ),

frontend/src/app/pages/exercises/exercise/shared/exercise-map/shared/vehicle-popup/vehicle-popup.component.ts

@@ -2,7 +2,7 @@ import type { OnInit } from '@angular/core';
 import { Component, EventEmitter, Output } from '@angular/core';
 import { Store } from '@ngrx/store';
 import type { UUID, Vehicle } from 'digital-fuesim-manv-shared';
-import { Material, Patient, Personnel } from 'digital-fuesim-manv-shared';
+import { isInVehicle } from 'digital-fuesim-manv-shared';
 import type { Observable } from 'rxjs';
 import { combineLatest, map, switchMap } from 'rxjs';
 import { ExerciseService } from 'src/app/core/exercise.service';
@@ -45,23 +45,21 @@ export class VehiclePopupComponent implements PopupComponent, OnInit {
                 ).map((materialId) =>
                     this.store
                         .select(createSelectMaterial(materialId))
-                        .pipe(map((material) => Material.isInVehicle(material)))
+                        .pipe(map((material) => isInVehicle(material)))
                 );
                 const personnelAreInVehicle$ = Object.keys(
                     _vehicle.personnelIds
                 ).map((personnelId) =>
                     this.store
                         .select(createSelectPersonnel(personnelId))
-                        .pipe(
-                            map((personnel) => Personnel.isInVehicle(personnel))
-                        )
+                        .pipe(map((personnel) => isInVehicle(personnel)))
                 );
                 const patientsAreInVehicle$ = Object.keys(
                     _vehicle.patientIds
                 ).map((patientId) =>
                     this.store
                         .select(createSelectPatient(patientId))
-                        .pipe(map((patient) => Patient.isInVehicle(patient)))
+                        .pipe(map((patient) => isInVehicle(patient)))
                 );
                 return combineLatest([
                     ...materialsAreInVehicle$,
@@ -70,7 +68,7 @@ export class VehiclePopupComponent implements PopupComponent, OnInit {
                 ]);
             }),
             map((areInVehicle) =>
-                areInVehicle.every((isInVehicle) => !isInVehicle)
+                areInVehicle.every((isInAVehicle) => !isInAVehicle)
             )
         );
     }

frontend/src/app/pages/exercises/exercise/shared/exercise-map/utility/geometry-helper.ts

@@ -1,4 +1,9 @@
-import type { Position, Size, UUID } from 'digital-fuesim-manv-shared';
+import type {
+    MapCoordinates,
+    Position,
+    Size,
+    UUID,
+} from 'digital-fuesim-manv-shared';
 import type { Feature } from 'ol';
 import type { Coordinate } from 'ol/coordinate';
 import type { Geometry } from 'ol/geom';
@@ -32,7 +37,7 @@ type ArrayElement<ArrayType> = ArrayType extends readonly (infer ElementType)[]
     : never;
 
 type SubstituteCoordinateForPoint<T> = T extends Coordinate
-    ? Position
+    ? MapCoordinates
     : T extends Array<ArrayElement<T>>
     ? SubstituteCoordinateForPoint<ArrayElement<T>>[]
     : never;

frontend/src/app/pages/exercises/exercise/shared/exercise-map/utility/ol-map-manager.ts

@@ -5,6 +5,7 @@ import type {
     MergeIntersection,
     UUID,
 } from 'digital-fuesim-manv-shared';
+import { coordinatesOf } from 'digital-fuesim-manv-shared';
 import type { Feature } from 'ol';
 import { Overlay, View } from 'ol';
 import type { Polygon } from 'ol/geom';
@@ -356,10 +357,10 @@ export class OlMapManager {
                 const center = view.getCenter()!;
                 const previousZoom = view.getZoom()!;
                 const targetExtent = [
-                    viewport.position.x,
-                    viewport.position.y - viewport.size.height,
-                    viewport.position.x + viewport.size.width,
-                    viewport.position.y,
+                    coordinatesOf(viewport).x,
+                    coordinatesOf(viewport).y - viewport.size.height,
+                    coordinatesOf(viewport).x + viewport.size.width,
+                    coordinatesOf(viewport).y,
                 ];
                 view.fit(targetExtent);
                 const matchingZoom = view.getZoom()!;
@@ -528,20 +529,20 @@ export class OlMapManager {
             return;
         }
         const minX = Math.min(
-            ...viewports.map((viewport) => viewport.position.x)
+            ...viewports.map((viewport) => coordinatesOf(viewport).x)
         );
         const minY = Math.min(
             ...viewports.map(
-                (viewport) => viewport.position.y - viewport.size.height
+                (viewport) => coordinatesOf(viewport).y - viewport.size.height
             )
         );
         const maxX = Math.max(
             ...viewports.map(
-                (viewport) => viewport.position.x + viewport.size.width
+                (viewport) => coordinatesOf(viewport).x + viewport.size.width
             )
         );
         const maxY = Math.max(
-            ...viewports.map((viewport) => viewport.position.y)
+            ...viewports.map((viewport) => coordinatesOf(viewport).y)
         );
         const padding = 25;
         view.fit([minX, minY, maxX, maxY], {

frontend/src/app/pages/exercises/exercise/shared/exercise-map/utility/point-geometry-helper.ts

@@ -1,7 +1,7 @@
-import { Position } from 'digital-fuesim-manv-shared';
+import type { WithPosition } from 'digital-fuesim-manv-shared';
+import { MapCoordinates, coordinatesOf } from 'digital-fuesim-manv-shared';
 import { Feature } from 'ol';
 import { Point } from 'ol/geom';
-import type { WithPosition } from '../../utility/types/with-position';
 import type {
     CoordinatePair,
     Coordinates,
@@ -11,12 +11,13 @@ import type {
 import { interpolate } from './geometry-helper';
 
 export class PointGeometryHelper implements GeometryHelper<Point> {
-    create = (element: WithPosition<any>): Feature<Point> =>
+    create = (element: WithPosition): Feature<Point> =>
         new Feature(new Point(this.getElementCoordinates(element)));
 
-    getElementCoordinates = (
-        element: WithPosition<any>
-    ): Coordinates<Point> => [element.position.x, element.position.y];
+    getElementCoordinates = (element: WithPosition): Coordinates<Point> => [
+        coordinatesOf(element).x,
+        coordinatesOf(element).y,
+    ];
 
     getFeatureCoordinates = (feature: Feature<Point>): Coordinates<Point> =>
         feature.getGeometry()!.getCoordinates();
@@ -28,7 +29,7 @@ export class PointGeometryHelper implements GeometryHelper<Point> {
         interpolate(positions.startPosition, positions.endPosition, progress);
 
     getFeaturePosition = (feature: Feature<Point>): Positions<Point> =>
-        Position.create(
+        MapCoordinates.create(
             this.getFeatureCoordinates(feature)[0]!,
             this.getFeatureCoordinates(feature)[1]!
         );