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

1 files changed, 248 insertions, 0 deletions

diff --git a/app/lib/params/G-Piko.xtp b/app/lib/params/G-Piko.xtp
new file mode 100644
index 0000000..f55e459
--- /dev/null
+++ b/app/lib/params/G-Piko.xtp
@@ -0,0 +1,248 @@
+CONTENTS Piko G Scale Track
+CONTENTS G Scale - Piko
+
+SUBCONTENTS Piko G Scale Track - Straights
+TURNOUT G "Piko	G-G1200 1200mm (47.24) Straight	35208"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 47.244094 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 47.244094 0.000000
+	END$SEGS
+TURNOUT G "Piko	G-G600 600mm (23.62) Straight	35209"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 23.622047 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 23.622047 0.000000
+	END$SEGS
+TURNOUT G "Piko	G-G320 320mm (321.54/12.66) Straight	35200"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 12.659055 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 12.659055 0.000000
+	END$SEGS
+TURNOUT G "Piko	G-G280 280mm (278.46/10.96) Straight	35201"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 10.962992 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 10.962992 0.000000
+	END$SEGS
+TURNOUT G "Piko	G-G160 160mm (160.77/6.33) Straight	35202"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.329528 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 6.329528 0.000000
+	END$SEGS
+TURNOUT G "Piko	G-G140 140mm (139.23/5.48) Straight	35203"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 5.481496 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 5.481496 0.000000
+	END$SEGS
+TURNOUT G "Piko	G-G95 95mm (96.15/3.79) Straight	35204"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 3.785433 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 3.785433 0.000000
+	END$SEGS
+
+
+SUBCONTENTS Piko G Scale Track - Curves
+TURNOUT G "Piko	G-R1 600mm (23.62) Rad. 30° Curve	35211"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 11.811024 -3.164754 120.000000
+	C 0 0.000000 23.622047 0.000000 -23.622047 0.000000 30.000000
+	END$SEGS
+TURNOUT G "Piko	G-R3 921.54mm (36.28) Rad. 30° Curve	35213"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 18.140551 -4.860746 120.000000
+	C 0 0.000000 36.281102 0.000000 -36.281102 0.000000 30.000000
+	END$SEGS
+TURNOUT G "Piko	G-R3 921.54mm (36.28) Rad. 7.5° Curve	35214"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.735634 -0.310390 97.500000
+	C 0 0.000000 36.281102 0.000000 -36.281102 0.000000 7.500000
+	END$SEGS
+TURNOUT G "Piko	G-R5 1243.08mm (48.94) Rad. 15° Curve	35215"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 12.666645 -1.667595 105.000000
+	C 0 0.000000 48.940157 0.000000 -48.940157 0.000000 15.000000
+	END$SEGS
+TURNOUT G "Piko	G-R5 1243.08mm (48.94) Rad. 7.5° Curve	35216"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.387972 -0.418690 97.500000
+	C 0 0.000000 48.940157 0.000000 -48.940157 0.000000 7.500000
+	END$SEGS
+TURNOUT G "Piko	G-R7 1564.62mm (61.60) Rad. 15° Curve	35217"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 15.943049	-2.098942 105.000000
+	C 0 0.000000 61.599213 0.000000 -61.599213 0.000000 15.000000
+	END$SEGS
+TURNOUT G "Piko	G-R7 1564.62mm (61.60) Rad. 7.5° Curve	35218"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 8.040311 -0.526990 97.500000
+	C 0 0.000000 61.599213 0.000000 -61.599213 0.000000 7.500000
+	END$SEGS
+
+
+SUBCONTENTS Piko G Scale Track - Crossings
+TURNOUT G "Piko	K30 30° Crossing	35240"
+	P "Normal" 1 0 2
+	E 0.000000 0.000000 270.000000
+	E 12.659055 0.000000 90.000000
+	E 0.847996 3.164764 300.000000
+	E 11.811059 -3.164764 120.000000
+	S 0 0.000000 0.000000 0.000000 12.659055 0.000000
+	S 0 0.000000 0.847996 3.164764 11.811059 -3.164764
+	END$SEGS
+TURNOUT G "Piko	K60 60° Crossing	35241"
+	P "Normal" 1 0 2
+	E 0.000000 0.000000 270.000000
+	E 6.329528 0.000000 90.000000
+	E 1.582382 2.740766 330.000000
+	E 4.747146 -2.740766 150.000000
+	S 0 0.000000 0.000000 0.000000 6.329528 0.000000
+	S 0 0.000000 1.582382 2.740766 4.747146 -2.740766
+	END$SEGS
+
+
+SUBCONTENTS Piko G Scale Track - Switches
+TURNOUT G "Piko	R1 Switch Left	G-WLR1/35220"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 12.659055 0.000000 90.000000
+	E 11.811024 3.164754 60.000000
+	S 0 0.000000 0.000000 0.000000 12.659055 0.000000
+	C 0 0.000000 23.622047 0.000000 23.622047 150.000000 30.000000
+	END$SEGS
+TURNOUT G "Piko	R1 Switch Right	G-WRR1/35221"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 12.659055 0.000000 90.000000
+	E 11.811024 -3.164754 120.000000
+	S 0 0.000000 0.000000 0.000000 12.659055 0.000000
+	C 0 0.000000 23.622047 0.000000 -23.622047 0.000000 30.000000
+	END$SEGS
+TURNOUT G "Piko	R3 Switch Left	G-WLR3/35228"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 16.444488 0.000000 90.000000
+	E 13.884177 2.761734 67.500000
+	S 0 0.000000 0.000000 0.000000 16.444488 0.000000
+	C 0 0.000000 36.281102 0.000000 36.281102 157.500000 22.500000
+	END$SEGS
+TURNOUT G "Piko	R3 Switch Right	G-WRR3/35229"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 16.444488 0.000000 90.000000
+	E 13.884177 -2.761734 112.500000  
+	S 0 0.000000 0.000000 0.000000 16.444488 0.000000
+	C 0 0.000000 36.281102 0.000000 -36.281102 0.000000 22.500000
+	END$SEGS
+TURNOUT G "Piko	R5 Switch Left	G-WLR5/35222"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 18.988583 0.000000 90.000000
+	E 18.728587	3.725348 67.500000
+	S 0 0.000000 0.000000 0.000000 18.988583 0.000000
+	C 0 0.000000 48.940157 0.000000 48.940157 157.500000 22.500000
+	END$SEGS
+TURNOUT G "Piko	R5 Switch Right	G-WRR5/35223"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 18.988583 0.000000 90.000000
+	E 18.728587	-3.725348 112.500000
+	S 0 0.000000 0.000000 0.000000 18.988583 0.000000
+	C 0 0.000000 48.940157 0.000000 -48.940157 0.000000 22.500000
+	END$SEGS
+TURNOUT G "Piko	R7 Switch Left	G-WLR7/35226"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 23.622047 0.000000 90.000000
+	E 23.572998 4.688961 67.500000
+	S 0 0.000000 0.000000 0.000000 23.622047 0.000000
+	C 0 0.000000 61.599213 0.000000 61.599213 157.500000 22.500000
+	END$SEGS
+TURNOUT G "Piko	R7 Switch Right	G-WRR7/35227"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 23.622047 0.000000 90.000000
+	E 23.572998 -4.688961 112.500000
+	S 0 0.000000 0.000000 0.000000 23.622047 0.000000
+	C 0 0.000000 61.599213 0.000000 -61.599213 0.000000 22.500000
+	END$SEGS
+
+SUBCONTENTS Piko G Scale Track - Wye and Slip Switches
+TURNOUT G "Piko	G-DKW Double-Slip Switch 	G-DKW" 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 12.659055 0.000000 90.000000
+	E 0.847996 3.164764 300.000000
+	E 11.811059 -3.164764 120.000000
+	S 0 0.000000 0.000000 0.000000 3.540000 0.000000
+	S 0 0.000000 3.540000 0.000000 9.119055 0.000000
+	S 0 0.000000 9.119055 0.000000 12.659055 0.000000
+	S 0 0.000000 0.847996 3.164764 3.913726 1.394764
+	S 0 0.000000 3.913726 1.394764 8.745329 -1.394764
+	S 0 0.000000 8.745329 -1.394764 11.811059 -3.164764
+	C 0 0.000000 10.410658 3.540000 -10.410658 0.000000 30.000000
+	C 0 0.000000 -10.410658 9.119055 10.410658 180.000000 30.000000
+	END$SEGS
+TURNOUT G "Piko	G-WY Wye Switch 	G-WY"
+	P "Left" 1
+	P "Right" 2
+	E 0.000000 0.000000 270.000000
+	E 11.811024 3.164754 60.000000
+	E 11.811024 -3.164754 120.000000
+	C 0 0.000000 23.622047 0.000000 23.622047 150.000000 30.000000
+	C 0 0.000000 23.622047 0.000000 -23.622047 0.000000 30.000000
+	END$SEGS
+TURNOUT G "Piko	G-W3 3-Way Switch 	G-W3"
+	P "Left" 1
+	P "Normal" 2
+	P "Right" 3
+	E 0.000000 0.000000 270.000000
+	E 12.659055 0.000000 90.000000
+	E 11.811024 3.164754 60.000000
+	E 11.811024 -3.164754 120.000000
+	C 0 0.000000 23.622047 0.000000 23.622047 150.000000 30.000000
+	S 0 0.000000 0.000000 0.000000 12.659055 0.000000
+	C 0 0.000000 23.622047 0.000000 -23.622047 0.000000 30.000000
+	END$SEGS
+
+SUBCONTENTS Piko G Scale Track - Curve Switches
+TURNOUT G "Piko	R3/R5 Curve Switch Left	G-BWL/35224"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 28.783734 14.194567 37.500000
+	E 29.792880 10.113320 52.500000
+	C 0 0.000000 36.281102 0.000000 36.281102 127.500000 52.500000
+	C 0 0.000000 48.940157 0.000000 48.940157 142.500000 37.500000
+	END$SEGS
+TURNOUT G "Piko	R3/R5 Curve Switch Right	G-BWR/35225"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 29.792880 -10.113320 127.500000
+	E 28.783734 -14.194567 142.500000
+	C 0 0.000000 36.281102 0.000000 -36.281102 0.000000 52.500000
+	C 0 0.000000 48.940157 0.000000 -48.940157 0.000000 37.500000
+	END$SEGS
\ No newline at end of file