Merge branch 'feature/upstream' into develop

1 files changed, 64 insertions, 2 deletions

diff --git a/app/lib/demos/dmhndld.xtr b/app/lib/demos/dmhndld.xtr
index 2647818..cf3c477 100644
--- a/app/lib/demos/dmhndld.xtr
+++ b/app/lib/demos/dmhndld.xtr
@@ -3,11 +3,11 @@
 VERSION 10
 DEMOINIT
 ORIG 4.000 13.000 6.000
-STRAIGHT 1 0 0 0 0 N 2
+STRAIGHT 1 0 0 0 0 DEMO 2
 	E 13.625000 6.625000 243.300294
 	E 34.875000 17.312500 63.300294
 	END
-CURVE 2 0 0 0 0 N 2 34.992582 -3.178627 0 16.250000 0 0.000000 0.000000
+CURVE 2 0 0 0 0 DEMO 2 34.992582 -3.178627 0 16.250000 0 0.000000 0.000000
 	E 19.937500 2.937500 202.109448
 	E 40.001921 12.279996 107.954824
 	END
@@ -107,5 +107,67 @@ RESET
 MESSAGE
 =========================================
 END
+REGRESSION START 10 - handlaid turnout
+STRAIGHT 1 0 0 0 0 DEMO 2
+	E4 13.625000 6.625000 243.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 7 20.692306 10.179439 63.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 2 0 0 0 0 DEMO 2 34.992582 -3.178627 0 16.250000 0 0.000000 0.000000
+	E4 19.937500 2.937500 202.109448 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 12 22.817510 7.583813 41.475827 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 3 0 0 0 0 DEMO 2
+	T4 7 21.323206 10.496745 243.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 34.875000 17.312500 63.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 4 0 0 0 0 DEMO 2
+	T4 7 21.310280 10.521238 241.053198 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 5 22.150312 10.985857 61.053198 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 5 0 0 0 0 DEMO 2 16.103354 21.918786 0 12.493784 0 0.000000 0.000000
+	T4 6 24.004126 12.240333 50.774343 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 22.150312 10.985857 241.053198 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 6 0 0 0 0 DEMO 2
+	T4 5 24.004126 12.240333 230.774343 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 24.277659 12.463625 50.774343 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  7 0 8 0 0 DEMO 2 20.692306 10.179439 0 243.300294 "	Hand Laid Turnout, Angle=12.5	"
+	T4 1 20.692306 10.179439 243.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 3 21.323206 10.496745 63.300294 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 4 21.310280 10.521238 61.053198 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	P "Reverse" 2
+	S 0 0.000000 0.000000 0.000000 0.000000 -0.706200
+	S 0 0.000000 0.000000 0.000000 0.027690 -0.705657
+	END
+CURVE 8 0 0 0 0 DEMO 2 34.992582 -3.178627 0 16.250000 0 0.000000 0.000000
+	T4 12 23.296269 8.102275 223.964248 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 40.001921 12.279996 107.954824 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+CURVE 9 0 0 0 0 DEMO 2 29.929997 1.296563 0 9.492997 0 0.000000 0.000000
+	T4 12 23.303539 8.094140 225.730320 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 10 23.481733 8.263404 47.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 10 0 0 0 0 DEMO 2
+	T4 9 23.481733 8.263404 227.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 11 26.592848 11.142944 47.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+STRAIGHT 11 0 0 0 0 DEMO 2
+	T4 10 26.592848 11.142944 227.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	E4 26.851986 11.382793 47.213730 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	END
+TURNOUT  12 0 8 0 0 DEMO 2 22.817510 7.583813 0 221.475827 "	Hand Laid Turnout, Angle=12.4	"
+	T4 2 22.817510 7.583813 221.475827 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 8 23.296269 8.102275 43.964248 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	T4 9 23.303539 8.094140 45.730320 0 0.0 0.0 0.0 0.0 0 0 0 0.000000 
+	D 0.000000 0.000000
+	P "Normal" 1
+	P "Reverse" 2
+	S 0 0.000000 0.000000 0.000000 -0.015323 -0.705534
+	S 0 0.000000 0.000000 0.000000 -0.026159 -0.704254
+	END
+REGRESSION END
 STEP
 CLEAR