make junction between station branch and bottom figure-of-8 have a flyover instead...

diff --git a/layout/ours.m4 b/layout/ours.m4
index bad343cc1919ccbe08c5dad6287291777957a73d..219a1561952881ff40151569abc43f50971543b7 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -58,8 +58,8 @@ segment /
 
 layer 2
 #rel top_3lk top_45x_br 85 -37 -2.25
-rel top_3lk top_45x_br 67 -40 -2.55
-extend -top_45x_br -top_4le0 len 80 -900
+rel top_3lk top_45x_br 67 -39 -2.25
+extend -top_45x_br -top_4le0 len 120 -1200
 
 layer s
 rel top_3lk top_5_ref 0 -74
@@ -222,8 +222,9 @@ join -leb_0k top_0lm_c 315 arcsline
 segment /
 
 layer 2
-part top_45x scis_pecof br
-join top_5le top_45x_bl 600 twoarcs
+extend top_5le top_5re0 len 30.0 315
+extend top_5re0 top_45x_bl len 95 -1200
+part top_45x scis_pecof bl
 
 #---------- top main-line/station junction
 
@@ -233,24 +234,24 @@ rel top_0rme1 -top_2j_c 0 -37
 part top_2j pt_pecofguess_ll c
 join top_2lk -top_2j_b 600
 
-extend top_2j_a -top_34jx_tr len 50
-part top_34jx cross_pecof_l tr
-join top_3lk top_34jx_br 450
+extend top_45x_tr top_4j21 len 95 1200
+join top_4j21 -top_2j_a 315 twoarcs
 
-join top_45x_tr top_34jx_bl 600
+rel -top_0rm_a top_5j3b 0 -148
+extend top_45x_tl top_5j3a len 95 -1200
+join top_5j3a top_5j3b 315 twoarcs
 
-extend top_34jx_tl top_3j3 len 30 -700
-extend top_3j3 -top_3j_b len 30 800
-part top_3j pt_pecofguess_ll b
+extend top_3lk top_3u1 len 335
+rel -top_0rm_a top_3u2 -0 -105
+join top_3u1 top_3u2 450 cross twoarcs !arcsline
 
-extend -rim_3t -rim_3tt ang 45 -389
+extend -rim_3t -rim_3tt ang 1 -389
 
-join -top_2j_c rim_2t 352
-join -top_3j_c rim_3tt 352
+part top_3j pt_peco_cl c -rim_3tt
+join top_3u2 -top_3j_b 315
+join top_5j3b -top_3j_a 315
 
-extend top_45x_tl top_5x1 len 40
-extend top_5x1 top_5x2 len 40 2000
-join top_5x2 -top_3j_a 450
+join -top_2j_c rim_2t 352
 
 #---------- station