Merge branch 'feature/upstream' into develop

1 files changed, 27 insertions, 23 deletions

diff --git a/app/lib/params/N-PecoCode80Streamline.xtp b/app/lib/params/N-PecoCode80Streamline.xtp
index 0d31703..73267e7 100644
--- a/app/lib/params/N-PecoCode80Streamline.xtp
+++ b/app/lib/params/N-PecoCode80Streamline.xtp
@@ -1,4 +1,4 @@
-CONTENTS Peco N-Scale Code80 Streamline Track
+CONTENTS Peco N Scale Code 80 Streamline Track
 SUBCONTENTS Peco Code 80 - Turnouts
 TURNOUT N  "Peco-80	Medium Right	SL-1738/395"
 	P "Normal" 1 2
@@ -57,26 +57,30 @@ TURNOUT N  "Peco-80	Wye	SL-1741/397"
 	S 0 0.000000 2.178781 -0.063715 5.000000 -0.261000
 	END
 TURNOUT N  "Peco-80	Curved Right	SL-1734/386"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
+	P "Normal" 1 2 3
+	P "Reverse" 1 4 5 6
 	E 0.000000 0.000000 270.000000
-	E 6.187000 -0.343000 99.763000
-	E 6.093000 -0.875000 105.836000
-	C 0 0 36.000000 -1.064000 -35.984000 1.693000 1.195000
-	C 0 0 36.000000 1.405000 -36.024000 358.957000 8.676000
-	C 0 0 18.000000 0.570000 -18.029000 0.573000 16.046000
-	S 0 0 5.718000 -0.781000 6.093000 -0.875000
+	E 6.137008 -0.526772 99.815000
+	E 6.048031 -1.046457 109.633000
+	C 0 0.000000 35.984252 0.000000 -35.984252 0.000000 0.079612
+	C 0 0.000000 35.880126 0.011345 -35.880140 0.061728 9.688447
+	C 0 0.000000 36.000000 0.002864 -35.984333 9.735388 0.079612
+	C 0 0.000000 17.185618 0.172609 -17.185215 359.591225 10.119708
+	C 0 0.000000 18.699999 -0.281647 -18.642768 10.329528 9.301755
+	C 0 0.000000 18.000000 0.000137 -18.000011 19.473845 0.159155
 	END
 TURNOUT N  "Peco-80	Curved Left	SL-1735/387"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
+	P "Normal" 1 2 3
+	P "Reverse" 1 4 5 6
 	E 0.000000 0.000000 270.000000
-	E 6.187000 0.343000 80.237000
-	E 6.093000 0.875000 74.000000
-	C 0 0 -36.000000 -1.064000 35.984000 177.112000 1.195000
-	C 0 0 -36.000000 1.405000 36.024000 172.367000 8.676000
-	C 0 0 -18.000000 0.570000 18.029000 163.381000 16.046000
-	S 0 0 5.718000 0.781000 6.093000 0.875000
+	E 6.137008 0.526772 80.185000
+	E 6.048031 1.046457 70.367000
+	C 0 0.000000 35.984252 0.000000 35.984252 179.920388 0.079612
+	C 0 0.000000 -35.880126 0.011345 35.880140 170.249825 9.688447
+	C 0 0.000000 36.000000 0.002864 35.984333 170.185000 0.079612
+	C 0 0.000000 -17.185618 0.172609 17.185215 170.289067 10.119708
+	C 0 0.000000 -18.699999 -0.281647 18.642768 160.368717 9.301755
+	C 0 0.000000 18.000000 0.000137 18.000011 160.367000 0.159155
 	END
 SUBCONTENTS Peco Code 80 - Crossings
 # Crossing Design by Dave Bullis - 3.582677 25.000000 3.582677
@@ -163,12 +167,12 @@ TURNOUT N "Peco	Turn Table	NB-55"
 	E	0.000000	-3.218750	180.000000
 	E	-0.558930	-3.169850	190.000000
 	E	-1.100877	-3.024636	200.000000
-	E	-1.609375	-2.787519	210.000000	
+	E	-1.609375	-2.787519	210.000000
 	E	-2.068973	-2.465706	220.000000
-	E	-2.465706	-2.068973	230.000000	
+	E	-2.465706	-2.068973	230.000000
 	E	-2.787519	-1.609375	240.000000
 	E	-3.024636	-1.100877	250.000000
-	E	-3.169850	-0.558930	260.000000	
+	E	-3.169850	-0.558930	260.000000
 	E	-3.218750	0.000000	270.000000
 	E	-3.169850	0.558930	280.000000
 	E	-3.024636	1.100877	290.000000
@@ -197,7 +201,7 @@ TURNOUT N "Peco	Turn Table	NB-55"
 	S	16777215	0.000000	2.298133	1.928363	-2.298133	-1.928363
 	S	0	0.000000	-2.298133	-1.928363	-2.465706	-2.068973
 	S	0	0.000000	2.787519	1.609375	2.598076	1.500000
-	S	16777215	0.000000	2.598076	1.500000	-2.598076	-1.500000	
+	S	16777215	0.000000	2.598076	1.500000	-2.598076	-1.500000
 	S	0	0.000000	-2.598076	-1.500000	-2.787519	-1.609375
 	S	0	0.000000	3.024636	1.100877	2.819078	1.026060
 	S	16777215	0.000000	2.819078	1.026060	-2.819078	-1.026060
@@ -220,7 +224,7 @@ TURNOUT N "Peco	Turn Table	NB-55"
 	S	0	0.000000	2.465706	-2.068973	2.298133	-1.928363
 	S	16777215	0.000000	2.298133	-1.928363	-2.298133	1.928363
 	S	0	0.000000	-2.298133	1.928363	-2.465706	2.068973
-	S	0	0.000000	2.068973	-2.465706	1.928363	-2.298133	
+	S	0	0.000000	2.068973	-2.465706	1.928363	-2.298133
 	S	16777215	0.000000	1.928363	-2.298133	-1.928363	2.298133
 	S	0	0.000000	-1.928363	2.298133	-2.068973	2.465706
 	S	0	0.000000	1.609375	-2.787519	1.500000	-2.598076
@@ -323,4 +327,4 @@ TURNOUT N "Peco Code 55/80	Inspection Pit(Mid Section)	NB-56FB"
 	L 0 0.020000 0.000000 0.160000 1.122047 0.160000
 	L 0 0.020000 0.000000 -0.160000 1.122047 -0.160000
 	L 0 0.020000 0.000000 -0.300000 1.122047 -0.300000
-END
\ No newline at end of file
+END