Skip to content

Commit 6d600a3

Browse files
emersionemersion
committed
Add TrainrunSectionViewObject.getTrainrun()
TrainrunSectionViewObject will represent multiple trainrun sections soon. Add a helper to get the parent trainrun to reduce reliance on a single trainrun. Signed-off-by: Simon Ser <[email protected]>
1 parent b7d8786 commit 6d600a3

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

‎src/app/view/editor-main-view/data-views/d3.utils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,21 @@ export class D3Utils {
4545
d3.selectAll(StaticDomTags.EDGE_LINE_ARROW_DOM_REF)
4646
.filter(
4747
(d: TrainrunSectionViewObject) =>
48-
d !== undefined && d.trainrunSection.getTrainrunId() === trainrunSection.getTrainrunId(),
48+
d !== undefined && d.getTrainrun().getId() === trainrunSection.getTrainrunId(),
4949
)
5050
.classed(StaticDomTags.TAG_HOVER, true);
5151

5252
d3.selectAll(StaticDomTags.EDGE_LINE_DOM_REF)
5353
.filter(
5454
(d: TrainrunSectionViewObject) =>
55-
d !== undefined && d.trainrunSection.getTrainrunId() === trainrunSection.getTrainrunId(),
55+
d !== undefined && d.getTrainrun().getId() === trainrunSection.getTrainrunId(),
5656
)
5757
.classed(StaticDomTags.TAG_HOVER, true);
5858

5959
d3.selectAll(StaticDomTags.EDGE_ROOT_CONTAINER_DOM_REF)
6060
.filter(
6161
(d: TrainrunSectionViewObject) =>
62-
d !== undefined && d.trainrunSection.getTrainrunId() === trainrunSection.getTrainrunId(),
62+
d !== undefined && d.getTrainrun().getId() === trainrunSection.getTrainrunId(),
6363
)
6464
.classed(StaticDomTags.TAG_HOVER, true);
6565

‎src/app/view/editor-main-view/data-views/trainrunSectionViewObject.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ export class TrainrunSectionViewObject {
3030
);
3131
}
3232

33+
getTrainrun() {
34+
return this.trainrunSection.getTrainrun();
35+
}
36+
3337
static generateKey(
3438
editorView: EditorView,
3539
d: TrainrunSection,

‎src/app/view/editor-main-view/data-views/trainrunsections.view.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ export class TrainrunSectionsView {
11321132

11331133
groupEnter
11341134
.filter((d: TrainrunSectionViewObject) => {
1135-
const displayTextBackground = d.trainrunSection.getTrainrun().isRoundTrip() || isOneWayText;
1135+
const displayTextBackground = d.getTrainrun().isRoundTrip() || isOneWayText;
11361136
return (
11371137
this.filterTrainrunsectionAtNode(d.trainrunSection, atSource) &&
11381138
this.filterTimeTrainrunsectionNonStop(d.trainrunSection, atSource, isArrival) &&
@@ -1152,7 +1152,7 @@ export class TrainrunSectionsView {
11521152
)
11531153
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
11541154
.attr(StaticDomTags.EDGE_LINE_LINE_ID, (d: TrainrunSectionViewObject) =>
1155-
d.trainrunSection.getTrainrun().getId(),
1155+
d.getTrainrun().getId(),
11561156
)
11571157
.attr(StaticDomTags.EDGE_LINE_TEXT_INDEX, lineTextElement)
11581158
.attr(
@@ -1239,7 +1239,7 @@ export class TrainrunSectionsView {
12391239
groupLinesEnter
12401240
.append(StaticDomTags.EDGE_LINE_ARROW_SVG)
12411241
.attr("d", (d: TrainrunSectionViewObject) => {
1242-
return d.trainrunSection.getTrainrun().isRoundTrip() ? "" : "M-4,-5L2,0L-4,5Z";
1242+
return d.getTrainrun().isRoundTrip() ? "" : "M-4,-5L2,0L-4,5Z";
12431243
})
12441244
.attr("transform", (d: TrainrunSectionViewObject) =>
12451245
this.translateAndRotateArrow(d.trainrunSection, arrowType),
@@ -1266,10 +1266,10 @@ export class TrainrunSectionsView {
12661266
)
12671267
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
12681268
.attr(StaticDomTags.EDGE_LINE_LINE_ID, (d: TrainrunSectionViewObject) =>
1269-
d.trainrunSection.getTrainrun().getId(),
1269+
d.getTrainrun().getId(),
12701270
)
12711271
.classed(StaticDomTags.TAG_SELECTED, (d: TrainrunSectionViewObject) =>
1272-
d.trainrunSection.getTrainrun().selected(),
1272+
d.getTrainrun().selected(),
12731273
)
12741274
.classed(StaticDomTags.TAG_LINE_ARROW_EDITOR, true)
12751275
.classed(StaticDomTags.TAG_MUTED, (d: TrainrunSectionViewObject) =>
@@ -1313,13 +1313,13 @@ export class TrainrunSectionsView {
13131313
)
13141314
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
13151315
.attr(StaticDomTags.EDGE_LINE_LINE_ID, (d: TrainrunSectionViewObject) =>
1316-
d.trainrunSection.getTrainrun().getId(),
1316+
d.getTrainrun().getId(),
13171317
)
13181318
.attr("d", (d: TrainrunSectionViewObject) =>
13191319
D3Utils.getPathAsSVGString(this.transformPath(d.trainrunSection)),
13201320
)
13211321
.classed(StaticDomTags.TAG_SELECTED, (d: TrainrunSectionViewObject) =>
1322-
d.trainrunSection.getTrainrun().selected(),
1322+
d.getTrainrun().selected(),
13231323
)
13241324
.classed(StaticDomTags.TAG_EVENT_DISABLED, !enableEvents)
13251325
.classed(classRef, true);
@@ -1378,7 +1378,7 @@ export class TrainrunSectionsView {
13781378
)
13791379
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
13801380
.attr(StaticDomTags.EDGE_LINE_LINE_ID, (d: TrainrunSectionViewObject) =>
1381-
d.trainrunSection.getTrainrunId(),
1381+
d.getTrainrun().getId(),
13821382
)
13831383
.attr("d", (d: TrainrunSectionViewObject) =>
13841384
TrainrunSectionsView.createSemicircle(
@@ -1406,7 +1406,7 @@ export class TrainrunSectionsView {
14061406
TrainrunSectionsView.isMuted(d.trainrunSection, selectedTrainrun, connectedTrainIds),
14071407
)
14081408
.classed(StaticDomTags.TAG_SELECTED, (d: TrainrunSectionViewObject) =>
1409-
d.trainrunSection.getTrainrun().selected(),
1409+
d.getTrainrun().selected(),
14101410
);
14111411
}
14121412

@@ -1450,7 +1450,7 @@ export class TrainrunSectionsView {
14501450
.attr("class", StaticDomTags.EDGE_LINE_PIN_CLASS)
14511451
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
14521452
.attr(StaticDomTags.EDGE_LINE_LINE_ID, (d: TrainrunSectionViewObject) =>
1453-
d.trainrunSection.getTrainrunId(),
1453+
d.getTrainrun().getId(),
14541454
)
14551455
.attr("cx", (d: TrainrunSectionViewObject) =>
14561456
TrainrunSectionsView.getPosition(d.trainrunSection, atSource).getX(),
@@ -1502,7 +1502,7 @@ export class TrainrunSectionsView {
15021502
TrainrunSectionsView.isMuted(d.trainrunSection, selectedTrainrun, connectedTrainIds),
15031503
)
15041504
.classed(StaticDomTags.TAG_SELECTED, (d: TrainrunSectionViewObject) =>
1505-
d.trainrunSection.getTrainrun().selected(),
1505+
d.getTrainrun().selected(),
15061506
)
15071507
.on("mouseover", (d: TrainrunSectionViewObject, i, a) =>
15081508
this.onTrainrunSectionMouseoverPin(
@@ -1545,7 +1545,7 @@ export class TrainrunSectionsView {
15451545
const renderingObjects = groupEnter
15461546
.filter((d: TrainrunSectionViewObject) => {
15471547
const displayTextElement =
1548-
d.trainrunSection.getTrainrun().isRoundTrip() || isDefaultText || isOneWayText;
1548+
d.getTrainrun().isRoundTrip() || isDefaultText || isOneWayText;
15491549

15501550
return (
15511551
this.filterTrainrunsectionAtNode(d.trainrunSection, atSource) &&
@@ -1566,7 +1566,7 @@ export class TrainrunSectionsView {
15661566
.attr("data-testid", StaticDomTags.EDGE_LINE_TEXT_CLASS)
15671567
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
15681568
.attr(StaticDomTags.EDGE_LINE_LINE_ID, (d: TrainrunSectionViewObject) =>
1569-
d.trainrunSection.getTrainrunId(),
1569+
d.getTrainrun().getId(),
15701570
)
15711571
.attr(StaticDomTags.EDGE_LINE_TEXT_INDEX, textElement)
15721572
.attr("x", (d: TrainrunSectionViewObject) => {
@@ -1607,7 +1607,7 @@ export class TrainrunSectionsView {
16071607
this.getAdditionPositioningValueForViewObjectWithCollapsedSupport(d, textElement),
16081608
)
16091609
.classed(StaticDomTags.TAG_SELECTED, (d: TrainrunSectionViewObject) =>
1610-
d.trainrunSection.getTrainrun().selected(),
1610+
d.getTrainrun().selected(),
16111611
)
16121612
.classed(StaticDomTags.TAG_MUTED, (d: TrainrunSectionViewObject) =>
16131613
TrainrunSectionsView.isMuted(d.trainrunSection, selectedTrainrun, connectedTrainIds),
@@ -1698,7 +1698,7 @@ export class TrainrunSectionsView {
16981698
)
16991699
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
17001700
.attr(StaticDomTags.EDGE_LINE_LINE_ID, (d: TrainrunSectionViewObject) =>
1701-
d.trainrunSection.getTrainrunId(),
1701+
d.getTrainrun().getId(),
17021702
)
17031703
.attr(StaticDomTags.EDGE_LINE_TEXT_INDEX, textElement)
17041704
.attr("x", 0)
@@ -1710,7 +1710,7 @@ export class TrainrunSectionsView {
17101710
),
17111711
)
17121712
.classed(StaticDomTags.TAG_SELECTED, (d: TrainrunSectionViewObject) =>
1713-
d.trainrunSection.getTrainrun().selected(),
1713+
d.getTrainrun().selected(),
17141714
)
17151715
.classed(StaticDomTags.TAG_MUTED, (d: TrainrunSectionViewObject) =>
17161716
TrainrunSectionsView.isMuted(d.trainrunSection, selectedTrainrun, connectedTrainIds),
@@ -1919,7 +1919,7 @@ export class TrainrunSectionsView {
19191919
.attr("class", StaticDomTags.EDGE_ROOT_CONTAINER)
19201920
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
19211921
.classed(StaticDomTags.TAG_SELECTED, (d: TrainrunSectionViewObject) =>
1922-
d.trainrunSection.getTrainrun().selected(),
1922+
d.getTrainrun().selected(),
19231923
)
19241924
.classed(StaticDomTags.TAG_MUTED, (d: TrainrunSectionViewObject) =>
19251925
TrainrunSectionsView.isMuted(d.trainrunSection, selectedTrainrun, connectedTrainIds),
@@ -1929,7 +1929,7 @@ export class TrainrunSectionsView {
19291929
.append(StaticDomTags.EDGE_SVG)
19301930
.attr("class", StaticDomTags.EDGE_CLASS + " Lines")
19311931
.classed(StaticDomTags.TAG_SELECTED, (d: TrainrunSectionViewObject) =>
1932-
d.trainrunSection.getTrainrun().selected(),
1932+
d.getTrainrun().selected(),
19331933
)
19341934
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
19351935
.attr("data-testid", `${StaticDomTags.EDGE_CLASS}-lines`);
@@ -1938,7 +1938,7 @@ export class TrainrunSectionsView {
19381938
.append(StaticDomTags.EDGE_SVG)
19391939
.attr("class", StaticDomTags.EDGE_CLASS + " Labels")
19401940
.classed(StaticDomTags.TAG_SELECTED, (d: TrainrunSectionViewObject) =>
1941-
d.trainrunSection.getTrainrun().selected(),
1941+
d.getTrainrun().selected(),
19421942
)
19431943
.attr(StaticDomTags.EDGE_ID, (d: TrainrunSectionViewObject) => d.trainrunSection.getId())
19441944
.attr("data-testid", `${StaticDomTags.EDGE_CLASS}-labels`);
@@ -2848,7 +2848,7 @@ export class TrainrunSectionsView {
28482848
)
28492849
.attr(StaticDomTags.EDGE_ID, (t: TrainrunSectionViewObject) => t.trainrunSection.getId())
28502850
.attr(StaticDomTags.EDGE_LINE_LINE_ID, (t: TrainrunSectionViewObject) =>
2851-
t.trainrunSection.getTrainrun().getId(),
2851+
t.getTrainrun().getId(),
28522852
)
28532853
.attr("cx", position.getX())
28542854
.attr("cy", position.getY())
@@ -2859,7 +2859,7 @@ export class TrainrunSectionsView {
28592859
TrainrunSectionsView.isMuted(t.trainrunSection, selectedTrainrun, connectedTrainIds),
28602860
)
28612861
.classed(StaticDomTags.TAG_SELECTED, (t: TrainrunSectionViewObject) =>
2862-
t.trainrunSection.getTrainrun().selected(),
2862+
t.getTrainrun().selected(),
28632863
)
28642864
.classed(StaticDomTags.EDGE_LINE_STOPS_FILL, () => !collapsedStops)
28652865
.on("mouseover", (t: TrainrunSectionViewObject, i, a) =>

0 commit comments

Comments
 (0)