From 456b3d012c12995833fd9539e6f330851eb5df0d Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Wed, 23 Oct 2024 13:59:36 +0200
Subject: [PATCH] =?UTF-8?q?Richtung=20aus=20Kurve=20und=20angetriebener=20?=
 =?UTF-8?q?Kurve=20entfernt,=20da=20diese=20am=20Anfangs-=20und=20Endpunkt?=
 =?UTF-8?q?=20direkt=20h=C3=A4ngt.=20H=C3=B6he=20setzen=20und=20auslesen?=
 =?UTF-8?q?=20vereinfacht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAIN_SSG.rdx | 440 +++++----------------------------------------------
 1 file changed, 39 insertions(+), 401 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 7e8e1f2..3f605f1 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-10-23T13:15:02" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-10-23T13:57:19" 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">
@@ -60,7 +60,7 @@
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -76,7 +76,7 @@
 					<FIELD Id="RDK:302575" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:302576" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:18732236" Name="KurveType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18732236" Name="KurveType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18732225" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:18732226" Name="L1" Type="double" />
@@ -91,7 +91,6 @@
 					<FIELD Id="RDK:21686346" Name="L1" Type="double" />
 					<FIELD Id="RDK:21686347" Name="H_Anfang" Type="double" />
 					<FIELD Id="RDK:21686348" Name="H_Ende" Type="double" />
-					<FIELD Id="RDK:21686349" Name="Delta_h" Type="double" DesignTimeRemark="Höhendifferenz" />
 					<FIELD Id="RDK:21700896" Name="isOk" Type="boolean" DesignTimeRemark="True beide Punkte angebunden sind und die Höhen der Nachbarn passen" />
 				</TYPE>
 				<TYPE Id="RDK:18116690" Name="FoerdererType" SubType="structure">
@@ -16965,68 +16964,20 @@ me.x
 					<CASEGROUP Id="RDK:18732456" CaseType="0">
 						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<IFTHENELSE Id="RDK:18740516">
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Foerderer"]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:18740515" SubType="Then">
-								<CALLFUNCTION Id="RDK:18740514">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:18740525">
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:18740524" SubType="Then">
-								<CALLFUNCTION Id="RDK:18740523">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:21455965">
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:21455964" SubType="Then">
-								<CALLFUNCTION Id="RDK:21455963">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:21692198">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer"]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:21692197" SubType="Then">
-								<CALLFUNCTION Id="RDK:21692196">
+							<GROUP Id="RDK:18740515" SubType="Then">
+								<CALLFUNCTION Id="RDK:18740514">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
 									</PAR>
@@ -17044,68 +16995,20 @@ me.x
 					<CASEGROUP Id="RDK:21692168" CaseType="0">
 						<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
 						<IFTHENELSE Id="RDK:21692161">
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Foerderer"]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:21692160" SubType="Then">
-								<CALLFUNCTION Id="RDK:21692159">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:21692164">
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:21692163" SubType="Then">
-								<CALLFUNCTION Id="RDK:21692162">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:21692167">
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:21692166" SubType="Then">
-								<CALLFUNCTION Id="RDK:21692165">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:21692184">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer"]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:21692183" SubType="Then">
-								<CALLFUNCTION Id="RDK:21692182">
+							<GROUP Id="RDK:21692160" SubType="Then">
+								<CALLFUNCTION Id="RDK:21692159">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
 									</PAR>
@@ -17169,9 +17072,15 @@ me.x
 							</GROUP>
 						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:18895399">
-							<VALUECONDITION Value="true">
+							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
 							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer"]]></EXP>
+							</VALUECONDITION>
 							<GROUP Id="RDK:18895398" SubType="Then">
 								<CALLFUNCTION Id="RDK:18895397">
 									<PAR Name="FuncName">
@@ -17212,6 +17121,7 @@ me.x
 											<PAR Name="Dbl" />
 											<PAR Name="Int" />
 											<PAR Name="Boo" />
+											<PAR Name="StrArr" />
 										</SET_STRUCT>
 										<CALLFUNCTION Id="RDK:18895327">
 											<PAR Name="FuncName">
@@ -17229,130 +17139,6 @@ me.x
 								</IFTHENELSE>
 							</GROUP>
 						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:18895451">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kurve"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:18895450" SubType="Then">
-								<CALLFUNCTION Id="RDK:18895449">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-								<CALLFUNCTION Id="RDK:18979603">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$Calculate Foerderer Data]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-								<IFTHENELSE Id="RDK:18979617">
-									<VALUECONDITION Value="false">
-										<EXP><![CDATA[$=$IsEmpty(RueckgabeListe)]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:18979616" SubType="Then">
-										<SET_STRUCT Id="RDK:18979614" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
-											<PAR Name="Key">
-												<EXP><![CDATA[$C$shapeID]]></EXP>
-											</PAR>
-											<PAR Name="Str">
-												<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-											</PAR>
-											<PAR Name="Dbl" />
-											<PAR Name="Int" />
-											<PAR Name="Boo" />
-											<PAR Name="StrArr" />
-										</SET_STRUCT>
-										<CALLFUNCTION Id="RDK:18979615">
-											<PAR Name="FuncName">
-												<EXP><![CDATA[$C$WriteShapeDataFoerderer]]></EXP>
-											</PAR>
-											<PAR Name="InputExp">
-												<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
-											</PAR>
-											<PAR Name="ResultRef">
-												<EXP><![CDATA[$V$]]></EXP>
-											</PAR>
-											<PAR Name="Options" />
-										</CALLFUNCTION>
-									</GROUP>
-								</IFTHENELSE>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:21692226">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="KurveFoerderer"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:21692225" SubType="Then">
-								<CALLFUNCTION Id="RDK:21692219">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-								<CALLFUNCTION Id="RDK:21692220">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$Calculate Foerderer Data]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-								<IFTHENELSE Id="RDK:21692224">
-									<VALUECONDITION Value="false">
-										<EXP><![CDATA[$=$IsEmpty(RueckgabeListe)]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:21692223" SubType="Then">
-										<SET_STRUCT Id="RDK:21692221" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
-											<PAR Name="Key">
-												<EXP><![CDATA[$C$shapeID]]></EXP>
-											</PAR>
-											<PAR Name="Str">
-												<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-											</PAR>
-											<PAR Name="Dbl" />
-											<PAR Name="Int" />
-											<PAR Name="Boo" />
-											<PAR Name="StrArr" />
-										</SET_STRUCT>
-										<CALLFUNCTION Id="RDK:21692222">
-											<PAR Name="FuncName">
-												<EXP><![CDATA[$C$WriteShapeDataFoerderer]]></EXP>
-											</PAR>
-											<PAR Name="InputExp">
-												<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
-											</PAR>
-											<PAR Name="ResultRef">
-												<EXP><![CDATA[$V$]]></EXP>
-											</PAR>
-											<PAR Name="Options" />
-										</CALLFUNCTION>
-									</GROUP>
-								</IFTHENELSE>
-							</GROUP>
-						</IFTHENELSE>
 						<COMMENTS Id="RDK:18895415" DesignTimeRemark="//TODO" />
 						<IFTHENELSE Id="RDK:18462393" Suppressed="True">
 							<VALUECONDITION Value="true">
@@ -17597,7 +17383,7 @@ me.x
 					</GROUP>
 				</IFTHENELSE>
 				<COMMENTS Id="RDK:21073064" DesignTimeRemark="Berechne die zweite Höhe der Gefällestrecke/Kurve/Förderer, wenn eine Höhe vorgegeben ist" />
-				<IFTHENELSE Id="RDK:21073054">
+				<IFTHENELSE Id="RDK:21073054" Suppressed="True">
 					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family = "Kurve"]]></EXP>
 					</VALUECONDITION>
@@ -17622,7 +17408,7 @@ me.x
 						</CALLFUNCTION>
 					</GROUP>
 				</IFTHENELSE>
-				<IFTHENELSE Id="RDK:21073052">
+				<IFTHENELSE Id="RDK:21073052" Suppressed="True">
 					<VALUECONDITION Value="true" Oper="OR">
 						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Kurve"]]></EXP>
 					</VALUECONDITION>
@@ -20949,22 +20735,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:21692342" CaseType="0">
 						<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
-						<IFTHENELSE Id="RDK:21692341">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$IsEmpty(shape_item.KurveFoerdererDefinition.H_Anfang)]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$IsEmpty(shape_item.KurveFoerdererDefinition.H_Ende)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:21692339" SubType="Then">
-								<SET Id="RDK:21692337" VarRef="Param.Result">
-									<EXP><![CDATA[$C$False]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<EXIT_PROCESS Id="RDK:21692338" BreakType="4" ExitStatus="0" />
-							</GROUP>
-							<GROUP Id="RDK:21692340" SubType="Else" />
-						</IFTHENELSE>
+						<EXIT_PROCESS Id="RDK:21730240" BreakType="4" ExitStatus="0" />
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:21231254" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
@@ -23593,7 +23364,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:18742737" Name="item_0" Type="Editor2DShapeType" />
 					<VAR Id="RDK:18935909" Name="cp_partner" Type="SSGConnectionPoint" />
 					<VAR Id="RDK:18827203" Name="hoehe" Type="double" />
-					<VAR Id="RDK:20622266" Name="Richtung" Type="integer" />
 					<VAR Id="RDK:18742671" Name="UebergabeListe" Type="SSGParameter[]" />
 					<VAR Id="RDK:18742672" Name="RueckgabeListe" Type="SSGParameter[]" />
 					<VAR Id="RDK:20803353" Name="cpId" Type="string" />
@@ -23712,10 +23482,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<CASEGROUP Id="RDK:18827084" CaseType="0">
 						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<COMMENTS Id="RDK:18827100" DesignTimeRemark="//Kurve hat Index == 0" />
-						<SET Id="RDK:21645108" VarRef="Richtung">
-							<EXP><![CDATA[$=$RueckgabeListe["key=Richtung"].Dbl]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
 						<IFTHENELSE Id="RDK:18827233">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
@@ -23725,46 +23491,20 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<IFTHENELSE Id="RDK:21665696">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$item_0.KurveDefinition.Richtung="Ab"]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:21665693" SubType="Then">
-										<SET Id="RDK:21665692" VarRef="item_0.KurveDefinition.H_Ende">
-											<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-									<GROUP Id="RDK:21665695" SubType="Else">
-										<SET Id="RDK:21665694" VarRef="item_0.KurveDefinition.H_Ende">
-											<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-								</IFTHENELSE>
+								<SET Id="RDK:21704411" VarRef="item_0.KurveDefinition.H_Ende">
+									<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 							<GROUP Id="RDK:18827232" SubType="Else">
 								<SET Id="RDK:18827241" VarRef="item_0.KurveDefinition.H_Ende">
 									<EXP><![CDATA[$=$hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<IFTHENELSE Id="RDK:21665716">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$item_0.KurveDefinition.Richtung="Ab"]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:21665713" SubType="Then">
-										<SET Id="RDK:21665712" VarRef="item_0.KurveDefinition.H_Anfang">
-											<EXP><![CDATA[$=$hoehe - KurveData_defaults.Delta_h]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-									<GROUP Id="RDK:21665715" SubType="Else">
-										<SET Id="RDK:21665714" VarRef="item_0.KurveDefinition.H_Anfang">
-											<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-								</IFTHENELSE>
+								<SET Id="RDK:21704419" VarRef="item_0.KurveDefinition.H_Anfang">
+									<EXP><![CDATA[$=$hoehe + KurveData_defaults.Delta_h]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</GROUP>
 						</IFTHENELSE>
 						<SET Id="RDK:18956018" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID]">
@@ -23775,61 +23515,14 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<CASEGROUP Id="RDK:21692496" CaseType="0">
 						<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
 						<COMMENTS Id="RDK:21692478" DesignTimeRemark="//Kurve hat Index == 0" />
-						<SET Id="RDK:21692479" VarRef="Richtung">
-							<EXP><![CDATA[$=$RueckgabeListe["key=Richtung"].Dbl]]></EXP>
+						<SET Id="RDK:21704425" VarRef="item_0.KurveFoerdererDefinition.H_Anfang">
+							<EXP><![CDATA[$=$hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:21704427" VarRef="item_0.KurveFoerdererDefinition.H_Ende">
+							<EXP><![CDATA[$=$hoehe]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<IFTHENELSE Id="RDK:21692494">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:21692486" SubType="Then">
-								<SET Id="RDK:21692480" VarRef="item_0.KurveFoerdererDefinition.H_Anfang">
-									<EXP><![CDATA[$=$hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<IFTHENELSE Id="RDK:21692485">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$item_0.KurveFoerdererDefinition.Richtung="Ab"]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:21692482" SubType="Then">
-										<SET Id="RDK:21692481" VarRef="item_0.KurveFoerdererDefinition.H_Ende">
-											<EXP><![CDATA[$=$hoehe - KurveFoerdererData_defaults.Delta_h]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-									<GROUP Id="RDK:21692484" SubType="Else">
-										<SET Id="RDK:21692483" VarRef="item_0.KurveFoerdererDefinition.H_Ende">
-											<EXP><![CDATA[$=$hoehe + KurveFoerdererData_defaults.Delta_h]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-								</IFTHENELSE>
-							</GROUP>
-							<GROUP Id="RDK:21692493" SubType="Else">
-								<SET Id="RDK:21692487" VarRef="item_0.KurveFoerdererDefinition.H_Ende">
-									<EXP><![CDATA[$=$hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<IFTHENELSE Id="RDK:21692492">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$item_0.KurveFoerdererDefinition.Richtung="Ab"]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:21692489" SubType="Then">
-										<SET Id="RDK:21692488" VarRef="item_0.KurveFoerdererDefinition.H_Anfang">
-											<EXP><![CDATA[$=$hoehe - KurveFoerdererData_defaults.Delta_h]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-									<GROUP Id="RDK:21692491" SubType="Else">
-										<SET Id="RDK:21692490" VarRef="item_0.KurveFoerdererDefinition.H_Anfang">
-											<EXP><![CDATA[$=$hoehe + KurveFoerdererData_defaults.Delta_h]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-								</IFTHENELSE>
-							</GROUP>
-						</IFTHENELSE>
 						<SET Id="RDK:21692495" VarRef="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID]">
 							<EXP><![CDATA[$=$item_0]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -23944,23 +23637,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$item.KurveDefinition.H_Ende]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<IFTHENELSE Id="RDK:21114298">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$h1>h2]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:21114295" SubType="Then" DesignTimeRemark="richtung=1, von cp1 nach cp2 abfallen">
-								<SET Id="RDK:21114294" VarRef="richtung">
-									<EXP><![CDATA[$=$1]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:21114297" SubType="Else" DesignTimeRemark="richtung=0, von cp2 nach cp1 abfallen">
-								<SET Id="RDK:21114296" VarRef="richtung">
-									<EXP><![CDATA[$=$0]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:18895307">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
@@ -23981,48 +23657,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:21692536" CaseType="0">
 						<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
-						<SET Id="RDK:21692524" VarRef="h1">
+						<SET Id="RDK:21692524" VarRef="hoehe">
 							<EXP><![CDATA[$=$item.KurveFoerdererDefinition.H_Anfang]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:21692525" VarRef="h2">
-							<EXP><![CDATA[$=$item.KurveFoerdererDefinition.H_Ende]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<IFTHENELSE Id="RDK:21692530">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$h1>h2]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:21692527" SubType="Then" DesignTimeRemark="richtung=1, von cp1 nach cp2 abfallen">
-								<SET Id="RDK:21692526" VarRef="richtung">
-									<EXP><![CDATA[$=$1]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:21692529" SubType="Else" DesignTimeRemark="richtung=0, von cp2 nach cp1 abfallen">
-								<SET Id="RDK:21692528" VarRef="richtung">
-									<EXP><![CDATA[$=$0]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:21692535">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$cpId="cp1"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:21692532" SubType="Then">
-								<SET Id="RDK:21692531" VarRef="hoehe">
-									<EXP><![CDATA[$=$h1]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:21692534" SubType="Else">
-								<SET Id="RDK:21692533" VarRef="hoehe">
-									<EXP><![CDATA[$=$h2]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18741924" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>