Skip to content

fix: The migration of the third-party import was not correctly perfor… #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2025
Merged

fix: The migration of the third-party import was not correctly perfor… #620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/app/view/editor-tools-view-component/editor-tools-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {StammdatenService} from "../../services/data/stammdaten.service";
import {LogService} from "../../logger/log.service";
import {VersionControlService} from "../../services/data/version-control.service";
import {
Direction,
HaltezeitFachCategories,
NetzgrafikDto,
NodeDto,
Expand All @@ -27,6 +28,7 @@ import {TrainrunSectionValidator} from "../../services/util/trainrunsection.vali
import {OriginDestinationService} from "src/app/services/analytics/origin-destination/components/origin-destination.service";
import {EditorMode} from "../editor-menu/editor-mode";
import {NODE_TEXT_AREA_HEIGHT, RASTERING_BASIC_GRID_SIZE} from "../rastering/definitions";
import {ResourceService} from "../../services/data/resource.service";

interface ContainertoExportData {
documentToExport: HTMLElement;
Expand Down Expand Up @@ -63,6 +65,7 @@ export class EditorToolsViewComponent {
private viewportCullService: ViewportCullService,
private levelOfDetailService: LevelOfDetailService,
private originDestinationService: OriginDestinationService,
private resourceService: ResourceService,
) {}

onLoadButton() {
Expand Down Expand Up @@ -764,12 +767,24 @@ export class EditorToolsViewComponent {
}
trans.setIsNonStopTransit(arrivalTime - departureTime === 0);
});

const res = this.resourceService.createAndGetResource(false);
n.setResourceId(res.getId());
});

// step(4) Migrate 3rd party imported trainruns/node/resource to ensure direction is set
this.dataService.ensureAllResourcesLinkedToNetzgrafikObjects();
this.trainrunService.getTrainruns().forEach((t) => {
const currentDirection = t.getDirection();
if (currentDirection === undefined) {
t.setDirection(Direction.ROUND_TRIP);
}
});

// step(4) Recalc/propagate consecutive times
// step(5) Recalc/propagate consecutive times
this.trainrunService.propagateInitialConsecutiveTimes();

// step(5) Validate all trainrun sections
// step(6) Validate all trainrun sections
this.trainrunSectionService.getTrainrunSections().forEach((ts) => {
TrainrunSectionValidator.validateOneSection(ts);
TrainrunSectionValidator.validateTravelTime(ts);
Expand Down