Skip to content

Sszw: fix fill trackswitch left right #2268

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

Open
TruongQuangSB wants to merge 2 commits into
base: main
Choose a base branch
from
+25 −22
Open

Sszw: fix fill trackswitch left right #2268

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f6e7a1
Sszw: fix fill trackswitch left right
TruongQuangSB Mar 16, 2026
efa9976
Add NPE check
TruongQuangSB Mar 16, 2026
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
47 changes: 25 additions & 22 deletions ....set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszw/SszwTransformator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,27 +163,31 @@ class SszwTransformator extends AbstractPlanPro2TableModelTransformator {
wKrGspElement,
[isSimpleTrackSwitch],
[
val potk = punktObjektTOPKante.firstOrNull
return (potk.abstand.wert === BigDecimal.ZERO &&
potk.topKante.TOPAnschlussA ===
ENUMTOPAnschluss.ENUMTOP_ANSCHLUSS_LINKS) ||
(potk.abstand.wert !== BigDecimal.ZERO &&
potk.topKante.TOPAnschlussB ===
ENUMTOPAnschluss.ENUMTOP_ANSCHLUSS_RECHTS)
punktObjektTOPKante.exists [ potk |
(potk.abstand.wert === BigDecimal.ZERO &&
potk.topKante.TOPAnschlussA ===
ENUMTOPAnschluss.ENUMTOP_ANSCHLUSS_LINKS) ||
(potk.abstand.wert !== BigDecimal.ZERO &&
potk.topKante.TOPAnschlussB ===
ENUMTOPAnschluss.ENUMTOP_ANSCHLUSS_LINKS)
]
]
)

val wKomponentEW_R = refWKrAnlage.getGspKomponente(
wKrGspElement,
[isSimpleTrackSwitch],
[
val potk = punktObjektTOPKante.firstOrNull
return (potk.abstand.wert === BigDecimal.ZERO &&
potk.topKante.TOPAnschlussA ===
ENUMTOPAnschluss.ENUMTOP_ANSCHLUSS_RECHTS) ||
(potk.abstand.wert !== BigDecimal.ZERO &&
potk.topKante.TOPAnschlussB ===
ENUMTOPAnschluss.ENUMTOP_ANSCHLUSS_LINKS)
punktObjektTOPKante.exists [ potk |
(potk.abstand.wert === BigDecimal.ZERO &&
potk.topKante.TOPAnschlussA ===
ENUMTOPAnschluss.ENUMTOP_ANSCHLUSS_RECHTS) ||
(potk.abstand.wert !== BigDecimal.ZERO &&
potk.topKante.TOPAnschlussB ===
ENUMTOPAnschluss.ENUMTOP_ANSCHLUSS_RECHTS)

]

]
)

Expand Down Expand Up @@ -271,7 +275,7 @@ class SszwTransformator extends AbstractPlanPro2TableModelTransformator {
// J: Sszw.Zulaessige_Geschwindigkeit.Kreuzung.li
fill(
row,
cols.getColumn(Geschwindigkeit_W_L),
cols.getColumn(Geschwindigkeit_Kr_L),
refWKrAnlage,
[
getWKrGeschwindigkeit(
Expand Down Expand Up @@ -433,9 +437,8 @@ class SszwTransformator extends AbstractPlanPro2TableModelTransformator {
val distance = gspKomponente.map[new TopPoint(it)].map [ gspPoint |
topGraphService.findShortestDistance(signalTopPoint, gspPoint)
].map[orElse(null)].filterNull
return distance.nullOrEmpty
? ""
: AgateRounding.roundDown(distance.min.doubleValue).toString
return distance.nullOrEmpty ? "" : AgateRounding.roundDown(
distance.min.doubleValue).toString
}

private def String getWKrGeschwindigkeit(
Expand All @@ -454,10 +457,10 @@ class SszwTransformator extends AbstractPlanPro2TableModelTransformator {
switch (type) {
case ENUMW_KR_ART_DKW,
case ENUMW_KR_ART_EKW: {
val gspKomponent = gspElement.WKrGspKomponenten.findFirst [
val gspKomponent = gspElement?.WKrGspKomponenten?.findFirst [
zungenpaar?.kreuzungsgleis?.wert === leftRightCross
]
return allowSpeedEKW_DKW.apply(gspKomponent)?.toString ?: ""
return allowSpeedEKW_DKW?.apply(gspKomponent)?.toString ?: ""
}
case ENUMW_KR_ART_ABW,
case ENUMW_KR_ART_DW,
Expand All @@ -468,8 +471,8 @@ class SszwTransformator extends AbstractPlanPro2TableModelTransformator {
case ENUMW_KR_ART_FLACHKREUZUNG,
case ENUMW_KR_ART_KR,
case ENUMW_KR_ART_SONSTIGE: {
val gspKomponent = gspElement.WKrGspKomponenten.firstOrNull
return allowSpeed.apply(gspKomponent)?.toString ?: ""
val gspKomponent = gspElement?.WKrGspKomponenten?.firstOrNull
return allowSpeed?.apply(gspKomponent)?.toString ?: ""
}
default:
""
Expand Down
Loading