From 0ba0900bf4f7c1181a8817d3390aacb9d7616306 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Tue, 19 May 2026 13:45:50 +0200 Subject: [PATCH 1/2] Fix ssks general condition --- .../table/pt1/ssks/SsksTransformator.xtend | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend index 4c7abc45fa..de2a237fa8 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend @@ -641,6 +641,9 @@ class SsksTransformator extends AbstractSignalTableTransform { } private static def boolean isSsksSignal(Signal signal) { + if (signal.identitaet.wert == "D44C4E86-8AA4-450E-913D-F30BF9398364") { + println("TEST") + } if (signal?.signalFiktiv !== null && !signal?.signalFiktiv?.fiktivesSignalFunktion.exists [ inRelevantFiktivFunktion.contains(it) @@ -653,7 +656,7 @@ class SsksTransformator extends AbstractSignalTableTransform { val signalFunktion = signalReal?.signalFunktion?.wert return (signalArt !== null && signalArt != ENUM_SIGNAL_ART_ANDERE) || - (signalFunktion !== null && + (signalReal.signalRealAktiv !== null && signalFunktion !== null && signalFunktion == ENUM_SIGNAL_FUNKTION_ALLEINSTEHENDES_ZUSATZSIGNAL) || isETCSMarker(signal) @@ -1243,19 +1246,18 @@ class SsksTransformator extends AbstractSignalTableTransform { [throw new RuntimeException(e)] ) } - + override protected getSideDistanceMastType() { return List.of(ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_MAST_HOCH, - ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_MAST_NIEDRIG, - ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_SONSTIGE_HOCH, - ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_SONSTIGE_NIEDRIG, - ENUM_BEFESTIGUNG_ART_SONDERANORDNUNG_MAST_HOCH, - ENUM_BEFESTIGUNG_ART_SONDERANORDNUNG_MAST_NIEDRIG, - ENUM_BEFESTIGUNG_ART_PFOSTEN_HOCH, - ENUM_BEFESTIGUNG_ART_PFOSTEN_NIEDRIG, - ENUM_BEFESTIGUNG_ART_ARBEITSBUEHNE, - ENUM_BEFESTIGUNG_ART_OL_MAST, ENUM_BEFESTIGUNG_ART_WAND, - ENUM_BEFESTIGUNG_ART_DACH_DECKE); + ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_MAST_NIEDRIG, + ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_SONSTIGE_HOCH, + ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_SONSTIGE_NIEDRIG, + ENUM_BEFESTIGUNG_ART_SONDERANORDNUNG_MAST_HOCH, + ENUM_BEFESTIGUNG_ART_SONDERANORDNUNG_MAST_NIEDRIG, + ENUM_BEFESTIGUNG_ART_PFOSTEN_HOCH, + ENUM_BEFESTIGUNG_ART_PFOSTEN_NIEDRIG, + ENUM_BEFESTIGUNG_ART_ARBEITSBUEHNE, ENUM_BEFESTIGUNG_ART_OL_MAST, + ENUM_BEFESTIGUNG_ART_WAND, ENUM_BEFESTIGUNG_ART_DACH_DECKE); } } From b1cb98c144c2b42bb06e2c197ff51f95697cada1 Mon Sep 17 00:00:00 2001 From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com> Date: Tue, 19 May 2026 13:48:07 +0200 Subject: [PATCH 2/2] remove debug code --- .../eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend | 3 --- 1 file changed, 3 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend index de2a237fa8..e0084fbaa5 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend @@ -641,9 +641,6 @@ class SsksTransformator extends AbstractSignalTableTransform { } private static def boolean isSsksSignal(Signal signal) { - if (signal.identitaet.wert == "D44C4E86-8AA4-450E-913D-F30BF9398364") { - println("TEST") - } if (signal?.signalFiktiv !== null && !signal?.signalFiktiv?.fiktivesSignalFunktion.exists [ inRelevantFiktivFunktion.contains(it)