From 47d38b211dc651c58fd07bf776c7f41daebba936 Mon Sep 17 00:00:00 2001
From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com>
Date: Tue, 17 Dec 2024 10:21:12 +0100
Subject: [PATCH] Ssld free reporting section (#1184)

* Ssld: modify free reporting section

* Remove test code

* Remove unused attribute
---
 .../table/pt1/ssld/SsldTransformator.xtend    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend
index e3cad22b8..fe4031191 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend
+++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend
@@ -68,26 +68,26 @@ class SsldTransformator extends AbstractPlanPro2TableModelTransformator {
 		].filter[present].map[get].min
 	}
 
-	def String getFreigemeldetLaenge(Fstr_DWeg dweg, TopGraph topGraph,
-		BigDecimal maxLength) {
+	def String getFreigemeldetLaenge(Fstr_DWeg dweg, TopGraph topGraph) {
 		val startSignal = dweg?.fstrFahrweg?.start
-		val fmas = dweg?.FMAs.toList.filter [
+		var fmas = dweg?.FMAs.toList.filter [
 			topGraph.isInWirkrichtungOfSignal(startSignal, it)
-		]
+		].toList
+		// When not exists relevant FMA_Komponent/Gleis_Abschluss on the Fstr_Fahrweg of this DWeg,
+		// then take the FMA_Komponent/Gleis_Abschluss of this FMA_Anlage_Freimeldung,
+		// which in direction of the start Signal
 		if (fmas.empty) {
-			return ""
+			fmas = dweg?.fmaAnlageFreimeldung?.map[fmaGrenzen]?.flatten.toSet.
+				filter[topGraph.isInWirkrichtungOfSignal(startSignal, it)].
+				toList
 		}
 
 		val relevantDistances = fmas?.map [
 			getShortestPathLength(dweg?.fstrFahrweg?.start, it)
-		].filter [
-			maxLength.compareTo(it) >= 0 &&
-				dweg?.fstrDWegAllg?.laengeSoll?.wert.compareTo(it) <= 0
 		]
-		if (relevantDistances.nullOrEmpty) {
-			return AgateRounding.roundDown(maxLength.doubleValue).toString
+		if (relevantDistances.isEmpty) {
+			return ""
 		}
-
 		val roundedDistance = AgateRounding.roundDown(
 			relevantDistances.max.doubleValue)
 		if (roundedDistance == 0.0)
@@ -196,7 +196,7 @@ class SsldTransformator extends AbstractPlanPro2TableModelTransformator {
 				instance,
 				cols.getColumn(Freigemeldet),
 				dweg,
-				[getFreigemeldetLaenge(topGraph, fstrFahrWegLength)]
+				[getFreigemeldetLaenge(topGraph)]
 			)
 
 			// J: Ssld.Eigenschaften.massgebende_Neigung