improved mainline/station junction

[trains.git] / layout / ours.m4

diff --git a/layout/ours.m4 b/layout/ours.m4
index 43d2fdbbe67b8279f9e091cb962c7517f5116d0c..aa8441dbd904e9ed678177eb173910512eeea559 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -140,6 +140,13 @@ extend sq_br_i sq_bl_o2 upto sq_bl_o
 
 #---------- bottom junction between main loop, main-8
 
+layer l100
+
+rel sq_tr_o ctrlbox_bl -64 156
+extend ctrlbox_bl ctrlbox_br len 50
+rel ctrlbox_bl ctrlbox_blv 0 0 90
+extend ctrlbox_blv ctrlbox_tl len 100
+
 layer 0
 
 #rel sq_br_i bot_3rj_c 315
@@ -229,9 +236,13 @@ part top_45x scis_pecof bl
 
 #---------- top main-line/station junction
 
+layer 6
+extend -rim_2t top_2j_c len 450 -352
+#extend -rim_2t top_2j_c upto top_0rme1 -352
+
 layer 8
-rel top_0rme1 -top_2j_c 0 -37
-part top_2j pt_pecofguess_ll c
+part top_2j pt_peco_cl c
+#part top_2j pt_pecofguess_ll c
 
 layer 4
 extend top_2lk top_2j21 len 300
@@ -241,19 +252,22 @@ join top_2j21 -top_2j_b 600
 
 layer 8
 extend top_45x_tr top_4j21 len 95 1200
-join top_4j21 -top_2j_a 500 twoarcs
+extend top_2j_a -top_4j22 len 0.010 -352
+join top_4j21 top_4j22 352 twoarcs
 
 rel -top_0rm_a top_5j3b 0 -148
 extend top_45x_tl top_5j3a len 95 -1200
 join top_5j3a top_5j3b 315 twoarcs
 
 layer 0
-extend top_3lk top_3u1 len 335
-rel -top_0rm_a top_3u2 -0 -105
-join top_3u1 top_3u2 500 cross twoarcs !arcsline
+extend top_3lk top_3u1 len 330
+rel -top_0rm_a top_3u2 35 -111
+join top_3u1 top_3u2 600
+#cross twoarcs !arcsline
 
 layer 4
-extend -rim_3t -rim_3tt ang 1 -389
+extend -rim_3t -rim_3tt1 len 15.3
+extend -rim_3tt1 -rim_3tt ang 17.5 -315
 part top_3j pt_peco_cl c -rim_3tt
 
 layer 2
@@ -265,9 +279,6 @@ extend top_3j_a top_5j3c ang 45 -315
 layer 8
 join top_5j3b -top_5j3c 315 arcline
 
-layer 6
-join -top_2j_c rim_2t 352
-
 #---------- station
 
 # left bridge, `leb'