From 7749aeba7f1bcc68fca4e4babd19c2c9b20fc940 Mon Sep 17 00:00:00 2001 From: Martin Hoffmann Date: Sat, 18 Feb 2023 11:03:34 +0100 Subject: [PATCH 1/2] Detail 4 of northern part of line DE 6298. --- paths/de/u/d4.osm | 1321 +++++++++++++++++++++++++++++++++++++ rules/de/u/d4/62/6298.map | 631 ++++++++++++++++++ rules/de/u/d4/62/6299.map | 20 + rules/de/u/d4/63/6340.map | 191 ++++++ rules/de/u/d4/67/6730.map | 27 + rules/de/u/d4/67/6733.map | 19 + 6 files changed, 2209 insertions(+) create mode 100644 paths/de/u/d4.osm create mode 100644 rules/de/u/d4/62/6298.map create mode 100644 rules/de/u/d4/62/6299.map create mode 100644 rules/de/u/d4/63/6340.map create mode 100644 rules/de/u/d4/67/6730.map create mode 100644 rules/de/u/d4/67/6733.map diff --git a/paths/de/u/d4.osm b/paths/de/u/d4.osm new file mode 100644 index 00000000..da163aa5 --- /dev/null +++ b/paths/de/u/d4.osm @@ -0,0 +1,1321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rules/de/u/d4/62/6298.map b/rules/de/u/d4/62/6298.map new file mode 100644 index 00000000..6387a667 --- /dev/null +++ b/rules/de/u/d4/62/6298.map @@ -0,0 +1,631 @@ +# DE 6298. Neudietendorf - Ritschenhausen +# +let nr = path("d4.de.6298"); + +with detail = [4, 5] { + # point.de.Neudietendorf: de.6340 + + with link = "point.de.Neudietendorf-Ds" { + # Gl. 3 + track(:first:station :pax, + nr[:ndi.yw, :ndi.fa] >> 0.5dt + ); + # W61 - W62 + track(:station, + nr[:ndi.yw + 200m] >> 0.5dt + -- nr[:ndi.yw + 280m] << 0.5dt + ); + # Anschl. + track(:station :removed, + nr[:ndi.yf + 70m] >> 0.5dt + -- nr[:ndi.yf + 150m] >> 2.0dt + ); + + # Gl. 4 + track(:first:station :pax, + nr[:ndi.yw, :ndi.fa] << 0.5dt + ); + # W61 - W62 + track(:station, + nr[:ndi.yw + 320m] << 0.5dt + -- nr[:ndi.yw + 400m] >> 0.5dt + ); + + # Anschl. Lager + track(:station :closed, + nr[:ndi.yf + 70m, :ndi.yf + 600m] >> 2.0dt + ); + track(:station :closed, + nr[:ndi.yf + 149m, :ndi.yf + 150m] >> 2.0dt + -- nr[:ndi.yf + 220m, :ndi.yf + 400m] >> 3.0dt + ); + track(:station :closed, + nr[:ndi.yf + 200m, :ndi.yf + 300m] >> 5.0dt + -- nr[:ndi.yf + 450m, :ndi.yf + 451m] >> 2.0dt + ); + + # Str. 6730 + track(:station :removed, + nr[:ndi.yw] >> 1.5dt + -- nr[:ndi.yw + 60m] >> 0.5dt + ); + + marker(:left :de.bft :removed, nr[:ndi.yw + 130m] << 0.5dt); + with layer = -1 marker(:left :de.bft.casing :removed, + nr[:ndi.yw + 130m] << 0.5dt + ); + station(:right:left_align :removed, + nr[:ndi.yw + 130m - 0.5sw] << 0.5dt << 2.1sw, + hbox(:left:top, "N. Ds"), + hbox(:left:top, + vbox(:right:top, "6370: ", "6298: "), + vbox(:right:top, "??", "??") + ) + ); + } + + with link = "line.de.6298" { + let nd = path("d4.de.6298.nd"); + + with layer = -2 track(:first:station :double :removed, + nd[:ndi.ya - 0.1dl, :ndi.ya] << 1dt + .. nd[:ndi.yya, :ndi.yf] + ); + + track(:first :double :excat:ac15 :pax, + nr[:ndi.fa, :sul - 210m] + ); + } + + + with link = "point.de.Sülzenbrücken" { + track(:first:station :double :pax, nr[:sul - 210m, :sul + 200m]); + + platform(:pax, + nr[:sul - 155m, :sul - 20m] >> 0.5dt + -- nr[:sul - 20m, :sul - 155m] << 1.2dt + ); + platform(:pax, + nr[:sul + 10m, :sul + 145m] << 0.5dt + -- nr[:sul + 145m, :sul + 10m] >> 1.2dt + ); + + marker(:right :de.hp :pax, nr[:sul] >> 0.5dt); + station(:left :pax, nr[:sul + 0.4sw] >> 0.5dt >> 1.4sw, + "Sülzenbrücken", "3,38" + ); + } + + + with link = "line.de.6298" { + track(:first :double :excat:ac15 :pax, + nr[:sul + 1.1km, :sul + 200m] + ); + line_badge(:pax, nr[:sul + 1.1km], "6298"); + track(:first :double :excat:ac15 :pax, + nr[:sul + 1.1km, :haa - 230m] + ); + } + + + with link = "point.de.Haarhausen" { + track(:first:station :double :pax, nr[:haa - 230m, :haa + 230m]); + + platform(:pax, + nr[:haa - 180m, :haa - 40m] >> 0.5dt + -- nr[:haa - 40m, :haa - 180m] << 1.2dt + ); + platform(:removed, + nr[:haa - 180m, :haa - 40m] << 0.5dt + -- nr[:haa - 40m, :haa - 180m] >> 1.2dt + ); + platform(:pax, + nr[:haa + 40m, :haa + 180m] << 0.5dt + -- nr[:haa + 180m, :haa + 40m] >> 1.2dt + ); + + marker(:right :de.hp :pax, nr[:haa] >> 0.5dt); + marker(:right :de.bf :removed, nr[:haa - 20m] >> 0.5dt); + station(:left :pax, nr[:haa + 0.3sw] >> 0.5dt >> 1.6sw, + "Haarhausen", + hbox(:center:base, span(:removed, "5,69 → "), "5,71") + ); + } + + + with link = "line.de.6298" { + track(:first :double :excat:ac15 :pax, nr[:haa + 230m, :arn.a]); + } + + + with link = "point.de.Arnstadt-Hbf" { + let ai = path("d4.de.6733"); + let as = path("d4.de.6299"); + let ar = path("d4.de.6298.ar"); + + # Gl. 1 + track(:first:station :excat:ac15 :pax, nr[:arn.a, :arn.fp] >> 0.5dt); + # W1 - W2 + track(:station, + nr[:arn - 850m] >> 0.5dt + -- nr[:arn - 770m] << 0.5dt + ); + # W10 - W11 + track(:station, + nr[:arn + 100m] >> 0.5dt + -- nr[:arn + 190m] << 0.5dt + ); + + # Gl. 2 + track(:first:station :excat:ac15 :pax, nr[:arn.a, :arn.fp] << 0.5dt); + # W13 - W14 + track(:station, + nr[:arn + 200m] << 0.5dt + -- nr[:arn + 290m] << 1.5dt + ); + # W17 - W18 + track(:station, + nr[:arn + 630m] << 0.5dt + -- nr[:arn + 720m] >> 0.5dt + ); + + # Gl. 6 + track(:first:station :excat:ac15 :pax, + nr[:arn - 651m, :arn - 650m] << 0.5dt + -- nr[:arn - 570m, :arn.ys + 350m] << 1.5dt + .. as[:arn.fr - 0.1dl, :arn.fr] + ); + # W15 - W16 + track(:station, + nr[:arn + 320m] << 1.5dt + -- nr[:arn + 410m] << 0.5dt + ); + + # Gl. 7 + track(:station, + nr[:arn - 511m, :arn - 510m] << 1.5dt + -- nr[:arn - 440m, :arn + 130m - 0.7dl] << 2.5dt + -- nr[:arn + 200m - 0.7dl, :arn + 201m - 0.7dl] << 1.5dt + ); + + # Gl. 8 + track(:station, + nr[:arn - 140m, :arn + 150m] << 3.5dt + ); + + # Gl. 9 + track(:station, + nr[:arn - 800m, :arn - 200m] << 3.5dt + -- nr[:arn - 150m, :arn + 100m] << 4.5dt + ); + # W10 - W6 + track(:station, + nr[:arn - 630m] << 3.5dt + -- nr[:arn - 530m] << 1.5dt + ); + + # Gl. 13/17 + track(:station, + nr[:arn - 490m, :arn - 0.7dl] << 5.5dt + -- nr[:arn + 50m - 0.7dl, :arn + 51m - 0.7dl] << 4.5dt + ); + + # Gl. 18/19 + track(:station, + nr[:arn - 591m, :arn - 590m] << 3.5dt + -- nr[:arn - 440m, :arn] << 6.5dt + -- nr[:arn + 200m, :arn.ys] << 2.5dt + .. ai[:arn.xi - 60m, :arn.xi] + ); + + # Ex-Gleise rechts + track(:station :removed, + nr[:arn - 790m, :arn - 100m] >> 1.5dt + ); + track(:station :removed, + nr[:arn - 560m, :arn - 400m] >> 3.5dt + ); + track(:station :removed, + nr[:arn - 560m, :arn - 450m] >> 4.5dt + -- nr[:arn - 350m, :arn - 100m] >> 2.5dt + ); + track(:station :removed, + nr[:arn - 300m] >> 2.5dt + -- nr[:arn - 200m] >> 0.5dt + ); + + # Bahnsteig 1 + platform(:excat:ac15 :pax, + nr[:arn - 160m, :arn + 40m] >> 0.5dt + -- nr[:arn + 40m, :arn - 70m] << 1.2dt + -- nr[:arn - 70m, :arn - 165m] << 1.1dt + ); + platform(:removed, + nr[:arn + 40m, :arn + 90m] >> 0.5dt + -- nr[:arn + 90m, :arn + 40m] << 1.2dt + ); + + # Bahnsteig 2/6 + platform(:excat:ac15 :pax, + nr[:arn - 130m, :arn + 90m] << 0.5dt + -- nr[:arn + 90m, :arn - 130m] >> 1.5dt + ); + + # Bw + track(:station, + nr[:arn - 890m, :arn - 580m] << 2.5dt + ); + track(:station, + nr[:arn - 890m, :arn - 680m] << 1.5dt + -- nr[:arn - 630m, :arn - 629m] << 2.5dt + ); + + marker(:left :de.bw, nr[:arn - 890m - 0.3sw] << 1.5dt); + slabel(:left, nr[:arn - 890m - 0.65sw] >> 3.5dt, + "Bw Arnstadt/hist" + ); + + # Anschluss Stadtverwaltung + track(:station, + nr[:arn - 630m, :arn - 631m] >> 3.5dt + .. ar[:a + 4dt, :a + 670m] + -- ar[:a + 710m, :xa - 50m] << 1dt + -- ar[:xa, :f] + ); + track(:station, + ar[:a + 499m, :a + 500m] + -- ar[:a + 550m, :a + 670m + 0.7dl] >> 1dt + -- ar[:a + 710m + 0.7dl, :xa] + ); + track(:station, + ar[:a + 859m, :a + 860m] << 1dt + -- ar[:a + 910m, :a + 1070m] << 2dt + ); + track(:station, + ar[:f - 951m, :f - 950m] + -- ar[:f - 800m, :f - 400m] << 3dt + -- ar[:f - 250m, :f - 249m] + ); + track(:station, + ar[:f - 850m, :f - 550m] << 2dt + ); + + marker(:right :de.bf :pax, nr[:arn] >> 1.2dt); + station(:left :pax, nr[:arn + 0.2sw] >> 1.2dt >> 1.8sw, + span(:bold, "Arnstadt Hbf"), + hbox(:center:top, + vbox(:right:top, "6298: ", "6299: ", "6377: "), + vbox(:right:top, "9,", "0,", "0,"), + vbox(:left:top, "96", "00", "00") + ) + ); + } + + + with link = "line.de.6298" { + track(:first :double :pax, nr[:arn.fp, :ars - 1sw]); + } + + + with link = "point.de.Arnstadt-Süd" { + track(:first:station :double :pax, nr[:ars - 1sw, :ars + 250m]); + + platform(:pax, + nr[:ars, :ars + 130m] >> 0.5dt + -- nr[:ars + 130m, :ars] >> 0.5dt + ); + platform(:removed, + nr[:ars + 130m, :ars + 200m] >> 0.5dt + -- nr[:ars + 200m, :ars + 130m] >> 0.5dt + ); + + marker(:right :de.hp :pax, nr[:ars] >> 0.5dt); + station(:left :pax, nr[:ars + 0.55sw] >> 0.5dt >> 1.2sw, + "Arnstadt Süd", "11,31" + ); + } + + + with link = "line.de.6298" { + track(:first :double :pax, nr[:ars + 250m, :pla.a]); + line_badge(:pax, nr[:ars + 2.0km], "6298"); + } + + + with link = "point.de.Arnstadt-Goerdelerdamm" { + marker(:left :de.bk :removed, nr[:goe] << 0.5dt); + station(:left :removed, nr[:goe + 0.5sw] >> 2.0dt, + "Goerdelerdamm", "12,18" + ); + } + + + with link = "point.de.Lohmühle" { + marker(:right :de.bk :removed, nr[:loh] >> 0.5dt); + station(:left :removed, nr[:loh + 0.4sw] >> 0.5dt >> 1.0sw, + vbox(:center:bottom, + span(:gone, "Siegelbach"), + "Lohmühle" + ), + "14,98" + ); + } + + + with link = "point.de.Plaue-Thür" { + let pr = path("d4.de.6694"); + + # Gl. 1 + track(:first:station :pax, nr[:pla.a, :pla.fg] >> 0.5dt); + # W1 - W2 + track(:station :pax, + nr[:pla.pn - 220m + 0.7dl] >> 0.5dt + -- nr[:pla.pn - 130m + 0.7dl] << 0.5dt + ); + + # Gl. 2 + track(:first:station :pax, + nr[:pla.a, :pla.yi] << 0.5dt + -- nr[:pla.yi + 100m, :pla.yi + 101m] >> 0.5dt + ); + track(:first:station :removed, + nr[:pla.yi, :pla.fg] << 0.5dt + ); + # W6 - W7 + track(:station, + nr[:pla.yi - 50m] << 0.5dt + -- pr[:pla.yi + 40m] << 1.5dt + ); + + # Gl. 3 + track(:second:station :pax, + nr[:pla.pn - 221m, :pla.pn - 220m] << 0.5dt + -- pr[:pla.pn - 130m, :pla.fi] << 1.5dt + ); + # W4 - W5 + track(:station, + nr[:pla.yi - 160m] << 1.5dt + -- nr[:pla.yi - 70m] << 0.5dt + ); + + # Gl. 4 + track(:station :removed, + nr[:pla.pn - 80m, :pla + 80m] << 2.5dt + ); + + # Gl. 5 + track(:station :removed, + nr[:pla.pn - 131m, :pla.pn - 130m] << 1.5dt + -- nr[:pla.pn - 30m, :pla + 30m] << 3.5dt + -- nr[:pla + 130m, :pla + 131m] << 1.5dt + ); + + # Ladegl. rechts + track(:station :removed, + nr[:pla - 321m, :pla - 320m] >> 0.5dt + -- nr[:pla - 220m, :pla - 0.5sw] >> 2.5dt + ); + + # Bahnsteig 1 + platform(:removed, + nr[:pla - 220m, :pla - 110m] >> 0.5dt + -- nr[:pla - 110m, :pla - 220m] << 1.2dt + ); + platform(:pax, + nr[:pla - 110m, :pla + 50m] >> 0.5dt + -- nr[:pla + 50m, :pla - 110m] << 1.2dt + ); + + # Bahnsteig 2/3 + platform(:removed, + nr[:pla - 220m, :pla - 140m] << 0.5dt + -- nr[:pla - 140m, :pla - 220m] >> 1.5dt + ); + platform(:pax, + nr[:pla - 140m, :pla + 20m] << 0.5dt + -- nr[:pla + 20m, :pla - 140m] >> 1.5dt + ); + + marker(:right :de.bf :pax, nr[:pla] >> 1.2dt); + station(:left :pax, nr[:pla + 0.4sw] >> 1.2dt >> 1.2sw, + hbox(:center:base, span(:bold, "Plaue "), "(Thür)"), + hbox(:center:base, + vbox(:right:top, "6298: ", "6694: "), + vbox(:right:top, "18,", "0,"), + vbox(:left:top, "17", "00") + ) + ); + } + + + with link = "line.de.6298" { + track(:first :pax, nr[:pla.fg, :gra.a] >> 0.5dt); + track(:first :removed, nr[:pla.fg, :gra.a] << 0.5dt); + line_badge(:pax, nr[:pla.fg + 1.3km], "6298"); + } + + + with link = "point.de.Gräfenroda" { + # Gl. 1 + track(:second:station, + nr[:gra, :gra.f - 250m] >> 2.0dt + .. nr[:gra.f - 1m, :gra.f] >> 1.5dt + ); + + # Gl. 2 + track(:station, + nr[:gra - 416m, :gra - 415m] >> 0.5dt + -- nr[:gra - 320m, :gra - 105m] >> 1.5dt + -- nr[:gra - 10m, :gra - 9m] >> 0.5dt + ); + + # Gl. 3 + track(:first:station :pax, nr[:gra.a, :gra.f] >> 0.5dt); + # W4 - W5 + track(:station, + nr[:gra + 170m] >> 0.5dt + -- nr[:gra + 265m] >> 2.0dt + ); + + # Gl. 4 + track(:first:station :removed, nr[:gra.a, :gra - 280m] << 0.5dt); + track(:station, + nr[:gra - 366m, :gra - 365m] >> 0.5dt + -- nr[:gra - 280m, :gra.f - 400m] << 0.5dt + -- nr[:gra.f - 310m, :gra.f - 309m] >> 0.5dt + ); + track(:first:station :removed, nr[:gra.f - 400m, :gra.f] << 0.5dt); + + # Bahnsteig 1 + platform(:open, + nr[:gra, :gra + 60m] >> 2.0dt + -- nr[:gra + 60m, :gra] << 1.3dt + ); + + # Bahnsteig 2 + platform(:open, + nr[:gra - 275m, :gra - 140m] >> 1.5dt + -- nr[:gra - 140m, :gra - 275m] << 2.2dt + ); + + # Bahnsteig 3 + platform(:pax, + nr[:gra + 10m, :gra + 165m] >> 0.5dt + -- nr[:gra + 165m, :gra + 10m] << 1.1dt + ); + + marker(:right :de.bf :pax, nr[:gra] >> 2dt); + station(:top :pax, nr[:gra + 0.2sw] >> 2.0dt >> 1.4sw, + span(:bold, "Gräfenroda"), + hbox(:center:top, + vbox(:right:top, span(:closed, "6697: "), "6298: "), + vbox(:right:top, span(:closed, "35,"), "24,"), + vbox(:left:top, span(:closed, "70"), "17") + ) + ); + } + + + with link = "line.de.6298" { + track(:first :pax, nr[:gra.f, :dor - 200m] >> 0.5dt); + track(:first :removed, nr[:gra.f, :dor - 200m] << 0.5dt); + line_badge(:pax, nr[:dor - 1.6km], "6298"); + } + + + with link = "point.de.Dörrberg" { + track(:first:station :pax, nr[:dor - 200m, :dor + 1sw] >> 0.5dt); + track(:first:station :removed, nr[:dor - 200m, :dor + 1sw] << 0.5dt); + + platform(:pax, + nr[:dor - 150m, :dor - 10m] >> 0.5dt + -- nr[:dor - 10m, :dor - 150m] << 1.2dt + ); + + marker(:right :de.hp :pax, nr[:dor] >> 0.5dt); + marker(:right :de.bk :removed, nr[:dor] >> 0.5dt); + station(:left :pax, nr[:dor + 0.6sw] >> 0.5dt >> 1.3sw, + "Dörrberg", "27,97" + ); + } + + + with link = "line.de.6298" { + track(:first :pax, nr[:dor + 1sw, :tzw.a] >> 0.5dt); + track(:first :removed, nr[:dor + 1sw, :tzw.a] << 0.5dt); + } + + + with link = "struct.de.Tunnel-am-Zwang" { + marker(:top :tunnel.r :pax, nr[:tzw.a] >> 0.5dt); + marker(:right :tunnel.dt :pax, nr[:tzw.a] << 0.5dt); + marker(:top :tunnel.l :pax, nr[:tzw.a] << 0.5dt); + + marker(:bottom :tunnel.l :pax, nr[:tzw.f] >> 0.5dt); + marker(:right :tunnel.dt :pax, nr[:tzw.f] << 0.5dt); + marker(:bottom :tunnel.r :pax, nr[:tzw.f] << 0.5dt); + + slabel(:right :italic :pax, nr[:tzw.a - 2dt] << 2.5dt, + hbox(:left:top, vbox(:center:top, + "Tunnel am Zwang", "104 m" + )) + ); + } + + + with link = "line.de.6298" { + track(:first :pax, nr[:tzw.f, :geh.a] >> 0.5dt); + track(:first :removed, nr[:tzw.f, :geh.a] << 0.5dt); + } + + + with link = "point.de.Kehltal" { + marker(:right :de.bk :removed, nr[:keh] >> 0.5dt); + station(:left :removed, nr[:keh + 0.5sw] >> 0.5dt >> 1.2sw, + "Kehltal", "32,30" + ); + } + + + with link = "point.de.Gehlberg" { + # Gl. 1 + track(:first:station :removed, + nr[:geh.a, :geh.a + 200m] << 0.5dt + ); + track(:first:station :pax, + nr[:geh.a, :geh.a + 0.1dl] >> 0.5dt + .. nr[:geh.a + 200m, :geh.f] << 0.5dt + ); + track(:station, + nr[:geh + 180m] << 0.5dt + -- nr[:geh + 270m] >> 0.5dt + ); + + # Gl. 2 + track(:first:station :removed, + nr[:geh.a, :geh.a + 280m] >> 0.5dt + ); + track(:first:station :pax, + nr[:geh.a + 199m, :geh.a + 200m] << 0.5dt + .. nr[:geh.a + 280m, :geh.f] >> 0.5dt + ); + + # Bahnsteig 1 + platform(:pax, + nr[:geh - 60m, :geh + 100m] << 0.5dt + -- nr[:geh + 100m, :geh - 60m] >> 1.2dt + ); + + # Bahnsteig 2 + platform(:pax, + nr[:geh - 60m, :geh + 100m] >> 0.5dt + -- nr[:geh + 100m, :geh - 60m] << 1.2dt + ); + + marker(:left :de.bf :pax, nr[:geh] << 0.5dt); + station(:bottom :pax, nr[:geh] << 0.5dt << 1.2sw, + "Gehlberg", "35,59" + ); + } + + + with link = "line.de.6298" { + track(:first :double :pax, nr[:geh.f, :brt.a]); + } + + + with link = "struct.de.Brandleite-Tunnel" { + marker(:top :tunnel.r :pax, nr[:brt.a] >> 0.5dt); + marker(:right :tunnel.dt :pax, nr[:brt.a] << 0.5dt); + marker(:top :tunnel.l :pax, nr[:brt.a] << 0.5dt); + + track(:first:tunnel :double :pax, nr[:brt.a, :brt.f]); + + marker(:bottom :tunnel.l :pax, nr[:brt.f] >> 0.5dt); + marker(:right :tunnel.dt :pax, nr[:brt.f] << 0.5dt); + marker(:bottom :tunnel.r :pax, nr[:brt.f] << 0.5dt); + } + + +} + diff --git a/rules/de/u/d4/62/6299.map b/rules/de/u/d4/62/6299.map new file mode 100644 index 00000000..c51b7afb --- /dev/null +++ b/rules/de/u/d4/62/6299.map @@ -0,0 +1,20 @@ +# DE 6299. Arnstadt Hbf - Saalfeld (Saale) +# +let as = path("d4.de.6299"); + +with detail = [4, 5] { + # point.de.Arnstadt-Hbf: de.6299 + + + with link = "line.de.6299" { + badge(:pax, as[:arn.fr], + hbox(:left:middle, + " ", + span(:badgesize, "6299 "), + "→ Saalfeld ", + span(:light, "(Saale)") + ) + ); + } +} + diff --git a/rules/de/u/d4/63/6340.map b/rules/de/u/d4/63/6340.map new file mode 100644 index 00000000..a217e4e4 --- /dev/null +++ b/rules/de/u/d4/63/6340.map @@ -0,0 +1,191 @@ +# DE 6340. Halle (Saale) Hbf - Baunatal-Guntershausen +# +let hg = path("d4.de.u.6340"); + +with detail = [4, 5] { + + badge(:cat:ac15 :pax, hg[:ndi.a] >> 0.5dt, + hbox(:left:middle, + " ", + vbox(:center:middle :badgesize, " 6291 ", "6340 "), + "→ Erfurt" + ) + ); + + + with link = "point.de.Neudietendorf" { + let nr = path("d4.de.6298"); + + # Gl. 1 + with layer = 2 track(:first:station :cat:ac15 :pax, + hg[:ndi.a, :ndi.ys - 250m] >> 0.5dt + ); + with layer = 1 casing(:first:station :cat:ac15 :pax, + hg[:ndi.yr, :ndi.ys - 250m] >> 0.5dt + ); + # W5 - W6 + track(:station :cat:ac15, + hg[:ndi - 380m] >> 0.5dt + -- hg[:ndi - 280m] >> 1.5dt + ); + # W9 - W10 + track(:station :cat:ac15, + hg[:ndi - 150m] >> 0.5dt + -- hg[:ndi - 50m] << 0.5dt + ); + # W21 - W22 + track(:station :cat:ac15, + hg[:ndi + 480m] >> 0.5dt + -- hg[:ndi + 590m] >> 1.5dt + ); + + # Gl. 2 + with layer = 2 track(:first:station :cat:ac15 :pax, + hg[:ndi.a, :ndi.ys - 250m] << 0.5dt + ); + with layer = 1 casing(:first:station :cat:ac15 :pax, + hg[:ndi.yr, :ndi.ys - 250m] << 0.5dt + ); + # W3 - W4 + track(:station :cat:ac15, + hg[:ndi - 500m] << 0.5dt + -- hg[:ndi - 400m] >> 0.5dt + ); + + # Gl. 3 + track(:first:station :cat:ac15 :pax, + hg[:ndi.a, :ndi.yr - 120m] >> 1.5dt + ); + track(:first:station :pax, + hg[:ndi.yr - 120m, :ndi.yr + 20m] >> 1.5dt + .. nr[:ndi.yw, :ndi.yw + 0.1dl] >> 0.5dt + ); + # W1 - W2 + track(:station :cat:ac15, + hg[:ndi - 580m] >> 1.5dt + -- hg[:ndi - 480m] >> 0.5dt + ); + # W24 - W25 + track(:station :cat:ac15, + hg[:ndi + 610m] >> 1.5dt + -- hg[:ndi + 700m] >> 2.5dt + ); + # W26 - W27 + track(:station :cat:ac15, + hg[:ndi.yr - 120m] >> 1.5dt + -- hg[:ndi.yr] >> 0.5dt + ); + + # Gl. 4 + track(:first:station, + hg[:ndi + 220m, :ndi.yr + 100m] << 1.5dt + ); + with layer = 2 track(:first:station :pax, + hg[:ndi.yr - 0.1dl, :ndi.yr] << 0.5dt + -- hg[:ndi.yr + 100m, :ndi.yr + 101m] << 1.5dt + .. nr[:ndi.yw, :ndi.yw + 0.1dl] << 0.5dt + ); + + # Gl. 5 + track(:station :cat:ac15, + hg[:ndi - 150m, :ndi.yr] >> 2.5dt + ); + # W28 - W29 + track(:station, + hg[:ndi.yr - 80m] >> 2.5dt + -- hg[:ndi.yr + 20m] >> 1.5dt + ); + + # Gl. 7 + track(:station :cat:ac15, + hg[:ndi - 221m, :ndi - 220m] >> 1.5dt + -- hg[:ndi - 80m, :ndi + 460m] >> 3.5dt + -- hg[:ndi + 540m, :ndi + 541m] >> 2.5dt + ); + + # Bahnsteig Gl. 1/3 + platform(:cat:ac15 :pax, + hg[:ndi - 20m, :ndi + 190m] >> 0.5dt + -- hg[:ndi + 190m, :ndi - 20m] << 1.5dt + ); + + # Bahnsteig Gl. 2 + platform(:cat:ac15 :pax, + hg[:ndi - 20m, :ndi + 190m] << 0.5dt + -- hg[:ndi + 190m, :ndi - 20m] >> 1.2dt + ); + + # Bahnsteig Gl. 4 + platform(:open, + hg[:ndi + 220m, :ndi + 490m] << 1.5dt + -- hg[:ndi + 490m, :ndi + 220m] >> 2.2dt + ); + + marker(:left :de.bf :cat:ac15 :pax, hg[:ndi] << 0.5dt); + station(:top :cat:ac15 :pax, hg[:ndi] >> 5.5dt + (-6dt, 0dt), + hbox(:left:top :bold, "Neudietendorf"), + hbox(:center:top, + vbox(:right:top, "6291: ", "6340: ", "6298: "), + vbox(:right:top, "120,", "120,", "−0,"), + vbox(:left:top, "96", "96", "14"), + vbox(:right:top :removed, " ← ", " ← ", " ← "), + vbox(:right:top :removed, "120,", "120,", "−0,"), + vbox(:left:top :removed, "89", "89", "21") + ) + ); + } + + + with link = "point.de.Neudietendorf-Dn" { + # Gl. 1 + with layer = 2 track(:first:station :cat:ac15 :pax, + hg[:ndi.ys - 250m, :ndi.fg] >> 0.5dt + ); + # W43 - W44 + track(:station :cat:ac15, + hg[:ndi.ys + 120m] >> 0.5dt + -- hg[:ndi.ys + 200m] << 0.5dt + ); + + # Gl. 2 + with layer = 2 track(:first:station :cat:ac15 :pax, + hg[:ndi.ys - 250m, :ndi.fg] << 0.5dt + ); + # W45 - W46 + track(:station :cat:ac15, + hg[:ndi.ys + 220m] << 0.5dt + -- hg[:ndi.ys + 300m] >> 0.5dt + ); + + # Gl. 5 + track(:station :cat:ac15, + hg[:ndi.yr - 0.1dl, :ndi.yr] >> 2.5dt + .. hg[:ndi.ys - 21m, :ndi.ys - 20m] >> 1.5dt + -- hg[:ndi.ys + 50m, :ndi.ys + 51m] >> 0.5dt + ); + # Schutzgleis W41 + track(:station, + hg[:ndi.ys - 20m, :ndi.ys + 70m] >> 1.5dt + ); + + # Str. 6730 + track(:station :removed, + hg[:ndi.ys, :ndi.ys + 50m] << 1.5dt + -- hg[:ndi.ys + 120m, :ndi.ys + 121m] << 0.5dt + ); + + marker(:right :de.bft :removed, hg[:ndi.ys + 70m + 0.5sw] >> 0.5dt); + station(:top :removed, hg[:ndi.ys + 70m + 0.5sw] >> 0.5dt >> 1.2sw, + "N. Dn", + hbox(:center:top, + vbox(:right:top, "6340: ", "6730: "), + vbox(:right:top, "??", "??") + ) + ); + } + + badge(:cat:ac15 :pax, hg[:ndi.fg], + hbox(:right:middle, "Gotha ← ", span(:badgesize, "6340 ")) + ); +} + diff --git a/rules/de/u/d4/67/6730.map b/rules/de/u/d4/67/6730.map new file mode 100644 index 00000000..3473de56 --- /dev/null +++ b/rules/de/u/d4/67/6730.map @@ -0,0 +1,27 @@ +# DE 6730. Neudietendorf Ds - Neudietendorf Dn +# +let nn = path("d4.de.6730"); + +with detail = [4, 5] { + # point.de.Neudietendorf-Dn: de.6340 + + + with link = "line.de.6730" { + track(:station :removed, + nn[:ndi.yw - 0.1dl, :ndi.yw] << 1.5dt + .. nn[:ndi.ys, :ndi.ys + 0.1dl] << 1.5dt + ); + + guide(:linenum :removed, + nn[:ndi.yw + 200m] << 2.2dt + -- nn[:ndi.yw + 200m] << 5dt + ); + label(:linenum :removed, nn[:ndi.yw + 200m] << 5dt + (-0.5dt, 0dt), + hbox(:center:top, "6730") + ); + } + + + # point.de.Neudietendorf-Ds: de.6298 +} + diff --git a/rules/de/u/d4/67/6733.map b/rules/de/u/d4/67/6733.map new file mode 100644 index 00000000..6cc4dedf --- /dev/null +++ b/rules/de/u/d4/67/6733.map @@ -0,0 +1,19 @@ +# DE 6733. Arnstadt Ost - Ichtershausen +# +let ai = path("d4.de.6733"); + +with detail = [4, 5] { + # point.de.Arnstadt-Hbf: de.6299 + + + with link = "line.de.6377" { + badge(:open, ai[:arn.xi], + hbox(:left:middle, + " ", + span(:badgesize, "6377 "), + "→ Ichtershausen" + ) + ); + } +} + From e18ece5e263a34d6364f7f22752a49ea799930c8 Mon Sep 17 00:00:00 2001 From: Martin Hoffmann Date: Fri, 12 Dec 2025 08:40:21 +0100 Subject: [PATCH 2/2] Renovate northern part of line DE 6298. --- paths/de/u/d4.osm | 1998 ++++++++++++++++++++----------------- rules/de/u/d3/62/6298.map | 289 ++++++ rules/de/u/d3/62/6299.map | 21 + rules/de/u/d3/63/6340.map | 67 ++ rules/de/u/d3/66/6694.map | 19 + rules/de/u/d3/67/6730.map | 19 + rules/de/u/d3/67/6733.map | 19 + rules/de/u/d4/62/6298.map | 751 ++++++++------ rules/de/u/d4/62/6299.map | 2 +- rules/de/u/d4/63/6340.map | 192 ++-- rules/de/u/d4/66/6694.map | 20 + rules/de/u/d4/67/6730.map | 21 +- rules/de/u/d4/67/6733.map | 2 +- 13 files changed, 2075 insertions(+), 1345 deletions(-) create mode 100644 rules/de/u/d3/62/6298.map create mode 100644 rules/de/u/d3/62/6299.map create mode 100644 rules/de/u/d3/63/6340.map create mode 100644 rules/de/u/d3/66/6694.map create mode 100644 rules/de/u/d3/67/6730.map create mode 100644 rules/de/u/d3/67/6733.map create mode 100644 rules/de/u/d4/66/6694.map diff --git a/paths/de/u/d4.osm b/paths/de/u/d4.osm index da163aa5..5b1357c5 100644 --- a/paths/de/u/d4.osm +++ b/paths/de/u/d4.osm @@ -1,1321 +1,1525 @@ - - - - - - - - - + + + + + + + + + - + - + - + - + - - + + - - - + + + - - - + + + - + - + - + - - - + + + - - - - - - - + + + + + + + - + - - + + - - - - - - - - - + + + + + + + + + + + + + + + - + - + - - - + + + + + - - + - + - - - + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - - + + - - - + + + - - - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - + - - - + + + - - - - + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/rules/de/u/d3/62/6298.map b/rules/de/u/d3/62/6298.map new file mode 100644 index 00000000..4213e973 --- /dev/null +++ b/rules/de/u/d3/62/6298.map @@ -0,0 +1,289 @@ +# DE 6298. Neudietendorf - Ritschenhausen +# +let nr = path("d3.de.6298"); + +with detail = 3, + railway = :first :double :excat:ac15 :pax +{ + # point.de.Neudietendorf: de.6340 + + with link = "point.de.Neudietendorf-Ds", railway = :station { + # DE 6298 + track(nr[:ndi.yw + 1dl, :ndi.yw + 3dl]); + + # DE 6730 + track(:single :side :removed, + nr[:ndi.yw + 1dl, :ndi.yw + 1.1dl] >> 0.5md >> 1ms >> 0.5lt + -- nr[:ndi.yw + 2dl, :ndi.yw + 2.1dl] >> 0.5md << 0.5lt + ); + + marker(:left :de.bft :removed, nr[:ndi.yw + 2dl] << 0.5md); + slabel(:right :xsmall :removed, + nr[:ndi.yw + 2dl] << 0.5md << 1sh + (1.3dt, 0.8dt), + "N. Ds" + ); + } + + with link = "line.de.6298" { + track(nr[:ndi.yw + 3dl, :sul - 0.49sw]); + } + + with link = "point.de.Sülzenbrücken", railway = :station { + track(nr[:sul - 0.5sw, :sul + 0.5sw]); + marker(:right :de.hp, nr[:sul] >> 0.5md); + slabel(:right, nr[:sul] << 0.5md + (1.3dt, 0.9dt), "Sülzenbrücken"); + } + + with link = "line.de.6298" { + track(nr[:sul + 0.49sw, :sul + 1.2km]); + line_label(:right:e, nr[:sul + 1.2km] >> 0.5md, "6298"); + track(nr[:sul + 1.2km, :haa - 0.49sw]); + } + + with link = "point.de.Sülzenbrücken", railway = :station { + track(nr[:haa - 0.5sw, :haa + 0.5sw]); + marker(:right :de.hp, nr[:haa] >> 0.5md); + marker(:right :de.exbf, nr[:haa] >> 0.5md); + slabel(:right, nr[:haa] << 0.5md + (1.3dt, 0.7dt), "Haarhausen"); + } + + with link = "line.de.6298" { + track(nr[:haa + 0.49sw, :arn - 640m]); + } + + with link = "point.de.Arnstadt-Hbf", railway = :station { + let as = path("d3.de.6299"); + + # DE 6733 + track(:single :second :nocat :nopax :removed, + nr[:arn.ys - 0.1dl, :arn.ys] << 0.5md << 1ms << 0.5mt + .. path("d3.de.6733")[:arn.zi - 0.1dl, :arn.zi] + ); + + # DE 6299 + track(:single :nocat, + nr[:arn - 640m, :arn - 639m] << 0.5md >> 0.5mt + -- nr[:arn - 640m + 1dl, :arn.zs] << 0.5md << 1ms << 0.5mt + .. as[:arn.zs + 1md, :arn.zs + 1.1md] + ); + + # DE 6298 + track(nr[:arn - 640m, :arn.ys + 1seg]); + + marker(:right :de.bf, nr[:arn] >> 0.5md); + slabel(:left :bold, nr[:arn] >> 0.5md >> 1sh + (-1.8dt, 1.3dt), + "Arnstadt Hbf" + ); + } +} + +with detail = 3, + railway = :first :double :pax +{ + with link = "line.de.6298" { + track(nr[:arn.ys + 0.99seg, :ars - 0.49sw]); + } + + with link = "point.de.Arnstadt-Süd", railway = :station { + track(nr[:ars - 0.5sw, :ars + 0.5sw]); + marker(:right :de.hp, nr[:ars] >> 0.5md); + slabel(:left, nr[:ars] >> 0.5md >> 1sh + (-1.3dt, 1dt), + "Arnstadt Süd" + ); + } + + with link = "line.de.6298" { + track(nr[:ars + 0.49sw, :goe]); + } + + with link = "point.de.Arnstadt-Goerdelerdamm", railway = :station { + marker(:left :de.bk :removed, nr[:goe] << 0.5md); + slabel(:right :xsmall :removed, + nr[:goe] << 0.5md << 1sh + (1.2dt, 1dt), + "Goerdelerdamm" + ); + } + + with link = "line.de.6298" { + track(nr[:goe, :goe + 1.4km]); + line_label(:right:e, nr[:goe + 1.4km] >> 0.5md, (0dt, -0.4dt), "6298"); + track(nr[:goe + 1.4km, :loh]); + } + + with link = "point.de.Lohmühle", railway = :station { + marker(:right :de.bk :removed, nr[:loh] >> 0.5md); + slabel(:left :small :removed, + nr[:loh] >> 0.5md >> 1sh + (-0.8dt, 0.6dt), + "Siegelbach*" + ); + } + + with link = "line.de.6298" { + track(nr[:loh, :pla.pn - 220m]); + } + + with link = "point.de.Plaue-Thür", railway = :station { + let pr = path("d3.de.6694"); + + # DE 6298 + track(nr[:pla.pn - 220m, :pla.yi]); + track(:single, nr[:pla.yi, :pla.yi + 1seg] >> 0.5md << 0.5mt); + track(:single :removed, nr[:pla.yi, :pla.yi + 1seg] << 0.5md >> 0.5mt); + + # DE 6694 + track(:single :second, + nr[:pla.pn - 220m, :pla.pn - 219m] << 0.5md >> 0.5mt + -- pr[:pla.pn - 220m + 1dl, :pla.yi + 1seg] + << 0.5md << 1ms << 0.5mt + ); + + marker(:right :de.bf, nr[:pla] >> 0.5md); + slabel(:right, nr[:pla] << 0.5md << 1ms << 1mt + (1.4dt, 1dt), + hbox(:left:base, span(:bold, "Plaue"), " (Thür)") + ); + } +} + +with detail = 3, + railway = :first :pax +{ + with link = "line.de.6298" { + track(:up:ldn, + nr[:pla.yi + 1seg, :pla.yi + 3.1km] >> 0.5md << 0.5mt + ); + track(:dn:rup :removed, + nr[:pla.yi + 1seg, :pla.yi + 3.1km] << 0.5md >> 0.5mt + ); + line_label(:right:s, nr[:pla.yi + 3.1km] >> 0.5md, + (-0.2dt, 0dt), "6298" + ); + track(:up:ldn, + nr[:pla.yi + 3.1km, :gra - 360m] >> 0.5md << 0.5mt + ); + track(:dn:rup :removed, + nr[:pla.yi + 3.1km, :gra - 360m] << 0.5md >> 0.5mt + ); + } + + with link = "point.de.Gräfenroda", railway = :station { + # DE 8298 + track(:double, nr[:gra - 360m, :gra + 550m]); + + # DE 6697 + track(:second, nr[:gra, :gra + 550m] >> 0.5md >> 1ms >> 0.5mt); + + marker(:right :de.bf, nr[:gra] >> 0.5md >> 1ms >> 1mt); + slabel(:left :bold, + nr[:gra] >> 0.5md >> 1ms >> 1mt >> 1sh + (-1.3dt, 0dt), + "Gräfenroda" + ); + } + + with link = "line.de.6298" { + track(:up:ldn:ror, + nr[:gra + 550m, :gra.yg] >> 0.5md << 0.5mt + ); + track(:dn:rup :removed, + nr[:gra + 550m, :gra.yg] << 0.5md >> 0.5mt + ); + + track(:up:ldn:ror, + nr[:gra.yg, :gra.yg + 0.5seg] >> 0.5md << 0.5mt + ); + track(:dn:rup :removed, + nr[:gra.yg, :gra.yg + 0.5seg] << 0.5md >> 0.5mt + ); + + track(:up:ldn, + nr[:gra.yg + 0.5seg, :gra.yg + 1km] >> 0.5md << 0.5mt + ); + track(:dn:rup :removed, + nr[:gra.yg + 0.5seg, :gra.yg + 1km] << 0.5md >> 0.5mt + ); + line_label(:left:w, nr[:gra.yg + 1km] << 0.5md, (0dt, 0.3dt), "6298"); + track(:up:ldn, + nr[:gra.yg + 1km, :dor - 0.5sw] >> 0.5md << 0.5mt + ); + track(:dn:rup :removed, + nr[:gra.yg + 1km, :dor - 0.5sw] << 0.5md >> 0.5mt + ); + } + + with link = "point.de.Dörrberg", railway = :station { + track(nr[:dor - 0.51sw, :dor + 0.51sw] >> 0.5md << 0.5mt); + track(:removed, nr[:dor - 0.51sw, :dor + 0.51sw] << 0.5md >> 0.5mt); + marker(:right :de.hp, nr[:dor] >> 0.5md); + slabel(:left, nr[:dor] >> 0.5md >> 1sh + (-1.3dt, 1dt), + "Dörrberg" + ); + } + + with link = "line.de.6298" { + track(:up:ldn, nr[:dor + 0.5sw, :tzw.a] >> 0.5md << 0.5mt); + track(:dn:rup :removed, nr[:dor + 0.5sw, :tzw.a] << 0.5md >> 0.5mt); + } + + with link = "struct.de.Tunnel-am-Zwang" { + marker(:right :tuna, nr[:tzw.a] >> 0.5md << 0.5mt); + marker(:left :tuna, nr[:tzw.a] << 0.5md >> 0.5mt); + + marker(:right :tunf, nr[:tzw.f] >> 0.5md << 0.5mt); + marker(:left :tunf, nr[:tzw.f] << 0.5md >> 0.5mt); + + slabel(:left :xsmall :italic, + nr[:tzw.a + 50m] >> 0.5md + (-2.3dt, -0.3dt), + "Tunnel am Zwang" + ); + + } + + with link = "line.de.6298" { + track(:up:ldn, nr[:tzw.f, :keh] >> 0.5md << 0.5mt); + track(:dn:rup :removed, nr[:tzw.f, :keh] << 0.5md >> 0.5mt); + } + + with link = "point.de.Kehltal", railway = :station { + marker(:right :de.bk :removed, nr[:keh] >> 0.5md); + slabel(:left :xsmall :removed, nr[:keh] >> 0.5md >> 1sh + (-1dt, 0.8dt), + "Kehltal" + ); + } + + with link = "line.de.6298" { + track(:up:ldn, nr[:keh, :geh - 760m] >> 0.5md << 0.5mt); + track(:dn:rup :removed, nr[:keh, :geh - 760m] << 0.5md >> 0.5mt); + } + + with link = "point.de.Gehlberg", railway = :station { + track(:double, nr[:geh - 760m, :geh + 0.5sw]); + marker(:left :de.bf, nr[:geh] << 0.5md); + slabel(:bottom, nr[:geh] << 0.5md << 1sh + (0dt, 0.3dt), "Gehlberg"); + } + + with link = "line.de.6298" { + track(:double, nr[:geh + 0.5sw, :brt.a]); + } + + with link = "struct.de.Brandleite-Tunnel" { + marker(:right :tuna, nr[:brt.a] >> 0.5md << 0.5mt); + marker(:left :tuna, nr[:brt.a] << 0.5md >> 0.5mt); + + track(:double :tunnel, nr[:brt.a, :brt.f]); + + marker(:right :tunf, nr[:brt.f] >> 0.5md << 0.5mt); + marker(:left :tunf, nr[:brt.f] << 0.5md >> 0.5mt); + + slabel(:top :xsmall :italic, + nr[:brt.a + 1.5km] >> 0.5md + (-2dt, -1.5dt), + "Brandleite-Tunnel" + ); + } + + with link = "point.de.Oberhof-Thür", railway = :station { + track(:double, nr[:brt.f, :obe + 1.2sw]); + marker(:left :de.bf :nopax, nr[:obe + 0.7sw] << 0.5md); + slabel(:left :nopax, nr[:obe] >> 0.5md + (-1.8dt, 0.5dt), + hbox(:right:base, "Oberhof", span(:light, " (Thür)")) + ); + } +} diff --git a/rules/de/u/d3/62/6299.map b/rules/de/u/d3/62/6299.map new file mode 100644 index 00000000..320189f7 --- /dev/null +++ b/rules/de/u/d3/62/6299.map @@ -0,0 +1,21 @@ +# DE 6299. Arnstadt Hbf - Saalfeld (Saale) +# +let as = path("d3.de.6299"); + +with detail = 3 { + # point.de.Arnstadt-Hbf: de.6299 + + + with link = "line.de.6299" { + badge(:pax, as[:arn.zs + 1md] + (0.5dt, 0dt), + hbox(:left:middle :small, + " ", + span(:xsmall, "6299 "), + "→ Saalfeld ", + span(:light, "(Saale)") + ) + ); + } +} + + diff --git a/rules/de/u/d3/63/6340.map b/rules/de/u/d3/63/6340.map new file mode 100644 index 00000000..547f9052 --- /dev/null +++ b/rules/de/u/d3/63/6340.map @@ -0,0 +1,67 @@ +# DE 6340. Halle (Saale) Hbf - Baunatal-Guntershausen +# +let hg = path("d3.de.u.6340"); + +with detail = 3, + railway = :first :double :cat:ac15 :pax +{ + badge(:cat:ac15 :pax, hg[:ndi.a] >> 0.5mo, + hbox(:left:middle :small, + " ", + vbox(:center:middle :xsmall, " 6291 ", " 6340 "), + "→ Erfurt" + ) + ); + + with link = "point.de.Neudietendorf", railway = :station { + let nr = path("d3.de.6298"); + + # DE 6298 dn + with layer = -1 track(:single :nocat, + hg[:ndi.yr - 1.1dl, :ndi.yr - 1dl] << 0.5md >> 0.5mt + -- hg[:ndi.yr - 0.1dl, :ndi.yr] << 0.5md << 1ms << 0.5mt + ); + track(:single :nocat, + hg[:ndi.yr - 0.1dl, :ndi.yr] << 0.5md << 1ms << 0.5mt + .. nr[:ndi.yw + 1dl, :ndi.yw + 1.1dl] << 0.5md >> 0.5mt + ); + + # DE 6340 + track(hg[:ndi.a, :ndi.yr]); + track(:casing, hg[:ndi.yr, :ndi.ys]); + + # DE 6291 - DE 6298 up + track(:single, hg[:ndi.a, :ndi.yr] >> 0.5md >> 1ms >> 0.5mt); + with layer = -1 track(:single :nocat, + hg[:ndi.yr - 0.1dl, :ndi.yr] >> 0.5md >> 1ms >> 0.5mt + .. nr[:ndi.yw + 1dl, :ndi.yw + 1.1dl] >> 0.5md << 0.5mt + ); + + marker(:left :de.bf, hg[:ndi] << 0.5md); + slabel(:left :bold, hg[:ndi] >> 0.5md >> 1ms >> 1mt + (-1dt, 0dt), + "Neudietendorf" + ); + } + + with link = "point.de.Neudietendorf-Dn", railway = :station { + # DE 6340 + track(hg[:ndi.ys, :ndi.fg]); + + # DE 6730 + track(:single :side :nopax :removed, + hg[:ndi.ys - 0.1dl, :ndi.ys] << 0.5md << 1ms << 0.5lt + .. hg[:ndi.ys + 1dl, :ndi.ys + 1.1dl] << 0.5md >> 0.5lt + ); + + marker(:right :de.bft :removed, hg[:ndi.ys + 1dl] >> 0.5md); + slabel(:left :xsmall :removed, + hg[:ndi.ys + 1dl] >> 0.5md >> 1sh + (-1.5dt, 0.3dt), + "N. Dn" + ); + } + + badge(:cat:ac15 :pax, hg[:ndi.fg], + hbox(:right:middle :small, "Gotha ← ", span(:xsmall, "6340 ")) + ); +} + diff --git a/rules/de/u/d3/66/6694.map b/rules/de/u/d3/66/6694.map new file mode 100644 index 00000000..1ab680c0 --- /dev/null +++ b/rules/de/u/d3/66/6694.map @@ -0,0 +1,19 @@ +# DE 6694. Plaue (Thür) - Rennsteig +# +let pr = path("d3.de.6694"); + +with detail = 3, + railway = :second :pax +{ + # point.de.Plaue-Thür de.6298 + + with link = "line.de.6694" { + badge(pr[:pla.yi + 1seg] << 0.5md << 1ms << 0.5mt, + hbox(:right:middle :small, + "Rennsteig ← ", + span(:xsmall, "6694 ") + ) + ); + } +} + diff --git a/rules/de/u/d3/67/6730.map b/rules/de/u/d3/67/6730.map new file mode 100644 index 00000000..ad45dd3f --- /dev/null +++ b/rules/de/u/d3/67/6730.map @@ -0,0 +1,19 @@ +# DE 6730. Neudietendorf Ds - Neudietendorf Dn +# +let nn = path("d3.de.6730"); + +with detail = 3, + railway = :side :nopax :removed +{ + # point.de.Neudietendorf-Dn: de.6340 + + with link = "line.de.6730" { + track( + nn[:ndi.yw - 1.1dl, :ndi.yw - 1dl] << 0.5md << 1ms << 0.5lt + .. nn[:ndi.ys, :ndi.ys + 0.1dl] << 0.5md << 1ms << 0.5lt + ); + } + + # point.de.Neudietendorf-Ds: de.6298 +} + diff --git a/rules/de/u/d3/67/6733.map b/rules/de/u/d3/67/6733.map new file mode 100644 index 00000000..afb180d2 --- /dev/null +++ b/rules/de/u/d3/67/6733.map @@ -0,0 +1,19 @@ +# DE 6733. Arnstadt Ost - Ichtershausen +# +let ai = path("d3.de.6733"); + +with detail = 3 { + # point.de.Arnstadt-Hbf: de.6299 + + with link = "line.de.6377" { + badge(:removed, ai[:arn.zi] + (0.3dt, 0dt), + hbox(:left:middle :small, + " ", + span(:xsmall, "6377 "), + "→ Ichtershausen" + ) + ); + } +} + + diff --git a/rules/de/u/d4/62/6298.map b/rules/de/u/d4/62/6298.map index 6387a667..0bd38b42 100644 --- a/rules/de/u/d4/62/6298.map +++ b/rules/de/u/d4/62/6298.map @@ -1,62 +1,60 @@ # DE 6298. Neudietendorf - Ritschenhausen # -let nr = path("d4.de.6298"); +let nr = path("d3.de.6298"); -with detail = [4, 5] { +with detail = 4, + railway = :first :excat:ac15 :pax +{ # point.de.Neudietendorf: de.6340 - with link = "point.de.Neudietendorf-Ds" { + with link = "point.de.Neudietendorf-Ds", railway = :station { # Gl. 3 - track(:first:station :pax, - nr[:ndi.yw, :ndi.fa] >> 0.5dt - ); + track(nr[:ndi.yw, :ndi.fa] >> 0.5mo); # W61 - W62 - track(:station, - nr[:ndi.yw + 200m] >> 0.5dt - -- nr[:ndi.yw + 280m] << 0.5dt + track(:side :nopax, + nr[:ndi.yw + 200m] >> 0.5mo + -- nr[:ndi.yw + 280m] << 0.5mo ); # Anschl. - track(:station :removed, - nr[:ndi.yf + 70m] >> 0.5dt - -- nr[:ndi.yf + 150m] >> 2.0dt + track(:side :nopax :removed, + nr[:ndi.yf + 70m] >> 0.5mo + -- nr[:ndi.yf + 150m] >> 2.0mo ); # Gl. 4 - track(:first:station :pax, - nr[:ndi.yw, :ndi.fa] << 0.5dt - ); + track(nr[:ndi.yw, :ndi.fa] << 0.5mo); # W61 - W62 - track(:station, - nr[:ndi.yw + 320m] << 0.5dt - -- nr[:ndi.yw + 400m] >> 0.5dt + track(:side :nopax, + nr[:ndi.yw + 320m] << 0.5mo + -- nr[:ndi.yw + 400m] >> 0.5mo ); # Anschl. Lager - track(:station :closed, - nr[:ndi.yf + 70m, :ndi.yf + 600m] >> 2.0dt + track(:side :nopax :closed, + nr[:ndi.yf + 70m, :ndi.yf + 600m] >> 2.0mo ); - track(:station :closed, - nr[:ndi.yf + 149m, :ndi.yf + 150m] >> 2.0dt - -- nr[:ndi.yf + 220m, :ndi.yf + 400m] >> 3.0dt + track(:side :nopax :closed, + nr[:ndi.yf + 149m, :ndi.yf + 150m] >> 2.0mo + -- nr[:ndi.yf + 220m, :ndi.yf + 400m] >> 3.0mo ); - track(:station :closed, - nr[:ndi.yf + 200m, :ndi.yf + 300m] >> 5.0dt - -- nr[:ndi.yf + 450m, :ndi.yf + 451m] >> 2.0dt + track(:side :nopax :closed, + nr[:ndi.yf + 200m, :ndi.yf + 300m] >> 5.0mo + -- nr[:ndi.yf + 450m, :ndi.yf + 451m] >> 2.0mo ); # Str. 6730 - track(:station :removed, - nr[:ndi.yw] >> 1.5dt - -- nr[:ndi.yw + 60m] >> 0.5dt + track(:side :nopax :removed, + nr[:ndi.yw] >> 1.5mo + -- nr[:ndi.yw + 60m] >> 0.5mo ); - marker(:left :de.bft :removed, nr[:ndi.yw + 130m] << 0.5dt); + marker(:left :de.bft :removed, nr[:ndi.yw + 130m] << 0.5mo); with layer = -1 marker(:left :de.bft.casing :removed, - nr[:ndi.yw + 130m] << 0.5dt + nr[:ndi.yw + 130m] << 0.5mo ); station(:right:left_align :removed, - nr[:ndi.yw + 130m - 0.5sw] << 0.5dt << 2.1sw, - hbox(:left:top, "N. Ds"), + nr[:ndi.yw + 130m] + (0.3km, 0dt) + (2dt, 0dt), + "N. Ds", hbox(:left:top, vbox(:right:top, "6370: ", "6298: "), vbox(:right:top, "??", "??") @@ -65,567 +63,658 @@ with detail = [4, 5] { } with link = "line.de.6298" { - let nd = path("d4.de.6298.nd"); + let nd = path("d3.de.6298.nd"); - with layer = -2 track(:first:station :double :removed, - nd[:ndi.ya - 0.1dl, :ndi.ya] << 1dt + with layer = -1 track(:station :double :removed, + nd[:ndi.ya - 0.1dl, :ndi.ya] << 1mo .. nd[:ndi.yya, :ndi.yf] ); - - track(:first :double :excat:ac15 :pax, - nr[:ndi.fa, :sul - 210m] - ); } + with link = "line.de.6298" { + track(:double, nr[:ndi.fa, :sul - 160m]); + } - with link = "point.de.Sülzenbrücken" { - track(:first:station :double :pax, nr[:sul - 210m, :sul + 200m]); + with link = "point.de.Sülzenbrücken", railway = :station { + track(:double :pax, nr[:sul - 160m, :sul + 150m]); platform(:pax, - nr[:sul - 155m, :sul - 20m] >> 0.5dt - -- nr[:sul - 20m, :sul - 155m] << 1.2dt + nr[:sul - 155m, :sul - 20m] >> 0.5mo >> 0.5mt + -- nr[:sul - 20m, :sul - 155m] << 1.3mo ); platform(:pax, - nr[:sul + 10m, :sul + 145m] << 0.5dt - -- nr[:sul + 145m, :sul + 10m] >> 1.2dt + nr[:sul + 10m, :sul + 145m] << 0.5mo << 0.5mt + -- nr[:sul + 145m, :sul + 10m] >> 1.3mo ); - marker(:right :de.hp :pax, nr[:sul] >> 0.5dt); - station(:left :pax, nr[:sul + 0.4sw] >> 0.5dt >> 1.4sw, - "Sülzenbrücken", "3,38" + marker(:right :de.hp, nr[:sul] >> 1.3mo); + station(:left, nr[:sul] >> 1.3mo >> 1sh + (-1.3dt, 1.6dt), + "Sülzenbrücken", + hbox(:center:base, "6298: 3,384", span(:removed, " ← 3,40")) ); } - with link = "line.de.6298" { - track(:first :double :excat:ac15 :pax, - nr[:sul + 1.1km, :sul + 200m] - ); - line_badge(:pax, nr[:sul + 1.1km], "6298"); - track(:first :double :excat:ac15 :pax, - nr[:sul + 1.1km, :haa - 230m] - ); + track(:double, nr[:sul + 150m, :sul + 1.2km]); + line_label(:right:e, nr[:sul + 1.2km] >> 0.5mo >> 0.5mt, "6298"); + track(:double, nr[:sul + 1.2km, :haa - 180m]); } - with link = "point.de.Haarhausen" { - track(:first:station :double :pax, nr[:haa - 230m, :haa + 230m]); + track(:first:station :double :pax, nr[:haa - 180m, :haa + 180m]); - platform(:pax, - nr[:haa - 180m, :haa - 40m] >> 0.5dt - -- nr[:haa - 40m, :haa - 180m] << 1.2dt + platform( + nr[:haa - 180m, :haa - 40m] >> 0.5mo >> 0.5mt + -- nr[:haa - 40m, :haa - 180m] << 1.3mo ); + platform(:removed, - nr[:haa - 180m, :haa - 40m] << 0.5dt - -- nr[:haa - 40m, :haa - 180m] >> 1.2dt + nr[:haa - 180m, :haa - 40m] << 0.5mo << 0.5mt + -- nr[:haa - 40m, :haa - 180m] >> 1.3mo ); platform(:pax, - nr[:haa + 40m, :haa + 180m] << 0.5dt - -- nr[:haa + 180m, :haa + 40m] >> 1.2dt + nr[:haa + 40m, :haa + 180m] << 0.5mo << 0.5mt + -- nr[:haa + 180m, :haa + 40m] >> 1.3mo ); - marker(:right :de.hp :pax, nr[:haa] >> 0.5dt); - marker(:right :de.bf :removed, nr[:haa - 20m] >> 0.5dt); - station(:left :pax, nr[:haa + 0.3sw] >> 0.5dt >> 1.6sw, + marker(:right :de.hp :pax, nr[:haa] >> 1.3mo); + marker(:right :de.exbf :pax, nr[:haa] >> 1.3mo); + station(:left:right_align, + nr[:haa] >> 1.3mo >> 1.5sh + (-1.3dt, 1.6dt), "Haarhausen", - hbox(:center:base, span(:removed, "5,69 → "), "5,71") + hbox(:center:base, "6298: ", span(:removed, "5,69 → "), "5,712") ); } - with link = "line.de.6298" { track(:first :double :excat:ac15 :pax, nr[:haa + 230m, :arn.a]); } + with link = "point.de.Arnstadt-Hbf", railway = :station { + let ai = path("d3.de.6733"); + let as = path("d3.de.6299"); + let ar = path("d3.de.6298.ar"); - with link = "point.de.Arnstadt-Hbf" { - let ai = path("d4.de.6733"); - let as = path("d4.de.6299"); - let ar = path("d4.de.6298.ar"); - - # Gl. 1 - track(:first:station :excat:ac15 :pax, nr[:arn.a, :arn.fp] >> 0.5dt); + # Gl. 1 (DE 6298 up) + track(nr[:arn.a, :arn.fp] >> 0.5mo); # W1 - W2 - track(:station, - nr[:arn - 850m] >> 0.5dt - -- nr[:arn - 770m] << 0.5dt + track(:side :nopax, + nr[:arn - 850m] >> 0.5mo + -- nr[:arn - 770m] << 0.5mo ); # W10 - W11 - track(:station, - nr[:arn + 100m] >> 0.5dt - -- nr[:arn + 190m] << 0.5dt + track(:side, + nr[:arn + 100m] >> 0.5mo + -- nr[:arn + 190m] << 0.5mo ); - # Gl. 2 - track(:first:station :excat:ac15 :pax, nr[:arn.a, :arn.fp] << 0.5dt); + # Gl. 2 (DE 6298 dn) + track(nr[:arn.a, :arn.fp] << 0.5mo); # W13 - W14 - track(:station, - nr[:arn + 200m] << 0.5dt - -- nr[:arn + 290m] << 1.5dt + track(:side, + nr[:arn + 200m] << 0.5mo + -- nr[:arn + 290m] << 1.5mo ); # W17 - W18 - track(:station, - nr[:arn + 630m] << 0.5dt - -- nr[:arn + 720m] >> 0.5dt + track(:side :nopax, + nr[:arn + 630m] << 0.5mo + -- nr[:arn + 720m] >> 0.5mo ); - # Gl. 6 - track(:first:station :excat:ac15 :pax, - nr[:arn - 651m, :arn - 650m] << 0.5dt - -- nr[:arn - 570m, :arn.ys + 350m] << 1.5dt + # Gl. 6 (DE 6299) + track( + nr[:arn - 651m, :arn - 650m] << 0.5mo + -- nr[:arn - 570m, :arn.ys + 350m] << 1.5mo .. as[:arn.fr - 0.1dl, :arn.fr] ); # W15 - W16 - track(:station, - nr[:arn + 320m] << 1.5dt - -- nr[:arn + 410m] << 0.5dt + track(:side :nopax, + nr[:arn + 320m] << 1.5mo + -- nr[:arn + 410m] << 0.5mo ); # Gl. 7 - track(:station, - nr[:arn - 511m, :arn - 510m] << 1.5dt - -- nr[:arn - 440m, :arn + 130m - 0.7dl] << 2.5dt - -- nr[:arn + 200m - 0.7dl, :arn + 201m - 0.7dl] << 1.5dt + track(:side :nopax, + nr[:arn - 511m, :arn - 510m] << 1.5mo + -- nr[:arn - 440m, :arn + 130m - 0.7dl] << 2.5mo + -- nr[:arn + 200m - 0.7dl, :arn + 201m - 0.7dl] << 1.5mo ); # Gl. 8 - track(:station, - nr[:arn - 140m, :arn + 150m] << 3.5dt + track(:side :nopax, + nr[:arn - 140m, :arn + 150m] << 3.5mo ); # Gl. 9 - track(:station, - nr[:arn - 800m, :arn - 200m] << 3.5dt - -- nr[:arn - 150m, :arn + 100m] << 4.5dt + track(:side :nopax, + nr[:arn - 800m, :arn - 200m] << 3.5mo + -- nr[:arn - 150m, :arn + 100m] << 4.5mo ); # W10 - W6 - track(:station, - nr[:arn - 630m] << 3.5dt - -- nr[:arn - 530m] << 1.5dt + track(:side :nopax, + nr[:arn - 630m] << 3.5mo + -- nr[:arn - 530m] << 1.5mo ); # Gl. 13/17 - track(:station, - nr[:arn - 490m, :arn - 0.7dl] << 5.5dt - -- nr[:arn + 50m - 0.7dl, :arn + 51m - 0.7dl] << 4.5dt + track(:side :nopax, + nr[:arn - 490m, :arn - 0.7dl] << 5.5mo + -- nr[:arn + 50m - 0.7dl, :arn + 51m - 0.7dl] << 4.5mo ); # Gl. 18/19 - track(:station, - nr[:arn - 591m, :arn - 590m] << 3.5dt - -- nr[:arn - 440m, :arn] << 6.5dt - -- nr[:arn + 200m, :arn.ys] << 2.5dt + track(:side :nopax, + nr[:arn - 591m, :arn - 590m] << 3.5mo + -- nr[:arn - 440m, :arn] << 6.5mo + -- nr[:arn + 200m, :arn.ys] << 2.5mo .. ai[:arn.xi - 60m, :arn.xi] ); # Ex-Gleise rechts - track(:station :removed, - nr[:arn - 790m, :arn - 100m] >> 1.5dt + track(:side :nopax :removed, + nr[:arn - 790m, :arn - 100m] >> 1.5mo ); - track(:station :removed, - nr[:arn - 560m, :arn - 400m] >> 3.5dt + track(:side :nopax :removed, + nr[:arn - 560m, :arn - 400m] >> 3.5mo ); - track(:station :removed, - nr[:arn - 560m, :arn - 450m] >> 4.5dt - -- nr[:arn - 350m, :arn - 100m] >> 2.5dt + track(:side :nopax :removed, + nr[:arn - 560m, :arn - 450m] >> 4.5mo + -- nr[:arn - 350m, :arn - 100m] >> 2.5mo ); - track(:station :removed, - nr[:arn - 300m] >> 2.5dt - -- nr[:arn - 200m] >> 0.5dt + track(:side :nopax :removed, + nr[:arn - 300m] >> 2.5mo + -- nr[:arn - 200m] >> 0.5mo ); # Bahnsteig 1 - platform(:excat:ac15 :pax, - nr[:arn - 160m, :arn + 40m] >> 0.5dt - -- nr[:arn + 40m, :arn - 70m] << 1.2dt - -- nr[:arn - 70m, :arn - 165m] << 1.1dt + platform( + nr[:arn - 160m, :arn + 40m] >> 0.5mo >> 0.5mt + -- nr[:arn + 40m, :arn - 70m] << 1.3mo + -- nr[:arn - 70m, :arn - 165m] << 1.2mo ); platform(:removed, - nr[:arn + 40m, :arn + 90m] >> 0.5dt - -- nr[:arn + 90m, :arn + 40m] << 1.2dt + nr[:arn + 40m, :arn + 90m] >> 0.5mo >> 0.5mt + -- nr[:arn + 90m, :arn + 40m] << 1.3mo ); # Bahnsteig 2/6 - platform(:excat:ac15 :pax, - nr[:arn - 130m, :arn + 90m] << 0.5dt - -- nr[:arn + 90m, :arn - 130m] >> 1.5dt + platform( + nr[:arn - 130m, :arn + 90m] << 0.5mo << 0.5mt + -- nr[:arn + 90m, :arn - 130m] >> 1.5mo << 0.5mt ); # Bw - track(:station, - nr[:arn - 890m, :arn - 580m] << 2.5dt + track(:side :nopax, + nr[:arn - 890m, :arn - 580m] << 2.5mo ); - track(:station, - nr[:arn - 890m, :arn - 680m] << 1.5dt - -- nr[:arn - 630m, :arn - 629m] << 2.5dt + track(:side :nopax, + nr[:arn - 890m, :arn - 680m] << 1.5mo + -- nr[:arn - 630m, :arn - 629m] << 2.5mo ); - marker(:left :de.bw, nr[:arn - 890m - 0.3sw] << 1.5dt); - slabel(:left, nr[:arn - 890m - 0.65sw] >> 3.5dt, + marker(:left :de.bw, nr[:arn - 890m - 0.3sw] << 1.5mo); + slabel(:left, nr[:arn - 890m - 0.65sw] >> 3.5mo, "Bw Arnstadt/hist" ); # Anschluss Stadtverwaltung - track(:station, - nr[:arn - 630m, :arn - 631m] >> 3.5dt - .. ar[:a + 4dt, :a + 670m] - -- ar[:a + 710m, :xa - 50m] << 1dt + track(:side :nopax, + nr[:arn - 630m, :arn - 631m] >> 3.5mo + .. ar[:a + 4mo, :a + 670m] + -- ar[:a + 710m, :xa - 50m] << 1mo -- ar[:xa, :f] ); - track(:station, + track(:side :nopax, ar[:a + 499m, :a + 500m] - -- ar[:a + 550m, :a + 670m + 0.7dl] >> 1dt + -- ar[:a + 550m, :a + 670m + 0.7dl] >> 1mo -- ar[:a + 710m + 0.7dl, :xa] ); - track(:station, - ar[:a + 859m, :a + 860m] << 1dt - -- ar[:a + 910m, :a + 1070m] << 2dt + track(:side :nopax, + ar[:a + 859m, :a + 860m] << 1mo + -- ar[:a + 910m, :a + 1070m] << 2mo ); - track(:station, + track(:side :nopax, ar[:f - 951m, :f - 950m] - -- ar[:f - 800m, :f - 400m] << 3dt + -- ar[:f - 800m, :f - 400m] << 3mo -- ar[:f - 250m, :f - 249m] ); - track(:station, - ar[:f - 850m, :f - 550m] << 2dt + track(:side :nopax, + ar[:f - 850m, :f - 550m] << 2mo ); - marker(:right :de.bf :pax, nr[:arn] >> 1.2dt); - station(:left :pax, nr[:arn + 0.2sw] >> 1.2dt >> 1.8sw, + marker(:right :de.bf, nr[:arn] >> 1.3mo); + station(:left, nr[:arn] >> 1.3mo >> 1sh + (-2.0dt, 1.8dt), span(:bold, "Arnstadt Hbf"), hbox(:center:top, vbox(:right:top, "6298: ", "6299: ", "6377: "), - vbox(:right:top, "9,", "0,", "0,"), - vbox(:left:top, "96", "00", "00") + vbox(:sep:top, + hbox(:sep:base, "9,", anchor(), "955"), + hbox(:sep:base, "−0,", anchor(), "659"), + hbox(:sep:base :removed, "0,", anchor(), "00") + ) ) ); } +} - +with detail = 4, + railway = :first :pax +{ with link = "line.de.6298" { - track(:first :double :pax, nr[:arn.fp, :ars - 1sw]); + track(:double, nr[:arn.fp - 0.1dl, :ars - 0.49sw]); } - - with link = "point.de.Arnstadt-Süd" { - track(:first:station :double :pax, nr[:ars - 1sw, :ars + 250m]); + with link = "point.de.Arnstadt-Süd", railway = :station { + track(:first:station :double :pax, nr[:ars - 0.5sw, :ars + 200m]); platform(:pax, - nr[:ars, :ars + 130m] >> 0.5dt - -- nr[:ars + 130m, :ars] >> 0.5dt + nr[:ars, :ars + 130m] >> 0.5mo << 0.5mt + -- nr[:ars + 130m, :ars] >> 0.5mo << 0.5mt ); platform(:removed, - nr[:ars + 130m, :ars + 200m] >> 0.5dt - -- nr[:ars + 200m, :ars + 130m] >> 0.5dt + nr[:ars + 130m, :ars + 200m] >> 0.5mo << 0.5mt + -- nr[:ars + 200m, :ars + 130m] >> 0.5mo << 0.5mt ); - marker(:right :de.hp :pax, nr[:ars] >> 0.5dt); - station(:left :pax, nr[:ars + 0.55sw] >> 0.5dt >> 1.2sw, - "Arnstadt Süd", "11,31" + marker(:right :de.hp, nr[:ars] >> 0.5mo >> 0.5mt); + station(:left, nr[:ars] >> 0.5mo >> 0.5mt >> 1sh + (-1.5dt, 1.2dt), + "Arnstadt Süd", "6298: 11,313" ); } - with link = "line.de.6298" { - track(:first :double :pax, nr[:ars + 250m, :pla.a]); - line_badge(:pax, nr[:ars + 2.0km], "6298"); + track(:double, nr[:ars + 200m, :goe]); } - - with link = "point.de.Arnstadt-Goerdelerdamm" { - marker(:left :de.bk :removed, nr[:goe] << 0.5dt); - station(:left :removed, nr[:goe + 0.5sw] >> 2.0dt, - "Goerdelerdamm", "12,18" + with link = "point.de.Arnstadt-Goerdelerdamm", railway = :station { + marker(:left :de.bk :removed, nr[:goe] << 0.5mo << 0.5mt); + station(:right :removed, + nr[:goe] << 0.5mo << 0.5mt << 1sh + (1dt, 1dt), + span(:small, "Goerdelerdamm"), "6298: 12,18" ); } + with link = "line.de.6298" { + track(:double, nr[:goe, :goe + 1.4km]); + line_label(:right:e, nr[:goe + 1.4km] >> 0.5mo >> 0.5mt, + (0dt, -0.4dt), "6298" + ); + track(:double, nr[:goe + 1.4km, :loh]); + } - with link = "point.de.Lohmühle" { - marker(:right :de.bk :removed, nr[:loh] >> 0.5dt); - station(:left :removed, nr[:loh + 0.4sw] >> 0.5dt >> 1.0sw, - vbox(:center:bottom, - span(:gone, "Siegelbach"), - "Lohmühle" - ), - "14,98" + with link = "point.de.Lohmühle", railway = :station { + marker(:right :de.bk :removed, nr[:loh] >> 0.5mo >> 0.5mt); + label(:removed, + nr[:loh] >> 0.5mo >> 0.5mt >> 1.0sh + (-1.3dt, 0.8dt), + vbox(:right:base :small, + span(:former, "Siegelbach"), + vbox(:center:topbase, + "Lohmühle", + span(:xsmall, "6298: 14,98") + ) + ) ); } + with link = "line.de.6298" { + track(:double, nr[:loh, :pla.a]); + } - with link = "point.de.Plaue-Thür" { - let pr = path("d4.de.6694"); + with link = "point.de.Plaue-Thür", railway = :station { + let pr = path("d3.de.6694"); - # Gl. 1 - track(:first:station :pax, nr[:pla.a, :pla.fg] >> 0.5dt); + # Gl. 1 (DE 6298 up) + track(nr[:pla.a, :pla.fg] >> 0.5mo); # W1 - W2 - track(:station :pax, - nr[:pla.pn - 220m + 0.7dl] >> 0.5dt - -- nr[:pla.pn - 130m + 0.7dl] << 0.5dt + track(:side, + nr[:pla.pn - 220m + 0.7dl] >> 0.5mo + -- nr[:pla.pn - 130m + 0.7dl] << 0.5mo ); - # Gl. 2 - track(:first:station :pax, - nr[:pla.a, :pla.yi] << 0.5dt - -- nr[:pla.yi + 100m, :pla.yi + 101m] >> 0.5dt + # Gl. 2 (DE 6298 dn) + track( + nr[:pla.a, :pla.yi] << 0.5mo + -- nr[:pla.yi + 100m, :pla.yi + 101m] >> 0.5mo ); - track(:first:station :removed, - nr[:pla.yi, :pla.fg] << 0.5dt + track(:removed, + nr[:pla.yi, :pla.fg] << 0.5mo ); # W6 - W7 - track(:station, - nr[:pla.yi - 50m] << 0.5dt - -- pr[:pla.yi + 40m] << 1.5dt + track(:side :nopax, + nr[:pla.yi - 50m] << 0.5mo + -- pr[:pla.yi + 40m] << 1.5mo ); - # Gl. 3 - track(:second:station :pax, - nr[:pla.pn - 221m, :pla.pn - 220m] << 0.5dt - -- pr[:pla.pn - 130m, :pla.fi] << 1.5dt + # Gl. 3 (DE 6694) + track(:second, + nr[:pla.pn - 221m, :pla.pn - 220m] << 0.5mo + -- pr[:pla.pn - 130m, :pla.fi] << 1.5mo ); # W4 - W5 - track(:station, - nr[:pla.yi - 160m] << 1.5dt - -- nr[:pla.yi - 70m] << 0.5dt + track(:side :nopax, + nr[:pla.yi - 160m] << 1.5mo + -- nr[:pla.yi - 70m] << 0.5mo ); # Gl. 4 - track(:station :removed, - nr[:pla.pn - 80m, :pla + 80m] << 2.5dt + track(:side :nopax :removed, + nr[:pla.pn - 80m, :pla + 80m] << 2.5mo ); # Gl. 5 - track(:station :removed, - nr[:pla.pn - 131m, :pla.pn - 130m] << 1.5dt - -- nr[:pla.pn - 30m, :pla + 30m] << 3.5dt - -- nr[:pla + 130m, :pla + 131m] << 1.5dt + track(:side :nopax :removed, + nr[:pla.pn - 131m, :pla.pn - 130m] << 1.5mo + -- nr[:pla.pn - 30m, :pla + 30m] << 3.5mo + -- nr[:pla + 130m, :pla + 131m] << 1.5mo ); # Ladegl. rechts - track(:station :removed, - nr[:pla - 321m, :pla - 320m] >> 0.5dt - -- nr[:pla - 220m, :pla - 0.5sw] >> 2.5dt + track(:side :nopax :removed, + nr[:pla - 321m, :pla - 320m] >> 0.5mo + -- nr[:pla - 220m, :pla - 0.6sw] >> 2.5mo ); # Bahnsteig 1 platform(:removed, - nr[:pla - 220m, :pla - 110m] >> 0.5dt - -- nr[:pla - 110m, :pla - 220m] << 1.2dt + nr[:pla - 220m, :pla - 110m] >> 0.5mo >> 0.5mt + -- nr[:pla - 110m, :pla - 220m] << 1.3mo ); platform(:pax, - nr[:pla - 110m, :pla + 50m] >> 0.5dt - -- nr[:pla + 50m, :pla - 110m] << 1.2dt + nr[:pla - 110m, :pla + 50m] >> 0.5mo >> 0.5mt + -- nr[:pla + 50m, :pla - 110m] << 1.3mo ); # Bahnsteig 2/3 platform(:removed, - nr[:pla - 220m, :pla - 140m] << 0.5dt - -- nr[:pla - 140m, :pla - 220m] >> 1.5dt + nr[:pla - 220m, :pla - 140m] << 0.5mo >> 0.5mt + -- nr[:pla - 140m, :pla - 220m] >> 1.5mo >> 0.5mt ); platform(:pax, - nr[:pla - 140m, :pla + 20m] << 0.5dt - -- nr[:pla + 20m, :pla - 140m] >> 1.5dt + nr[:pla - 140m, :pla + 20m] << 0.5mo >> 0.5mt + -- nr[:pla + 20m, :pla - 140m] >> 1.5mo >> 0.5mt ); - marker(:right :de.bf :pax, nr[:pla] >> 1.2dt); - station(:left :pax, nr[:pla + 0.4sw] >> 1.2dt >> 1.2sw, + marker(:right :de.bf :pax, nr[:pla] >> 1.3mo); + station(:left :pax, nr[:pla] >> 1.3mo >> 1sh + (-1.5dt, 1dt), hbox(:center:base, span(:bold, "Plaue "), "(Thür)"), hbox(:center:base, vbox(:right:top, "6298: ", "6694: "), - vbox(:right:top, "18,", "0,"), - vbox(:left:top, "17", "00") + vbox(:sep:top, + hbox(:sep:base, "18,", anchor(), "167"), + hbox(:sep:base, "−0,", anchor(), "720") + ) ) ); } with link = "line.de.6298" { - track(:first :pax, nr[:pla.fg, :gra.a] >> 0.5dt); - track(:first :removed, nr[:pla.fg, :gra.a] << 0.5dt); - line_badge(:pax, nr[:pla.fg + 1.3km], "6298"); + track(:up:ldn, nr[:pla.fg, :pla.yi + 3.1km] >> 0.5mo); + track(:dn:rup :removed, nr[:pla.fg, :pla.yi + 3.1km] << 0.5mo); + line_label(:right:s, nr[:pla.yi + 3.1km] >> 0.5mo >> 0.5mt, + (-0.2dt, 0dt), "6298" + ); + track(:up:ldn, nr[:pla.yi + 3.1km, :gra.a] >> 0.5mo); + track(:dn:rup :removed, nr[:pla.yi + 3.1km, :gra.a] << 0.5mo); } - with link = "point.de.Gräfenroda" { - # Gl. 1 - track(:second:station, - nr[:gra, :gra.f - 250m] >> 2.0dt - .. nr[:gra.f - 1m, :gra.f] >> 1.5dt + with link = "point.de.Gräfenroda", railway = :station { + # Gl. 1 (DE 6697) + track(:side :nopax, + nr[:gra, :gra.f - 250m] >> 2.0mo + .. nr[:gra.f - 1m, :gra.f] >> 1.5mo ); # Gl. 2 - track(:station, - nr[:gra - 416m, :gra - 415m] >> 0.5dt - -- nr[:gra - 320m, :gra - 105m] >> 1.5dt - -- nr[:gra - 10m, :gra - 9m] >> 0.5dt + track(:side :nopax, + nr[:gra - 416m, :gra - 415m] >> 0.5mo + -- nr[:gra - 320m, :gra - 105m] >> 1.5mo + -- nr[:gra - 10m, :gra - 9m] >> 0.5mo ); - # Gl. 3 - track(:first:station :pax, nr[:gra.a, :gra.f] >> 0.5dt); + # Gl. 3 (DE 6298 up) + track(nr[:gra.a, :gra.f] >> 0.5mo); # W4 - W5 - track(:station, - nr[:gra + 170m] >> 0.5dt - -- nr[:gra + 265m] >> 2.0dt + track(:side :nopax, + nr[:gra + 170m] >> 0.5mo + -- nr[:gra + 265m] >> 2.0mo ); - # Gl. 4 - track(:first:station :removed, nr[:gra.a, :gra - 280m] << 0.5dt); - track(:station, - nr[:gra - 366m, :gra - 365m] >> 0.5dt - -- nr[:gra - 280m, :gra.f - 400m] << 0.5dt - -- nr[:gra.f - 310m, :gra.f - 309m] >> 0.5dt + # Gl. 4 (DE 6298 dn) + track(:removed, nr[:gra.a, :gra - 280m] << 0.5mo); + track( + nr[:gra - 366m, :gra - 365m] >> 0.5mo + -- nr[:gra - 280m, :gra.f - 400m] << 0.5mo + -- nr[:gra.f - 310m, :gra.f - 309m] >> 0.5mo ); - track(:first:station :removed, nr[:gra.f - 400m, :gra.f] << 0.5dt); + track(:removed, nr[:gra.f - 400m, :gra.f] << 0.5mo); # Bahnsteig 1 - platform(:open, - nr[:gra, :gra + 60m] >> 2.0dt - -- nr[:gra + 60m, :gra] << 1.3dt + platform(:nopax, + nr[:gra, :gra + 60m] >> 2.0mo << 0.5lt + -- nr[:gra + 60m, :gra] << 1.3mo ); # Bahnsteig 2 - platform(:open, - nr[:gra - 275m, :gra - 140m] >> 1.5dt - -- nr[:gra - 140m, :gra - 275m] << 2.2dt + platform(:nopax, + nr[:gra - 275m, :gra - 140m] >> 1.5mo >> 0.5lt + -- nr[:gra - 140m, :gra - 275m] << 2.3mo ); # Bahnsteig 3 - platform(:pax, - nr[:gra + 10m, :gra + 165m] >> 0.5dt - -- nr[:gra + 165m, :gra + 10m] << 1.1dt + platform( + nr[:gra + 10m, :gra + 165m] >> 0.5mo >> 0.5mt + -- nr[:gra + 165m, :gra + 10m] << 1.2mo ); - marker(:right :de.bf :pax, nr[:gra] >> 2dt); - station(:top :pax, nr[:gra + 0.2sw] >> 2.0dt >> 1.4sw, + marker(:right :de.bf, nr[:gra] >> 2mo >> 0.5lt); + station(:top, + nr[:gra + 0.2sw] >> 2.0mo >> 0.5lt >> 1sh + (-1dt, -1.3dt), span(:bold, "Gräfenroda"), hbox(:center:top, vbox(:right:top, span(:closed, "6697: "), "6298: "), - vbox(:right:top, span(:closed, "35,"), "24,"), - vbox(:left:top, span(:closed, "70"), "17") + vbox(:sep:top, + hbox(:sep:base :closed, "35,", anchor(), "697"), + hbox(:sep:base, "24,", anchor(), "167") + ) ) ); } - with link = "line.de.6298" { - track(:first :pax, nr[:gra.f, :dor - 200m] >> 0.5dt); - track(:first :removed, nr[:gra.f, :dor - 200m] << 0.5dt); - line_badge(:pax, nr[:dor - 1.6km], "6298"); + track(:up:ldn:ror, nr[:gra.f, :gra.yg] >> 0.5mo); + track(:dn:rup :removed, nr[:gra.f, :gra.yg] << 0.5mo); + + track(:up:ldn:ror, nr[:gra.yg, :gra.yg + 0.5seg] >> 0.5mo); + track(:dn:rup :removed, nr[:gra.yg, :gra.yg + 0.5seg] << 0.5mo); + + track(:up:ldn, nr[:gra.yg + 0.5seg, :gra.yg + 1km] >> 0.5mo); + track(:dn:rup :removed, nr[:gra.yg + 0.5seg, :gra.yg + 1km] << 0.5mo); + + line_label(:left:w, nr[:gra.yg + 1km] << 0.5mo << 0.5mt, + (0dt, 0.3dt), "6298" + ); + + track(:up:ldn, nr[:gra.yg + 1km, :dor - 150m] >> 0.5mo); + track(:dn:rup :removed, nr[:gra.yg + 1km, :dor - 150m] << 0.5mo); } - with link = "point.de.Dörrberg" { - track(:first:station :pax, nr[:dor - 200m, :dor + 1sw] >> 0.5dt); - track(:first:station :removed, nr[:dor - 200m, :dor + 1sw] << 0.5dt); + with link = "point.de.Dörrberg", railway = :station { + track(nr[:dor - 150m, :dor + 0.5sw] >> 0.5mo); + track(:removed, nr[:dor - 150m, :dor + 0.5sw] << 0.5mo); platform(:pax, - nr[:dor - 150m, :dor - 10m] >> 0.5dt - -- nr[:dor - 10m, :dor - 150m] << 1.2dt + nr[:dor - 150m, :dor - 10m] >> 0.5mo >> 0.5mt + -- nr[:dor - 10m, :dor - 150m] << 1.3mo ); - marker(:right :de.hp :pax, nr[:dor] >> 0.5dt); - marker(:right :de.bk :removed, nr[:dor] >> 0.5dt); - station(:left :pax, nr[:dor + 0.6sw] >> 0.5dt >> 1.3sw, - "Dörrberg", "27,97" + marker(:right :de.hp, nr[:dor] >> 1.3mo); + station(:left, nr[:dor] >> 1.3mo >> 1sh + (-1.8dt, 1dt), + "Dörrberg", "6298: 27,967" ); } with link = "line.de.6298" { - track(:first :pax, nr[:dor + 1sw, :tzw.a] >> 0.5dt); - track(:first :removed, nr[:dor + 1sw, :tzw.a] << 0.5dt); + track(:first :pax, nr[:dor + 0.5sw, :tzw.a] >> 0.5mo); + track(:first :removed, nr[:dor + 0.5sw, :tzw.a] << 0.5mo); } with link = "struct.de.Tunnel-am-Zwang" { - marker(:top :tunnel.r :pax, nr[:tzw.a] >> 0.5dt); - marker(:right :tunnel.dt :pax, nr[:tzw.a] << 0.5dt); - marker(:top :tunnel.l :pax, nr[:tzw.a] << 0.5dt); + marker(:right :tuna, nr[:tzw.a] >> 0.5mo); + marker(:right :tuno, nr[:tzw.a]); + marker(:left :tuna, nr[:tzw.a] << 0.5mo); - marker(:bottom :tunnel.l :pax, nr[:tzw.f] >> 0.5dt); - marker(:right :tunnel.dt :pax, nr[:tzw.f] << 0.5dt); - marker(:bottom :tunnel.r :pax, nr[:tzw.f] << 0.5dt); + marker(:right :tunf, nr[:tzw.f] >> 0.5mo); + marker(:right :tuno, nr[:tzw.f]); + marker(:left :tunf, nr[:tzw.f] << 0.5mo); - slabel(:right :italic :pax, nr[:tzw.a - 2dt] << 2.5dt, - hbox(:left:top, vbox(:center:top, + slabel(:right :italic, + nr[:tzw.a + 50m] << 0.5mo << 0.5mt + (3.5dt, 2dt), + hbox(:left:base, vbox(:center:topbase, "Tunnel am Zwang", "104 m" )) ); } - with link = "line.de.6298" { - track(:first :pax, nr[:tzw.f, :geh.a] >> 0.5dt); - track(:first :removed, nr[:tzw.f, :geh.a] << 0.5dt); + track(:up:ldn, nr[:tzw.f, :keh] >> 0.5mo); + track(:dn:rup :removed, nr[:tzw.f, :keh] << 0.5mo); } - - with link = "point.de.Kehltal" { - marker(:right :de.bk :removed, nr[:keh] >> 0.5dt); - station(:left :removed, nr[:keh + 0.5sw] >> 0.5dt >> 1.2sw, - "Kehltal", "32,30" + with link = "point.de.Kehltal", railway = :station { + marker(:right :de.bk :removed, nr[:keh] >> 0.5mo >> 0.5mt); + station(:left:right_align :removed, + nr[:keh] >> 0.5mo >> 0.5mt >> 1sh + (-1.3dt, 0.7dt), + span(:small, "Kehltal"), "6298: 32,30" ); } + with link = "line.de.6298" { + track(:up:ldn, nr[:keh, :geh.a] >> 0.5mo); + track(:dn:rup :removed, nr[:keh, :geh.a] << 0.5mo); + } - with link = "point.de.Gehlberg" { + with link = "point.de.Gehlberg", railway = :station { # Gl. 1 - track(:first:station :removed, - nr[:geh.a, :geh.a + 200m] << 0.5dt + track(:removed, + nr[:geh.a, :geh.a + 200m] << 0.5mo ); - track(:first:station :pax, - nr[:geh.a, :geh.a + 0.1dl] >> 0.5dt - .. nr[:geh.a + 200m, :geh.f] << 0.5dt + track( + nr[:geh.a, :geh.a + 0.1dl] >> 0.5mo + .. nr[:geh.a + 200m, :geh.f] << 0.5mo ); - track(:station, - nr[:geh + 180m] << 0.5dt - -- nr[:geh + 270m] >> 0.5dt + track(:side, + nr[:geh + 180m] << 0.5mo + -- nr[:geh + 270m] >> 0.5mo ); # Gl. 2 - track(:first:station :removed, - nr[:geh.a, :geh.a + 280m] >> 0.5dt + track(:removed, + nr[:geh.a, :geh.a + 280m] >> 0.5mo ); - track(:first:station :pax, - nr[:geh.a + 199m, :geh.a + 200m] << 0.5dt - .. nr[:geh.a + 280m, :geh.f] >> 0.5dt + track( + nr[:geh.a + 199m, :geh.a + 200m] << 0.5mo + .. nr[:geh.a + 280m, :geh.f] >> 0.5mo ); # Bahnsteig 1 platform(:pax, - nr[:geh - 60m, :geh + 100m] << 0.5dt - -- nr[:geh + 100m, :geh - 60m] >> 1.2dt + nr[:geh - 60m, :geh + 100m] << 0.5mo << 0.5mt + -- nr[:geh + 100m, :geh - 60m] >> 1.3mo ); # Bahnsteig 2 platform(:pax, - nr[:geh - 60m, :geh + 100m] >> 0.5dt - -- nr[:geh + 100m, :geh - 60m] << 1.2dt + nr[:geh - 60m, :geh + 100m] >> 0.5mo >> 0.5mt + -- nr[:geh + 100m, :geh - 60m] << 1.3mo ); - marker(:left :de.bf :pax, nr[:geh] << 0.5dt); - station(:bottom :pax, nr[:geh] << 0.5dt << 1.2sw, - "Gehlberg", "35,59" + marker(:left :de.bf :pax, nr[:geh] << 1.3mo); + station(:bottom :pax, nr[:geh] << 1.3mo << 1.3sh, + "Gehlberg", "6298: 35,587" ); } - with link = "line.de.6298" { - track(:first :double :pax, nr[:geh.f, :brt.a]); + track(:double, nr[:geh.f, :brt.a]); } with link = "struct.de.Brandleite-Tunnel" { - marker(:top :tunnel.r :pax, nr[:brt.a] >> 0.5dt); - marker(:right :tunnel.dt :pax, nr[:brt.a] << 0.5dt); - marker(:top :tunnel.l :pax, nr[:brt.a] << 0.5dt); + marker(:right :tuna, nr[:brt.a] >> 0.5mo); + marker(:right :tuno, nr[:brt.a]); + marker(:left :tuna, nr[:brt.a] << 0.5mo); - track(:first:tunnel :double :pax, nr[:brt.a, :brt.f]); + track(:double :tunnel, nr[:brt.a, :brt.f]); - marker(:bottom :tunnel.l :pax, nr[:brt.f] >> 0.5dt); - marker(:right :tunnel.dt :pax, nr[:brt.f] << 0.5dt); - marker(:bottom :tunnel.r :pax, nr[:brt.f] << 0.5dt); + marker(:right :tunf, nr[:brt.f] >> 0.5mo); + marker(:right :tuno, nr[:brt.f]); + marker(:left :tunf, nr[:brt.f] << 0.5mo); + + slabel(:top :italic, + nr[:brt.a + 1.5km] << 0.5mo << 0.5mt + (0dt, -2.5dt), + hbox(:left:bottom, vbox(:center:bottom, + "Brandleite-Tunnel", "3039 m" + )) + ); } + with link = "point.de.Oberhof-Thür", railway = :station { + # Gl. 1 (DE 6298 dn) + track(nr[:brt.f, :obe.f] << 0.5mo); + # W1 - W2 + track(:side :nopax, + nr[:brt.f + 5m] << 0.5mo + -- nr[:brt.f + 90m] >> 0.5mo + ); + + # Gl. 2 (DE 6298 up) + track( + nr[:brt.f, :obe + 430m ] >> 0.5mo + -- nr[:obe + 520m, :obe + 521m] << 0.5mo + ); + + # Gl. 4 + track(:side :nopax :removed, + nr[:obe + 120m, :obe + 620m] << 1.5mo + ); + + # Gl. 5 + track(:side :nopax, + nr[:obe + 99m, :obe + 100m] << 0.5mo + -- nr[:obe + 230m, :obe + 500m] << 2.5mo + ); + track(:side :nopax :removed, + nr[:obe + 500m, :obe + 510m] << 2.5mo + -- nr[:obe + 510m + 1dl, :obe + 510m + 1.1dl] << 1.5mo + ); + + # Gl. 7 + track(:side :nopax, nr[:obe + 140m, :obe + 230m] << 2.5mo); + + # Bstg. 1 + platform(:nopax, + nr[:obe - 75m, :obe + 100m] << 0.5mo << 0.5mt + -- nr[:obe + 100m, :obe - 75m] >> 1.3mo + ); + + # Bstg. 2 + platform(:nopax, + nr[:obe - 75m, :obe + 120m] >> 0.5mo >> 0.5mt + -- nr[:obe + 120m, :obe - 75m] << 1.3mo + ); + + marker(:left :de.bf :nopax, nr[:obe] << 1.3mo); + station(:right :nopax, nr[:obe] << 1.3mo << 1sh + (1.3dt, 2.7dt), + hbox(:right:base, "Oberhof", span(:light, " (Thür)")), + "6298: 40,068" + ); + + } } diff --git a/rules/de/u/d4/62/6299.map b/rules/de/u/d4/62/6299.map index c51b7afb..0a5cbc50 100644 --- a/rules/de/u/d4/62/6299.map +++ b/rules/de/u/d4/62/6299.map @@ -1,6 +1,6 @@ # DE 6299. Arnstadt Hbf - Saalfeld (Saale) # -let as = path("d4.de.6299"); +let as = path("d3.de.6299"); with detail = [4, 5] { # point.de.Arnstadt-Hbf: de.6299 diff --git a/rules/de/u/d4/63/6340.map b/rules/de/u/d4/63/6340.map index a217e4e4..22e8a39f 100644 --- a/rules/de/u/d4/63/6340.map +++ b/rules/de/u/d4/63/6340.map @@ -1,128 +1,117 @@ # DE 6340. Halle (Saale) Hbf - Baunatal-Guntershausen # -let hg = path("d4.de.u.6340"); +let hg = path("d3.de.u.6340"); -with detail = [4, 5] { +with detail = 4, + railway = :first :cat:ac15 :pax +{ - badge(:cat:ac15 :pax, hg[:ndi.a] >> 0.5dt, + badge(:cat:ac15 :pax, hg[:ndi.a] >> 0.5mo, hbox(:left:middle, " ", - vbox(:center:middle :badgesize, " 6291 ", "6340 "), + vbox(:center:middle :badgesize, " 6291 ", " 6340 "), "→ Erfurt" ) ); - with link = "point.de.Neudietendorf" { - let nr = path("d4.de.6298"); + with link = "point.de.Neudietendorf", railway = :station { + let nr = path("d3.de.6298"); - # Gl. 1 - with layer = 2 track(:first:station :cat:ac15 :pax, - hg[:ndi.a, :ndi.ys - 250m] >> 0.5dt - ); - with layer = 1 casing(:first:station :cat:ac15 :pax, - hg[:ndi.yr, :ndi.ys - 250m] >> 0.5dt - ); + # Gl. 1 (DE 6340 up) + track(:casing, hg[:ndi.a, :ndi.ys - 250m] >> 0.5mo); # W5 - W6 - track(:station :cat:ac15, - hg[:ndi - 380m] >> 0.5dt - -- hg[:ndi - 280m] >> 1.5dt + track(:side :nopax, + hg[:ndi - 380m] >> 0.5mo + -- hg[:ndi - 280m] >> 1.5mo ); # W9 - W10 - track(:station :cat:ac15, - hg[:ndi - 150m] >> 0.5dt - -- hg[:ndi - 50m] << 0.5dt + track(:side :nopax, + hg[:ndi - 150m] >> 0.5mo + -- hg[:ndi - 50m] << 0.5mo ); # W21 - W22 - track(:station :cat:ac15, - hg[:ndi + 480m] >> 0.5dt - -- hg[:ndi + 590m] >> 1.5dt + track(:side :nopax, + hg[:ndi + 480m] >> 0.5mo + -- hg[:ndi + 590m] >> 1.5mo ); - # Gl. 2 - with layer = 2 track(:first:station :cat:ac15 :pax, - hg[:ndi.a, :ndi.ys - 250m] << 0.5dt - ); - with layer = 1 casing(:first:station :cat:ac15 :pax, - hg[:ndi.yr, :ndi.ys - 250m] << 0.5dt - ); + # Gl. 2 (DE 6340 dn) + track(:casing, hg[:ndi.a, :ndi.ys - 250m] << 0.5mo); # W3 - W4 - track(:station :cat:ac15, - hg[:ndi - 500m] << 0.5dt - -- hg[:ndi - 400m] >> 0.5dt + track(:side :nopax, + hg[:ndi - 500m] << 0.5mo + -- hg[:ndi - 400m] >> 0.5mo ); - # Gl. 3 - track(:first:station :cat:ac15 :pax, - hg[:ndi.a, :ndi.yr - 120m] >> 1.5dt - ); - track(:first:station :pax, - hg[:ndi.yr - 120m, :ndi.yr + 20m] >> 1.5dt - .. nr[:ndi.yw, :ndi.yw + 0.1dl] >> 0.5dt + # Gl. 3 (DE 6291 - DE 6298 up) + track(hg[:ndi.a, :ndi.yr - 120m] >> 1.5mo); + track(:nocat, hg[:ndi.yr - 120m, :ndi.yr + 20m] >> 1.5mo); + with layer = -1 track(:nocat, + hg[:ndi.yr + 19m, :ndi.yr + 20m] >> 1.5mo + .. nr[:ndi.yw, :ndi.yw + 0.1dl] >> 0.5mo ); # W1 - W2 - track(:station :cat:ac15, - hg[:ndi - 580m] >> 1.5dt - -- hg[:ndi - 480m] >> 0.5dt + track(:side :nopax, + hg[:ndi - 580m] >> 1.5mo + -- hg[:ndi - 480m] >> 0.5mo ); # W24 - W25 - track(:station :cat:ac15, - hg[:ndi + 610m] >> 1.5dt - -- hg[:ndi + 700m] >> 2.5dt + track(:side :nopax, + hg[:ndi + 610m] >> 1.5mo + -- hg[:ndi + 700m] >> 2.5mo ); # W26 - W27 - track(:station :cat:ac15, - hg[:ndi.yr - 120m] >> 1.5dt - -- hg[:ndi.yr] >> 0.5dt + track(:side :nopax, + hg[:ndi.yr - 120m] >> 1.5mo + -- hg[:ndi.yr] >> 0.5mo ); - # Gl. 4 - track(:first:station, - hg[:ndi + 220m, :ndi.yr + 100m] << 1.5dt + # Gl. 4 (DE 6298 dn) + track(:nocat :nopax, + hg[:ndi + 220m, :ndi.yr + 100m] << 1.5mo ); - with layer = 2 track(:first:station :pax, - hg[:ndi.yr - 0.1dl, :ndi.yr] << 0.5dt - -- hg[:ndi.yr + 100m, :ndi.yr + 101m] << 1.5dt - .. nr[:ndi.yw, :ndi.yw + 0.1dl] << 0.5dt + track(:nocat, + hg[:ndi.yr - 0.1dl, :ndi.yr] << 0.5mo + -- hg[:ndi.yr + 100m, :ndi.yr + 101m] << 1.5mo + .. nr[:ndi.yw, :ndi.yw + 0.1dl] << 0.5mo ); # Gl. 5 - track(:station :cat:ac15, - hg[:ndi - 150m, :ndi.yr] >> 2.5dt - ); + track(:side :nopax, hg[:ndi - 150m, :ndi.yr] >> 2.5mo); # W28 - W29 - track(:station, - hg[:ndi.yr - 80m] >> 2.5dt - -- hg[:ndi.yr + 20m] >> 1.5dt + track(:side :nocat :nopax, + hg[:ndi.yr - 80m] >> 2.5mo + -- hg[:ndi.yr + 20m] >> 1.5mo ); # Gl. 7 - track(:station :cat:ac15, - hg[:ndi - 221m, :ndi - 220m] >> 1.5dt - -- hg[:ndi - 80m, :ndi + 460m] >> 3.5dt - -- hg[:ndi + 540m, :ndi + 541m] >> 2.5dt + track(:side :nopax, + hg[:ndi - 221m, :ndi - 220m] >> 1.5mo + -- hg[:ndi - 80m, :ndi + 460m] >> 3.5mo + -- hg[:ndi + 540m, :ndi + 541m] >> 2.5mo ); # Bahnsteig Gl. 1/3 - platform(:cat:ac15 :pax, - hg[:ndi - 20m, :ndi + 190m] >> 0.5dt - -- hg[:ndi + 190m, :ndi - 20m] << 1.5dt + platform( + hg[:ndi - 20m, :ndi + 190m] >> 0.5mo >> 0.5mt + -- hg[:ndi + 190m, :ndi - 20m] << 1.5mo >> 0.5mt ); # Bahnsteig Gl. 2 - platform(:cat:ac15 :pax, - hg[:ndi - 20m, :ndi + 190m] << 0.5dt - -- hg[:ndi + 190m, :ndi - 20m] >> 1.2dt + platform( + hg[:ndi - 20m, :ndi + 190m] << 0.5mo << 0.5mt + -- hg[:ndi + 190m, :ndi - 20m] >> 1.2mo ); # Bahnsteig Gl. 4 - platform(:open, - hg[:ndi + 220m, :ndi + 490m] << 1.5dt - -- hg[:ndi + 490m, :ndi + 220m] >> 2.2dt + platform(:nocat, + hg[:ndi + 220m, :ndi + 490m] << 1.5mo << 0.4mt + -- hg[:ndi + 490m, :ndi + 220m] >> 2.2mo ); - marker(:left :de.bf :cat:ac15 :pax, hg[:ndi] << 0.5dt); - station(:top :cat:ac15 :pax, hg[:ndi] >> 5.5dt + (-6dt, 0dt), + marker(:left :de.bf :cat:ac15 :pax, hg[:ndi] << 1.2mo); + station(:top :cat:ac15 :pax, hg[:ndi] >> 5.5mo + (-6dt, -0.3dt), hbox(:left:top :bold, "Neudietendorf"), hbox(:center:top, vbox(:right:top, "6291: ", "6340: ", "6298: "), @@ -136,46 +125,45 @@ with detail = [4, 5] { } - with link = "point.de.Neudietendorf-Dn" { - # Gl. 1 - with layer = 2 track(:first:station :cat:ac15 :pax, - hg[:ndi.ys - 250m, :ndi.fg] >> 0.5dt - ); + with link = "point.de.Neudietendorf-Dn", railway = :station { + # Gl. 1 (DE 6340 up) + track(hg[:ndi.ys - 250m, :ndi.fg] >> 0.5mo); # W43 - W44 - track(:station :cat:ac15, - hg[:ndi.ys + 120m] >> 0.5dt - -- hg[:ndi.ys + 200m] << 0.5dt + track(:side :nopax, + hg[:ndi.ys + 120m] >> 0.5mo + -- hg[:ndi.ys + 200m] << 0.5mo ); - # Gl. 2 - with layer = 2 track(:first:station :cat:ac15 :pax, - hg[:ndi.ys - 250m, :ndi.fg] << 0.5dt - ); + # Gl. 2 (DE 6340 dn) + track(hg[:ndi.ys - 250m, :ndi.fg] << 0.5mo); # W45 - W46 - track(:station :cat:ac15, - hg[:ndi.ys + 220m] << 0.5dt - -- hg[:ndi.ys + 300m] >> 0.5dt + track(:side :nopax, + hg[:ndi.ys + 220m] << 0.5mo + -- hg[:ndi.ys + 300m] >> 0.5mo ); # Gl. 5 - track(:station :cat:ac15, - hg[:ndi.yr - 0.1dl, :ndi.yr] >> 2.5dt - .. hg[:ndi.ys - 21m, :ndi.ys - 20m] >> 1.5dt - -- hg[:ndi.ys + 50m, :ndi.ys + 51m] >> 0.5dt + track(:side :nopax, + hg[:ndi.yr - 0.1dl, :ndi.yr] >> 2.5mo + .. hg[:ndi.ys - 21m, :ndi.ys - 20m] >> 1.5mo + -- hg[:ndi.ys + 50m, :ndi.ys + 51m] >> 0.5mo ); # Schutzgleis W41 - track(:station, - hg[:ndi.ys - 20m, :ndi.ys + 70m] >> 1.5dt + track(:side :nocat :nopax, + hg[:ndi.ys - 20m, :ndi.ys + 70m] >> 1.5mo ); # Str. 6730 - track(:station :removed, - hg[:ndi.ys, :ndi.ys + 50m] << 1.5dt - -- hg[:ndi.ys + 120m, :ndi.ys + 121m] << 0.5dt + track(:side :nopax :removed, + hg[:ndi.ys, :ndi.ys + 50m] << 1.5mo + -- hg[:ndi.ys + 120m, :ndi.ys + 121m] << 0.5mo ); - marker(:right :de.bft :removed, hg[:ndi.ys + 70m + 0.5sw] >> 0.5dt); - station(:top :removed, hg[:ndi.ys + 70m + 0.5sw] >> 0.5dt >> 1.2sw, + marker(:right :de.bft :removed, + hg[:ndi.ys + 70m + 0.5sw] >> 0.5mo >> 0.5mt + ); + station(:top :removed, + hg[:ndi.ys + 70m + 0.5sw] >> 0.5mo >> 0.5mt >> 1sh + (-0.5dt, -1dt), "N. Dn", hbox(:center:top, vbox(:right:top, "6340: ", "6730: "), diff --git a/rules/de/u/d4/66/6694.map b/rules/de/u/d4/66/6694.map new file mode 100644 index 00000000..00cdeecc --- /dev/null +++ b/rules/de/u/d4/66/6694.map @@ -0,0 +1,20 @@ +# DE 6694. Plaue (Thür) - Rennsteig +# +let pr = path("d3.de.6694"); + +with detail = 4, + railway = :second :pax +{ + # point.de.Plaue-Thür de.6298 + + with link = "line.de.6694" { + badge(pr[:pla.fi] << 1.5mo, + hbox(:right:middle, + "Rennsteig ← ", + span(:xsmall, "6694 ") + ) + ); + } +} + + diff --git a/rules/de/u/d4/67/6730.map b/rules/de/u/d4/67/6730.map index 3473de56..e1904eb2 100644 --- a/rules/de/u/d4/67/6730.map +++ b/rules/de/u/d4/67/6730.map @@ -1,24 +1,19 @@ # DE 6730. Neudietendorf Ds - Neudietendorf Dn # -let nn = path("d4.de.6730"); +let nn = path("d3.de.6730"); -with detail = [4, 5] { +with detail = 4, + railway = :side :nopax :removed +{ # point.de.Neudietendorf-Dn: de.6340 with link = "line.de.6730" { - track(:station :removed, - nn[:ndi.yw - 0.1dl, :ndi.yw] << 1.5dt - .. nn[:ndi.ys, :ndi.ys + 0.1dl] << 1.5dt - ); - - guide(:linenum :removed, - nn[:ndi.yw + 200m] << 2.2dt - -- nn[:ndi.yw + 200m] << 5dt - ); - label(:linenum :removed, nn[:ndi.yw + 200m] << 5dt + (-0.5dt, 0dt), - hbox(:center:top, "6730") + track(nn[:ndi.yw, :ndi.yw + 220m] << 1.5mo); + line_label(:left:n, nn[:ndi.yw + 220m] << 1.5mo << 0.5lt, + (-0.7dt, 0dt), "6730" ); + track(nn[:ndi.yw + 220m, :ndi.ys] << 1.5mo); } diff --git a/rules/de/u/d4/67/6733.map b/rules/de/u/d4/67/6733.map index 6cc4dedf..aa0539f8 100644 --- a/rules/de/u/d4/67/6733.map +++ b/rules/de/u/d4/67/6733.map @@ -1,6 +1,6 @@ # DE 6733. Arnstadt Ost - Ichtershausen # -let ai = path("d4.de.6733"); +let ai = path("d3.de.6733"); with detail = [4, 5] { # point.de.Arnstadt-Hbf: de.6299