some adjs to layers

[trains.git] / layout / ours.m4

diff --git a/layout/ours.m4 b/layout/ours.m4
index f3327e3f0277f90f0608efd0baf0357b3770a105..70780d4c66026a160ecee23f164040dfafbbb81f 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -302,7 +302,39 @@ part leb_5eb pt_peco_ml c
 extend leb_5eb_b sta_5neare3 ang 50 -315
 join sta_5neare3 sta_5neare2 352
 
-extend leb_5eb_a super_h0 ang 90 -315
+layer 12
+extend leb_5eb_a super_h00 uptoang 0 -325
+layer 16
+extend super_h00 super_h01 len 300
+extend super_h01 super_h0 parallel sta_5nears -325
+extend super_h0 super_h10 len 400
+extend super_h10 super_h1 uptoang -1.5 800
+
+layer s
+rel -sq_br_i place_super_h2 -350 0
+
+layer 20
+extend super_h1 super_h2 upto place_super_h2
+
+layer 24
+rel -sq_tr_i super_h3 -315 0
+join super_h2 super_h3 315 arcline
+
+layer 28
+rel -sq_tr_o super_h4 315 0
+join super_h3 super_h4 315 arcline
+
+layer 30
+extend super_h4 -super_jtrr_a ang 5 -315
+part super_jtrr pt_peco_mr a
+part super_jtrl pt_peco_ml c -super_jtrr_c
+extend super_jtrl_b super_mid uptoang 275 -315
+extend super_mid -super_jbl_b parallel super_jtrl_b 315
+part super_jbl pt_peco_ml b
+join super_jbl_a -super_jtrr_b 315 arcline
+join super_jtrl_a super_jbl_c 315 arcline
+
+
 
 layer 20
 
@@ -313,12 +345,12 @@ part sta_67r pt_peco_sl a -sta_6far
 
 rel sq_br_i high_6br0 230 0 -180
 extend high_6br0 high_6br1 ang 90 -230
-join -sta_67r_c high_6br0 230
+##join -sta_67r_c high_6br0 230
 
 extend -sta_6far -sta_6nears len 630
 part sta_67l pt_peco_sl b sta_6nears
 join sta_67l_a -sta_67r_b 230
-extend -sta_67l_c high_6bl5 uptoang -30 230
+#extend -sta_67l_c high_6bl5 uptoang -30 230
 
 layer p20
 
@@ -420,7 +452,8 @@ layer 18
 extend high_6s1 high_6s2 len 100
 
 layer 20
-rel sq_tr_i high_6s4 0 320 90
+#rel sq_tr_i high_6s4 0 320 90
+rel sq_tl_i -high_6s4 320 0
 
 layer 18
 join high_6s2 high_6s4 230
@@ -429,44 +462,44 @@ join high_6s2 high_6s4 230
 
 layer 20
 
-extend high_6s4 highr_6jt_c ang 45 230
-part highr_6jt pt_peco_sr c
+extend high_6s4 highr_6jt_c ang 45 -230
+part highr_6jt pt_peco_sl c
 
-rel sta_1far -high_sta6far -10 -37
+rel sta_1far -high_sta6far -10 0
 extend high_sta6far high_sta6near upto sta_2y0_a
 
-extend highr_6jt_b highr_x_br uptoang -120 230
+extend highr_6jt_b highr_x_br uptoang -60 -230
 
 part highr_x cross_atlas_90m br
 
-extend highr_x_tl highr_6sc_c ang 20 230
-part highr_6sc pt_peco_sr c
+extend highr_x_tl highr_6sc_c ang 20 -230
+part highr_6sc pt_peco_sl c
 extend highr_6sc_a highr_6out ang 15 230
-join highr_6out high_sta6far 230
+##join highr_6out high_sta6far 230
 
 layer s
-extend -highr_x_bl -demo_highr_6jb_c uptoang -90 230
-extend -sq_br_o place_highr_6jb_c upto demo_highr_6jb_c
+extend highr_x_bl -demo_highr_6jb_c uptoang 90 -230
+extend sq_bl_i place_highr_6jb_c upto demo_highr_6jb_c
 
 layer 20
-rel place_highr_6jb_c highr_6jb_c -5 0
-part highr_6jb pt_peco_sl c
-join highr_6jb_b highr_x_bl 230
+rel place_highr_6jb_c highr_6jb_c -10 0
+part highr_6jb pt_peco_sr c
+join highr_6jb_b -highr_x_bl 230
 join highr_6jt_a -highr_6jb_a 230 arcline
-join high_6br1 highr_6jb_c 230
+##join high_6br1 highr_6jb_c 230
 
-extend highr_x_tr highr_7kink uptoang 225 -230
-extend highr_7kink -highr_7sc_a ang 30 230
+extend -highr_x_tr highr_7kink uptoang -45 230
+extend highr_7kink -highr_7sc_a ang 30 -230
 rel high_sta6near high_sta7near 0 37
 
-part highr_7sc pt_peco_sr a
-join -highr_7sc_c high_sta7near 230
+part highr_7sc pt_peco_sl a
+##join -highr_7sc_c high_sta7near 230
 
-join highr_7sc_b -highr_6sc_b 230
+##join highr_7sc_b -highr_6sc_b 230
 
-part high_67j pt_peco_sr c high_6bl5
-join high_67j_b -high_sta6near 267
-join high_67j_a -high_sta7near 230
+#part high_67j pt_peco_sr c high_6bl5
+##join high_67j_b -high_sta6near 267
+##join high_67j_a -high_sta7near 230
 
 #---------- shunting yard