fix: typo 'Serivce' -> 'Service'

Signed-off-by: Louis Greiner <[email protected]>

src/app/app.component.ts

@@ -9,7 +9,7 @@ import {Observable, merge} from "rxjs";
 import {ProjectDto} from "./api/generated";
 import {NetzgrafikDto} from "./data-structures/business.data.structures";
 import {Operation} from "./models/operation.model";
-import {LabelService} from "./services/data/label.serivce";
+import {LabelService} from "./services/data/label.service";
 import {NodeService} from "./services/data/node.service";
 import {I18nService} from "./core/i18n/i18n.service";
 

src/app/perlenkette/perlenkette-section/perlenkette-section.component.ts

@@ -101,7 +101,7 @@ export class PerlenketteSectionComponent
   constructor(
     private trainrunService: TrainrunService,
     private trainrunSectionService: TrainrunSectionService,
-    private nodeSerivce: NodeService,
+    private nodeService: NodeService,
     private uiInteractionService: UiInteractionService,
     public trainrunSectionTimesService: TrainrunSectionTimesService,
     readonly filterService: FilterService,

src/app/services/analytics/algorithms/shortest-travel-time-search.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../../models/trainrunsection.model";
 import {LogService} from "../../../logger/log.service";
 import {LogPublishersService} from "../../../logger/log.publishers.service";
 import {LabelGroupService} from "../../data/labelgroup.service";
-import {LabelService} from "../../data/label.serivce";
+import {LabelService} from "../../data/label.service";
 import {NetzgrafikUnitTesting} from "../../../../integration-testing/netzgrafik.unit.testing";
 import {AnalyticsService} from "../analytics.service";
 import {FilterService} from "../../ui/filter.service";

src/app/services/data/copy.service.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "./label.service";
 import {FilterService} from "../ui/filter.service";
 import {NetzgrafikColoringService} from "../data/netzgrafikColoring.service";
 import {UndoService} from "../data/undo.service";

src/app/services/data/copy.service.ts

@@ -32,8 +32,8 @@ export class CopyService implements OnDestroy {
     private readonly dataService: DataService,
     private readonly trainrunService: TrainrunService,
     private readonly trainrunSectionService: TrainrunSectionService,
-    private readonly nodeSerivce: NodeService,
-    private readonly noteSerivce: NoteService,
+    private readonly nodeService: NodeService,
+    private readonly noteService: NoteService,
     private readonly filterService: FilterService,
     private readonly uiInteractionService: UiInteractionService,
     private readonly undoService: UndoService,
@@ -128,7 +128,7 @@ export class CopyService implements OnDestroy {
   private filterNote(copiedNetzgrafik: NetzgrafikDto) {
     copiedNetzgrafik.freeFloatingTexts =
       copiedNetzgrafik.freeFloatingTexts.filter((text: FreeFloatingTextDto) => {
-        const note = this.noteSerivce.getNoteFromId(text.id);
+        const note = this.noteService.getNoteFromId(text.id);
         return this.filterService.filterNote(note);
       });
   }
@@ -139,7 +139,7 @@ export class CopyService implements OnDestroy {
     ) {
       // selected notes to copy
       const selNodes: Node[] = [];
-      this.nodeSerivce.getNodes().forEach((n: Node) => {
+      this.nodeService.getNodes().forEach((n: Node) => {
         if (n.selected()) {
           selNodes.push(n);
         }
@@ -161,7 +161,7 @@ export class CopyService implements OnDestroy {
       copiedNetzgrafik.freeFloatingTexts =
         copiedNetzgrafik.freeFloatingTexts.filter(
           (text: FreeFloatingTextDto) => {
-            const note: Note = this.noteSerivce.getNoteFromId(text.id);
+            const note: Note = this.noteService.getNoteFromId(text.id);
             if (note === undefined) {
               return false;
             }
@@ -202,7 +202,7 @@ export class CopyService implements OnDestroy {
     if (netzgrafik !== undefined) {
       this.undoService.pushCurrentVersion(true);
       this.dataService.insertCopyNetzgrafikDto(netzgrafik);
-      this.nodeSerivce.unselectAllNodes();
+      this.nodeService.unselectAllNodes();
     }
   }
 

src/app/services/data/data.service.ts

@@ -15,7 +15,7 @@ import {ResourceService} from "./resource.service";
 import {BehaviorSubject, combineLatest, Observable, Subject} from "rxjs";
 import {debounceTime, map, skip, takeUntil} from "rxjs/operators";
 import {NoteService} from "./note.service";
-import {LabelService} from "./label.serivce";
+import {LabelService} from "./label.service";
 import {LabelGroupService} from "./labelgroup.service";
 import {DataMigration} from "../../utils/data-migration";
 import {FilterService} from "../ui/filter.service";

src/app/services/data/is-trainrun-selected.service.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "./label.service";
 import {NetzgrafikUnitTesting} from "../../../integration-testing/netzgrafik.unit.testing";
 import {FilterService} from "../ui/filter.service";
 import {NetzgrafikColoringService} from "../data/netzgrafikColoring.service";

src/app/services/data/labelgroup.service.ts

@@ -6,7 +6,7 @@ import {
   LabelRef,
 } from "../../data-structures/business.data.structures";
 import {LabelGroup} from "../../models/labelGroup.model";
-import {LabelService} from "./label.serivce";
+import {LabelService} from "./label.service";
 import {Label} from "../../models/label.model";
 
 @Injectable({

src/app/services/data/netzgrafikColoring.service.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "./label.service";
 import {FilterService} from "../ui/filter.service";
 import {NetzgrafikColoringService} from "../data/netzgrafikColoring.service";
 import {UndoService} from "../data/undo.service";
@@ -19,7 +19,7 @@ import {UiInteractionService} from "../ui/ui.interaction.service";
 import {LoadPerlenketteService} from "../../perlenkette/service/load-perlenkette.service";
 import {NetzgrafikUnitTesting} from "../../../integration-testing/netzgrafik.unit.testing";
 
-describe("NetzgraphikColoringSerivce", () => {
+describe("NetzgraphikColoringService", () => {
   let dataService: DataService;
   let nodeService: NodeService;
   let resourceService: ResourceService;

src/app/services/data/node.service.ts

@@ -27,7 +27,7 @@ import {takeUntil} from "rxjs/operators";
 import {Vec2D} from "../../utils/vec2D";
 import {NODE_POSITION_BASIC_RASTER} from "../../view/rastering/definitions";
 import {MathUtils} from "../../utils/math";
-import {LabelService} from "./label.serivce";
+import {LabelService} from "./label.service";
 import {FilterService} from "../ui/filter.service";
 import {ConnectionDto} from "../../data-structures/technical.data.structures";
 import {TrainrunsectionValidator} from "../util/trainrunsection.validator";

src/app/services/data/note.service.ts

@@ -9,7 +9,7 @@ import {
 import {Vec2D} from "../../utils/vec2D";
 import {MathUtils} from "../../utils/math";
 import {NOTE_POSITION_BASIC_RASTER} from "../../view/rastering/definitions";
-import {LabelService} from "./label.serivce";
+import {LabelService} from "./label.service";
 import {FilterService} from "../ui/filter.service";
 
 @Injectable({

src/app/services/data/trainrun.service.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "./label.service";
 import {NetzgrafikUnitTesting} from "../../../integration-testing/netzgrafik.unit.testing";
 import {FilterService} from "../ui/filter.service";
 import {NetzgrafikColoringService} from "../data/netzgrafikColoring.service";

src/app/services/data/trainrun.service.ts

@@ -18,7 +18,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {GeneralViewFunctions} from "../../view/util/generalViewFunctions";
 import {NonStopTrainrunIterator, TrainrunIterator,} from "../util/trainrun.iterator";
 import {LogService} from "../../logger/log.service";
-import {LabelService} from "./label.serivce";
+import {LabelService} from "./label.service";
 import {FilterService} from "../ui/filter.service";
 import {Transition} from "../../models/transition.model";
 import {Port} from "../../models/port.model";

src/app/services/data/trainrunsection.service.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "./label.service";
 import {NetzgrafikUnitTesting} from "../../../integration-testing/netzgrafik.unit.testing";
 import {FilterService} from "../ui/filter.service";
 import {NetzgrafikColoringService} from "../data/netzgrafikColoring.service";

src/app/services/data/undo.service.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "./label.service";
 import {NetzgrafikUnitTesting} from "../../../integration-testing/netzgrafik.unit.testing";
 import {FilterService} from "../ui/filter.service";
 import {NetzgrafikColoringService} from "../data/netzgrafikColoring.service";

src/app/services/ui/filter.service.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "../data/label.service";
 import {NetzgrafikUnitTesting} from "../../../integration-testing/netzgrafik.unit.testing";
 import {FilterService} from "../ui/filter.service";
 import {AnalyticsService} from "../analytics/analytics.service";

src/app/services/ui/filter.service.ts

@@ -9,7 +9,7 @@ import {
 import {BehaviorSubject, Subject} from "rxjs";
 import {DataService} from "../data/data.service";
 import {Node} from "../../models/node.model";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "../data/label.service";
 import {Label} from "../../models/label.model";
 import {LabelGroupService} from "../data/labelgroup.service";
 import {LabelGroup, LogicalFilterOperator} from "../../models/labelGroup.model";

src/app/services/ui/ui.interaction.service.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "../data/label.service";
 import {FilterService} from "./filter.service";
 import {AnalyticsService} from "../analytics/analytics.service";
 import {UiInteractionService} from "./ui.interaction.service";

src/app/services/util/position.transformation.service.spec.ts

@@ -8,7 +8,7 @@ import {NoteService} from "../../services/data/note.service";
 import {Node} from "../../models/node.model";
 import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LabelGroupService} from "../../services/data/labelgroup.service";
-import {LabelService} from "../../services/data/label.serivce";
+import {LabelService} from "../data/label.service";
 import {NetzgrafikColoringService} from "../../services/data/netzgrafikColoring.service";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
@@ -103,7 +103,7 @@ describe("PositionTransformationService", () => {
       loadPerlenketteService,
     );
 
-    const viewportCullSerivce = new ViewportCullService(
+    const viewportCullService = new ViewportCullService(
       uiInteractionService,
       nodeService,
       noteService,
@@ -115,7 +115,7 @@ describe("PositionTransformationService", () => {
       nodeService,
       noteService,
       uiInteractionService,
-      viewportCullSerivce
+      viewportCullService
     );
   });
 

src/app/services/util/position.transformation.service.ts

@@ -13,8 +13,8 @@ import {ViewportCullService} from "../ui/viewport.cull.service";
 export class PositionTransformationService {
   constructor(
     private readonly trainrunSectionService: TrainrunSectionService,
-    private readonly nodeSerivce: NodeService,
-    private readonly noteSerivce: NoteService,
+    private readonly nodeService: NodeService,
+    private readonly noteService: NoteService,
     private readonly uiInteractionService: UiInteractionService,
     private readonly viewportCullService: ViewportCullService,
   ) {
@@ -24,7 +24,7 @@ export class PositionTransformationService {
     const scaleCenterCoordinates: Vec2D = this.computeScaleCenterCoordinates(zoomCenter, windowViewboxPropertiesMapKey);
     const focalNode: Node = this.getFocalNode(scaleCenterCoordinates);
 
-    this.nodeSerivce.getNodes().forEach((n, index) => {
+    this.nodeService.getNodes().forEach((n, index) => {
       let newPos = new Vec2D(
         (n.getPositionX() - scaleCenterCoordinates.getX()) * factor + scaleCenterCoordinates.getX(),
         (n.getPositionY() - scaleCenterCoordinates.getY()) * factor + scaleCenterCoordinates.getY()
@@ -51,8 +51,8 @@ export class PositionTransformationService {
   }
 
   private getFocalNode(scaleCenterCoordinates: Vec2D): Node {
-    // get the node under the mouse cursos and update the scaleCenter
-    const focalNode = this.nodeSerivce.getNodes().find((n) =>
+    // get the node under the mouse cursor and update the scaleCenter
+    const focalNode = this.nodeService.getNodes().find((n) =>
       scaleCenterCoordinates.getX() > n.getPositionX() && scaleCenterCoordinates.getX() < (n.getPositionX() + n.getNodeWidth()) &&
       scaleCenterCoordinates.getY() > n.getPositionY() && scaleCenterCoordinates.getY() < (n.getPositionY() + n.getNodeHeight())
     );
@@ -96,8 +96,8 @@ export class PositionTransformationService {
     });
   }
 
-  private upateRendering() {
-    this.nodeSerivce.initPortOrdering();
+  private updateRendering() {
+    this.nodeService.initPortOrdering();
 
     this.trainrunSectionService.getTrainrunSections().forEach(ts => {
       ts.routeEdgeAndPlaceText();
@@ -108,19 +108,19 @@ export class PositionTransformationService {
   }
 
   scaleNetzgrafikArea(factor: number, zoomCenter: Vec2D, windowViewboxPropertiesMapKey: string) {
-    const nodes: Node[] = this.nodeSerivce.getSelectedNodes();
+    const nodes: Node[] = this.nodeService.getSelectedNodes();
 
     if (nodes.length < 2) {
       this.scaleFullNetzgrafikArea(factor, zoomCenter, windowViewboxPropertiesMapKey);
     } else {
       this.scaleNetzgrafikSelectedNodesArea(factor, zoomCenter, nodes, windowViewboxPropertiesMapKey);
     }
 
-    this.upateRendering();
+    this.updateRendering();
   }
 
   alignSelectedElementsToLeftBorder() {
-    const nodes: Node[] = this.nodeSerivce.getSelectedNodes();
+    const nodes: Node[] = this.nodeService.getSelectedNodes();
 
     let leftX = undefined;
     nodes.forEach((n) => {
@@ -138,11 +138,11 @@ export class PositionTransformationService {
       });
     }
 
-    this.upateRendering();
+    this.updateRendering();
   }
 
   alignSelectedElementsToRightBorder() {
-    const nodes: Node[] = this.nodeSerivce.getSelectedNodes();
+    const nodes: Node[] = this.nodeService.getSelectedNodes();
 
     let rightX = undefined;
     nodes.forEach((n) => {
@@ -160,11 +160,11 @@ export class PositionTransformationService {
       });
     }
 
-    this.upateRendering();
+    this.updateRendering();
   }
 
   alignSelectedElementsToTopBorder() {
-    const nodes: Node[] = this.nodeSerivce.getSelectedNodes();
+    const nodes: Node[] = this.nodeService.getSelectedNodes();
 
     let topY = undefined;
     nodes.forEach((n) => {
@@ -182,11 +182,11 @@ export class PositionTransformationService {
       });
     }
 
-    this.upateRendering();
+    this.updateRendering();
   }
 
   alignSelectedElementsToBottomBorder() {
-    const nodes: Node[] = this.nodeSerivce.getSelectedNodes();
+    const nodes: Node[] = this.nodeService.getSelectedNodes();
 
     let bottomY = undefined;
     nodes.forEach((n) => {
@@ -204,7 +204,7 @@ export class PositionTransformationService {
       });
     }
 
-    this.upateRendering();
+    this.updateRendering();
   }
 
 }

src/app/services/util/trainrunsection.helper.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "../data/label.service";
 import {NetzgrafikUnitTesting} from "../../../integration-testing/netzgrafik.unit.testing";
 import {FilterService} from "../ui/filter.service";
 import {NetzgrafikColoringService} from "../data/netzgrafikColoring.service";

src/app/services/util/transition.validator.spec.ts

@@ -10,7 +10,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model";
 import {LogService} from "../../logger/log.service";
 import {LogPublishersService} from "../../logger/log.publishers.service";
 import {LabelGroupService} from "../data/labelgroup.service";
-import {LabelService} from "../data/label.serivce";
+import {LabelService} from "../data/label.service";
 import {NetzgrafikUnitTesting} from "../../../integration-testing/netzgrafik.unit.testing";
 import {FilterService} from "../ui/filter.service";
 import {NetzgrafikColoringService} from "../data/netzgrafikColoring.service";

src/app/streckengrafik/components/grid/path-grid/path-grid.component.ts

@@ -51,7 +51,7 @@ export class PathGridComponent implements OnInit, OnDestroy, AfterViewInit {
     private readonly sgPathSliderService: Sg7PathSliderService,
     private readonly resizeService: ResizeService,
     private readonly viewBoxService: ViewBoxService,
-    private readonly nodeSerivce: NodeService,
+    private readonly nodeService: NodeService,
     private readonly cd: ChangeDetectorRef,
   ) {}
 
@@ -165,14 +165,14 @@ export class PathGridComponent implements OnInit, OnDestroy, AfterViewInit {
 
     let ret = "[ ";
     if (trackData.nodeId1 !== undefined) {
-      const node1 = this.nodeSerivce.getNodeFromId(trackData.nodeId1);
+      const node1 = this.nodeService.getNodeFromId(trackData.nodeId1);
       if (node1 !== undefined && node1) {
         ret += node1.getBetriebspunktName();
       }
     }
 
     if (trackData.nodeId2 !== undefined) {
-      const node2 = this.nodeSerivce.getNodeFromId(trackData.nodeId2);
+      const node2 = this.nodeService.getNodeFromId(trackData.nodeId2);
       if (node2 !== undefined && node2) {
         if (ret !== "") {
           ret += " , ";