New upstream version 5.3.0GAupstream/5.3.0GAupstream

1 files changed, 281 insertions, 0 deletions

diff --git a/app/lib/params/1-mrkln.xtp b/app/lib/params/1-mrkln.xtp
new file mode 100644
index 0000000..0b3929b
--- /dev/null
+++ b/app/lib/params/1-mrkln.xtp
@@ -0,0 +1,281 @@
+CONTENTS Märklin 1 Scale Turnouts
+#Update per webiste 08/2023
+SUBCONTENTS Märklin 1-Scale - Straight Tracks
+TURNOUT 1  "Märklin	Straight 900mm	59033/59061"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 35.433071 0.000000 90.000000
+	S 0 0 0.000000 0.000000 35.433071 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 600mm	59059"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 23.622047 0.000000 90.000000
+	S 0 0 0.000000 0.000000 23.622047 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 300mm	5903/59058"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 11.811024 0.000000 90.000000
+	S 0 0 0.000000 0.000000 11.811024 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 200mm	59057"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 7.874016 0.000000 90.000000
+	S 0 0 0.000000 0.000000 7.874016 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 152.2mm	59056"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 5.992126 0.000000 90.000000
+	S 0 0 0.000000 0.000000 5.992126 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 150mm	5917/59055"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 5.905512 0.000000 90.000000
+	S 0 0 0.000000 0.000000 5.905512 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 116mm	59054"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 4.566929 0.000000 90.000000
+	S 0 0 0.000000 0.000000 4.566929 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 100mm	59053"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 3.937008 0.000000 90.000000
+	S 0 0 0.000000 0.000000 3.937008 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 80.4mm	5904"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 3.165354 0.000000 90.000000
+	S 0 0 0.000000 0.000000 3.165354 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 79mm	59052"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 3.110236 0.000000 90.000000
+	S 0 0 0.000000 0.000000 3.110236 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Isolation Straight 80.4mm	5905"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 3.165354 0.000000 90.000000
+	S 0 0 0.000000 0.000000 3.165354 0.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Straight 59.5mm	5916/59051"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 2.342520 0.000000 90.000000
+	S 0 0 0.000000 0.000000 2.342520 0.000000
+	END$SEGS
+
+SUBCONTENTS Märklin 1-Scale - Curved Tracks
+TURNOUT 1  "Märklin	Curved R600mm 30°	5922"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 11.811024 -3.164754 120.000000
+	C 0 0 23.622047 0.000000 -23.622047 0.000000 30.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R760.8mm 30°	59230"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 14.976378 -4.012908 120.000000
+	C 0 0 29.952756 0.000000 -29.952756 0.000000 30.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R1020mm 22.5°	5935"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 15.367602 -3.056806 112.500000
+	C 0 0 40.157480 0.000000 -40.157480 0.000000 22.500000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R1176mm 22.5°	5936/59072"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 17.717942 -3.524318 112.500000
+	C 0 0 46.299213 0.000000 -46.299213 0.000000 22.500000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R1394mm 15°	59075"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 14.204478 -1.870055 105.000000
+	C 0 0 54.881890 0.000000 -54.881890 0.000000 15.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R1394mm 22.5°	59073"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 21.002390 -4.177635 112.500000
+	C 0 0 54.881890 0.000000 -54.881890 0.000000 22.500000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R1550mm 15°	59074"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 15.794076 -2.079329 105.000000
+	C 0 0 61.023622 0.000000 -61.023622 0.000000 15.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R1550mm 22.5°	59076"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 23.352729 -4.645147 112.500000
+	C 0 0 61.023622 0.000000 -61.023622 0.000000 22.500000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R1715mm 22.5°	59077"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 25.838665 -5.139630 112.500000
+	C 0 0 67.519685 0.000000 -67.519685 0.000000 22.500000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R2321mm 10°	59078"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 15.867615 -1.388236 100.000000
+	C 0 0 91.377953 0.000000 -91.377953 0.000000 10.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Curved R2461mm 10°	59071"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 16.824731 -1.471973 100.000000
+	C 0 0 96.889764 0.000000 -96.889764 0.000000 10.000000
+	END$SEGS
+
+SUBCONTENTS Märklin 1-Scale - Turnouts
+TURNOUT 1  "Märklin	Short Right Turnout	5966"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 11.811024 0.000000 90.000000
+	E 11.811024 -3.164754 120.000000
+	S 0 0 0.000000 0.000000 11.811024 0.000000
+	C 0 0 23.622047 0.000000 -23.622047 0.000000 30.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Short Left Turnout	5965"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 11.811024 0.000000 90.000000
+	E 11.811024 3.164754 60.000000
+	S 0 0 0.000000 0.000000 11.811024 0.000000
+	C 0 0 -23.622047 0.000000 23.622047 150.000000 30.000000
+	END$SEGS
+TURNOUT 1  "Märklin	Medium Right Turnout	5977"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 15.374016 0.000000 90.000000
+	E 15.367602 -3.056806 112.500000
+	S 0 0 0.000000 0.000000 15.374000 0.000000
+	C 0 0 40.157480 0.000000 -40.157480 0.000000 22.500000
+	END$SEGS
+TURNOUT 1  "Märklin	Medium Left Turnout	5976"
+	P "Normal" 1
+	P "Reverse" 2
+	E 0.000000 0.000000 270.000000
+	E 15.374016 0.000000 90.000000
+	E 15.367602 3.056806 67.500000
+	S 0 0 0.000000 0.000000 15.374000 0.000000
+	C 0 0 -40.157480 0.000000 40.157480 157.500000 22.500000
+	END$SEGS
+TURNOUT 1  "Märklin	Right Turnout Set 600mm	59083"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 23.622047 0.000000 90.000000
+	E 23.622047 -2.986654 100.000000
+	S 0 0.000000 0.000000 0.000000 1.770000 -0.000000
+	S 0 0.000000 1.770000 -0.000000 23.622047 0.000000
+	C 0 0.000000 56.166025 1.770000 -56.166025 0.000000 10.000000
+	S 0 0.000000 11.523128 -0.853288 23.622047 -2.986654
+	END$SEGS
+TURNOUT 1  "Märklin	Left Turnout Set 600mm	59084"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 23.622047 0.000000 90.000000
+	E 23.622047 2.986654 80.000000
+	S 0 0.000000 0.000000 0.000000 1.770000 0.000000
+	S 0 0.000000 1.770000 0.000000 23.622047 0.000000
+	C 0 0.000000 -56.166025 1.770000 56.166025 170.000000 10.000000
+	S 0 0.000000 11.523128 0.853288 23.622047 2.986654
+	END$SEGS
+TURNOUT 1 "Marklin	Left Turnout	59088/92"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 19.291339 0.000000 90.000000
+	E 18.898138 2.986654 75.000000
+	S 0 0.000000 0.000000 0.000000 1.770000 0.000000
+	S 0 0.000000 1.770000 0.000000 19.291339 0.000000
+	C 0 0.000000 -45.436233 1.770000 45.436233 165.000000 15.000000
+	S 0 0.000000 13.529762 1.548202 18.898138 2.986654
+	END$SEGS
+TURNOUT 1 "Marklin	Right Turnout	59087/92"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 19.291339 0.000000 90.000000
+	E 18.898138 -2.986654 105.000000
+	S 0 0.000000 0.000000 0.000000 1.770000 -0.000000
+	S 0 0.000000 1.770000 -0.000000 19.291339 0.000000
+	C 0 0.000000 45.436233 1.770000 -45.436233 0.000000 15.000000
+	S 0 0.000000 13.529762 -1.548202 18.898138 -2.986654
+	END$SEGS
+
+SUBCONTENTS Märklin 1-Scale - 3W,Slip & Crossovers
+TURNOUT 1 "Marklin	3 Way Turnout	59091/92"
+	P "Left" 1 2 3
+	P "Normal" 1 4 7
+	P "Right" 1 4 5 6
+	E 0.000000 0.000000 270.000000
+	E 18.898138 2.986654 75.000000
+	E 24.528059 -2.986654 105.000000
+	E 24.921260 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 1.770000 0.000000
+	C 0 0.000000 -45.436233 1.770000 45.436233 165.000000 15.000000
+	S 0 0.000000 13.529762 1.548202 18.898138 2.986654
+	S 0 0.000000 1.770000 0.000000 3.612170 -0.000000
+	C 0 0.000000 74.207061 3.612170 -74.207061 0.000000 15.000000
+	S 0 0.000000 22.818370 -2.528544 24.528059 -2.986654
+	S 0 0.000000 3.612170 -0.000000 24.921260 0.000000
+	END$SEGS
+TURNOUT 1 "Marklin	Double-Slip	59093/92"
+	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 23.079092 0.000000 90.000000
+	E 0.393200 2.986654 285.000000
+	E 22.685892 -2.986654 105.000000
+	S 0 0.000000 0.000000 0.000000 3.540000 0.000000
+	S 0 0.000000 3.540000 0.000000 19.539092 0.000000
+	S 0 0.000000 19.539092 0.000000 23.079092 0.000000
+	S 0 0.000000 0.393200 2.986654 3.812578 2.070435
+	S 0 0.000000 3.812578 2.070435 19.266514 -2.070435
+	S 0 0.000000 19.266514 -2.070435 22.685892 -2.986654
+	C 0 0.000000 60.762584 3.540000 -60.762584 0.000000 15.000000
+	C 0 0.000000 -60.762584 19.539092 60.762584 180.000000 15.000000
+	END$SEGS
+TURNOUT 1 "Marklin	Dbl Crossover	59094/88/87"
+	P "Normal" 1 2 3 0 4 5 6
+	P "Reverse" 1 7 8 9 6 0 4 10 11 12 3
+	E 0.000000 0.000000 270.000000
+	E 37.795276 0.000000 90.000000
+	E 0.000000 5.973309 270.000000
+	E 37.795276 5.973309 90.000000
+	S 0 0.000000 0.000000 0.000000 3.034139 0.000000
+	S 0 0.000000 3.034139 0.000000 34.761137 0.000000
+	S 0 0.000000 34.761137 0.000000 37.795276 0.000000
+	S 0 0.000000 0.000000 5.973309 3.034139 5.973309
+	S 0 0.000000 3.034139 5.973309 34.761137 5.973309
+	S 0 0.000000 34.761137 5.973309 37.795276 5.973309
+	C 0 0.000000 -43.098023 3.034139 43.098023 160.773647 19.226353
+	S 0 0.000000 17.226360 2.403792 20.568916 3.569517
+	C 0 0.000000 43.098023 34.761137 -37.124714 340.773647 19.226353
+	C 0 0.000000 43.098023 3.034139 -37.124714 0.000000 19.226353
+	S 0 0.000000 17.226360 3.569517 20.568916 2.403792
+	C 0 0.000000 -43.098023 34.761137 43.098023 180.000000 19.226353
+	END$SEGS