From df28bc9f405263ecd5a67fb1fc42a495201e78d6 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Thu, 19 Dec 2024 12:08:13 +0100
Subject: [PATCH] =?UTF-8?q?erste=20Fassung=20der=20Funktion=20getAttribute?=
 =?UTF-8?q?IdOfShapeItem=20erzeugt.=20Bugfix=20beim=20Sivas=20Export:=20?=
 =?UTF-8?q?=C3=9Cberschriften=20waren=20noch=20nicht=20korrekt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 157 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 153 insertions(+), 4 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 0ad6cf8..98a1f20 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-12-17T16:36:11" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-12-19T11:27:51" LanguageVersion="2014.1.3.699" />
 	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
 		<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
 			<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -1136,6 +1136,7 @@
 			<VAR Id="RDK:22306027" Name="anzahlKurvenRecht30" Type="integer" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:22306064" Name="laenge" Type="double" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:22306065" Name="laenge" Type="double" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:22341863" Name="attributeId" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -6693,6 +6694,128 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						<PAR Name="AdvancedOptions" />
 					</SET>
 				</FUNCTION>
+				<FUNCTION Id="RDK:22341543" Name="getAttributeIdOfShapeItem" DesignTimeRemark="Erzeugt eine Id spezifisch für alle Attribute eines Elements, so dass diese als &quot;gleichartig&quot; erkannt werden, z.B. zwei Kreisel mit 5m Länge erhalten diesselbe AttributId. " InputTypeName="string" ResultTypeName="string">
+					<GROUP Id="RDK:22341587" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:22341567" Name="shapeId" Type="string">
+							<SET Id="RDK:22341566" VarRef="Me">
+								<EXP><![CDATA[$=$Param.Input]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+						<VAR Id="RDK:22341858" Name="shapeItem" Type="Editor2DShapeType" />
+						<VAR Id="RDK:22341827" Name="group" Type="string" />
+						<VAR Id="RDK:22341885" Name="idStr" Type="string" />
+						<VAR Id="RDK:22341850" Name="inGroup" Type="boolean" />
+						<VAR Id="RDK:22341569" Name="splitArr" Type="string[]" Suppressed="True">
+							<SET Id="RDK:22341568" VarRef="Me">
+								<EXP><![CDATA[$=$splitStr(group, ";")]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+					</GROUP>
+					<CALLFUNCTION Id="RDK:22341846">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$IsInGroup]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$shapeId]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$inGroup]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<IFTHENELSE Id="RDK:22341836">
+						<VALUECONDITION Value="true">
+							<EXP><![CDATA[$=$inGroup]]></EXP>
+						</VALUECONDITION>
+						<GROUP Id="RDK:22341835" SubType="Then" />
+					</IFTHENELSE>
+					<SET Id="RDK:22341856" VarRef="shapeItem">
+						<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SELECTCASE Id="RDK:22341823">
+						<EXP><![CDATA[$=$shapeItem.family]]></EXP>
+						<CASEGROUP Id="RDK:22341722" CaseType="0">
+							<EXP><![CDATA[$C$Kreisel]]></EXP>
+							<SET Id="RDK:22341883" VarRef="idStr">
+								<EXP><![CDATA[$=$"KRE"+shapeItem.KreiselDefinition.AbstandMS]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341733" CaseType="0">
+							<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+							<SET Id="RDK:22341887" VarRef="idStr">
+								<EXP><![CDATA[$=$"GEF"+shapeItem.GefaelleDefinition.L1]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341744" CaseType="0">
+							<EXP><![CDATA[$C$Foerderer]]></EXP>
+							<SET Id="RDK:22341889" VarRef="idStr">
+								<EXP><![CDATA[$=$"FOD"+shapeItem.FoerdererDefinition.L1]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341755" CaseType="0">
+							<EXP><![CDATA[$C$VarioFoerderer]]></EXP>
+							<SET Id="RDK:22341891" VarRef="idStr">
+								<EXP><![CDATA[$=$"VAF"+shapeItem.VarioFoerdererDefinition.L1]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341766" CaseType="0">
+							<EXP><![CDATA[$C$Weiche]]></EXP>
+							<SET Id="RDK:22341893" VarRef="idStr">
+								<EXP><![CDATA[$=$"WEI"+shapeItem.WeicheDefinition.Weichenart]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341777" CaseType="0">
+							<EXP><![CDATA[$C$Kurve]]></EXP>
+							<SET Id="RDK:22341895" VarRef="idStr">
+								<EXP><![CDATA[$=$"KVG"+shapeItem.KurveDefinition.KurvenWinkel+shapeItem.KurveDefinition.KurvenRichtung]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341788" CaseType="0">
+							<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
+							<SET Id="RDK:22341897" VarRef="idStr">
+								<EXP><![CDATA[$=$"KVF"+shapeItem.KurveFoerdererDefinition.KurvenWinkel+"."+shapeItem.KurveFoerdererDefinition.KurvenRichtung]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341799" CaseType="0">
+							<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
+							<SET Id="RDK:22341899" VarRef="idStr">
+								<EXP><![CDATA[$=$"BTM"+shapeItem.BTMTBeladungDefinition.Drehung]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341810" CaseType="0">
+							<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
+							<SET Id="RDK:22341901" VarRef="idStr">
+								<EXP><![CDATA[$=$"BTE"+shapeItem.BTMTEntladungDefinition.Drehung]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341821" CaseType="0">
+							<EXP><![CDATA[$C$Eckrad]]></EXP>
+							<SET Id="RDK:22341903" VarRef="idStr">
+								<EXP><![CDATA[$=$"EKR"+shapeItem.EckradDefinition.Durchmesser]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:22341822" CaseType="1">
+							<EXP />
+						</CASEGROUP>
+					</SELECTCASE>
+					<SET Id="RDK:22341907" VarRef="Param.Result">
+						<EXP><![CDATA[$=$idStr]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+				</FUNCTION>
 				<FUNCTION Id="RDK:22028265" Name="SetGroupAttributes" DesignTimeRemark="Set die Werte für den CSV Export für eine Strecke, bestehend aus Förderer und Gefälleanteilen" InputTypeName="string">
 					<GROUP Id="RDK:22028256" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 						<VAR Id="RDK:22028283" Name="group" Type="string">
@@ -7669,6 +7792,12 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</PAR>
 							<PAR Name="POS_TO_ADD" />
 						</LIST_ADD>
+						<LIST_ADD Id="RDK:22341541" Suppressed="True" ListRef="längenInMeter">
+							<PAR Name="VALUE_TO_ADD">
+								<EXP><![CDATA[$=$länge]]></EXP>
+							</PAR>
+							<PAR Name="POS_TO_ADD" />
+						</LIST_ADD>
 						<FOREACHLOOP Id="RDK:22306067" ItemVarRef="länge">
 							<PAR Name="ArrayValueExp">
 								<EXP><![CDATA[$=$GFM.{Länge in Meter}]]></EXP>
@@ -7874,6 +8003,12 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</PAR>
 							<PAR Name="POS_TO_ADD" />
 						</LIST_ADD>
+						<LIST_ADD Id="RDK:22341539" Suppressed="True" ListRef="längenInMeter">
+							<PAR Name="VALUE_TO_ADD">
+								<EXP><![CDATA[$=$laenge]]></EXP>
+							</PAR>
+							<PAR Name="POS_TO_ADD" />
+						</LIST_ADD>
 						<FOREACHLOOP Id="RDK:22306061" ItemVarRef="laenge">
 							<PAR Name="ArrayValueExp">
 								<EXP><![CDATA[$=$ASM.{Länge in Meter}]]></EXP>
@@ -21587,7 +21722,8 @@ me.x
 			<FUNCTION Id="RDK:1516909" Name="SivasExport" Bookmarked="True">
 				<GROUP Id="RDK:1516850" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:1516843" Name="CSV_List" Type="CSVType[]" />
-					<VAR Id="RDK:22305605" Name="SivasExport_List" Type="SivasExportType[]" />
+					<VAR Id="RDK:22305605" Name="ReducedExport_List" Type="SivasExportType[]" />
+					<VAR Id="RDK:22341875" Name="SivasExport_List" Type="SivasExportType[]" />
 					<VAR Id="RDK:22305577" Name="CSVFileName" Type="string" />
 					<VAR Id="RDK:22305579" Name="CSVFile" Type="string" />
 				</GROUP>
@@ -21685,7 +21821,7 @@ me.x
 								<EXP><![CDATA[$=$CSVFile]]></EXP>
 							</PAR>
 							<PAR Name="TextLine">
-								<EXP><![CDATA[$=$StrListToStr(FieldNames(CSV_Item), ";")]]></EXP>
+								<EXP><![CDATA[$=$StrListToStr(FieldNames(SIVAS_Item), ";")]]></EXP>
 							</PAR>
 							<PAR Name="Options">
 								<EXP><![CDATA[$C$(ENCODING=UTF-8)]]></EXP>
@@ -21852,6 +21988,7 @@ me.x
 						<VAR Id="RDK:22305393" Name="CSVFile" Type="string" />
 					</GROUP>
 					<VAR Id="RDK:22305395" Name="inGroup" Type="boolean" />
+					<VAR Id="RDK:22341879" Name="attributeId" Type="string" />
 					<VAR Id="RDK:22305639" Name="withGroups" Type="boolean">
 						<SET Id="RDK:22305650" VarRef="Me">
 							<EXP><![CDATA[$=$Param.Input]]></EXP>
@@ -21867,6 +22004,18 @@ me.x
 					<PAR Name="ExitCondExp">
 						<EXP><![CDATA[$V$]]></EXP>
 					</PAR>
+					<CALLFUNCTION Id="RDK:22341877">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$getAttributeIdOfShapeItem]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$ShapeItem.id]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$attributeId]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
 					<CALLFUNCTION Id="RDK:22305397">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$IsInGroup]]></EXP>
@@ -22481,7 +22630,7 @@ me.x
 							</GROUP>
 							<GROUP Id="RDK:22305530" Name="NachbarIds" SubType="Generic">
 								<SET Id="RDK:22305529" VarRef="CSV_Item.NachbarIds">
-									<EXP><![CDATA[$=$""]]></EXP>
+									<EXP><![CDATA[$=$"-"]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>