diff --git a/tests/test_omniflo.lsp b/tests/test_omniflo.lsp index 37b9455..4ddb028 100644 --- a/tests/test_omniflo.lsp +++ b/tests/test_omniflo.lsp @@ -225,6 +225,16 @@ (omniflo:test-result-json (strcat "OMNI_" (itoa idx)) sivasnr description hoehe-str "OK") results-list)) + ;; Beschriftung ueber dem Block einfuegen + (entmake + (list + '(0 . "TEXT") + '(8 . "ANNOTATION") + (cons 10 (list x-val (+ y-val 50) 0)) + '(40 . 30) + (cons 1 sivasnr) + ) + ) ) (progn (setq anzahl-fehler (1+ anzahl-fehler)) diff --git a/tests/testdata/omniflo_tests.json b/tests/testdata/omniflo_tests.json index 29b4432..e90fa0b 100644 --- a/tests/testdata/omniflo_tests.json +++ b/tests/testdata/omniflo_tests.json @@ -3,8 +3,8 @@ "id": "821104025", "type": "bogen", "sivasnr": "821104025", - "x": -205.81, - "y": -195.55, + "x": 219.4, + "y": 223.06, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/22,5° – 84/522", @@ -14,8 +14,8 @@ "id": "821104025_0_B10090", "type": "bogen", "sivasnr": "821104025+0_B10090", - "x": -10243.29, - "y": -2400.57, + "x": 956.95, + "y": 631.77, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/22,5° – 84/522 mit TEF Innen", @@ -25,8 +25,8 @@ "id": "821104025_0_B10091", "type": "bogen", "sivasnr": "821104025+0_B10091", - "x": -10311.78, - "y": -1485.33, + "x": 1780.35, + "y": 730.41, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/22,5° – 84/522 mit TEF Aussen", @@ -36,8 +36,8 @@ "id": "821104021", "type": "bogen", "sivasnr": "821104021", - "x": -1839.88, - "y": -2670.33, + "x": 269.99, + "y": -835.95, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 400/45° – 400/670", @@ -47,8 +47,8 @@ "id": "821104026", "type": "bogen", "sivasnr": "821104026", - "x": 769.72, - "y": -1758.38, + "x": 1213.63, + "y": -969.45, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/45° – 232/610", @@ -58,8 +58,8 @@ "id": "821104026_0_B10071", "type": "bogen", "sivasnr": "821104026+0_B10071", - "x": -8789.06, - "y": -1910.31, + "x": 2023.78, + "y": -699.42, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/45° – 232/610 mit TEF Innen", @@ -69,8 +69,8 @@ "id": "821104037", "type": "bogen", "sivasnr": "821104037", - "x": 2903.79, - "y": -1936.33, + "x": 2836.97, + "y": -1030.52, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/45° – 205/337", @@ -80,8 +80,8 @@ "id": "821104029", "type": "bogen", "sivasnr": "821104029", - "x": 3251.84, - "y": -1716.33, + "x": 3617.59, + "y": -1044.66, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/45° 191/552", @@ -91,8 +91,8 @@ "id": "821104031", "type": "bogen", "sivasnr": "821104031", - "x": 5323.26, - "y": -4810.33, + "x": 4588.32, + "y": -934.89, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/45° – 400/825", @@ -102,8 +102,8 @@ "id": "821104031_0_B10060", "type": "bogen", "sivasnr": "821104031+0_B10060", - "x": -4725.96, - "y": -2401.36, + "x": 5669.08, + "y": -540.54, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/45° – 400/825 mit TEF Aussen", @@ -113,8 +113,8 @@ "id": "821104031_0_B10070", "type": "bogen", "sivasnr": "821104031+0_B10070", - "x": -6823.98, - "y": -3702.69, + "x": 6828.13, + "y": -540.52, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/45° – 400/825 mit TEF Innen", @@ -124,8 +124,8 @@ "id": "821104024", "type": "bogen", "sivasnr": "821104024", - "x": 40.29, - "y": -3861.42, + "x": 367.27, + "y": -2295.45, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 400/67,5° – 339/508", @@ -135,8 +135,8 @@ "id": "821104024_0_B10081", "type": "bogen", "sivasnr": "821104024+0_B10081", - "x": -7386.80, - "y": -5784.98, + "x": 1094.53, + "y": -2241.83, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 400/67,5° – 339/508 mit TEF Innen", @@ -146,8 +146,8 @@ "id": "821104027", "type": "bogen", "sivasnr": "821104027", - "x": -1365.48, - "y": -4576.17, + "x": 1983.51, + "y": -2104.46, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/67,5° – 488/778", @@ -157,8 +157,8 @@ "id": "821104027_0_B10080", "type": "bogen", "sivasnr": "821104027+0_B10080", - "x": -6115.19, - "y": -4744.94, + "x": 2951.61, + "y": -2091.83, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/67,5° – 488/778 mit TEF Innen", @@ -168,8 +168,8 @@ "id": "821104028", "type": "bogen", "sivasnr": "821104028", - "x": 5397.44, - "y": -3091.42, + "x": 3799.2, + "y": -2214.86, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/67,5° – 420/582", @@ -179,8 +179,8 @@ "id": "821104065", "type": "bogen", "sivasnr": "821104065", - "x": 3943.29, - "y": -3244.57, + "x": 4745.07, + "y": -2138.18, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/67,5° – 498/758", @@ -190,8 +190,8 @@ "id": "821104022", "type": "bogen", "sivasnr": "821104022", - "x": 740.00, - "y": -4413.45, + "x": 500.0, + "y": -3266.22, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 400/90° – 500/500", @@ -201,8 +201,8 @@ "id": "821104030", "type": "bogen", "sivasnr": "821104030", - "x": 21.04, - "y": -5333.45, + "x": 1271.04, + "y": -3216.22, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 500/90° – 550/550", @@ -212,8 +212,8 @@ "id": "821104033", "type": "bogen", "sivasnr": "821104033", - "x": 12.08, - "y": -3683.45, + "x": 2292.08, + "y": -2966.22, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/90° – 800/800", @@ -223,8 +223,8 @@ "id": "821104033_0_B10040", "type": "bogen", "sivasnr": "821104033+0_B10040", - "x": -4472.83, - "y": -5104.30, + "x": 3313.12, + "y": -2966.22, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/90° – 800/800 mit TEF Aussen", @@ -234,8 +234,8 @@ "id": "821104033_0_B10050", "type": "bogen", "sivasnr": "821104033+0_B10050", - "x": 1917.57, - "y": -4714.30, + "x": 4444.42, + "y": -2966.22, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/90° – 800/800 mit TEF Innen", @@ -245,8 +245,8 @@ "id": "821104035", "type": "bogen", "sivasnr": "821104035", - "x": 5565.46, - "y": -4003.45, + "x": 5515.46, + "y": -2896.22, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/90° – 850/870", @@ -256,8 +256,8 @@ "id": "821104041", "type": "bogen", "sivasnr": "821104041", - "x": 4826.50, - "y": -4093.45, + "x": 6426.5, + "y": -2916.22, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/90° – 850/690", @@ -267,8 +267,8 @@ "id": "821104034", "type": "bogen", "sivasnr": "821104034", - "x": 5157.53, - "y": -3953.45, + "x": 7537.53, + "y": -2916.22, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/90° – 850/890", @@ -278,8 +278,8 @@ "id": "821104066", "type": "bogen", "sivasnr": "821104066", - "x": 8438.57, - "y": -4023.45, + "x": 8658.57, + "y": -3161.22, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 550/90° – 900/605", @@ -289,8 +289,8 @@ "id": "821104043", "type": "bogen", "sivasnr": "821104043", - "x": -103.03, - "y": -5341.52, + "x": 150.0, + "y": -4577.87, "hoehe": 2000, "drehung": 0.0, "description": "APB 110 R 630/180° – 1300/800", @@ -300,8 +300,8 @@ "id": "834342011", "type": "weiche", "sivasnr": "834342011", - "x": 1385.81, - "y": -8276.82, + "x": 120.94, + "y": -7038.6, "hoehe": 2000, "drehung": 0.0, "description": "WEICHENKOERPER S L, KPL. MIT M", @@ -311,8 +311,8 @@ "id": "834342001", "type": "weiche", "sivasnr": "834342001", - "x": 1177.09, - "y": -8346.82, + "x": 428.03, + "y": -7038.6, "hoehe": 2000, "drehung": 0.0, "description": "WEICHENKOERPER S R, KPL. MIT M", @@ -322,8 +322,8 @@ "id": "834342012", "type": "weiche", "sivasnr": "834342012", - "x": 2134.78, - "y": -8276.82, + "x": 869.9, + "y": -7038.6, "hoehe": 2000, "drehung": 0.0, "description": "WEICHENKOERPER S L, KPL. MIT P", @@ -333,8 +333,8 @@ "id": "834342002", "type": "weiche", "sivasnr": "834342002", - "x": 1926.05, - "y": -8346.82, + "x": 1176.99, + "y": -7038.6, "hoehe": 2000, "drehung": 0.0, "description": "WEICHENKOERPER S R, KPL. MIT P", @@ -344,8 +344,8 @@ "id": "834342100", "type": "weiche", "sivasnr": "834342100", - "x": -70.00, - "y": -9217.82, + "x": 120.94, + "y": -7958.99, "hoehe": 2000, "drehung": 0.0, "description": "WEICHENKOERPER S D, KPL. MIT M", @@ -355,8 +355,8 @@ "id": "834342101", "type": "weiche", "sivasnr": "834342101", - "x": 371.88, - "y": -9217.82, + "x": 562.82, + "y": -7958.99, "hoehe": 2000, "drehung": 0.0, "description": "WEICHENKOERPER S D, KPL. MIT P", @@ -366,8 +366,8 @@ "id": "834342200", "type": "weiche", "sivasnr": "834342200", - "x": 2358.00, - "y": -10101.88, + "x": 120.94, + "y": -8866.43, "hoehe": 2000, "drehung": 0.0, "description": "WEICHENKOERPER S T, KPL. MIT M", @@ -377,8 +377,8 @@ "id": "834342201", "type": "weiche", "sivasnr": "834342201", - "x": 2799.88, - "y": -10101.88, + "x": 562.82, + "y": -8866.43, "hoehe": 2000, "drehung": 0.0, "description": "WEICHENKOERPER S T, KPL. MIT P", @@ -388,8 +388,8 @@ "id": "834372001", "type": "weiche", "sivasnr": "834372001", - "x": -2240.00, - "y": -9276.88, + "x": 365.01, + "y": -9532.6, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-L-350/700, KPL. MIT M", @@ -399,8 +399,8 @@ "id": "834372002", "type": "weiche", "sivasnr": "834372002", - "x": -1621.45, - "y": -9276.88, + "x": 983.56, + "y": -9532.6, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-L-350/700, KPL. MIT P", @@ -410,8 +410,8 @@ "id": "834372002_0_BG090090", "type": "weiche", "sivasnr": "834372002+0_BG090090", - "x": -14436.07, - "y": -11761.56, + "x": 1883.86, + "y": -9389.29, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-L-350/700, KPL. MIT P mit TEF Innen", @@ -421,8 +421,8 @@ "id": "834372004", "type": "weiche", "sivasnr": "834372004", - "x": 375.94, - "y": -9156.88, + "x": 2190.95, + "y": -9532.6, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-R-350/700, KPL. MIT M", @@ -432,8 +432,8 @@ "id": "834372005", "type": "weiche", "sivasnr": "834372005", - "x": 994.49, - "y": -9156.88, + "x": 2809.5, + "y": -9532.6, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-R-350/700, KPL. MIT P", @@ -443,8 +443,8 @@ "id": "834372005_0_BG090090", "type": "weiche", "sivasnr": "834372005+0_BG090090", - "x": -13487.70, - "y": -12189.36, + "x": 3428.05, + "y": -9389.29, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-R-350/700, KPL. MIT P mit TEF Innen", @@ -454,8 +454,8 @@ "id": "834372007", "type": "weiche", "sivasnr": "834372007", - "x": 1085.40, - "y": -9365.83, + "x": 4770.46, + "y": -9532.59, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-L-400/750, KPL. MIT M", @@ -465,8 +465,8 @@ "id": "834372008", "type": "weiche", "sivasnr": "834372008", - "x": 1753.82, - "y": -9365.83, + "x": 5438.88, + "y": -9532.59, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-L-400/750, KPL. MIT P", @@ -476,8 +476,8 @@ "id": "834372008_0_BG190090", "type": "weiche", "sivasnr": "834372008+0_BG190090", - "x": -6446.36, - "y": -11479.80, + "x": 6339.19, + "y": -9393.52, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-L-400/750, KPL. MIT P mit TEF Ihnen", @@ -487,8 +487,8 @@ "id": "834372010", "type": "weiche", "sivasnr": "834372010", - "x": 4460.87, - "y": -9127.78, + "x": 6646.27, + "y": -9532.59, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-R-400/750, KPL. MIT M", @@ -498,8 +498,8 @@ "id": "834372011", "type": "weiche", "sivasnr": "834372011", - "x": 5129.29, - "y": -9127.78, + "x": 7314.69, + "y": -9532.59, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-R-400/750, KPL. MIT P", @@ -509,8 +509,8 @@ "id": "834372011_0_BG190090", "type": "weiche", "sivasnr": "834372011+0_BG190090", - "x": -3447.43, - "y": -11611.90, + "x": 7983.12, + "y": -9393.52, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 45°-R-400/750, KPL. MIT P mit TEF Ihnen", @@ -520,8 +520,8 @@ "id": "834372021", "type": "weiche", "sivasnr": "834372021", - "x": -810.00, - "y": -11370.82, + "x": 500.23, + "y": -10745.73, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-L-500/600, KPL. MIT M", @@ -531,8 +531,8 @@ "id": "834372022", "type": "weiche", "sivasnr": "834372022", - "x": -56.23, - "y": -11370.82, + "x": 1254.0, + "y": -10745.73, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-L-500/600, KPL. MIT P", @@ -542,8 +542,8 @@ "id": "834372024", "type": "weiche", "sivasnr": "834372024", - "x": -69.14, - "y": -11290.82, + "x": 1561.09, + "y": -10745.73, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-R-500/600, KPL. MIT M", @@ -553,8 +553,8 @@ "id": "834372025", "type": "weiche", "sivasnr": "834372025", - "x": 684.63, - "y": -11290.82, + "x": 2314.87, + "y": -10745.73, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-R-500/600, KPL. MIT P", @@ -564,8 +564,8 @@ "id": "834372027", "type": "weiche", "sivasnr": "834372027", - "x": 4135.10, - "y": -10630.82, + "x": 3715.47, + "y": -10645.74, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-L-700/700, KPL. MIT M", @@ -575,8 +575,8 @@ "id": "834372028", "type": "weiche", "sivasnr": "834372028", - "x": 5089.01, - "y": -10630.82, + "x": 4669.39, + "y": -10645.74, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-L-700/700, KPL. MIT P", @@ -586,8 +586,8 @@ "id": "834372028_0_BG080090", "type": "weiche", "sivasnr": "834372028+0_BG080090", - "x": -3672.36, - "y": -12770.82, + "x": 5623.3, + "y": -10507.68, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-L-700/700, KPL. MIT P mit TEF Innen", @@ -597,8 +597,8 @@ "id": "834372030", "type": "weiche", "sivasnr": "834372030", - "x": 3590.02, - "y": -11250.82, + "x": 5930.39, + "y": -10645.74, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-R-700/700, KPL. MIT M", @@ -608,8 +608,8 @@ "id": "834372031", "type": "weiche", "sivasnr": "834372031", - "x": 4543.93, - "y": -11250.82, + "x": 6884.31, + "y": -10645.74, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-R-700/700, KPL. MIT P", @@ -619,8 +619,8 @@ "id": "834372031_0_BG080090", "type": "weiche", "sivasnr": "834372031+0_BG080090", - "x": 643.54, - "y": -12793.23, + "x": 7838.23, + "y": -10507.3, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S 90°-R-700/700, KPL. MIT P mit TEF Innen", @@ -630,8 +630,8 @@ "id": "834372047", "type": "weiche", "sivasnr": "834372047", - "x": -2040.00, - "y": -12220.49, + "x": 221.05, + "y": -12670.25, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S PARALLEL-L-200/750, KPL. MIT M", @@ -641,8 +641,8 @@ "id": "834372048", "type": "weiche", "sivasnr": "834372048", - "x": -1565.41, - "y": -12220.49, + "x": 695.64, + "y": -12670.25, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S PARALLEL-L-200/750, KPL. MIT P", @@ -652,8 +652,8 @@ "id": "834372050", "type": "weiche", "sivasnr": "834372050", - "x": -1948.32, - "y": -12130.49, + "x": 1002.72, + "y": -12670.25, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S PARALLEL-R-200/750, KPL. MIT M", @@ -663,8 +663,8 @@ "id": "834372051", "type": "weiche", "sivasnr": "834372051", - "x": -1473.73, - "y": -12130.49, + "x": 1477.32, + "y": -12670.25, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S PARALLEL-R-200/750, KPL. MIT P", @@ -674,8 +674,8 @@ "id": "834372100", "type": "weiche", "sivasnr": "834372100", - "x": -883.58, - "y": -13230.29, + "x": 365.01, + "y": -13724.18, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-350/700, KPL. MIT M", @@ -685,8 +685,8 @@ "id": "834372101", "type": "weiche", "sivasnr": "834372101", - "x": 46.43, - "y": -13230.29, + "x": 1295.02, + "y": -13724.18, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-350/700, KPL. MIT P", @@ -696,8 +696,8 @@ "id": "0_BG090090_834372101", "type": "weiche", "sivasnr": "0_BG090090+834372101", - "x": -15658.96, - "y": -16130.29, + "x": 2506.79, + "y": -13580.87, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-350/700, KPL. MIT P mit TEF links", @@ -707,8 +707,8 @@ "id": "834372101_0_BG090090", "type": "weiche", "sivasnr": "834372101+0_BG090090", - "x": -14728.95, - "y": -16130.29, + "x": 3436.8, + "y": -13580.87, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-350/700, KPL. MIT P mit TEF rechts", @@ -718,8 +718,8 @@ "id": "0_BG090090_834372101_0_BG090090", "type": "weiche", "sivasnr": "0_BG090090+834372101+0_BG090090", - "x": -13154.66, - "y": -16130.29, + "x": 5011.09, + "y": -13580.87, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-350/700, KPL. MIT P mit TEF beideseitig", @@ -729,8 +729,8 @@ "id": "834372103", "type": "weiche", "sivasnr": "834372103", - "x": 4521.62, - "y": -13141.44, + "x": 6353.51, + "y": -13724.18, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-400/750, KPL. MIT M", @@ -740,8 +740,8 @@ "id": "834372104", "type": "weiche", "sivasnr": "834372104", - "x": 5551.37, - "y": -13141.44, + "x": 7383.26, + "y": -13724.18, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-400/750, KPL. MIT P", @@ -751,8 +751,8 @@ "id": "0_BG190090_834372104", "type": "weiche", "sivasnr": "0_BG190090+834372104", - "x": -4300.65, - "y": -15480.29, + "x": 8644.9, + "y": -13585.1, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-400/750, KPL. MIT P mit TEF links", @@ -762,8 +762,8 @@ "id": "834372104_0_BG190090", "type": "weiche", "sivasnr": "834372104+0_BG190090", - "x": -3270.90, - "y": -15480.29, + "x": 9674.65, + "y": -13585.1, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-400/750, KPL. MIT P mit TEF rechts", @@ -773,8 +773,8 @@ "id": "0_BG190090_834372104_0_BG190090", "type": "weiche", "sivasnr": "0_BG190090+834372104+0_BG190090", - "x": -1696.60, - "y": -15480.29, + "x": 11248.95, + "y": -13585.1, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 45°-400/750, KPL. MIT P mit TEF beideseitig", @@ -784,8 +784,8 @@ "id": "834372106", "type": "weiche", "sivasnr": "834372106", - "x": -1690.00, - "y": -13554.24, + "x": 500.23, + "y": -14937.32, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 90°-500/600, KPL. MIT M", @@ -795,8 +795,8 @@ "id": "834372107", "type": "weiche", "sivasnr": "834372107", - "x": -489.54, - "y": -13554.24, + "x": 1700.69, + "y": -14937.32, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 90°-500/600, KPL. MIT P", @@ -806,8 +806,8 @@ "id": "834372109", "type": "weiche", "sivasnr": "834372109", - "x": -4039.08, - "y": -13234.24, + "x": 3101.29, + "y": -14837.34, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 90°-700/700, KPL. MIT M", @@ -817,8 +817,8 @@ "id": "834372110", "type": "weiche", "sivasnr": "834372110", - "x": -2438.34, - "y": -13234.24, + "x": 4702.03, + "y": -14837.34, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 90°-700/700, KPL. MIT P", @@ -828,8 +828,8 @@ "id": "0_BG080090_834372110", "type": "weiche", "sivasnr": "0_BG080090+834372110", - "x": -2633.38, - "y": -16704.62, + "x": 6302.77, + "y": -14699.26, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 90°-700/700, KPL. MIT P mit TEF links", @@ -839,8 +839,8 @@ "id": "834372110_0_BG080090", "type": "weiche", "sivasnr": "834372110+0_BG080090", - "x": -1032.64, - "y": -16704.24, + "x": 7903.51, + "y": -14698.88, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 90°-700/700, KPL. MIT P mit TEF rechts", @@ -850,8 +850,8 @@ "id": "0_BG080090_834372110_0_BG080090", "type": "weiche", "sivasnr": "0_BG080090+834372110+0_BG080090", - "x": 568.10, - "y": -16704.24, + "x": 9504.25, + "y": -14698.88, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D 90°-700/700, KPL. MIT P mit TEF beideseitig", @@ -861,8 +861,8 @@ "id": "834372115", "type": "weiche", "sivasnr": "834372115", - "x": -1360.00, - "y": -16633.91, + "x": 221.05, + "y": -16861.83, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D PARALLEL-200/750, KPL. MIT M", @@ -872,8 +872,8 @@ "id": "834372116", "type": "weiche", "sivasnr": "834372116", - "x": -717.91, - "y": -16633.91, + "x": 863.14, + "y": -16861.83, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S D PARALLEL-200/750, KPL. MIT P", @@ -883,8 +883,8 @@ "id": "834372200", "type": "weiche", "sivasnr": "834372200", - "x": -1829.93, - "y": -17003.71, + "x": 365.01, + "y": -17915.76, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-350/700, KPL. MIT M", @@ -894,8 +894,8 @@ "id": "834372201", "type": "weiche", "sivasnr": "834372201", - "x": -899.92, - "y": -17003.71, + "x": 1295.02, + "y": -17915.76, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-350/700, KPL. MIT P", @@ -905,8 +905,8 @@ "id": "0_BG090090_834372201", "type": "weiche", "sivasnr": "0_BG090090+834372201", - "x": -17168.96, - "y": -20063.71, + "x": 2506.79, + "y": -17772.46, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-350/700, KPL. MIT P mit TEF links", @@ -916,8 +916,8 @@ "id": "834372201_0_BG090090", "type": "weiche", "sivasnr": "834372201+0_BG090090", - "x": -16238.95, - "y": -20063.71, + "x": 3436.8, + "y": -17772.46, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-350/700, KPL. MIT P mit TEF rechts", @@ -927,8 +927,8 @@ "id": "0_BG090090_834372201_0_BG090090", "type": "weiche", "sivasnr": "0_BG090090+834372201+0_BG090090", - "x": -14664.66, - "y": -20063.71, + "x": 5011.09, + "y": -17772.46, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-350/700, KPL. MIT P mit TEF beideseitig", @@ -938,8 +938,8 @@ "id": "834372203", "type": "weiche", "sivasnr": "834372203", - "x": 6093.12, - "y": -16430.01, + "x": 6353.51, + "y": -17915.76, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-400/750, KPL. MIT M", @@ -949,8 +949,8 @@ "id": "834372204", "type": "weiche", "sivasnr": "834372204", - "x": 7122.88, - "y": -16430.01, + "x": 7383.26, + "y": -17915.76, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-400/750, KPL. MIT P", @@ -960,8 +960,8 @@ "id": "0_BG190090_834372204", "type": "weiche", "sivasnr": "0_BG190090+834372204", - "x": -5885.65, - "y": -19493.71, + "x": 8644.9, + "y": -17776.69, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-400/750, KPL. MIT P mit TEF links", @@ -971,8 +971,8 @@ "id": "834372204_0_BG190090", "type": "weiche", "sivasnr": "834372204+0_BG190090", - "x": -4855.90, - "y": -19493.71, + "x": 9674.65, + "y": -17776.69, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-400/750, KPL. MIT P mit TEF rechts", @@ -982,8 +982,8 @@ "id": "0_BG190090_834372204_0_BG190090", "type": "weiche", "sivasnr": "0_BG190090+834372204+0_BG190090", - "x": -3281.60, - "y": -19493.71, + "x": 11248.95, + "y": -17776.69, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 45°-400/750, KPL. MIT P mit TEF beideseitig", @@ -993,8 +993,8 @@ "id": "834372206", "type": "weiche", "sivasnr": "834372206", - "x": -7010.77, - "y": -17637.66, + "x": 500.23, + "y": -19128.9, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 90°-500/600, KPL. MIT M", @@ -1004,8 +1004,8 @@ "id": "834372207", "type": "weiche", "sivasnr": "834372207", - "x": -5810.31, - "y": -17637.66, + "x": 1700.69, + "y": -19128.9, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 90°-500/600, KPL. MIT P", @@ -1015,8 +1015,8 @@ "id": "834372209", "type": "weiche", "sivasnr": "834372209", - "x": -6838.34, - "y": -17027.57, + "x": 3101.29, + "y": -19028.92, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 90°-700/700, KPL. MIT M", @@ -1026,8 +1026,8 @@ "id": "834372210", "type": "weiche", "sivasnr": "834372210", - "x": -5237.60, - "y": -17027.57, + "x": 4702.03, + "y": -19028.92, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 90°-700/700, KPL. MIT P", @@ -1037,8 +1037,8 @@ "id": "0_BG080090_834372210", "type": "weiche", "sivasnr": "0_BG080090+834372210", - "x": -4367.60, - "y": -20608.04, + "x": 6302.77, + "y": -18890.84, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 90°-700/700, KPL. MIT P mit TEF links", @@ -1048,8 +1048,8 @@ "id": "834372210_0_BG080090", "type": "weiche", "sivasnr": "834372210+0_BG080090", - "x": -2766.86, - "y": -20607.66, + "x": 7903.51, + "y": -18890.47, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 90°-700/700, KPL. MIT P mit TEF rechts", @@ -1059,8 +1059,8 @@ "id": "0_BG080090_834372210_0_BG080090", "type": "weiche", "sivasnr": "0_BG080090+834372210+0_BG080090", - "x": -1166.12, - "y": -20607.66, + "x": 9504.25, + "y": -18890.47, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T 90°-700/700, KPL. MIT P mit TEF beideseitig", @@ -1070,8 +1070,8 @@ "id": "834372215", "type": "weiche", "sivasnr": "834372215", - "x": -1539.95, - "y": -20667.33, + "x": 221.05, + "y": -21053.42, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T PARALLEL-200/750, KPL. MIT M", @@ -1081,8 +1081,8 @@ "id": "834372216", "type": "weiche", "sivasnr": "834372216", - "x": -897.86, - "y": -20667.33, + "x": 863.14, + "y": -21053.42, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S T PARALLEL-200/750, KPL. MIT P", @@ -1092,8 +1092,8 @@ "id": "834372400", "type": "weiche", "sivasnr": "834372400", - "x": -8605.84, - "y": -19971.94, + "x": 700.23, + "y": -21757.11, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S C DELTA 1400/700, KPL. M", @@ -1103,8 +1103,8 @@ "id": "834372403", "type": "weiche", "sivasnr": "834372403", - "x": -11343.24, - "y": -19366.36, + "x": 2400.65, + "y": -21657.08, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S C DELTA 1600/800, KPL. M", @@ -1114,8 +1114,8 @@ "id": "834372404", "type": "weiche", "sivasnr": "834372404", - "x": -9542.85, - "y": -19366.36, + "x": 4201.04, + "y": -21657.08, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S C DELTA 1600/800, KPL. P", @@ -1125,8 +1125,8 @@ "id": "0_BG071090_834372404_0_BG071090", "type": "weiche", "sivasnr": "0_BG071090+834372404+0_BG071090", - "x": -15020.31, - "y": -23257.47, + "x": 6139.93, + "y": -21516.84, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S C DELTA 1600/800, KPL. MIT P mit TEF beideseitig", @@ -1136,8 +1136,8 @@ "id": "0_BG071090_834372404", "type": "weiche", "sivasnr": "0_BG071090+834372404", - "x": -12941.37, - "y": -23257.47, + "x": 8218.87, + "y": -21516.84, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S C DELTA 1600/800, KPL. MIT P mit TEF links", @@ -1147,8 +1147,8 @@ "id": "834372404_0_BG071090", "type": "weiche", "sivasnr": "834372404+0_BG071090", - "x": -13599.45, - "y": -23218.81, + "x": 10019.25, + "y": -21518.52, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S C DELTA 1600/800, KPL. MIT P mit TEF rechts", @@ -1158,8 +1158,8 @@ "id": "834372401", "type": "weiche", "sivasnr": "834372401", - "x": -8605.84, - "y": -21435.98, + "x": 700.23, + "y": -23310.54, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S C DELTA 1400/700, KPL. P", @@ -1169,11 +1169,11 @@ "id": "834372420", "type": "weiche", "sivasnr": "834372420", - "x": -9971.54, - "y": -22833.35, + "x": 700.22, + "y": -24623.72, "hoehe": 2000, "drehung": 0.0, "description": "WEICHE S C STAR 1400/1400, KPL. M", "row": "Sternweiche" } -] +] \ No newline at end of file