Merge gemacht. Versuch eines Tests der lisp Routinen erstellt

lib/export_csv.py

@@ -84,15 +84,27 @@ def build_gerade_merkmale(block):
 
 
 def build_kreisel_merkmale(block):
+    attribs = block.get("attribs", {})
+    abstand_mm = attribs.get("ABSTAND", "2300")
+    try:
+        abstand_m = str(round(float(abstand_mm) / 1000.0, 2))
+    except (ValueError, TypeError):
+        abstand_m = "2.3"
+    hoehe_mm = attribs.get("HOEHE", "0")
+    try:
+        hoehe_m = str(round(float(hoehe_mm) / 1000.0, 2))
+    except (ValueError, TypeError):
+        hoehe_m = "0"
     return {
-        "Abstand (Kreiselachse A - Kreiselachse) in Meter": "3",
-        "Anzahl der Separatoren": "2",
-        "Kreiselart": "Standard",
-        "Anzahl der Scanner": "0",
-        "Anzahl der Rampen": "0",
-        "Höhe in m": "2",
-        "Drehrichtung": "UZS",
-        "Drehung": block.get("rotation", 0.0)
+        "Abstand (Kreiselachse A - Kreiselachse) in Meter": abstand_m,
+        "Anzahl der Separatoren": attribs.get("N_SEPARATOREN", "2"),
+        "Kreiselart": attribs.get("KREISELART", "STANDARD"),
+        "Anzahl der Scanner": attribs.get("N_SCANNER", "0"),
+        "Anzahl der Rampen": attribs.get("N_RAMPEN", "0"),
+        "Höhe in m": hoehe_m,
+        "Drehrichtung": attribs.get("DREHRICHTUNG", "UZS"),
+        "Drehung": block.get("rotation", 0.0),
+        "Name": attribs.get("NAME", ""),
     }
 
 
@@ -100,7 +112,6 @@ def build_kreisel_merkmale(block):
 # Bekannte Blocknamen
 # ---------------------------------------------------------------------------
 
-KREISEL_BLOCKS = {"AN8", "SP8"}
 SKIP_BLOCKS = {"K1", "K2", "K3", "K4", "KS_EIN", "KS_AUS"}
 
 
@@ -182,8 +193,8 @@ def process_blocks(blocks, lookup):
             })
             continue
 
-        # ILS Kreisel
-        if bname in KREISEL_BLOCKS:
+        # ILS Kreisel (Compound-Bloecke mit Praefix KR_)
+        if bname.startswith("KR_"):
             elem_nr += 1
             kreisel_count += 1
             items.append({