Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1

1 files changed, 63 insertions, 30 deletions

diff --git a/app/lib/params/FastTrack-HO.xtp b/app/lib/params/FastTrack-HO.xtp
index c7bac97..4250ad0 100644
--- a/app/lib/params/FastTrack-HO.xtp
+++ b/app/lib/params/FastTrack-HO.xtp
@@ -126,30 +126,54 @@ TURNOUT HO "Fast Tracks	#6 Right Curve 60-33 Turnout	FT-6-R-60-33"
 
 SUBCONTENTS Fast Track HO Scale - #8 Curve Turnouts
 TURNOUT HO "Fast Tracks	#8 Left Curve 18-15 Turnout	FT-8-L-18-15"
-	P "Normal" 1 6 4 5
+	U "Curved Turnout" "" "Fast Tracks" "#8 Left Curve 18-15 TurnoutL" "FT-8-L-18-151" "#8 Right Curve 18-15 Turnout" "FT-8-R-18-15" 12.195184 48.357832 5.385980 40.457778 4.641370 12.899568 0.000000 0.000000 0
+	P "Normal" 1 4 5
 	P "Reverse" 1 2 3
 	E 0.000000 0.000000 270.000000
-	E 12.899568 4.641347 49.542222
-	E 12.195184 5.383598 41.642160
-	S 0 0.000000 0.000000 0.000000 0.853970 0.000000
-	C 0 0.000000 -14.598485 0.853989 14.598485 131.642084 48.357992
-	S 0 0.000000 11.763573 4.898159 12.195184 5.383598
-	C 0 0.000000 -17.647609 0.954021 17.647609 139.542146 40.457930
-	S 0 0.000000 12.405339 4.219843 12.899568 4.641347
-	S 0 0.000000 0.853970 0.000000 0.953998 0.000000
+	E 12.899568 4.641370 49.542222
+	E 12.195184 5.385980 41.642168
+	S 0 0.000000 0.000000 0.000000 0.848631 0.000000
+	C 0 0.000000 -14.605613 0.848631 14.605613 131.642168 48.357832
+	S 0 0.000000 11.763540 4.900528 12.195184 5.385980
+	C 0 0.000000 -17.647747 0.953529 17.647436 139.540662 40.799907
+	S 0 0.000000 12.405298 4.219853 12.899568 4.641370
+#UseOldPaths - Seg6 is short
+#	P "Normal" 1 6 4 5
+#	P "Reverse" 1 2 3
+#	E 0.000000 0.000000 270.000000
+#	E 12.899568 4.641347 49.542222
+#	E 12.195184 5.383598 41.642160
+#	S 0 0.000000 0.000000 0.000000 0.853970 0.000000
+#	C 0 0.000000 -14.598485 0.853989 14.598485 131.642084 48.357992
+#	S 0 0.000000 11.763573 4.898159 12.195184 5.383598
+#	C 0 0.000000 -17.647609 0.954021 17.647609 139.542146 40.457930
+#	S 0 0.000000 12.405339 4.219843 12.899568 4.641347
+#	S 0 0.000000 0.853970 0.000000 0.953998 0.000000
 	END
 TURNOUT HO "Fast Tracks	#8 Right Curve 18-15 Turnout	FT-8-R-18-15"
-	P "Normal" 1 6 4 5
+#UseOldPaths - Seg6 is short
+	U "Curved Turnout" "" "Fast Tracks" "#8 Left Curve 18-15 TurnoutL" "FT-8-L-18-151" "#8 Right Curve 18-15 Turnout" "FT-8-R-18-15" 12.195184 48.357832 5.385980 40.457778 4.641370 12.899568 0.000000 0.000000 0
+	P "Normal" 1 4 5
 	P "Reverse" 1 2 3
 	E 0.000000 0.000000 270.000000
-	E 12.899568 -4.641347 130.457778
-	E 12.195184 -5.383598 138.357840
-	S 0 0.000000 0.000000 0.000000 0.853970 0.000000
-	C 0 0.000000 14.598485 0.853912 -14.598485 0.000076 48.357992
-	S 0 0.000000 11.763573 -4.898159 12.195184 -5.383598
-	C 0 0.000000 17.647609 0.953928 -17.647609 0.000076 40.457930
-	S 0 0.000000 12.405339 -4.219843 12.899568 -4.641347
-	S 0 0.000000 0.853970 0.000000 0.953998 0.000000
+	E 12.899568 -4.641370 130.457778
+	E 12.195184 -5.385980 138.357832
+	S 0 0.000000 0.000000 0.000000 0.848631 -0.000000
+	C 0 0.000000 14.605613 0.848631 -14.605613 0.000000 48.357832
+	S 0 0.000000 11.763540 -4.900528 12.195184 -5.385980
+	C 0 0.000000 17.647747 0.953529 -17.647436 359.659431 40.799907
+	S 0 0.000000 12.405298 -4.219853 12.899568 -4.641370
+#	P "Normal" 1 6 4 5
+#	P "Reverse" 1 2 3
+#	E 0.000000 0.000000 270.000000
+#	E 12.899568 -4.641347 130.457778
+#	E 12.195184 -5.383598 138.357840
+#	S 0 0.000000 0.000000 0.000000 0.853970 0.000000
+#	C 0 0.000000 14.598485 0.853912 -14.598485 0.000076 48.357992
+#	S 0 0.000000 11.763573 -4.898159 12.195184 -5.383598
+#	C 0 0.000000 17.647609 0.953928 -17.647609 0.000076 40.457930
+#	S 0 0.000000 12.405339 -4.219843 12.899568 -4.641347
+#	S 0 0.000000 0.853970 0.000000 0.953998 0.000000
 	END
 TURNOUT HO "Fast Tracks	#8 Left Curve 24-20 Turnout	FT-8-L-24-20"
 	P "Normal" 1 4 5
@@ -487,9 +511,11 @@ TURNOUT HO "Fast Tracks	#10 Right Curve 60-46 Turnout	FT-10-R-60-46"
 
 
 SUBCONTENTS Fast Track HO Scale - Slips
-TURNOUT HO "Fast Tracks	#4 Slip Turnout (min length)	FT-S-4"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+TURNOUT HO "Fast Tracks	#4 Slip Turnout (min length)	FT-S-4" 512
+	P "Cross1" 1 2 3
+	P "Cross2" 4 5 6
+	P "Slip1" 1 7 6
+	P "Slip2" 4 8 3
 	E 0.000000 0.000000 270.000000
 	E 7.500000 0.000000 90.000000
 	E 0.119077 0.937495 284.477524
@@ -503,9 +529,11 @@ TURNOUT HO "Fast Tracks	#4 Slip Turnout (min length)	FT-S-4"
 	C 0 0.000000 19.294700 1.299227 -19.294700 0.000076 14.477676
 	C 0 0.000000 -19.294700 6.200721 19.294694 180.000076 14.477676
 	END
-TURNOUT HO "Fast Tracks	#5 Slip Turnout (min length)	FT-S-5"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+TURNOUT HO "Fast Tracks	#5 Slip Turnout (min length)	FT-S-5" 512
+	P "Cross1" 1 2 3
+	P "Cross2" 4 5 6
+	P "Slip1" 1 7 6
+	P "Slip2" 4 8 3
 	E 0.000000 0.000000 270.000000
 	E 8.800000 0.000000 90.000000
 	E 0.088897 0.879994 281.536969
@@ -519,9 +547,12 @@ TURNOUT HO "Fast Tracks	#5 Slip Turnout (min length)	FT-S-5"
 	C 0 0.000000 30.693984 1.299234 -30.693984 0.000076 11.537121
 	C 0 0.000000 -30.693984 7.500684 30.693976 180.000076 11.537121
 	END
-TURNOUT HO "Fast Tracks	#6 Slip Turnout (min length)	FT-S-6"	U "Double Slipswitch" "" "Fast Tracks" "#6 Slip Turnout (min length)" "FT-S-6" 10.200000 9.594076 10.200000 0.000000 0.031250 0
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+TURNOUT HO "Fast Tracks	#6 Slip Turnout (min length)	FT-S-6" 512
+	U "Double Slipswitch" "" "Fast Tracks" "#6 Slip Turnout (min length)" "FT-S-6" 10.200000 9.594076 10.200000 0.000000 0.031250 0
+	P "Cross1" 1 2 3
+	P "Cross2" 4 5 6
+	P "Slip1" 1 7 6
+	P "Slip2" 4 8 3
 	E 0.000000 0.000000 270.000000
 	E 10.200000 0.000000 90.000000
 	E 0.071331 0.849993 279.594076
@@ -535,9 +566,11 @@ TURNOUT HO "Fast Tracks	#6 Slip Turnout (min length)	FT-S-6"	U "Double Slipswitc
 	C 0 0.000000 45.289320 1.299241 -45.289320 0.000076 9.594228
 	C 0 0.000000 -45.289320 8.900638 45.289310 180.000076 9.594228
 	END
-TURNOUT HO "Fast Tracks	#8 Slip Turnout (min length)	FT-S-8"
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+TURNOUT HO "Fast Tracks	#8 Slip Turnout (min length)	FT-S-8" 512
+	P "Cross1" 1 2 3
+	P "Cross2" 4 5 6
+	P "Slip1" 1 7 6
+	P "Slip2" 4 8 3
 	E 0.000000 0.000000 270.000000
 	E 15.400000 0.000000 90.000000
 	E 0.060392 0.962490 277.180762