From 0c890ecf2e75448ebf8d7bd0295321c82fb37b16 Mon Sep 17 00:00:00 2001 From: Louis Greiner Date: Wed, 18 Dec 2024 15:03:17 +0100 Subject: [PATCH] fix: typo 'Serivce' -> 'Service' Signed-off-by: Louis Greiner --- src/app/app.component.ts | 2 +- .../perlenkette-section.component.ts | 2 +- .../shortest-travel-time-search.spec.ts | 2 +- src/app/services/data/copy.service.spec.ts | 2 +- src/app/services/data/copy.service.ts | 12 +-- src/app/services/data/data.service.ts | 2 +- .../data/is-trainrun-selected.service.spec.ts | 2 +- .../{label.serivce.ts => label.service.ts} | 0 src/app/services/data/labelgroup.service.ts | 2 +- .../data/netzgrafikColoring.service.spec.ts | 4 +- src/app/services/data/node.service.ts | 2 +- src/app/services/data/note.service.ts | 2 +- .../services/data/trainrun.service.spec.ts | 2 +- src/app/services/data/trainrun.service.ts | 2 +- .../data/trainrunsection.service.spec.ts | 2 +- src/app/services/data/undo.service.spec.ts | 2 +- src/app/services/ui/filter.service.spec.ts | 2 +- src/app/services/ui/filter.service.ts | 2 +- .../ui/ui.interaction.service.spec.ts | 2 +- .../position.transformation.service.spec.ts | 6 +- .../util/position.transformation.service.ts | 34 +++---- .../util/trainrunsection.helper.spec.ts | 2 +- .../util/transition.validator.spec.ts | 2 +- .../grid/path-grid/path-grid.component.ts | 6 +- .../grid/time-grid/time-grid.component.ts | 8 +- .../time-slider/time-slider.component.ts | 8 +- .../slider/timeline/timeline.component.ts | 8 +- .../components/streckengrafik.component.ts | 4 +- .../train-run-item.component.ts | 8 +- .../train-run-section.component.ts | 12 +-- ...ing-background-mouse-listener.component.ts | 10 +- .../services/sg-8-render.service.ts | 6 +- .../services/streckengrafik.services.spec.ts | 2 +- .../services/time-slider.service.ts | 10 +- .../services/util/update-counter.service.ts | 8 +- .../note-filter-tab.component.ts | 2 +- .../trainrun-filter-tab.component.ts | 2 +- .../editor-edit-tools-view.component.ts | 2 +- .../label-drop-list.component.ts | 2 +- .../filterable-label-filter.component.ts | 2 +- .../data-views/connections.view.spec.ts | 2 +- .../data-views/d3.utils.spec.ts | 10 +- .../data-views/data.view.spec.ts | 10 +- .../data-views/editor.keyEvents.ts | 92 +++++++++---------- .../data-views/nodes.view.spec.ts | 10 +- .../data-views/notes.view.spec.ts | 10 +- .../data-views/trainrunsections.view.spec.ts | 10 +- .../data-views/transitions.view.spec.ts | 10 +- .../editor-main-view.component.ts | 12 +-- .../editor-node-detail-view.component.ts | 2 +- .../editor-tools-view.component.ts | 2 +- .../label.service.test.spec.ts | 2 +- .../labelgroup.service.test.spec.ts | 2 +- .../node.service.test.spec.ts | 2 +- .../note.service.test.spec.ts | 2 +- .../origin.destination.csv.test.spec.ts | 2 +- .../reconnect.trainrunsections.test.spec.ts | 2 +- .../resource.service.test.spec.ts | 2 +- .../stammdaten.service.test.spec.ts | 2 +- .../trainIterator.test.spec.ts | 2 +- .../trainrunsection.service.test.spec.ts | 2 +- 61 files changed, 191 insertions(+), 191 deletions(-) rename src/app/services/data/{label.serivce.ts => label.service.ts} (100%) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 01f7b049..e613ad70 100644 --- a/src/app/app.component.ts +++ b/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"; diff --git a/src/app/perlenkette/perlenkette-section/perlenkette-section.component.ts b/src/app/perlenkette/perlenkette-section/perlenkette-section.component.ts index 7eae9aa3..e132dec0 100644 --- a/src/app/perlenkette/perlenkette-section/perlenkette-section.component.ts +++ b/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, diff --git a/src/app/services/analytics/algorithms/shortest-travel-time-search.spec.ts b/src/app/services/analytics/algorithms/shortest-travel-time-search.spec.ts index ee941172..038649ba 100644 --- a/src/app/services/analytics/algorithms/shortest-travel-time-search.spec.ts +++ b/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"; diff --git a/src/app/services/data/copy.service.spec.ts b/src/app/services/data/copy.service.spec.ts index cbdfb813..169135bd 100644 --- a/src/app/services/data/copy.service.spec.ts +++ b/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"; diff --git a/src/app/services/data/copy.service.ts b/src/app/services/data/copy.service.ts index 799dfb2a..1a514ac3 100644 --- a/src/app/services/data/copy.service.ts +++ b/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(); } } diff --git a/src/app/services/data/data.service.ts b/src/app/services/data/data.service.ts index d48c7d43..6b5a8b0b 100644 --- a/src/app/services/data/data.service.ts +++ b/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"; diff --git a/src/app/services/data/is-trainrun-selected.service.spec.ts b/src/app/services/data/is-trainrun-selected.service.spec.ts index 934b8ad9..0567ef18 100644 --- a/src/app/services/data/is-trainrun-selected.service.spec.ts +++ b/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"; diff --git a/src/app/services/data/label.serivce.ts b/src/app/services/data/label.service.ts similarity index 100% rename from src/app/services/data/label.serivce.ts rename to src/app/services/data/label.service.ts diff --git a/src/app/services/data/labelgroup.service.ts b/src/app/services/data/labelgroup.service.ts index c32f8be4..e024bf0c 100644 --- a/src/app/services/data/labelgroup.service.ts +++ b/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({ diff --git a/src/app/services/data/netzgrafikColoring.service.spec.ts b/src/app/services/data/netzgrafikColoring.service.spec.ts index 09a0c146..ded1c702 100644 --- a/src/app/services/data/netzgrafikColoring.service.spec.ts +++ b/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; diff --git a/src/app/services/data/node.service.ts b/src/app/services/data/node.service.ts index c49bce1a..87fac71e 100644 --- a/src/app/services/data/node.service.ts +++ b/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"; diff --git a/src/app/services/data/note.service.ts b/src/app/services/data/note.service.ts index 786020d8..80af9134 100644 --- a/src/app/services/data/note.service.ts +++ b/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({ diff --git a/src/app/services/data/trainrun.service.spec.ts b/src/app/services/data/trainrun.service.spec.ts index 07b9c004..36b0436a 100644 --- a/src/app/services/data/trainrun.service.spec.ts +++ b/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"; diff --git a/src/app/services/data/trainrun.service.ts b/src/app/services/data/trainrun.service.ts index 92c256d8..04fbed7d 100644 --- a/src/app/services/data/trainrun.service.ts +++ b/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"; diff --git a/src/app/services/data/trainrunsection.service.spec.ts b/src/app/services/data/trainrunsection.service.spec.ts index 24493fc4..78c22354 100644 --- a/src/app/services/data/trainrunsection.service.spec.ts +++ b/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"; diff --git a/src/app/services/data/undo.service.spec.ts b/src/app/services/data/undo.service.spec.ts index d422c0d7..242ff12d 100644 --- a/src/app/services/data/undo.service.spec.ts +++ b/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"; diff --git a/src/app/services/ui/filter.service.spec.ts b/src/app/services/ui/filter.service.spec.ts index 39ab38e3..f48bb27a 100644 --- a/src/app/services/ui/filter.service.spec.ts +++ b/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"; diff --git a/src/app/services/ui/filter.service.ts b/src/app/services/ui/filter.service.ts index 4d0d132e..dad5e829 100644 --- a/src/app/services/ui/filter.service.ts +++ b/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"; diff --git a/src/app/services/ui/ui.interaction.service.spec.ts b/src/app/services/ui/ui.interaction.service.spec.ts index 569de15d..df8b0d33 100644 --- a/src/app/services/ui/ui.interaction.service.spec.ts +++ b/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"; diff --git a/src/app/services/util/position.transformation.service.spec.ts b/src/app/services/util/position.transformation.service.spec.ts index 458941bc..57f976a0 100644 --- a/src/app/services/util/position.transformation.service.spec.ts +++ b/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 ); }); diff --git a/src/app/services/util/position.transformation.service.ts b/src/app/services/util/position.transformation.service.ts index df41bbb2..c0db9aed 100644 --- a/src/app/services/util/position.transformation.service.ts +++ b/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,7 +108,7 @@ 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); @@ -116,11 +116,11 @@ export class PositionTransformationService { 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(); } } diff --git a/src/app/services/util/trainrunsection.helper.spec.ts b/src/app/services/util/trainrunsection.helper.spec.ts index 0f66978d..93ce2a60 100644 --- a/src/app/services/util/trainrunsection.helper.spec.ts +++ b/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"; diff --git a/src/app/services/util/transition.validator.spec.ts b/src/app/services/util/transition.validator.spec.ts index a90efb83..d2530a65 100644 --- a/src/app/services/util/transition.validator.spec.ts +++ b/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"; diff --git a/src/app/streckengrafik/components/grid/path-grid/path-grid.component.ts b/src/app/streckengrafik/components/grid/path-grid/path-grid.component.ts index a987fa9c..a3c687f4 100644 --- a/src/app/streckengrafik/components/grid/path-grid/path-grid.component.ts +++ b/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 += " , "; diff --git a/src/app/streckengrafik/components/grid/time-grid/time-grid.component.ts b/src/app/streckengrafik/components/grid/time-grid/time-grid.component.ts index c83b58b2..93f79ef4 100644 --- a/src/app/streckengrafik/components/grid/time-grid/time-grid.component.ts +++ b/src/app/streckengrafik/components/grid/time-grid/time-grid.component.ts @@ -15,7 +15,7 @@ import {ViewBoxService} from "../../../services/util/view-box.service"; import { UpdateCounterController, UpdateCounterHandler, - UpdateCounterTriggerSerivce, + UpdateCounterTriggerService, } from "../../../services/util/update-counter.service"; @Component({ @@ -42,7 +42,7 @@ export class TimeGridComponent constructor( private timeSliderService: TimeSliderService, private readonly viewBoxService: ViewBoxService, - private readonly updateCounterTriggerSerivce: UpdateCounterTriggerSerivce, + private readonly updateCounterTriggerService: UpdateCounterTriggerService, private readonly cd: ChangeDetectorRef, ) {} @@ -134,8 +134,8 @@ export class TimeGridComponent } } - getUpdateCounterTriggerSerivce(): UpdateCounterTriggerSerivce { - return this.updateCounterTriggerSerivce; + getUpdateCounterTriggerService(): UpdateCounterTriggerService { + return this.updateCounterTriggerService; } getCurrentUpdateCounter(): number { diff --git a/src/app/streckengrafik/components/slider/time-slider/time-slider.component.ts b/src/app/streckengrafik/components/slider/time-slider/time-slider.component.ts index 86be626a..d892a0ad 100644 --- a/src/app/streckengrafik/components/slider/time-slider/time-slider.component.ts +++ b/src/app/streckengrafik/components/slider/time-slider/time-slider.component.ts @@ -17,7 +17,7 @@ import {TimeFormatter} from "../../../model/util/timeFormatter"; import { UpdateCounterController, UpdateCounterHandler, - UpdateCounterTriggerSerivce, + UpdateCounterTriggerService as UpdateCounterTriggerService, } from "../../../services/util/update-counter.service"; @Component({ @@ -70,7 +70,7 @@ export class TimeSliderComponent constructor( private readonly timeSliderService: TimeSliderService, private readonly viewBoxService: ViewBoxService, - private readonly updateCounterTriggerSerivce: UpdateCounterTriggerSerivce, + private readonly updateCounterTriggerService: UpdateCounterTriggerService, private readonly cd: ChangeDetectorRef, ) {} @@ -312,8 +312,8 @@ export class TimeSliderComponent } } - getUpdateCounterTriggerSerivce(): UpdateCounterTriggerSerivce { - return this.updateCounterTriggerSerivce; + getUpdateCounterTriggerService(): UpdateCounterTriggerService { + return this.updateCounterTriggerService; } getCurrentUpdateCounter(): number { diff --git a/src/app/streckengrafik/components/slider/timeline/timeline.component.ts b/src/app/streckengrafik/components/slider/timeline/timeline.component.ts index 3db2f556..938767f5 100644 --- a/src/app/streckengrafik/components/slider/timeline/timeline.component.ts +++ b/src/app/streckengrafik/components/slider/timeline/timeline.component.ts @@ -18,7 +18,7 @@ import {TimeFormatter} from "../../../model/util/timeFormatter"; import { UpdateCounterController, UpdateCounterHandler, - UpdateCounterTriggerSerivce, + UpdateCounterTriggerService as UpdateCounterTriggerService, } from "../../../services/util/update-counter.service"; @Component({ @@ -56,7 +56,7 @@ export class TimelineComponent constructor( private timeSliderService: TimeSliderService, private readonly viewBoxService: ViewBoxService, - private readonly updateCounterTriggerSerivce: UpdateCounterTriggerSerivce, + private readonly updateCounterTriggerService: UpdateCounterTriggerService, private readonly drawingBackgroundMouseListenerComponent: DrawingBackgroundMouseListenerService, ) {} @@ -236,8 +236,8 @@ export class TimelineComponent } } - getUpdateCounterTriggerSerivce(): UpdateCounterTriggerSerivce { - return this.updateCounterTriggerSerivce; + getUpdateCounterTriggerService(): UpdateCounterTriggerService { + return this.updateCounterTriggerService; } updateCounterCallback() { diff --git a/src/app/streckengrafik/components/streckengrafik.component.ts b/src/app/streckengrafik/components/streckengrafik.component.ts index 2cf4e930..1b0da8fe 100644 --- a/src/app/streckengrafik/components/streckengrafik.component.ts +++ b/src/app/streckengrafik/components/streckengrafik.component.ts @@ -18,7 +18,7 @@ import {ResizeChangeInfo} from "../model/util/resizeChangeInfo"; import {ResizeService} from "../services/util/resize.service"; import {SliderChangeInfo} from "../model/util/sliderChangeInfo"; import {TimeSliderService} from "../services/time-slider.service"; -import {UpdateCounterTriggerSerivce} from "../services/util/update-counter.service"; +import {UpdateCounterTriggerService as UpdateCounterTriggerService} from "../services/util/update-counter.service"; import {Sg4ToggleTrackOccupierService} from "../services/sg-4-toggle-track-occupier.service"; import { StreckengrafikDisplayElementService @@ -56,7 +56,7 @@ export class StreckengrafikComponent private readonly timeSliderService: TimeSliderService, private readonly viewBoxService: ViewBoxService, private readonly sg4ToggleTrackOccupierService: Sg4ToggleTrackOccupierService, - private readonly updateCounterTriggerSerivce: UpdateCounterTriggerSerivce, + private readonly updateCounterTriggerService: UpdateCounterTriggerService, private readonly cd: ChangeDetectorRef, private resizeService: ResizeService, private streckengrafikDisplayElementService: StreckengrafikDisplayElementService, diff --git a/src/app/streckengrafik/components/train-run-item/train-run-item.component.ts b/src/app/streckengrafik/components/train-run-item/train-run-item.component.ts index 83d6f627..c43a6349 100644 --- a/src/app/streckengrafik/components/train-run-item/train-run-item.component.ts +++ b/src/app/streckengrafik/components/train-run-item/train-run-item.component.ts @@ -11,7 +11,7 @@ import * as d3 from "d3"; import { UpdateCounterController, UpdateCounterHandler, - UpdateCounterTriggerSerivce, + UpdateCounterTriggerService, } from "../../services/util/update-counter.service"; @Component({ @@ -48,7 +48,7 @@ export class TrainRunItemComponent constructor( private readonly timeSliderService: TimeSliderService, private readonly viewBoxService: ViewBoxService, - private readonly updateCounterTriggerSerivce: UpdateCounterTriggerSerivce, + private readonly updateCounterTriggerService: UpdateCounterTriggerService, private readonly cd: ChangeDetectorRef, private readonly ngZone: NgZone, ) { @@ -184,8 +184,8 @@ export class TrainRunItemComponent d3.selectAll(key).raise(); } - getUpdateCounterTriggerSerivce(): UpdateCounterTriggerSerivce { - return this.updateCounterTriggerSerivce; + getUpdateCounterTriggerService(): UpdateCounterTriggerService { + return this.updateCounterTriggerService; } updateCounterCallback() { diff --git a/src/app/streckengrafik/components/train-run-section/train-run-section.component.ts b/src/app/streckengrafik/components/train-run-section/train-run-section.component.ts index 574a3359..d6927d22 100644 --- a/src/app/streckengrafik/components/train-run-section/train-run-section.component.ts +++ b/src/app/streckengrafik/components/train-run-section/train-run-section.component.ts @@ -28,7 +28,7 @@ import {FilterService} from "../../../services/ui/filter.service"; import { UpdateCounterController, UpdateCounterHandler, - UpdateCounterTriggerSerivce, + UpdateCounterTriggerService, } from "../../services/util/update-counter.service"; import {SliderChangeInfo} from "../../model/util/sliderChangeInfo"; import {NodeService} from "../../../services/data/node.service"; @@ -77,12 +77,12 @@ export class TrainRunSectionComponent constructor( private readonly trainrunService: TrainrunService, private readonly trainDataService: TrainDataService, - private readonly nodeSerivce: NodeService, + private readonly nodeService: NodeService, private readonly timeSliderService: TimeSliderService, private readonly uiInteractionService: UiInteractionService, private readonly trainrunSectionService: TrainrunSectionService, private readonly filterService: FilterService, - private readonly updateCounterTriggerSerivce: UpdateCounterTriggerSerivce, + private readonly updateCounterTriggerService: UpdateCounterTriggerService, private readonly streckengrafikDisplayElementService: StreckengrafikDisplayElementService, private readonly viewBoxService: ViewBoxService, private readonly sg4ToggleTrackOccupierService: Sg4ToggleTrackOccupierService, @@ -700,7 +700,7 @@ export class TrainRunSectionComponent isTimeFiltering(nodeId: number) { const sgTs: SgTrainrunSection = this.trainrunItem.getTrainrunSection(); - const node = this.nodeSerivce.getNodeFromId(nodeId); + const node = this.nodeService.getNodeFromId(nodeId); const trans = node.getTransition(sgTs.trainrunSectionId); if (trans) { if (trans.getIsNonStopTransit()) { @@ -1010,8 +1010,8 @@ export class TrainRunSectionComponent } } - getUpdateCounterTriggerSerivce(): UpdateCounterTriggerSerivce { - return this.updateCounterTriggerSerivce; + getUpdateCounterTriggerService(): UpdateCounterTriggerService { + return this.updateCounterTriggerService; } updateCounterCallback(delayedRendering = true) { diff --git a/src/app/streckengrafik/components/util/drawing-background-mouse-listener/drawing-background-mouse-listener.component.ts b/src/app/streckengrafik/components/util/drawing-background-mouse-listener/drawing-background-mouse-listener.component.ts index 7109e74f..df637771 100644 --- a/src/app/streckengrafik/components/util/drawing-background-mouse-listener/drawing-background-mouse-listener.component.ts +++ b/src/app/streckengrafik/components/util/drawing-background-mouse-listener/drawing-background-mouse-listener.component.ts @@ -2,7 +2,7 @@ import {Component, HostListener} from "@angular/core"; import {DrawingBackgroundMouseListenerService} from "../../../services/util/drawingBackgroundMouseListener.service"; import {TrainrunService} from "../../../../services/data/trainrun.service"; import {Sg8RenderService} from "../../../services/sg-8-render.service"; -import {UpdateCounterTriggerSerivce} from "../../../services/util/update-counter.service"; +import {UpdateCounterTriggerService} from "../../../services/util/update-counter.service"; @Component({ selector: "sbb-drawing-background-mouse-listener", @@ -15,7 +15,7 @@ export class DrawingBackgroundMouseListenerComponent { constructor( private drawingBackgroundMouseListenerService: DrawingBackgroundMouseListenerService, private readonly trainrunService: TrainrunService, - private readonly updateCounterTriggerSerivce: UpdateCounterTriggerSerivce, + private readonly updateCounterTriggerService: UpdateCounterTriggerService, private sg8RenderService: Sg8RenderService, ) {} @@ -29,7 +29,7 @@ export class DrawingBackgroundMouseListenerComponent { event.stopImmediatePropagation(); this.trainrunService.unselectAllTrainruns(); this.sg8RenderService.doRender(); - this.updateCounterTriggerSerivce.sendUpdateTrigger(); + this.updateCounterTriggerService.sendUpdateTrigger(); return; } @@ -40,7 +40,7 @@ export class DrawingBackgroundMouseListenerComponent { if (event.buttons > 0) { this.isMouseMovingButtonDown = true; } else { - this.updateCounterTriggerSerivce.sendUpdateTrigger(); + this.updateCounterTriggerService.sendUpdateTrigger(); } this.drawingBackgroundMouseListenerService.onMouseMove(event); return; @@ -62,7 +62,7 @@ export class DrawingBackgroundMouseListenerComponent { this.drawingBackgroundMouseListenerService.onMouseLeave(event); this.isMouseMovingButtonDown = false; - this.updateCounterTriggerSerivce.sendUpdateTrigger(); + this.updateCounterTriggerService.sendUpdateTrigger(); return; } diff --git a/src/app/streckengrafik/services/sg-8-render.service.ts b/src/app/streckengrafik/services/sg-8-render.service.ts index d36c3fee..dd6d4099 100644 --- a/src/app/streckengrafik/services/sg-8-render.service.ts +++ b/src/app/streckengrafik/services/sg-8-render.service.ts @@ -5,7 +5,7 @@ import {Sg7PathSliderService} from "./sg-7-path-slider.service"; import {takeUntil} from "rxjs/operators"; import {SgTrainrun} from "../model/streckengrafik-model/sg-trainrun"; import {SgStopService} from "./sg-stop-.service"; -import {UpdateCounterTriggerSerivce} from "./util/update-counter.service"; +import {UpdateCounterTriggerService} from "./util/update-counter.service"; @Injectable({ providedIn: "root", @@ -25,7 +25,7 @@ export class Sg8RenderService implements OnDestroy { constructor( private readonly sg7PathSliderService: Sg7PathSliderService, - private readonly updateCounterTriggerSerivce: UpdateCounterTriggerSerivce, + private readonly updateCounterTriggerService: UpdateCounterTriggerService, private readonly sgStopService: SgStopService, ) { this.sg7PathSliderService @@ -58,7 +58,7 @@ export class Sg8RenderService implements OnDestroy { if (this.sgStopService.isGO(this.selectedTrainrun.counter)) { this.trainrunSubject.next(this.selectedTrainrun.trainruns); this.selectedTrainrunSubject.next(this.selectedTrainrun); - this.updateCounterTriggerSerivce.sendUpdateTrigger(); + this.updateCounterTriggerService.sendUpdateTrigger(); } } } diff --git a/src/app/streckengrafik/services/streckengrafik.services.spec.ts b/src/app/streckengrafik/services/streckengrafik.services.spec.ts index 31ce8c73..78c3afc7 100644 --- a/src/app/streckengrafik/services/streckengrafik.services.spec.ts +++ b/src/app/streckengrafik/services/streckengrafik.services.spec.ts @@ -11,7 +11,7 @@ import {TrainrunSection} from "../../models/trainrunsection.model"; import {LogService} from "../../logger/log.service"; import {LogPublishersService} from "../../logger/log.publishers.service"; import {LabelGroupService} from "../../services/data/labelgroup.service"; -import {LabelService} from "../../services/data/label.serivce"; +import {LabelService} from "../../services/data/label.service"; import {FilterService} from "../../services/ui/filter.service"; import {NetzgrafikColoringService} from "../../services/data/netzgrafikColoring.service"; import {Sg6TrackService} from "./sg-6-track.service"; diff --git a/src/app/streckengrafik/services/time-slider.service.ts b/src/app/streckengrafik/services/time-slider.service.ts index f3fdd4cd..5e28dd11 100644 --- a/src/app/streckengrafik/services/time-slider.service.ts +++ b/src/app/streckengrafik/services/time-slider.service.ts @@ -3,7 +3,7 @@ import {BehaviorSubject, interval, Observable, Subject, take} from "rxjs"; import {DrawingBackgroundMouseListenerService} from "./util/drawingBackgroundMouseListener.service"; import {SliderChangeInfo} from "../model/util/sliderChangeInfo"; import {takeUntil} from "rxjs/operators"; -import {UpdateCounterTriggerSerivce} from "./util/update-counter.service"; +import {UpdateCounterTriggerSerivce as UpdateCounterTriggerService} from "./util/update-counter.service"; @Injectable({ providedIn: "root", @@ -29,11 +29,11 @@ export class TimeSliderService implements OnDestroy { private readonly destroyed$ = new Subject(); constructor( - private readonly drawingBackgroundMouseListenerSerice: DrawingBackgroundMouseListenerService, - private readonly updateCounterTriggerSerivce: UpdateCounterTriggerSerivce, + private readonly drawingBackgroundMouseListenerService: DrawingBackgroundMouseListenerService, + private readonly updateCounterTriggerService: UpdateCounterTriggerService, private readonly ngZone: NgZone, ) { - drawingBackgroundMouseListenerSerice + drawingBackgroundMouseListenerService .getMouseMoveObservable() .pipe(takeUntil(this.destroyed$)) .subscribe((event: MouseEvent) => { @@ -137,6 +137,6 @@ export class TimeSliderService implements OnDestroy { } stopHandleZoomPanning() { - this.updateCounterTriggerSerivce.sendUpdateTrigger(); + this.updateCounterTriggerService.sendUpdateTrigger(); } } diff --git a/src/app/streckengrafik/services/util/update-counter.service.ts b/src/app/streckengrafik/services/util/update-counter.service.ts index 26a2c3be..c71b2866 100644 --- a/src/app/streckengrafik/services/util/update-counter.service.ts +++ b/src/app/streckengrafik/services/util/update-counter.service.ts @@ -3,7 +3,7 @@ import {Directive, Injectable, OnDestroy} from "@angular/core"; export interface UpdateCounterHandler { updateCounterCallback: () => void; getCurrentUpdateCounter: () => number; - getUpdateCounterTriggerSerivce: () => UpdateCounterTriggerSerivce; + getUpdateCounterTriggerService: () => UpdateCounterTriggerService; } @Directive() @@ -13,7 +13,7 @@ export class UpdateCounterController implements OnDestroy { private updateCounterHandler: UpdateCounterHandler, ) { this.updateCounterHandler - .getUpdateCounterTriggerSerivce() + .getUpdateCounterTriggerService() .registerUpdateHandler(updateCounterHandler, counter); } @@ -23,7 +23,7 @@ export class UpdateCounterController implements OnDestroy { clear() { this.updateCounterHandler - .getUpdateCounterTriggerSerivce() + .getUpdateCounterTriggerService() .clear(this.updateCounterHandler); } } @@ -31,7 +31,7 @@ export class UpdateCounterController implements OnDestroy { @Injectable({ providedIn: "root", }) -export class UpdateCounterTriggerSerivce { +export class UpdateCounterTriggerService { private updateMap = new Map(); constructor() {} diff --git a/src/app/view/dialogs/note-dialog/note-filter-tab/note-filter-tab.component.ts b/src/app/view/dialogs/note-dialog/note-filter-tab/note-filter-tab.component.ts index def2ce54..0315454f 100644 --- a/src/app/view/dialogs/note-dialog/note-filter-tab/note-filter-tab.component.ts +++ b/src/app/view/dialogs/note-dialog/note-filter-tab/note-filter-tab.component.ts @@ -8,7 +8,7 @@ import { Output, } from "@angular/core"; import {DataService} from "../../../../services/data/data.service"; -import {LabelService} from "../../../../services/data/label.serivce"; +import {LabelService} from "../../../../services/data/label.service"; import {LabelRef} from "../../../../data-structures/business.data.structures"; import {LabelGroupService} from "../../../../services/data/labelgroup.service"; import {Subject} from "rxjs"; diff --git a/src/app/view/dialogs/trainrun-and-section-dialog/trainrun-filter-tab/trainrun-filter-tab.component.ts b/src/app/view/dialogs/trainrun-and-section-dialog/trainrun-filter-tab/trainrun-filter-tab.component.ts index 1637a72d..453950e1 100644 --- a/src/app/view/dialogs/trainrun-and-section-dialog/trainrun-filter-tab/trainrun-filter-tab.component.ts +++ b/src/app/view/dialogs/trainrun-and-section-dialog/trainrun-filter-tab/trainrun-filter-tab.component.ts @@ -12,7 +12,7 @@ import {TrainrunSectionService} from "../../../../services/data/trainrunsection. import {UiInteractionService} from "../../../../services/ui/ui.interaction.service"; import {ConfirmationDialogParameter} from "../../confirmation-dialog/confirmation-dialog.component"; import {DataService} from "../../../../services/data/data.service"; -import {LabelService} from "../../../../services/data/label.serivce"; +import {LabelService} from "../../../../services/data/label.service"; import {LabelRef} from "../../../../data-structures/business.data.structures"; import {LabelGroupService} from "../../../../services/data/labelgroup.service"; import {Subject} from "rxjs"; diff --git a/src/app/view/editor-edit-tools-view-component/editor-edit-tools-view.component.ts b/src/app/view/editor-edit-tools-view-component/editor-edit-tools-view.component.ts index 661684d8..481fa36d 100644 --- a/src/app/view/editor-edit-tools-view-component/editor-edit-tools-view.component.ts +++ b/src/app/view/editor-edit-tools-view-component/editor-edit-tools-view.component.ts @@ -14,7 +14,7 @@ import {Subject} from "rxjs"; import {TrainrunService} from "../../services/data/trainrun.service"; import {NoteService} from "../../services/data/note.service"; import {LabelRef} from "../../data-structures/business.data.structures"; -import {LabelService} from "../../services/data/label.serivce"; +import {LabelService} from "../../services/data/label.service"; import {LabelGroupService} from "../../services/data/labelgroup.service"; import {LabelGroup} from "../../models/labelGroup.model"; import {environment} from "../../../environments/environment"; diff --git a/src/app/view/editor-edit-tools-view-component/label-drop-list/label-drop-list.component.ts b/src/app/view/editor-edit-tools-view-component/label-drop-list/label-drop-list.component.ts index 56fc5a76..13cf16e4 100644 --- a/src/app/view/editor-edit-tools-view-component/label-drop-list/label-drop-list.component.ts +++ b/src/app/view/editor-edit-tools-view-component/label-drop-list/label-drop-list.component.ts @@ -9,7 +9,7 @@ import { } from "@angular/cdk/drag-drop"; import {NodeService} from "../../../services/data/node.service"; import {TrainrunService} from "../../../services/data/trainrun.service"; -import {LabelService} from "../../../services/data/label.serivce"; +import {LabelService} from "../../../services/data/label.service"; import {LabelGroupService} from "../../../services/data/labelgroup.service"; import {FilterService} from "../../../services/ui/filter.service"; import {LabelRef} from "../../../data-structures/business.data.structures"; diff --git a/src/app/view/editor-filter-view/filterable-label-filter/filterable-label-filter.component.ts b/src/app/view/editor-filter-view/filterable-label-filter/filterable-label-filter.component.ts index 859175ac..8cb014d1 100644 --- a/src/app/view/editor-filter-view/filterable-label-filter/filterable-label-filter.component.ts +++ b/src/app/view/editor-filter-view/filterable-label-filter/filterable-label-filter.component.ts @@ -3,7 +3,7 @@ import {FilterService} from "../../../services/ui/filter.service"; import {LabelRef} from "../../../data-structures/business.data.structures"; import {DataService} from "../../../services/data/data.service"; import {UiInteractionService} from "../../../services/ui/ui.interaction.service"; -import {LabelService} from "../../../services/data/label.serivce"; +import {LabelService} from "../../../services/data/label.service"; import {Label} from "../../../models/label.model"; import {takeUntil} from "rxjs/operators"; import {LabelGroupService} from "../../../services/data/labelgroup.service"; diff --git a/src/app/view/editor-main-view/data-views/connections.view.spec.ts b/src/app/view/editor-main-view/data-views/connections.view.spec.ts index 185280b6..9a77f3b0 100644 --- a/src/app/view/editor-main-view/data-views/connections.view.spec.ts +++ b/src/app/view/editor-main-view/data-views/connections.view.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 "../../../services/data/label.service"; import {NetzgrafikColoringService} from "../../../services/data/netzgrafikColoring.service"; import {UndoService} from "../../../services/data/undo.service"; import {CopyService} from "../../../services/data/copy.service"; diff --git a/src/app/view/editor-main-view/data-views/d3.utils.spec.ts b/src/app/view/editor-main-view/data-views/d3.utils.spec.ts index f1ef1dc3..25f169eb 100644 --- a/src/app/view/editor-main-view/data-views/d3.utils.spec.ts +++ b/src/app/view/editor-main-view/data-views/d3.utils.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 "../../../services/data/label.service"; import {NetzgrafikColoringService} from "../../../services/data/netzgrafikColoring.service"; import {UndoService} from "../../../services/data/undo.service"; import {CopyService} from "../../../services/data/copy.service"; @@ -135,7 +135,7 @@ describe("3d.Utils.tests", () => { const levelOfDetailService = new LevelOfDetailService( uiInteractionService ); - const viewportCullSerivce = new ViewportCullService( + const viewportCullService = new ViewportCullService( uiInteractionService, nodeService, noteService, @@ -147,7 +147,7 @@ describe("3d.Utils.tests", () => { nodeService, noteService, uiInteractionService, - viewportCullSerivce + viewportCullService ); const controller = new EditorMainViewComponent( @@ -161,7 +161,7 @@ describe("3d.Utils.tests", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService @@ -178,7 +178,7 @@ describe("3d.Utils.tests", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService diff --git a/src/app/view/editor-main-view/data-views/data.view.spec.ts b/src/app/view/editor-main-view/data-views/data.view.spec.ts index dc9bd70d..750a962e 100644 --- a/src/app/view/editor-main-view/data-views/data.view.spec.ts +++ b/src/app/view/editor-main-view/data-views/data.view.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 "../../../services/data/label.service"; import {NetzgrafikColoringService} from "../../../services/data/netzgrafikColoring.service"; import {UndoService} from "../../../services/data/undo.service"; import {CopyService} from "../../../services/data/copy.service"; @@ -137,7 +137,7 @@ describe("Editor-DataView", () => { ); - const viewportCullSerivce = new ViewportCullService( + const viewportCullService = new ViewportCullService( uiInteractionService, nodeService, noteService, @@ -153,7 +153,7 @@ describe("Editor-DataView", () => { nodeService, noteService, uiInteractionService, - viewportCullSerivce + viewportCullService ); @@ -168,7 +168,7 @@ describe("Editor-DataView", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService @@ -185,7 +185,7 @@ describe("Editor-DataView", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService diff --git a/src/app/view/editor-main-view/data-views/editor.keyEvents.ts b/src/app/view/editor-main-view/data-views/editor.keyEvents.ts index 63be097d..8b36d058 100644 --- a/src/app/view/editor-main-view/data-views/editor.keyEvents.ts +++ b/src/app/view/editor-main-view/data-views/editor.keyEvents.ts @@ -27,10 +27,10 @@ export class EditorKeyEvents { private editorMode: EditorMode; constructor( - private nodeSerivce: NodeService, + private nodeService: NodeService, private trainrunService: TrainrunService, private trainrunSectionService: TrainrunSectionService, - private noteSerivce: NoteService, + private noteService: NoteService, private filterService: FilterService, private uiInteractionService: UiInteractionService, private logService: LogService, @@ -283,15 +283,15 @@ export class EditorKeyEvents { private doDuplicateNote(): boolean { const hoveredNoteId = this.getHoveredNoteId(); if (hoveredNoteId !== undefined) { - const note = this.noteSerivce.duplicateNote(hoveredNoteId); - this.noteSerivce.moveNote( + const note = this.noteService.duplicateNote(hoveredNoteId); + this.noteService.moveNote( note.getId(), RASTERING_BASIC_GRID_SIZE, RASTERING_BASIC_GRID_SIZE, 1, true, ); - this.noteSerivce.unselectNote(note.getId()); + this.noteService.unselectNote(note.getId()); return true; } return false; @@ -305,7 +305,7 @@ export class EditorKeyEvents { } const hoveredNodeId = this.getHoveredNodeId(); if (hoveredNodeId !== undefined) { - const node = this.nodeSerivce.getNodeFromId(hoveredNodeId); + const node = this.nodeService.getNodeFromId(hoveredNodeId); this.duplicateNode(node, node.getNodeWidth(), node.getNodeHeight()); return true; } @@ -321,7 +321,7 @@ export class EditorKeyEvents { // --- Pass 1 ---- collect all selected nodes const collectedSelectedNodes: Node[] = []; - this.nodeSerivce.getNodes().forEach((n: Node) => { + this.nodeService.getNodes().forEach((n: Node) => { if (n.selected()) { collectedSelectedNodes.push(n); } @@ -373,7 +373,7 @@ export class EditorKeyEvents { }); // --- Pass 3 ---- duplicate all notes and calculate the max notes offset (position move to) - this.nodeSerivce.unselectAllNodes(false); + this.nodeService.unselectAllNodes(false); const newNodes: Node[] = []; let maxW = 0; let maxH = 0; @@ -443,9 +443,9 @@ export class EditorKeyEvents { }); // call update - due of disabled update (signal) in the passes 1-5 - this.nodeSerivce.nodesUpdated(); - this.nodeSerivce.transitionsUpdated(); - this.nodeSerivce.connectionsUpdated(); + this.nodeService.nodesUpdated(); + this.nodeService.transitionsUpdated(); + this.nodeService.connectionsUpdated(); this.trainrunService.trainrunsUpdated(); this.trainrunService.trainrunsUpdated(); return true; @@ -460,14 +460,14 @@ export class EditorKeyEvents { // --- Pass 1 ---- collect all selected nodes const collectedSelectedNotes: Note[] = []; - this.noteSerivce.getNotes().forEach((n: Note) => { + this.noteService.getNotes().forEach((n: Note) => { if (n.selected()) { collectedSelectedNotes.push(n); } }); // --- Pass 2 ---- duplicate all notes and calculate the max notes offset (position move to) - this.noteSerivce.unselectAllNotes(false); + this.noteService.unselectAllNotes(false); const newNotes: Note[] = []; let maxW = 0; let maxH = 0; @@ -476,8 +476,8 @@ export class EditorKeyEvents { maxH = Math.max(n.getHeight(), maxH); }); collectedSelectedNotes.forEach((n: Note) => { - const cNode = this.noteSerivce.duplicateNote(n.getId()); - this.noteSerivce.moveNote( + const cNode = this.noteService.duplicateNote(n.getId()); + this.noteService.moveNote( cNode.getId(), maxW + RASTERING_BASIC_GRID_SIZE, maxH + RASTERING_BASIC_GRID_SIZE, @@ -494,7 +494,7 @@ export class EditorKeyEvents { }); // call update - due of disabled update (signal) in the passes 1-5 - this.noteSerivce.notesUpdated(); + this.noteService.notesUpdated(); return true; } @@ -504,23 +504,23 @@ export class EditorKeyEvents { nodeHeight: number, enforceUpdate = true, ): Node { - const newNode = this.nodeSerivce.duplicateNode(node.getId()); - this.nodeSerivce.changeNodePosition( + const newNode = this.nodeService.duplicateNode(node.getId()); + this.nodeService.changeNodePosition( newNode.getId(), newNode.getPositionX() + nodeWidth + RASTERING_BASIC_GRID_SIZE, newNode.getPositionY() + nodeHeight + RASTERING_BASIC_GRID_SIZE, true, enforceUpdate, ); - this.nodeSerivce.unselectNode(newNode.getId(), enforceUpdate); + this.nodeService.unselectNode(newNode.getId(), enforceUpdate); return newNode; } private onKeyPressedEscape(): boolean { this.trainrunService.unselectAllTrainruns(); if (this.editorMode === EditorMode.MultiNodeMoving) { - this.nodeSerivce.unselectAllNodes(); - this.noteSerivce.unselectAllNotes(); + this.nodeService.unselectAllNodes(); + this.noteService.unselectAllNotes(); } return true; } @@ -532,10 +532,10 @@ export class EditorKeyEvents { this.uiInteractionService.getEditorMode() === EditorMode.NetzgrafikEditing ) { this.uiInteractionService.setEditorMode(EditorMode.MultiNodeMoving); - this.noteSerivce.getNotes().forEach((n: Note) => n.select()); - this.nodeSerivce.getNodes().forEach((n: Node) => n.select()); - this.noteSerivce.notesUpdated(); - this.nodeSerivce.nodesUpdated(); + this.noteService.getNotes().forEach((n: Note) => n.select()); + this.nodeService.getNodes().forEach((n: Node) => n.select()); + this.noteService.notesUpdated(); + this.nodeService.nodesUpdated(); } return true; } @@ -552,14 +552,14 @@ export class EditorKeyEvents { const mousePosition = this.svgMouseController.getLastMousePosition(); const hoveredNodeId = this.getHoveredNodeId(); if (hoveredNodeId !== undefined) { - this.nodeSerivce.addNodeWithPosition( + this.nodeService.addNodeWithPosition( mousePosition.getX(), mousePosition.getY(), ); return true; } - this.nodeSerivce.addNodeWithPosition( + this.nodeService.addNodeWithPosition( mousePosition.getX(), mousePosition.getY(), ); @@ -568,7 +568,7 @@ export class EditorKeyEvents { private deleteTrainrunsAndEmptyNodesIfFilteringActive() { let visibleTrainrunSections: number[] = []; - this.nodeSerivce.getNodes().forEach((n: Node) => { + this.nodeService.getNodes().forEach((n: Node) => { if (n.selected()) { n.getPorts().forEach((p: Port) => { const trainrunSection = p.getTrainrunSection(); @@ -589,13 +589,13 @@ export class EditorKeyEvents { }); let selectedNodeDeleted = false; - this.nodeSerivce.getNodes().forEach((n: Node) => { + this.nodeService.getNodes().forEach((n: Node) => { if (n.selected()) { if (n.getPorts().length === 0) { if (n.selected()) { selectedNodeDeleted = true; } - this.nodeSerivce.deleteNode(n.getId(), false); + this.nodeService.deleteNode(n.getId(), false); } } }); @@ -609,10 +609,10 @@ export class EditorKeyEvents { private removeAllSelectedNodes() { let selectedNodeDeleted = false; - this.nodeSerivce.getNodes().forEach((n: Node) => { + this.nodeService.getNodes().forEach((n: Node) => { if (n.selected()) { selectedNodeDeleted = true; - this.nodeSerivce.deleteNode(n.getId(), false); + this.nodeService.deleteNode(n.getId(), false); } }); @@ -622,9 +622,9 @@ export class EditorKeyEvents { } private removeAllSelectedNotes() { - this.noteSerivce.getNotes().forEach((n: Note) => { + this.noteService.getNotes().forEach((n: Note) => { if (n.selected()) { - this.noteSerivce.deleteNote(n.getId(), false); + this.noteService.deleteNote(n.getId(), false); } }); } @@ -635,10 +635,10 @@ export class EditorKeyEvents { } const selectedTrainrunSectionId = this.getSelectedTrainSectionId(); - const connections = this.nodeSerivce.getAllSelectedConnections(); + const connections = this.nodeService.getAllSelectedConnections(); if (connections.length > 0) { connections.forEach((connection: Connection) => { - const node = this.nodeSerivce + const node = this.nodeService .getNodes() .find( (n: Node) => @@ -647,7 +647,7 @@ export class EditorKeyEvents { .find((c) => connection.getId() === c.getId()) !== undefined, ); if (node !== undefined) { - this.nodeSerivce.removeConnectionFromNode( + this.nodeService.removeConnectionFromNode( node.getId(), connection.getId(), ); @@ -667,11 +667,11 @@ export class EditorKeyEvents { /* handle Notes */ this.removeAllSelectedNotes(); - this.noteSerivce.notesUpdated(); + this.noteService.notesUpdated(); this.uiInteractionService.setEditorMode(EditorMode.NetzgrafikEditing); - this.nodeSerivce.unselectAllNodes(); - this.noteSerivce.unselectAllNotes(); + this.nodeService.unselectAllNodes(); + this.noteService.unselectAllNotes(); return true; } @@ -684,8 +684,8 @@ export class EditorKeyEvents { const hoveredNodeId = this.getHoveredNodeId(); if (hoveredNodeId !== undefined) { - const selNodeDelete = this.nodeSerivce.isNodeSelected(hoveredNodeId); - this.nodeSerivce.deleteNode(hoveredNodeId); + const selNodeDelete = this.nodeService.isNodeSelected(hoveredNodeId); + this.nodeService.deleteNode(hoveredNodeId); if (selNodeDelete) { this.uiInteractionService.closeNodeStammdaten(); } @@ -694,7 +694,7 @@ export class EditorKeyEvents { const hoveredNoteId = this.getHoveredNoteId(); if (hoveredNoteId !== undefined) { - this.noteSerivce.deleteNote(hoveredNoteId); + this.noteService.deleteNote(hoveredNoteId); return true; } @@ -705,8 +705,8 @@ export class EditorKeyEvents { private netzgrafikElementsUpdated() { this.trainrunSectionService.trainrunSectionsUpdated(); this.trainrunService.trainrunsUpdated(); - this.nodeSerivce.transitionsUpdated(); - this.nodeSerivce.connectionsUpdated(); - this.nodeSerivce.nodesUpdated(); + this.nodeService.transitionsUpdated(); + this.nodeService.connectionsUpdated(); + this.nodeService.nodesUpdated(); } } diff --git a/src/app/view/editor-main-view/data-views/nodes.view.spec.ts b/src/app/view/editor-main-view/data-views/nodes.view.spec.ts index 0aa8a129..bd187256 100644 --- a/src/app/view/editor-main-view/data-views/nodes.view.spec.ts +++ b/src/app/view/editor-main-view/data-views/nodes.view.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 "../../../services/data/label.service"; import {NetzgrafikColoringService} from "../../../services/data/netzgrafikColoring.service"; import {UndoService} from "../../../services/data/undo.service"; import {CopyService} from "../../../services/data/copy.service"; @@ -135,7 +135,7 @@ describe("Nodes-View", () => { uiInteractionService ); - const viewportCullSerivce = new ViewportCullService( + const viewportCullService = new ViewportCullService( uiInteractionService, nodeService, noteService, @@ -147,7 +147,7 @@ describe("Nodes-View", () => { nodeService, noteService, uiInteractionService, - viewportCullSerivce + viewportCullService ); const controller = new EditorMainViewComponent( @@ -161,7 +161,7 @@ describe("Nodes-View", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService @@ -178,7 +178,7 @@ describe("Nodes-View", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService diff --git a/src/app/view/editor-main-view/data-views/notes.view.spec.ts b/src/app/view/editor-main-view/data-views/notes.view.spec.ts index cba6f1c7..7a0c4946 100644 --- a/src/app/view/editor-main-view/data-views/notes.view.spec.ts +++ b/src/app/view/editor-main-view/data-views/notes.view.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 "../../../services/data/label.service"; import {NetzgrafikColoringService} from "../../../services/data/netzgrafikColoring.service"; import {UndoService} from "../../../services/data/undo.service"; import {CopyService} from "../../../services/data/copy.service"; @@ -135,7 +135,7 @@ describe("Notes-View", () => { uiInteractionService ); - const viewportCullSerivce = new ViewportCullService( + const viewportCullService = new ViewportCullService( uiInteractionService, nodeService, noteService, @@ -147,7 +147,7 @@ describe("Notes-View", () => { nodeService, noteService, uiInteractionService, - viewportCullSerivce + viewportCullService ); const controller = new EditorMainViewComponent( @@ -161,7 +161,7 @@ describe("Notes-View", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService @@ -178,7 +178,7 @@ describe("Notes-View", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService diff --git a/src/app/view/editor-main-view/data-views/trainrunsections.view.spec.ts b/src/app/view/editor-main-view/data-views/trainrunsections.view.spec.ts index dbf33113..0b22c84f 100644 --- a/src/app/view/editor-main-view/data-views/trainrunsections.view.spec.ts +++ b/src/app/view/editor-main-view/data-views/trainrunsections.view.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 "../../../services/data/label.service"; import {NetzgrafikColoringService} from "../../../services/data/netzgrafikColoring.service"; import {UndoService} from "../../../services/data/undo.service"; import {CopyService} from "../../../services/data/copy.service"; @@ -140,7 +140,7 @@ describe("TrainrunSection-View", () => { uiInteractionService ); - const viewportCullSerivce = new ViewportCullService( + const viewportCullService = new ViewportCullService( uiInteractionService, nodeService, noteService, @@ -152,7 +152,7 @@ describe("TrainrunSection-View", () => { nodeService, noteService, uiInteractionService, - viewportCullSerivce + viewportCullService ); const controller = new EditorMainViewComponent( @@ -166,7 +166,7 @@ describe("TrainrunSection-View", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService @@ -183,7 +183,7 @@ describe("TrainrunSection-View", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService diff --git a/src/app/view/editor-main-view/data-views/transitions.view.spec.ts b/src/app/view/editor-main-view/data-views/transitions.view.spec.ts index d595830d..ad487633 100644 --- a/src/app/view/editor-main-view/data-views/transitions.view.spec.ts +++ b/src/app/view/editor-main-view/data-views/transitions.view.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 "../../../services/data/label.service"; import {NetzgrafikColoringService} from "../../../services/data/netzgrafikColoring.service"; import {UndoService} from "../../../services/data/undo.service"; import {CopyService} from "../../../services/data/copy.service"; @@ -135,7 +135,7 @@ describe("Transitions-View", () => { uiInteractionService ); - const viewportCullSerivce = new ViewportCullService( + const viewportCullService = new ViewportCullService( uiInteractionService, nodeService, noteService, @@ -147,7 +147,7 @@ describe("Transitions-View", () => { nodeService, noteService, uiInteractionService, - viewportCullSerivce + viewportCullService ); const controller = new EditorMainViewComponent( @@ -161,7 +161,7 @@ describe("Transitions-View", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService @@ -178,7 +178,7 @@ describe("Transitions-View", () => { undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, undefined, positionTransformationService diff --git a/src/app/view/editor-main-view/editor-main-view.component.ts b/src/app/view/editor-main-view/editor-main-view.component.ts index 2f224909..15a7e65d 100644 --- a/src/app/view/editor-main-view/editor-main-view.component.ts +++ b/src/app/view/editor-main-view/editor-main-view.component.ts @@ -73,10 +73,10 @@ export class EditorMainViewComponent implements AfterViewInit, OnDestroy { private uiInteractionService: UiInteractionService, private noteService: NoteService, private analyticsService: AnalyticsService, - private undoSerivce: UndoService, + private undoService: UndoService, private copyService: CopyService, private logService: LogService, - private viewportCullSerivce: ViewportCullService, + private viewportCullService: ViewportCullService, private levelOfDetailService: LevelOfDetailService, private versionControlService: VersionControlService, private positionTransformationService: PositionTransformationService @@ -89,10 +89,10 @@ export class EditorMainViewComponent implements AfterViewInit, OnDestroy { noteService, filterService, uiInteractionService, - undoSerivce, + undoService, copyService, logService, - viewportCullSerivce, + viewportCullService, levelOfDetailService, versionControlService, positionTransformationService @@ -591,11 +591,11 @@ export class EditorMainViewComponent implements AfterViewInit, OnDestroy { ); this.editorView.bindPauseUndoRecording(() => { - this.undoSerivce.pauseUndoRecording(); + this.undoService.pauseUndoRecording(); }); this.editorView.bindStartUndoRecording(() => { - this.undoSerivce.startUndoRecording(); + this.undoService.startUndoRecording(); }); } diff --git a/src/app/view/editor-side-view/editor-node-detail-view/editor-node-detail-view.component.ts b/src/app/view/editor-side-view/editor-node-detail-view/editor-node-detail-view.component.ts index 1ac22d36..6887e0ef 100644 --- a/src/app/view/editor-side-view/editor-node-detail-view/editor-node-detail-view.component.ts +++ b/src/app/view/editor-side-view/editor-node-detail-view/editor-node-detail-view.component.ts @@ -18,7 +18,7 @@ import {ResourceService} from "../../../services/data/resource.service"; import {Resource} from "../../../models/resource.model"; import {takeUntil} from "rxjs/operators"; import {Subject} from "rxjs"; -import {LabelService} from "../../../services/data/label.serivce"; +import {LabelService} from "../../../services/data/label.service"; import {LabelGroupService} from "../../../services/data/labelgroup.service"; import {SbbChipEvent, SbbChipInputEvent} from "@sbb-esta/angular/chips"; import {COMMA, ENTER} from "@angular/cdk/keycodes"; diff --git a/src/app/view/editor-tools-view-component/editor-tools-view.component.ts b/src/app/view/editor-tools-view-component/editor-tools-view.component.ts index 117d0aff..15a8ce0b 100644 --- a/src/app/view/editor-tools-view-component/editor-tools-view.component.ts +++ b/src/app/view/editor-tools-view-component/editor-tools-view.component.ts @@ -19,7 +19,7 @@ import { } from "../../data-structures/business.data.structures"; import {downloadBlob} from "../util/download-utils"; import {map} from "rxjs/operators"; -import {LabelService} from "../../services/data/label.serivce"; +import {LabelService} from "../../services/data/label.service"; import {NetzgrafikColoringService} from "../../services/data/netzgrafikColoring.service"; import {ViewportCullService} from "../../services/ui/viewport.cull.service"; import {LevelOfDetailService} from "../../services/ui/level.of.detail.service"; diff --git a/src/integration-testing/label.service.test.spec.ts b/src/integration-testing/label.service.test.spec.ts index 70cd9905..0994dc7f 100644 --- a/src/integration-testing/label.service.test.spec.ts +++ b/src/integration-testing/label.service.test.spec.ts @@ -7,7 +7,7 @@ import {ResourceService} from "../app/services/data/resource.service"; import {LogService} from "../app/logger/log.service"; import {LogPublishersService} from "../app/logger/log.publishers.service"; import {NoteService} from "../app/services/data/note.service"; -import {LabelService} from "../app/services/data/label.serivce"; +import {LabelService} from "../app/services/data/label.service"; import {LabelGroupService} from "../app/services/data/labelgroup.service"; import {NetzgrafikUnitTesting} from "./netzgrafik.unit.testing"; import {Label} from "../app/models/label.model"; diff --git a/src/integration-testing/labelgroup.service.test.spec.ts b/src/integration-testing/labelgroup.service.test.spec.ts index 4dad3233..f27d459c 100644 --- a/src/integration-testing/labelgroup.service.test.spec.ts +++ b/src/integration-testing/labelgroup.service.test.spec.ts @@ -7,7 +7,7 @@ import {ResourceService} from "../app/services/data/resource.service"; import {LogService} from "../app/logger/log.service"; import {LogPublishersService} from "../app/logger/log.publishers.service"; import {NoteService} from "../app/services/data/note.service"; -import {LabelService} from "../app/services/data/label.serivce"; +import {LabelService} from "../app/services/data/label.service"; import {LabelGroupService} from "../app/services/data/labelgroup.service"; import {NetzgrafikUnitTesting} from "./netzgrafik.unit.testing"; import {Label} from "../app/models/label.model"; diff --git a/src/integration-testing/node.service.test.spec.ts b/src/integration-testing/node.service.test.spec.ts index 869d865b..6d229eef 100644 --- a/src/integration-testing/node.service.test.spec.ts +++ b/src/integration-testing/node.service.test.spec.ts @@ -13,7 +13,7 @@ import {LogPublishersService} from "../app/logger/log.publishers.service"; import {NetzgrafikUnitTesting} from "./netzgrafik.unit.testing"; import {NetzgrafikUnitTestingTransition} from "./netzgrafik.unit.testing.transition"; import {NoteService} from "../app/services/data/note.service"; -import {LabelService} from "../app/services/data/label.serivce"; +import {LabelService} from "../app/services/data/label.service"; import {LabelGroupService} from "../app/services/data/labelgroup.service"; import {LabelRef} from "../app/data-structures/business.data.structures"; import {FilterService} from "../app/services/ui/filter.service"; diff --git a/src/integration-testing/note.service.test.spec.ts b/src/integration-testing/note.service.test.spec.ts index b6534fd5..db2ec32b 100644 --- a/src/integration-testing/note.service.test.spec.ts +++ b/src/integration-testing/note.service.test.spec.ts @@ -7,7 +7,7 @@ import {ResourceService} from "../app/services/data/resource.service"; import {LogService} from "../app/logger/log.service"; import {LogPublishersService} from "../app/logger/log.publishers.service"; import {NoteService} from "../app/services/data/note.service"; -import {LabelService} from "../app/services/data/label.serivce"; +import {LabelService} from "../app/services/data/label.service"; import {LabelGroupService} from "../app/services/data/labelgroup.service"; import {Note} from "../app/models/note.model"; import {NetzgrafikUnitTesting} from "./netzgrafik.unit.testing"; diff --git a/src/integration-testing/origin.destination.csv.test.spec.ts b/src/integration-testing/origin.destination.csv.test.spec.ts index e02e3a71..f3845ba0 100644 --- a/src/integration-testing/origin.destination.csv.test.spec.ts +++ b/src/integration-testing/origin.destination.csv.test.spec.ts @@ -1,7 +1,7 @@ import {LogPublishersService} from "src/app/logger/log.publishers.service"; import {LogService} from "src/app/logger/log.service"; import {DataService} from "src/app/services/data/data.service"; -import {LabelService} from "src/app/services/data/label.serivce"; +import {LabelService} from "src/app/services/data/label.service"; import {LabelGroupService} from "src/app/services/data/labelgroup.service"; import {NetzgrafikColoringService} from "src/app/services/data/netzgrafikColoring.service"; import {NodeService} from "src/app/services/data/node.service"; diff --git a/src/integration-testing/reconnect.trainrunsections.test.spec.ts b/src/integration-testing/reconnect.trainrunsections.test.spec.ts index c43bcd3c..a1134fc5 100644 --- a/src/integration-testing/reconnect.trainrunsections.test.spec.ts +++ b/src/integration-testing/reconnect.trainrunsections.test.spec.ts @@ -9,7 +9,7 @@ import {LogPublishersService} from "../app/logger/log.publishers.service"; import {NetzgrafikUnitTestingReconnectTrainrunSection} from "./netzgrafik.unit.test.reconnec.trainrunsectionst"; import {NoteService} from "../app/services/data/note.service"; import {LabelGroupService} from "../app/services/data/labelgroup.service"; -import {LabelService} from "../app/services/data/label.serivce"; +import {LabelService} from "../app/services/data/label.service"; import {FilterService} from "../app/services/ui/filter.service"; import {NetzgrafikColoringService} from "../app/services/data/netzgrafikColoring.service"; diff --git a/src/integration-testing/resource.service.test.spec.ts b/src/integration-testing/resource.service.test.spec.ts index 4c14e2cc..7ec7c864 100644 --- a/src/integration-testing/resource.service.test.spec.ts +++ b/src/integration-testing/resource.service.test.spec.ts @@ -7,7 +7,7 @@ import {ResourceService} from "../app/services/data/resource.service"; import {LogService} from "../app/logger/log.service"; import {LogPublishersService} from "../app/logger/log.publishers.service"; import {NoteService} from "../app/services/data/note.service"; -import {LabelService} from "../app/services/data/label.serivce"; +import {LabelService} from "../app/services/data/label.service"; import {LabelGroupService} from "../app/services/data/labelgroup.service"; import {NetzgrafikUnitTesting} from "./netzgrafik.unit.testing"; import {Resource} from "../app/models/resource.model"; diff --git a/src/integration-testing/stammdaten.service.test.spec.ts b/src/integration-testing/stammdaten.service.test.spec.ts index 6b3237e6..ce27b367 100644 --- a/src/integration-testing/stammdaten.service.test.spec.ts +++ b/src/integration-testing/stammdaten.service.test.spec.ts @@ -8,7 +8,7 @@ import {ResourceService} from "../app/services/data/resource.service"; import {LogService} from "../app/logger/log.service"; import {LogPublishersService} from "../app/logger/log.publishers.service"; import {NoteService} from "../app/services/data/note.service"; -import {LabelService} from "../app/services/data/label.serivce"; +import {LabelService} from "../app/services/data/label.service"; import {LabelGroupService} from "../app/services/data/labelgroup.service"; import {Note} from "../app/models/note.model"; import {NetzgrafikUnitTesting} from "./netzgrafik.unit.testing"; diff --git a/src/integration-testing/trainIterator.test.spec.ts b/src/integration-testing/trainIterator.test.spec.ts index d329a054..025f3063 100644 --- a/src/integration-testing/trainIterator.test.spec.ts +++ b/src/integration-testing/trainIterator.test.spec.ts @@ -13,7 +13,7 @@ import { } from "../app/services/util/trainrun.iterator"; import {NoteService} from "../app/services/data/note.service"; import {LabelGroupService} from "../app/services/data/labelgroup.service"; -import {LabelService} from "../app/services/data/label.serivce"; +import {LabelService} from "../app/services/data/label.service"; import {FilterService} from "../app/services/ui/filter.service"; import {NetzgrafikColoringService} from "../app/services/data/netzgrafikColoring.service"; diff --git a/src/integration-testing/trainrunsection.service.test.spec.ts b/src/integration-testing/trainrunsection.service.test.spec.ts index 34588ca7..a04956a7 100644 --- a/src/integration-testing/trainrunsection.service.test.spec.ts +++ b/src/integration-testing/trainrunsection.service.test.spec.ts @@ -15,7 +15,7 @@ import {LogPublishersService} from "../app/logger/log.publishers.service"; import {NetzgrafikUnitTesting} from "./netzgrafik.unit.testing"; import {NoteService} from "../app/services/data/note.service"; import {LabelGroupService} from "../app/services/data/labelgroup.service"; -import {LabelService} from "../app/services/data/label.serivce"; +import {LabelService} from "../app/services/data/label.service"; import {LinePatternRefs} from "../app/data-structures/business.data.structures"; import {FilterService} from "../app/services/ui/filter.service"; import {NetzgrafikColoringService} from "../app/services/data/netzgrafikColoring.service";