From 57a9f09898332812caa62c19b57129f8f107ad2c Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Mon, 20 Jul 2026 13:04:47 +0200
Subject: [PATCH] =?UTF-8?q?Attribut-Tags=20umbenannt:=20N=5FSEPARATOREN=20?=
 =?UTF-8?q?=E2=86=92=20ANZAHL=5FSEPARATOR,=20N=5FSCANNER=20=E2=86=92=20ANZ?=
 =?UTF-8?q?AHL=5FSCANNER?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lisp/KreiselInsert.lsp | 10 +++++-----
 lib/export_csv.py      |  4 ++--
 lib/export_sivas.py    |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Lisp/KreiselInsert.lsp b/Lisp/KreiselInsert.lsp
index 252279a..2bb0cd9 100644
--- a/Lisp/KreiselInsert.lsp
+++ b/Lisp/KreiselInsert.lsp
@@ -73,11 +73,11 @@
 ;; Attribut-Definitionen: ((TAG DEFAULT) ...)
 (setq *kreisel-attrib-defs*
   '(("NAME"           "")
-    ("DREHRICHTUNG"  "UZS")
-    ("N_SEPARATOREN" "2")
-    ("KREISELART"    "STANDARD")
-    ("N_SCANNER"     "0")
-    ("N_RAMPEN"      "0")
+    ("DREHRICHTUNG"     "UZS")
+    ("ANZAHL_SEPARATOR" "2")
+    ("KREISELART"       "STANDARD")
+    ("ANZAHL_SCANNER"   "0")
+    ("N_RAMPEN"         "0")
     ("DREHUNG"       "0")
     ("ABSTAND"       "2300")
     ("NUMMER"        "0")
diff --git a/lib/export_csv.py b/lib/export_csv.py
index 6271ff1..026a334 100644
--- a/lib/export_csv.py
+++ b/lib/export_csv.py
@@ -198,9 +198,9 @@ def build_kreisel_merkmale(block):
         hoehe_m = "0"
     return {
         "Abstand (Kreiselachse A - Kreiselachse) in Meter": abstand_m,
-        "Anzahl der Separatoren": attribs.get("N_SEPARATOREN", "2"),
+        "Anzahl der Separatoren": attribs.get("ANZAHL_SEPARATOR", attribs.get("N_SEPARATOREN", "2")),
         "Kreiselart": attribs.get("KREISELART", "STANDARD"),
-        "Anzahl der Scanner": attribs.get("N_SCANNER", "0"),
+        "Anzahl der Scanner": attribs.get("ANZAHL_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"),
diff --git a/lib/export_sivas.py b/lib/export_sivas.py
index 2157b96..6fe022d 100644
--- a/lib/export_sivas.py
+++ b/lib/export_sivas.py
@@ -109,9 +109,9 @@ def build_kreisel_details(block):
         hoehe_m = "0"
     return {
         "Abstand (Kreiselachse A - Kreiselachse) in Meter": abstand_m,
-        "Anzahl der Separatoren": attribs.get("N_SEPARATOREN", "2"),
+        "Anzahl der Separatoren": attribs.get("ANZAHL_SEPARATOR", attribs.get("N_SEPARATOREN", "2")),
         "Kreiselart": attribs.get("KREISELART", "STANDARD"),
-        "Anzahl der Scanner": attribs.get("N_SCANNER", "0"),
+        "Anzahl der Scanner": attribs.get("ANZAHL_SCANNER", attribs.get("N_SCANNER", "0")),
         "Anzahl der Rampen": attribs.get("N_RAMPEN", "0"),
         "Hoehe in m": hoehe_m,
         "Drehrichtung": attribs.get("DREHRICHTUNG", "UZS"),
@@ -254,7 +254,7 @@ def process_blocks(blocks, lookup):
             kreisel_list.append(block)
             attribs = block.get("attribs", {})
             counters["anzahl_kreisel"] += 1
-            n_sep = int(attribs.get("N_SEPARATOREN", "2") or "2")
+            n_sep = int(attribs.get("ANZAHL_SEPARATOR", attribs.get("N_SEPARATOREN", "2")) or "2")
             kreiselart = attribs.get("KREISELART", "STANDARD")
             if kreiselart == "PIN":
                 counters["anzahl_kreisel_pinband"] += 1
@@ -264,7 +264,7 @@ def process_blocks(blocks, lookup):
             abstand_mm = float(attribs.get("ABSTAND", "2300") or "2300")
             counters["laengen_kreisel"] += abstand_mm / 1000.0
             counters["anzahl_separatoren"] += n_sep
-            counters["anzahl_scanner"] += int(attribs.get("N_SCANNER", "0") or "0")
+            counters["anzahl_scanner"] += int(attribs.get("ANZAHL_SCANNER", attribs.get("N_SCANNER", "0")) or "0")
             if counters["anzahl_streckengruppen"] == 0:
                 counters["anzahl_streckengruppen"] = 1
             continue