alle gefaellestrecken ausnahmen sind jetzt drinnen logik wenn kreis nicht mit zwei kreisel verbuden ist

lib/plant2dxf.py

@@ -283,6 +283,7 @@ def handle_standard(msp, blocknames, teileid, x, y, lib_doc, doc, verbose):
 
 def handle_ils_2_0_gefaellestrecke(msp, teileid, merkmale, x, y, doc, lib_doc, verbose, symbols, gefaellestrecken_nachbarn,config):
     #Vorbereitung der attributen
+    
     am_kreisel = 0
     richtung2 ="DEFAULT"
     unterschiedlich = False
@@ -295,6 +296,7 @@ def handle_ils_2_0_gefaellestrecke(msp, teileid, merkmale, x, y, doc, lib_doc, v
         if teileid == nachbarn.get("Id"):
             gefaellestrecke_nachbarn = nachbarn
             break
+    if "Drehung0" in gefaellestrecke_nachbarn and "Drehung1" in gefaellestrecke_nachbarn:
         drehung0 =gefaellestrecke_nachbarn.get("Drehung0") 
         drehung1 = gefaellestrecke_nachbarn.get("Drehung1")
         hoehe0 = gefaellestrecke_nachbarn.get("Hoehe0")
@@ -322,77 +324,133 @@ def handle_ils_2_0_gefaellestrecke(msp, teileid, merkmale, x, y, doc, lib_doc, v
         halbabstand0 = abstand0 / 2
         dx0 = halbabstand0 * math.cos(richtung_rad0)
         dy0 = halbabstand0 * math.sin(richtung_rad0)
-    pos0_0 = (round(x0_kreisel + dx0),round( y0_kreisel + dy0),hoehe0)
+        pos0_0_floor= (math.floor(x0_kreisel + dx0),math.floor( y0_kreisel + dy0),hoehe0)
-    pos0_1 = (round(x0_kreisel- dx0),round( y0_kreisel- dy0), hoehe0)
+        pos0_1_floor = (math.floor(x0_kreisel- dx0),math.floor( y0_kreisel- dy0), hoehe0)
+        pos0_0_round= (round(x0_kreisel + dx0),round( y0_kreisel + dy0),hoehe0)
+        pos0_1_round = (round(x0_kreisel- dx0),round( y0_kreisel- dy0), hoehe0)
 
         halbabstand1 = abstand1 / 2
         dx1 = halbabstand1 * math.cos(richtung_rad1 )
         dy1 = halbabstand1 * math.sin(richtung_rad1)
-    pos1_0 = (round(x1_kreisel + dx1), round(y1_kreisel + dy1), hoehe1)
+        pos1_0_floor = (math.floor(x1_kreisel + dx1), math.floor(y1_kreisel + dy1), hoehe1)
-    pos1_1 = (round(x1_kreisel - dx1), round(y1_kreisel - dy1), hoehe1)
+        pos1_1_floor = (math.floor(x1_kreisel - dx1), math.floor(y1_kreisel - dy1), hoehe1)
+        pos1_0_round = (round(x1_kreisel + dx1), round(y1_kreisel + dy1), hoehe1)
+        pos1_1_round = (round(x1_kreisel - dx1), round(y1_kreisel - dy1), hoehe1)
         winkel = math.radians(float(merkmale.get("Drehung")))
 
         halbe_laenge = laenge / 2 
         dx = halbe_laenge *math.sin(winkel * -1)
         dy = halbe_laenge * math.cos(winkel)
-    start = (round(x +dx ), round(y + dy ),upper_hoehe_gefaehlle)
+        start_floor = (math.floor(x +dx ), math.floor(y + dy ),upper_hoehe_gefaehlle)
-    ende  = (round(x -dx), round(y - dy ) ,lower_hoehe_gefaehlle)
+        ende_floor  = (math.floor(x -dx), math.floor(y - dy ) ,lower_hoehe_gefaehlle)
-    abstand_fuer_kreis_start_x = start[0] +RADIUS, start[1]
+        start_round = (round(x +dx ), round(y + dy ),upper_hoehe_gefaehlle)
-    abstand_gegen_kreis_start_x = start[0] -RADIUS, start[1]
+        ende_round= (round(x -dx), round(y - dy ) ,lower_hoehe_gefaehlle)
-    abstand_fuer_kreis_start_y = start[0], start[1] + RADIUS
+        abstand_fuer_kreis_start_x_floor = start_floor[0] +RADIUS, start_floor[1]
-    abstand_gegen_kreis_start_y = start[0], start[1] - RADIUS
+        abstand_gegen_kreis_start_x_floor = start_floor[0] -RADIUS, start_floor[1]
-    abstand_fuer_kreis_ende_x= ende[0] + RADIUS, ende[1]
+        abstand_fuer_kreis_start_y_floor = start_floor[0], start_floor[1] + RADIUS
-    abstand_gegen_kreis_ende_x= ende[0] - RADIUS, ende[1]
+        abstand_gegen_kreis_start_y_floor = start_floor[0], start_floor[1] - RADIUS
-    abstand_fuer_kreis_ende_y = ende[0] , ende[1] + RADIUS
+        abstand_fuer_kreis_ende_x_floor= ende_floor[0] + RADIUS, ende_floor[1]
-    abstand_gegen_kreis_ende_y = ende[0] , ende[1] - RADIUS
+        abstand_gegen_kreis_ende_x_floor= ende_floor[0] - RADIUS, ende_floor[1]
+        abstand_fuer_kreis_ende_y_floor = ende_floor[0] , ende_floor[1] + RADIUS
+        abstand_gegen_kreis_ende_y_floor = ende_floor[0] , ende_floor[1] - RADIUS
+
+        abstand_fuer_kreis_start_x_round= start_round[0] +RADIUS, start_round[1]
+        abstand_gegen_kreis_start_x_round = start_round[0] -RADIUS, start_round[1]
+        abstand_fuer_kreis_start_y_round = start_round[0], start_round[1] + RADIUS
+        abstand_gegen_kreis_start_y_round = start_round[0], start_round[1] - RADIUS
+        abstand_fuer_kreis_ende_x_round= ende_round[0] + RADIUS, ende_round[1]
+        abstand_gegen_kreis_ende_x_round= ende_round[0] - RADIUS, ende_round[1]
+        abstand_fuer_kreis_ende_y_round = ende_round[0] , ende_round[1] + RADIUS
+        abstand_gegen_kreis_ende_y_round = ende_round[0] , ende_round[1] - RADIUS
 
 
-    if( (abstand_fuer_kreis_start_x[0] == pos0_0[0] and abstand_fuer_kreis_start_x[1] == pos0_0[1] )or
-        ( abstand_fuer_kreis_start_x[0] == pos0_1[0] and abstand_fuer_kreis_start_x[1] == pos0_1[1]) or
-        ( abstand_gegen_kreis_start_x[0] == pos0_0[0] and abstand_gegen_kreis_start_x[1] == pos0_0[1]) or
-        ( abstand_gegen_kreis_start_x[0] == pos0_1[0] and abstand_gegen_kreis_start_x[1] == pos0_1[1]) or
-        (abstand_fuer_kreis_ende_x[0] == pos0_0[0] and abstand_fuer_kreis_ende_x[1] == pos0_0[1] )or
-        ( abstand_fuer_kreis_ende_x[0] == pos0_1[0] and abstand_fuer_kreis_ende_x[1] == pos0_1[1]) or
-        ( abstand_gegen_kreis_ende_x[0] == pos0_0[0] and abstand_gegen_kreis_ende_x[1] == pos0_0[1]) or
-        ( abstand_gegen_kreis_ende_x[0] == pos0_1[0] and abstand_gegen_kreis_ende_x[1] == pos0_1[1]) or
     
-        (abstand_fuer_kreis_start_y[0] == pos0_0[0] and abstand_fuer_kreis_start_y[1] == pos0_0[1] )or
+        if( (abstand_fuer_kreis_start_x_floor[0] == pos0_0_floor[0] and abstand_fuer_kreis_start_x_floor[1] == pos0_0_floor[1] )or
-        ( abstand_fuer_kreis_start_y[0] == pos0_1[0] and abstand_fuer_kreis_start_y[1] == pos0_1[1]) or
+            ( abstand_fuer_kreis_start_x_floor[0] == pos0_1_floor[0] and abstand_fuer_kreis_start_x_floor[1] == pos0_1_floor[1]) or
-        ( abstand_gegen_kreis_start_y[0] == pos0_0[0] and abstand_gegen_kreis_start_y[1] == pos0_0[1]) or
+            ( abstand_gegen_kreis_start_x_floor[0] == pos0_0_floor[0] and abstand_gegen_kreis_start_x_floor[1] == pos0_0_floor[1]) or
-        ( abstand_gegen_kreis_start_y[0] == pos0_1[0] and abstand_gegen_kreis_start_y[1] == pos0_1[1]) or
+            ( abstand_gegen_kreis_start_x_floor[0] == pos0_1_floor[0] and abstand_gegen_kreis_start_x_floor[1] == pos0_1_floor[1]) or
-        (abstand_fuer_kreis_ende_y[0] == pos0_0[0] and abstand_fuer_kreis_ende_y[1] == pos0_0[1] )or
+            (abstand_fuer_kreis_ende_x_floor[0] == pos0_0_floor[0] and abstand_fuer_kreis_ende_x_floor[1] == pos0_0_floor[1] )or
-        ( abstand_fuer_kreis_ende_y[0] == pos0_1[0] and abstand_fuer_kreis_ende_y[1] == pos0_1[1]) or
+            ( abstand_fuer_kreis_ende_x_floor[0] == pos0_1_floor[0] and abstand_fuer_kreis_ende_x_floor[1] == pos0_1_floor[1]) or
-        ( abstand_gegen_kreis_ende_y[0] == pos0_0[0] and abstand_gegen_kreis_ende_y[1] == pos0_0[1]) or
+            ( abstand_gegen_kreis_ende_x_floor[0] == pos0_0_floor[0] and abstand_gegen_kreis_ende_x_floor[1] == pos0_0_floor[1]) or
-        ( abstand_gegen_kreis_ende_y[0] == pos0_1[0] and abstand_gegen_kreis_ende_y[1] == pos0_1[1]) 
+            ( abstand_gegen_kreis_ende_x_floor[0] == pos0_1_floor[0] and abstand_gegen_kreis_ende_x_floor[1] == pos0_1_floor[1]) or
+            
+            (abstand_fuer_kreis_start_y_floor[0] == pos0_0_floor[0] and abstand_fuer_kreis_start_y_floor[1] == pos0_0_floor[1] )or
+            ( abstand_fuer_kreis_start_y_floor[0] == pos0_1_floor[0] and abstand_fuer_kreis_start_y_floor[1] == pos0_1_floor[1]) or
+            ( abstand_gegen_kreis_start_y_floor[0] == pos0_0_floor[0] and abstand_gegen_kreis_start_y_floor[1] == pos0_0_floor[1]) or
+            ( abstand_gegen_kreis_start_y_floor[0] == pos0_1_floor[0] and abstand_gegen_kreis_start_y_floor[1] == pos0_1_floor[1]) or
+            (abstand_fuer_kreis_ende_y_floor[0] == pos0_0_floor[0] and abstand_fuer_kreis_ende_y_floor[1] == pos0_0_floor[1] )or
+            ( abstand_fuer_kreis_ende_y_floor[0] == pos0_1_floor[0] and abstand_fuer_kreis_ende_y_floor[1] == pos0_1_floor[1]) or
+            ( abstand_gegen_kreis_ende_y_floor[0] == pos0_0_floor[0] and abstand_gegen_kreis_ende_y_floor[1] == pos0_0_floor[1]) or
+            ( abstand_gegen_kreis_ende_y_floor[0] == pos0_1_floor[0] and abstand_gegen_kreis_ende_y_floor[1] == pos0_1_floor[1]) or
+            (abstand_fuer_kreis_start_x_round[0] == pos0_0_round[0] and abstand_fuer_kreis_start_x_round[1] == pos0_0_round[1] )or
+            ( abstand_fuer_kreis_start_x_round[0] == pos0_1_round[0] and abstand_fuer_kreis_start_x_round[1] == pos0_1_round[1]) or
+            ( abstand_gegen_kreis_start_x_round[0] == pos0_0_round[0] and abstand_gegen_kreis_start_x_round[1] == pos0_0_round[1]) or
+            ( abstand_gegen_kreis_start_x_round[0] == pos0_1_round[0] and abstand_gegen_kreis_start_x_round[1] == pos0_1_round[1]) or
+            (abstand_fuer_kreis_ende_x_round[0] == pos0_0_round[0] and abstand_fuer_kreis_ende_x_round[1] == pos0_0_round[1] )or
+            ( abstand_fuer_kreis_ende_x_round[0] == pos0_1_round[0] and abstand_fuer_kreis_ende_x_round[1] == pos0_1_round[1]) or
+            ( abstand_gegen_kreis_ende_x_round[0] == pos0_0_round[0] and abstand_gegen_kreis_ende_x_round[1] == pos0_0_round[1]) or
+            ( abstand_gegen_kreis_ende_x_round[0] == pos0_1_floor[0] and abstand_gegen_kreis_ende_x_round[1] == pos0_1_round[1]) or
+            
+            (abstand_fuer_kreis_start_y_round[0] == pos0_0_round[0] and abstand_fuer_kreis_start_y_round[1] == pos0_0_round[1] )or
+            ( abstand_fuer_kreis_start_y_round[0] == pos0_1_round[0] and abstand_fuer_kreis_start_y_round[1] == pos0_1_round[1]) or
+            ( abstand_gegen_kreis_start_y_round[0] == pos0_0_round[0] and abstand_gegen_kreis_start_y_round[1] == pos0_0_round[1]) or
+            ( abstand_gegen_kreis_start_y_round[0] == pos0_1_round[0] and abstand_gegen_kreis_start_y_round[1] == pos0_1_round[1]) or
+            (abstand_fuer_kreis_ende_y_round[0] == pos0_0_round[0] and abstand_fuer_kreis_ende_y_round[1] == pos0_0_round[1] )or
+            ( abstand_fuer_kreis_ende_y_round[0] == pos0_1_round[0] and abstand_fuer_kreis_ende_y_round[1] == pos0_1_round[1]) or
+            ( abstand_gegen_kreis_ende_y_round[0] == pos0_0_round[0] and abstand_gegen_kreis_ende_y_round[1] == pos0_0_round[1]) or
+            ( abstand_gegen_kreis_ende_y_round[0] == pos0_1_round[0] and abstand_gegen_kreis_ende_y_round[1] == pos0_1_round[1]) 
         ):
             kreisel_verbunden = kreisel_verbunden +1
             am_kreisel = 1
 
 
 
-    if( (abstand_fuer_kreis_start_x[0] == pos1_0[0] and abstand_fuer_kreis_start_x[1] == pos1_0[1] )or
+        if( (abstand_fuer_kreis_start_x_floor[0] == pos1_0_floor[0] and abstand_fuer_kreis_start_x_floor[1] == pos1_0_floor[1] )or
-        ( abstand_fuer_kreis_start_x[0] == pos1_1[0] and abstand_fuer_kreis_start_x[1] == pos1_1[1]) or
+            (abstand_fuer_kreis_start_x_floor[0] == pos1_1_floor[0] and abstand_fuer_kreis_start_x_floor[1] == pos1_1_floor[1]) or
-        ( abstand_gegen_kreis_start_x[0] == pos1_0[0] and abstand_gegen_kreis_start_x[1] == pos1_0[1]) or
+            (abstand_gegen_kreis_start_x_floor[0] == pos1_0_floor[0] and abstand_gegen_kreis_start_x_floor[1] == pos1_0_floor[1]) or
-        ( abstand_gegen_kreis_start_x[0] == pos1_1[0] and abstand_gegen_kreis_start_x[1] == pos1_1[1]) or
+            (abstand_gegen_kreis_start_x_floor[0] == pos1_1_floor[0] and abstand_gegen_kreis_start_x_floor[1] == pos1_1_floor[1]) or
-        (abstand_fuer_kreis_ende_x[0] == pos1_0[0] and abstand_fuer_kreis_ende_x[1] == pos1_0[1] )or
+            (abstand_fuer_kreis_ende_x_floor[0] == pos1_0_floor[0] and abstand_fuer_kreis_ende_x_floor[1] == pos1_0_floor[1] )or
-        ( abstand_fuer_kreis_ende_x[0] == pos1_1[0] and abstand_fuer_kreis_ende_x[1] == pos1_1[1]) or
+            (abstand_fuer_kreis_ende_x_floor[0] == pos1_1_floor[0] and abstand_fuer_kreis_ende_x_floor[1] == pos1_1_floor[1]) or
-        ( abstand_gegen_kreis_ende_x[0] == pos1_0[0] and abstand_gegen_kreis_ende_x[1] == pos1_0[1]) or
+            (abstand_gegen_kreis_ende_x_floor[0] == pos1_0_floor[0] and abstand_gegen_kreis_ende_x_floor[1] == pos1_0_floor[1]) or
-        ( abstand_gegen_kreis_ende_x[0] == pos1_1[0] and abstand_gegen_kreis_ende_x[1] == pos1_1[1]) or
+            (abstand_gegen_kreis_ende_x_floor[0] == pos1_1_floor[0] and abstand_gegen_kreis_ende_x_floor[1] == pos1_1_floor[1]) or
             
-        (abstand_fuer_kreis_start_y[0] == pos1_0[0] and abstand_fuer_kreis_start_y[1] == pos1_0[1] )or
+            (abstand_fuer_kreis_start_y_floor[0] == pos1_0_floor[0] and abstand_fuer_kreis_start_y_floor[1] == pos1_0_floor[1] )or
-        ( abstand_fuer_kreis_start_y[0] == pos1_1[0] and abstand_fuer_kreis_start_y[1] == pos1_1[1]) or
+            (abstand_fuer_kreis_start_y_floor[0] == pos1_1_floor[0] and abstand_fuer_kreis_start_y_floor[1] == pos1_1_floor[1]) or
-        ( abstand_gegen_kreis_start_y[0] == pos1_0[0] and abstand_gegen_kreis_start_y[1] == pos1_0[1]) or
+            (abstand_gegen_kreis_start_y_floor[0] == pos1_0_floor[0] and abstand_gegen_kreis_start_y_floor[1] == pos1_0_floor[1]) or
-        ( abstand_gegen_kreis_start_y[0] == pos1_1[0] and abstand_gegen_kreis_start_y[1] == pos1_1[1]) or
+            (abstand_gegen_kreis_start_y_floor[0] == pos1_1_floor[0] and abstand_gegen_kreis_start_y_floor[1] == pos1_1_floor[1]) or
-        (abstand_fuer_kreis_ende_y[0] == pos1_0[0] and abstand_fuer_kreis_ende_y[1] == pos1_0[1] )or
+            (abstand_fuer_kreis_ende_y_floor[0] == pos1_0_floor[0] and abstand_fuer_kreis_ende_y_floor[1] == pos1_0_floor[1] )or
-        ( abstand_fuer_kreis_ende_y[0] == pos1_1[0] and abstand_fuer_kreis_ende_y[1] == pos1_1[1]) or
+            (abstand_fuer_kreis_ende_y_floor[0] == pos1_1_floor[0] and abstand_fuer_kreis_ende_y_floor[1] == pos1_1_floor[1]) or
-        ( abstand_gegen_kreis_ende_y[0] == pos1_0[0] and abstand_gegen_kreis_ende_y[1] == pos1_0[1]) or
+            (abstand_gegen_kreis_ende_y_floor[0] == pos1_0_floor[0] and abstand_gegen_kreis_ende_y_floor[1] == pos1_0_floor[1]) or
-        ( abstand_gegen_kreis_ende_y[0] == pos1_1[0] and abstand_gegen_kreis_ende_y[1] == pos1_1[1]) 
+            (abstand_gegen_kreis_ende_y_floor[0] == pos1_1_floor[0] and abstand_gegen_kreis_ende_y_floor[1] == pos1_1_floor[1]) or
+
+
+
+
+            (abstand_fuer_kreis_start_x_round[0] == pos1_0_round[0] and abstand_fuer_kreis_start_x_round[1] == pos1_0_round[1] )or
+            (abstand_fuer_kreis_start_x_round[0] == pos1_1_round[0] and abstand_fuer_kreis_start_x_round[1] == pos1_1_round[1]) or
+            (abstand_gegen_kreis_start_x_round[0] == pos1_0_round[0] and abstand_gegen_kreis_start_x_round[1] == pos1_0_round[1]) or
+            (abstand_gegen_kreis_start_x_round[0] == pos1_1_round[0] and abstand_gegen_kreis_start_x_round[1] == pos1_1_round[1]) or
+            (abstand_fuer_kreis_ende_x_round[0] == pos1_0_round[0] and abstand_fuer_kreis_ende_x_round[1] == pos1_0_round[1])or
+            (abstand_fuer_kreis_ende_x_round[0] == pos1_1_round[0] and abstand_fuer_kreis_ende_x_round[1] == pos1_1_round[1]) or
+            (abstand_gegen_kreis_ende_x_round[0] == pos1_0_round[0] and abstand_gegen_kreis_ende_x_round[1] == pos1_0_round[1]) or
+            (abstand_gegen_kreis_ende_x_round[0] == pos1_1_round[0] and abstand_gegen_kreis_ende_x_round[1] == pos1_1_round[1]) or
+            
+            (abstand_fuer_kreis_start_y_round[0] == pos1_0_round[0] and abstand_fuer_kreis_start_y_round[1] == pos1_0_round[1] )or
+            (abstand_fuer_kreis_start_y_round[0] == pos1_1_round[0] and abstand_fuer_kreis_start_y_round[1] == pos1_1_round[1]) or
+            (abstand_gegen_kreis_start_y_round[0] == pos1_0_round[0] and abstand_gegen_kreis_start_y_round[1] == pos1_0_round[1]) or
+            (abstand_gegen_kreis_start_y_round[0] == pos1_1_round[0] and abstand_gegen_kreis_start_y_round[1] == pos1_1_round[1]) or
+            (abstand_fuer_kreis_ende_y_round[0] == pos1_0_round[0] and abstand_fuer_kreis_ende_y_round[1] == pos1_0_round[1] )or
+            (abstand_fuer_kreis_ende_y_round[0] == pos1_1_round[0] and abstand_fuer_kreis_ende_y_round[1] == pos1_1_round[1]) or
+            (abstand_gegen_kreis_ende_y_round[0] == pos1_0_round[0] and abstand_gegen_kreis_ende_y_round[1] == pos1_0_round[1]) or
+            (abstand_gegen_kreis_ende_y_round[0] == pos1_1_round[0] and abstand_gegen_kreis_ende_y_round[1] == pos1_1_round[1]) 
         ):
                 kreisel_verbunden = kreisel_verbunden +1
                 am_kreisel = 2
 
 
         if kreisel_verbunden == 2:
+            start = x +dx, y + dy,upper_hoehe_gefaehlle
+            ende  = x -dx, y - dy,lower_hoehe_gefaehlle
             msp.add_line(start,ende)
             return
 
@@ -411,12 +469,50 @@ def handle_ils_2_0_gefaellestrecke(msp, teileid, merkmale, x, y, doc, lib_doc, v
 
 
         if (richtung0 != richtung1 and kreisel_verbunden ==1):
-        if x-RADIUS == x0_kreisel or x+RADIUS == x0_kreisel or x-RADIUS == x1_kreisel or x+ RADIUS == x1_kreisel:
+            if(
-            richtung2= "Horinzontal"
+            (abstand_fuer_kreis_start_y_floor[0] == pos0_0_floor[0] and abstand_fuer_kreis_start_y_floor[1] == pos0_0_floor[1])or
+            (abstand_fuer_kreis_start_y_floor[0] == pos0_1_floor[0] and abstand_fuer_kreis_start_y_floor[1] == pos0_1_floor[1]) or
+            (abstand_gegen_kreis_start_y_floor[0] == pos0_0_floor[0] and abstand_gegen_kreis_start_y_floor[1] == pos0_0_floor[1]) or
+            (abstand_gegen_kreis_start_y_floor[0] == pos0_1_floor[0] and abstand_gegen_kreis_start_y_floor[1] == pos0_1_floor[1]) or
+            (abstand_fuer_kreis_ende_y_floor[0] == pos0_0_floor[0] and abstand_fuer_kreis_ende_y_floor[1] == pos0_0_floor[1])or
+            (abstand_fuer_kreis_ende_y_floor[0] == pos0_1_floor[0] and abstand_fuer_kreis_ende_y_floor[1] == pos0_1_floor[1]) or
+            (abstand_gegen_kreis_ende_y_floor[0] == pos0_0_floor[0] and abstand_gegen_kreis_ende_y_floor[1] == pos0_0_floor[1]) or
+            (abstand_gegen_kreis_ende_y_floor[0] == pos0_1_floor[0] and abstand_gegen_kreis_ende_y_floor[1] == pos0_1_floor[1]) or
+            (abstand_fuer_kreis_start_y_round[0] == pos0_0_round[0] and abstand_fuer_kreis_start_y_round[1] == pos0_0_round[1])or
+            (abstand_fuer_kreis_start_y_round[0] == pos0_1_round[0] and abstand_fuer_kreis_start_y_round[1] == pos0_1_round[1]) or
+            (abstand_gegen_kreis_start_y_round[0] == pos0_0_round[0] and abstand_gegen_kreis_start_y_round[1] == pos0_0_round[1]) or
+            (abstand_gegen_kreis_start_y_round[0] == pos0_1_round[0] and abstand_gegen_kreis_start_y_round[1] == pos0_1_round[1]) or
+            (abstand_fuer_kreis_ende_y_round[0] == pos0_0_round[0] and abstand_fuer_kreis_ende_y_round[1] == pos0_0_round[1])or
+            (abstand_fuer_kreis_ende_y_round[0] == pos0_1_round[0] and abstand_fuer_kreis_ende_y_round[1] == pos0_1_round[1]) or
+            (abstand_gegen_kreis_ende_y_round[0] == pos0_0_round[0] and abstand_gegen_kreis_ende_y_round[1] == pos0_0_round[1]) or
+            (abstand_gegen_kreis_ende_y_round[0] == pos0_1_round[0] and abstand_gegen_kreis_ende_y_round[1] == pos0_1_round[1]) or
+            
+
+            
+            (abstand_fuer_kreis_start_y_floor[0] == pos1_0_floor[0] and abstand_fuer_kreis_start_y_floor[1] == pos1_0_floor[1] )or
+            ( abstand_fuer_kreis_start_y_floor[0] == pos1_1_floor[0] and abstand_fuer_kreis_start_y_floor[1] == pos1_1_floor[1]) or
+            ( abstand_gegen_kreis_start_y_floor[0] == pos1_0_floor[0] and abstand_gegen_kreis_start_y_floor[1] == pos1_0_floor[1]) or
+            ( abstand_gegen_kreis_start_y_floor[0] == pos1_1_floor[0] and abstand_gegen_kreis_start_y_floor[1] == pos1_1_floor[1]) or
+            (abstand_fuer_kreis_ende_y_floor[0] == pos1_0_floor[0] and abstand_fuer_kreis_ende_y_floor[1] == pos1_0_floor[1] )or
+            ( abstand_fuer_kreis_ende_y_floor[0] == pos1_1_floor[0] and abstand_fuer_kreis_ende_y_floor[1] == pos1_1_floor[1]) or
+            ( abstand_gegen_kreis_ende_y_floor[0] == pos1_0_floor[0] and abstand_gegen_kreis_ende_y_floor[1] == pos1_0_floor[1]) or
+            ( abstand_gegen_kreis_ende_y_floor[0] == pos1_1_floor[0] and abstand_gegen_kreis_ende_y_floor[1] == pos1_1_floor[1]) or
+            
+            (abstand_fuer_kreis_start_y_round[0] == pos1_0_round[0] and abstand_fuer_kreis_start_y_round[1] == pos1_0_round[1] )or
+            ( abstand_fuer_kreis_start_y_round[0] == pos1_1_round[0] and abstand_fuer_kreis_start_y_round[1] == pos1_1_round[1]) or
+            ( abstand_gegen_kreis_start_y_round[0] == pos1_0_round[0] and abstand_gegen_kreis_start_y_round[1] == pos1_0_round[1]) or
+            ( abstand_gegen_kreis_start_y_round[0] == pos1_1_round[0] and abstand_gegen_kreis_start_y_round[1] == pos1_1_round[1]) or
+            (abstand_fuer_kreis_ende_y_round[0] == pos1_0_round[0] and abstand_fuer_kreis_ende_y_round[1] == pos1_0_round[1] )or
+            ( abstand_fuer_kreis_ende_y_round[0] == pos1_1_round[0] and abstand_fuer_kreis_ende_y_round[1] == pos1_1_round[1]) or
+            ( abstand_gegen_kreis_ende_y_round[0] == pos1_0_round[0] and abstand_gegen_kreis_ende_y_round[1] == pos1_0_round[1]) or
+            ( abstand_gegen_kreis_ende_y_round[0] == pos1_1_round[0] and abstand_gegen_kreis_ende_y_round[1] == pos1_1_round[1]) 
+        ):
+                richtung2= "Vertikal"
             else:
-            richtung2 = "Vertikal" 
+                richtung2 = "Horinzontal" 
             unterschiedlich = True
         #Berechnung des Gefälles
+
         if hoehe0 > hoehe1:
             hight_position = "higher"
         else:
@@ -444,7 +540,8 @@ def handle_ils_2_0_gefaellestrecke(msp, teileid, merkmale, x, y, doc, lib_doc, v
                     else:
                         gefaelle = "unten"
 
-        if (position == "higher_rechts" or position == "lower_rechts" or position=="higher_lower" or position== "lower_lower") and drehung0 != drehung1:
+            if kreisel_verbunden == 1 and am_kreisel ==2:
+                am_kreisel == 1
 
                 drehung_2 = drehung0
                 drehung0 = drehung1
@@ -478,9 +575,7 @@ def handle_ils_2_0_gefaellestrecke(msp, teileid, merkmale, x, y, doc, lib_doc, v
                         gefaelle = "unten"
 
             if am_kreisel == 2:
-            if am_kreisel == 1:
+
-                am_kreisel =2
-            elif am_kreisel ==2:
                 am_kreisel = 1
                 drehung_2 = drehung0
                 drehung0 = drehung1
@@ -500,6 +595,13 @@ def handle_ils_2_0_gefaellestrecke(msp, teileid, merkmale, x, y, doc, lib_doc, v
             rotation = 90
         elif gefaelle == "rechts" :
             rotation = 270
+
+
+
+        if (kreisel_verbunden == 1  and richtung2 =="DEFAULT"):
+            richtung2 = richtung0
+
+    
         gefaellegerade_erstellung(x, y, doc, lib_doc, asoffset, esoffset, upper_hoehe_gefaehlle, lower_hoehe_gefaehlle, hoehe_gefaehlle,richtung0,richtung1,richtung2, am_kreisel,drehung0, drehung1, laenge, hight_position, blockname)
 
             
@@ -512,6 +614,20 @@ def handle_ils_2_0_gefaellestrecke(msp, teileid, merkmale, x, y, doc, lib_doc, v
             
             
         )
+    else:
+            laenge_m = merkmale.get("Länge in Meter", "10").replace(",", ".")
+            try:
+                laenge = float(laenge_m) * 1000  # Meter → mm
+            except ValueError:
+                laenge = 10000  
+
+            winkel = math.radians(float(merkmale.get("Drehung")))
+            halbe_laenge = laenge / 2 
+            dx = halbe_laenge *math.sin(winkel * -1)
+            dy = halbe_laenge * math.cos(winkel)
+            start = x +dx, y + dy,upper_hoehe_gefaehlle
+            ende  = x -dx, y - dy,lower_hoehe_gefaehlle
+            msp.add_line(start,ende)
 
 
 def gefaellegerade_erstellung(x, y, doc, lib_doc, asoffset, esoffset, upper_hoehe_gefaehlle, lower_hoehe_gefaehlle, hoehe_gefaehlle,richtung0,richtun1,richtung2,am_kreisel, drehung0, drehung1, laenge, hight_position, blockname):
@@ -564,14 +680,14 @@ def gefaellegerade_erstellung(x, y, doc, lib_doc, asoffset, esoffset, upper_hoeh
 
             block_es = "400102632_ES-Element_90_links"
             import_block(block_es,lib_doc,doc)
-            block.add_blockref(block_as,(start[0]-x  ,start[1]+asoffset -y,start[2]))
+            block.add_blockref(block_es,(ende[0]-x  ,ende[1]-esoffset -y,ende[2]), dxfattribs={"rotation": 180})
         elif blockname not in doc.blocks  and  (drehung0 == "UZS" and drehung1 == "GUZS" and hight_position == "lower"):
             block = doc.blocks.new(name=blockname, base_point=(0,0,0))
             halbe_laenge = laenge / 2 
             
             dy = halbe_laenge * math.cos(0)
             start = (x , y + dy - asoffset,upper_hoehe_gefaehlle)
-            ende  = (x , y - dy + esoffset,lower_hoehe_gefaehlle)
+            ende  = (x , y - dy ,lower_hoehe_gefaehlle)
             line = Line.new(dxfattribs={"start": start, "end": ende})
             copy= line.copy()
             
@@ -579,14 +695,14 @@ def gefaellegerade_erstellung(x, y, doc, lib_doc, asoffset, esoffset, upper_hoeh
             block.add_entity(copy)
             block_as = "200000241_AS-Element_90_rechts"
       
-            import_block(block_es,lib_doc,doc)
+            import_block(block_as,lib_doc,doc)
             block.add_blockref(block_as,(start[0]-x  ,start[1]+asoffset -y,start[2]))
         elif blockname not in doc.blocks and drehung0 == "UZS" and drehung1 == "UZS" and hight_position == "higher":
             block = doc.blocks.new(name=blockname, base_point=(0,0,0))
             halbe_laenge = laenge / 2 
             
             dy = halbe_laenge * math.cos(0)
-            start = (x , y + dy - asoffset,upper_hoehe_gefaehlle)
+            start = (x , y + dy ,upper_hoehe_gefaehlle)
             ende  = (x , y - dy + esoffset,lower_hoehe_gefaehlle)
             line = Line.new(dxfattribs={"start": start, "end": ende})
             copy= line.copy()
@@ -607,7 +723,7 @@ def gefaellegerade_erstellung(x, y, doc, lib_doc, asoffset, esoffset, upper_hoeh
             
             dy = halbe_laenge * math.cos(0)
             start = (x , y + dy - asoffset,upper_hoehe_gefaehlle)
-            ende  = (x , y - dy + esoffset,lower_hoehe_gefaehlle)
+            ende  = (x , y - dy ,lower_hoehe_gefaehlle)
             line = Line.new(dxfattribs={"start": start, "end": ende})
             copy= line.copy()
             
@@ -615,13 +731,16 @@ def gefaellegerade_erstellung(x, y, doc, lib_doc, asoffset, esoffset, upper_hoeh
             block.add_entity(copy)
             block_as = "200000217_AS-Element_90_links"
             import_block(block_as,lib_doc,doc)
+
             block.add_blockref(block_as,(start[0]-x ,start[1]+asoffset -y,start[2]),dxfattribs={"rotation": 180})
+
+
         elif blockname not in doc.blocks and ((drehung0 == "UZS" and drehung1 == "GUZS" and hight_position== "higher")):
             block = doc.blocks.new(name=blockname, base_point=(0,0,0))
             halbe_laenge = laenge / 2 
             
             dy = halbe_laenge * math.cos(0)
-            start = (x , y + dy - asoffset,upper_hoehe_gefaehlle)
+            start = (x , y + dy,upper_hoehe_gefaehlle)
             ende  = (x , y - dy + esoffset,lower_hoehe_gefaehlle)
             line = Line.new(dxfattribs={"start": start, "end": ende})
             copy= line.copy()
@@ -639,7 +758,7 @@ def gefaellegerade_erstellung(x, y, doc, lib_doc, asoffset, esoffset, upper_hoeh
             
             dy = halbe_laenge * math.cos(0)
             start = (x , y + dy - asoffset,upper_hoehe_gefaehlle)
-            ende  = (x , y - dy + esoffset,lower_hoehe_gefaehlle)
+            ende  = (x , y - dy ,lower_hoehe_gefaehlle)
             line = Line.new(dxfattribs={"start": start, "end": ende})
             copy= line.copy()
             
@@ -650,16 +769,6 @@ def gefaellegerade_erstellung(x, y, doc, lib_doc, asoffset, esoffset, upper_hoeh
             
             block.add_blockref(block_as,(start[0]-x  ,start[1]+asoffset -y,start[2]),dxfattribs={"rotation": 180})
             
-
-
-     
-
-
-
-
-
-            
-    
     else:
         if blockname not in doc.blocks and drehung0 == "GUZS" and drehung1 == "GUZS"  :
             block = doc.blocks.new(name=blockname, base_point=(0,0,0))
@@ -743,9 +852,6 @@ def gefaellegerade_erstellung(x, y, doc, lib_doc, asoffset, esoffset, upper_hoeh
             
             block.add_blockref(block_es, (ende[0]-x  ,ende[1]-esoffset -y,ende[2]))
 
-
-    
-
 def handle_omniflo(msp, teileid, merkmale, x, y, doc, lib_doc, verbose, symbols, gefaellestrecken_nachbarn,config):
     """
     Für Omniflo Gerade: zeichnet eine Linie (Mitte = Koordinate, Länge und Winkel aus Merkmale).