Merge branch 'feature/upstream' into develop

1 files changed, 340 insertions, 0 deletions

diff --git a/app/lib/params/O-Atlas3Rail Roadbed.xtp b/app/lib/params/O-Atlas3Rail Roadbed.xtp
new file mode 100644
index 0000000..3f898b1
--- /dev/null
+++ b/app/lib/params/O-Atlas3Rail Roadbed.xtp
@@ -0,0 +1,340 @@
+CONTENTS Atlas O 21st Century 3 Rail (Roadbed) (Roadbed)

+

+SUBCONTENTS Atlas O 21st Century 3 Rail (Roadbed) - Curve Track

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-27 13.5"" Radius Full Curve	66043"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 9.545942 -3.954058 135.000000

+	C 0 0.000000 13.500000 0.000000 -13.500000 0.000000 45.000000

+	A3 0 0.050000 13.500000 0.000000 -13.500000 0 0.000000 45.000000

+	A3 11579568 0.053333 15.187500 0.000000 -13.500000 0 0.000000 45.000000

+	A3 11579568 0.053333 11.812500 0.000000 -13.500000 0 0.000000 45.000000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-27 13.5"" Radius Half Curve	66044"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.166226 -1.027626 112.500000

+	C 0 0.000000 13.500000 0.000000 -13.500000 0.000000 22.500000

+	A3 0 0.050000 13.500000 0.000000 -13.500000 0 0.000000 22.500000

+	A3 11579568 0.053333 15.187500 0.000000 -13.500000 0 0.000000 22.500000

+	A3 11579568 0.053333 11.812500 0.000000 -13.500000 0 0.000000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-36 18"" Radius Full Curve	66066"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 9.000000 -2.411543 120.000000

+	C 0 0.000000 18.000000 0.000000 -18.000000 0.000000 30.000000

+	A3 0 0.050000 18.000000 0.000000 -18.000000 0 0.000000 30.000000

+	A3 11579568 0.053333 19.687500 0.000000 -18.000000 0 0.000000 30.000000

+	A3 11579568 0.053333 16.312500 0.000000 -18.000000 0 0.000000 30.000000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-36 18"" Radius Qtr Curve	66068"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 2.349471 -0.153992 97.500000

+	C 0 0.000000 18.000000 0.000000 -18.000000 0.000000 7.500000

+	A3 0 0.050000 18.000000 0.000000 -18.000000 0 0.000000 7.500000

+	A3 11579568 0.053333 19.687500 0.000000 -18.000000 0 0.000000 7.500000

+	A3 11579568 0.053333 16.312500 0.000000 -18.000000 0 0.000000 7.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-45 22.5"" Radius Full Curve	66045"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 11.250000 -3.014428 120.000000

+	C 0 0.000000 22.500000 0.000000 -22.500000 0.000000 30.000000

+	A3 0 0.050000 22.500000 0.000000 -22.5000000 0 0.000000 30.000000

+	A3 11579568 0.053333 24.187500 0.000000 -22.500000 0 0.000000 30.000000

+	A3 11579568 0.053333 20.812500 0.000000 -22.500000 0 0.000000 30.000000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-45 22.5"" Radius Qtr Curve	66046"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 2.936839 -0.192491 97.500000

+	C 0 0.000000 22.500000 0.000000 -22.500000 0.000000 7.500000

+	A3 0 0.050000 22.500000 0.000000 -22.500000 0 0.000000 7.500000

+	A3 11579568 0.053333 24.187500 0.000000 -22.500000 0 0.000000 7.500000

+	A3 11579568 0.053333 20.812500 0.000000 -22.500000 0 0.000000 7.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-54 27"" Radius Full Section	66060"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 10.332453 -2.055253 112.500000

+	C 0 0.000000 27.000000 0.000000 -27.000000 0.000000 22.500000

+	A3 0 0.050000 27.000000 0.000000 -27.000000 0 0.000000 22.500000

+	A3 11579568 0.053333 28.687500 0.000000 -27.000000 0 0.000000 22.500000

+	A3 11579568 0.053333 25.312500 0.000000 -27.000000 0 0.000000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-54 27"" Radius Half Section	66061"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.267439 -0.518797 101.250000

+	C 0 0.000000 27.000000 0.000000 -27.000000 0.000000 11.250000

+	A3 0 0.050000 27.000000 0.000000 -27.000000 0 0.000000 11.250000

+	A3 11579568 0.053333 28.687500 0.000000 -27.000000 0 0.000000 11.250000

+	A3 11579568 0.053333 25.312500 0.000000 -27.000000 0 0.000000 11.250000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-63 31.5"" Radius Full Section	66060"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 12.054528 -2.397795 112.500000

+	C 0 0.000000 31.500000 0.000000 -31.500000 0.000000 22.500000

+	A 0 0.050000 31.500000 0.000000 -31.500000 0.000000 22.500000

+	A3 11579568 0.053333 33.187500 0.000000 -31.500000 0 0.000000 22.500000

+	A3 11579568 0.053333 29.812500 0.000000 -31.500000 0 0.000000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-72 36"" Radius Full Section	66062"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 13.776604 -2.740337 112.500000

+	C 0 0.000000 36.000000 0.000000 -36.000000 0.000000 22.500000

+	A 0 0.050000 36.000000 0.000000 -36.000000 0.000000 22.500000

+	A3 11579568 0.053333 37.687500 0.000000 -36.000000 0 0.000000 22.500000

+	A3 11579568 0.053333 34.312500 0.000000 -36.000000 0 0.000000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-72 36"" Radius Half Section	66063"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 7.023252 -0.691730 101.250000

+	C 0 0.000000 36.000000 0.000000 -36.000000 0.000000 11.250000

+	A 0 0.050000 36.000000 0.000000 -36.000000 0.000000 11.250000

+	A3 11579568 0.053333 37.687500 0.000000 -36.000000 0 0.000000 11.250000

+	A3 11579568 0.053333 34.312500 0.000000 -36.000000 0 0.000000 11.250000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-81 40.5"" Radius Full Curve	66011"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 15.498679 -3.082879 112.500000

+	C 0 0.000000 40.500000 0.000000 -40.500000 0.000000 22.500000

+	A 0 0.050000 40.500000 0.000000 -40.500000 0.000000 22.500000

+	A3 11579568 0.053333 42.187500 0.000000 -40.500000 0 0.000000 22.500000

+	A3 11579568 0.053333 38.812500 0.000000 -40.500000 0 0.000000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-81 40.5"" Radius 1/3rd Curve	66012"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.286311 -0.346483 97.500000

+	C 0 0.000000 40.500000 0.000000 -40.500000 0.000000 7.500000

+	A 0 0.050000 40.500000 0.000000 -40.500000 0.000000 7.500000

+	A3 11579568 0.053333 42.187500 0.000000 -40.500000 0 0.000000 7.500000

+	A3 11579568 0.053333 38.812500 0.000000 -40.500000 0 0.000000 7.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-90 45"" Radius Full Curve	66013"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 17.220754 -3.425421 112.500000

+	C 0 0.000000 45.000000 0.000000 -45.000000 0.000000 22.500000

+	A3 0 0.050000 45.000000 0.000000 -45.000000 0 0.000000 22.500000

+	A3 11579568 0.053333 46.687500 0.000000 -45.000000 0 0.000000 22.500000

+	A3 11579568 0.053333 43.312500 0.000000 -45.000000 0 0.000000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-99 49.5"" Radius Full Curve	66014"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 18.942830 -3.767963 112.500000

+	C 0 0.000000 49.500000 0.000000 -49.500000 0.000000 22.500000

+	A3 0 0.050000 49.500000 0.000000 -49.500000 0 0.000000 22.500000

+	A3 11579568 0.053333 51.187500 0.000000 -49.500000 0 0.000000 22.500000

+	A3 11579568 0.053333 47.812500 0.000000 -49.500000 0 0.000000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-108 54"" Radius Full Curve	66016"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 20.664905 -4.110505 112.500000

+	C 0 0.000000 54.000000 0.000000 -54.000000 0.000000 22.500000

+	A3 0 0.050000 54.000000 0.000000 -54.000000 0 0.000000 22.500000

+	A3 11579568 0.053333 55.687500 0.000000 -54.000000 0 0.000000 22.500000

+	A3 11579568 0.053333 52.312500 0.000000 -54.000000 0 0.000000 22.500000

+	END

+

+

+SUBCONTENTS Atlas O 21st Century 3 Rail (Roadbed) - Turnouts

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-54 Left	66070"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 14.500000 0.000000 90.000000

+	E 10.332453 2.055253 67.500000

+	S 0 0.000000 0.000000 0.000000 14.500000 0.000000

+	C 0 0.000000 27.000000 0.000000 27.000000 157.500000 22.500000

+	L3 0 0.050000 0.000000 0.000000 0 14.500000 0.000000 0

+	A3 0 0.050000 27.000000 0.000000 27.000000 0 157.500000 22.500000

+	L3 11579568 0.053333 14.000000 1.687500 0 14.500000 1.687500 0

+	L3 11579568 0.053333 0.000000 -1.687500 0 14.500000 -1.687500 0

+	A3 11579568 0.053333 25.312500 0.000000 27.000000 0 157.500000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-54 Right	66071"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 14.500000 0.000000 90.000000

+	E 10.332453 -2.055253 112.500000

+	S 0 0.000000 0.000000 0.000000 14.500000 0.000000

+	C 0 0.000000 27.000000 0.000000 -27.000000 0.000000 22.500000

+	L3 0 0.050000 0.000000 0.000000 0 14.500000 0.000000 0

+	A3 0 0.050000 27.000000 0.000000 -27.000000 0 0.000000 22.500000

+	L3 11579568 0.053333 14.000000 -1.687500 0 14.500000 -1.687500 0

+	L3 11579568 0.053333 0.000000 1.687500 0 14.500000 1.687500 0

+	A3 11579568 0.053333 25.312500 0.000000 -27.000000 0 0.000000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-72 Left	66072"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 14.500000 0.000000 90.000000

+	E 13.776593 2.740332 67.500000

+	S 0 0.000000 0.000000 0.000000 14.500000 0.000000

+	C 0 0.000000 36.000000 0.000000 36.000000 157.500000 22.500000

+	L3 0 0.050000 0.000000 0.000000 0 14.500000 0.000000 0

+	A3 0 0.050000 36.000000 0.000000 36.000000 0 157.500000 22.500000

+	L3 11579568 0.053333 0.000000 -1.687500 0 14.500000 -1.687500 0

+	A3 11579568 0.053333 34.312500 0.000000 36.000000 0 157.500000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-72 Right	66073"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 14.500000 0.000000 90.000000

+	E 13.776593 -2.740332 112.500000

+	S 0 0.000000 0.000000 0.000000 14.500000 0.000000

+	C 0 0.000000 36.000000 0.000000 -36.000000 0.000000 22.500000

+	L3 0 0.050000 0.000000 0.000000 0 14.500000 0.000000 0

+	A3 0 0.050000 36.000000 0.000000 -36.000000 0 0.000000 22.500000

+	L3 11579568 0.053333 0.000000 1.687500 0 14.500000 1.687500 0

+	A3 11579568 0.053333 34.312500 0.000000 -36.000000 0 0.000000 22.500000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-72 Wye	66074"

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 12.976674 1.363268 78.750000

+	E 12.976674 -1.363268 101.250000

+	S 0 0.000000 0.000000 0.000000 1.250000 0.000000

+	C 0 0.000000 -49.477943 1.250000 49.477943 168.750000 11.250000

+	S 0 0.000000 10.902789 0.950729 12.976674 1.363268

+	C 0 0.000000 49.477943 1.250000 -49.477943 0.000000 11.250000

+	S 0 0.000000 10.902789 -0.950729 12.976674 -1.363268

+	L3 0 0.050000 0.000000 0.000000 0 1.177000 0.000000 0

+	A3 0 0.050000 -49.477943 1.177059 49.477943 0 168.462955 11.537121

+	L3 0 0.050000 11.035944 1.000000 0 12.976674 1.363268 0

+	A3 0 0.050000 49.477943 1.176824 -49.477943 0 0.000076 11.537121

+	L3 0 0.050000 11.035944 -1.000000 0 12.976674 -1.363268 0

+	L3 11579568 0.053333 0.000000 1.687500 0 1.250000 1.687500 0

+	L3 11579568 0.053333 0.000000 -1.687500 0 1.250000 -1.687500 0

+	A3 11579568 0.053333 47.790443 1.250000 49.477943 0 168.750000 11.2500000

+	A3 11579568 0.053333 47.790443 1.250000 -49.477943 0 0.000000 11.2500000

+	L3 11579568 0.053333 10.573453 2.605780 0 12.687500 3.050000 0

+	L3 11579568 0.053333 10.573453 -2.605780 0 12.687500 -3.050000 0

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-36 Left	66075"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	E 9.000000 2.411543 60.000000

+	S 0 0.000000 0.000000 0.000000 10.000000 0.000000

+	C 0 0.000000 18.000000 0.000000 18.000000 150.000000 30.00000

+	L3 0 0.050000 0.000000 0.000000 0 10.000000 0.000000 0

+	A3 0 0.050000 18.000000 0.000000 18.000000 0 150.000000 30.000000

+	L3 11579568 0.053333 0.000000 -1.687500 0 10.000000 -1.687500 0

+	A3 11579568 0.053333 16.312500 0.000000 18.000000 0 150.000000 30.000000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-36 Right	66076"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	E 9.000000 -2.411543 120.000000

+	S 0 0.000000 0.000000 0.000000 10.000000 0.000000

+	C 0 0.000000 18.000000 0.000000 -18.000000 0.000000 30.000000

+	L3 0 0.050000 0.000000 0.000000 0 10.000000 0.000000 0

+	A3 0 0.050000 18.000000 0.000000 -18.000000 0 0.000000 30.000000

+	L3 11579568 0.053333 0.000000 1.687500 0 10.000000 1.687500 0

+	A3 11579568 0.053333 16.312500 0.000000 -18.000000 0 0.000000 30.000000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-45 Left	66085"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	E 11.250000 3.014428 60.000000

+	S 0 0.000000 0.000000 0.000000 10.000000 0.000000

+	C 0 0.000000 22.500000 0.000000 22.500000 150.000000 30.00000

+	L3 0 0.050000 0.000000 0.000000 0 10.000000 0.000000 0

+	A3 0 0.050000 22.500000 0.000000 22.500000 0 150.000000 30.000000

+	L3 11579568 0.053333 0.000000 -1.687500 0 10.000000 -1.687500 0

+	A3 11579568 0.053333 20.812500 0.000000 22.500000 0 150.000000 30.000000

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	O-45 Right	66086"

+	P "Normal" 1

+	P "Reverse" 2

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	E 11.250000 -3.014428 120.000000

+	S 0 0.000000 0.000000 0.000000 10.000000 0.000000

+	C 0 0.000000 22.500000 0.000000 -22.500000 0.000000 30.000000

+	L3 0 0.050000 0.000000 0.000000 0 10.000000 0.000000 0

+	A3 0 0.050000 22.500000 0.000000 -22.500000 0 0.000000 30.000000

+	L3 11579568 0.053333 0.000000 1.687500 0 10.000000 1.687500 0

+	A3 11579568 0.053333 20.812500 0.000000 -22.500000 0 0.000000 30.000000

+	END

+

+

+SUBCONTENTS Atlas O 21st Century 3 Rail (Roadbed) - Straight Track

+TURNOUT O "Atlas O 3 Rail (Roadbed)	10"" Straight	66050"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 10.000000 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 10.000000 0.000000

+	L3 0 0.050000 0.000000 0.000000 0 10.000000 0.000000 0

+	L3 11579568 0.053333 0.000000 1.687500 0 10.000000 1.687500 0

+	L3 11579568 0.053333 0.000000 -1.687500 0 10.000000 -1.687500 0

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	4.5"" Straight	66051"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 4.500000 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 4.500000 0.000000

+	L3 0 0.050000 0.000000 0.000000 0 4.500000 0.000000 0

+	L3 11579568 0.053333 0.000000 1.687500 0 4.500000 1.687500 0

+	L3 11579568 0.053333 0.000000 -1.687500 0 4.500000 -1.687500 0

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	1.75"" Straight	66052"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 1.750000 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 1.750000 0.000000

+	L3 0 0.050000 0.000000 0.000000 0 1.750000 0.000000 0

+	L3 11579568 0.053333 0.000000 1.687500 0 1.750000 1.687500 0

+	L3 11579568 0.053333 0.000000 -1.687500 0 1.750000 -1.687500 0

+	END

+TURNOUT O "Atlas O 3 Rail (Roadbed)	5.5"" Straight	66053"

+	P "Normal" 1

+	E 0.000000 0.000000 270.000000

+	E 5.500000 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 5.500000 0.000000

+	L3 0 0.050000 0.000000 0.000000 0 5.500000 0.000000 0

+	L3 11579568 0.053333 0.000000 1.687500 0 5.500000 1.687500 0

+	L3 11579568 0.053333 0.000000 -1.687500 0 5.500000 -1.687500 0

+	END

+

+

+SUBCONTENTS Atlas O 21st Century 3 Rail (Roadbed) - Crossings

+TURNOUT O "Atlas O 3 Rail (Roadbed)	90 Degree Crossing	66080"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 5.000000 0.000000 90.000000

+	E 2.500000 2.500000 360.000000

+	E 2.500000 -2.500000 180.000000

+	S 0 0.000000 0.000000 0.000000 5.000000 0.000000

+	S 0 0.000000 2.500007 2.500000 2.499993 -2.500000

+	L3 0 0.050000 0.000000 0.000000 0 5.000000 0.000000 0

+	L3 0 0.050000 2.500007 2.500000 0 2.499993 -2.500000 0

+	L3 11579568 0.053333 0.000000 1.687500 0 0.812500 1.687500 0

+	L3 11579568 0.053333 0.000000 -1.687500 0 0.812500 -1.687500 0

+	L3 11579568 0.053333 4.187500 1.687500 0 5.000000 1.687500 0

+	L3 11579568 0.053333 4.187500 -1.687500 0 5.000000 -1.687500 0

+	L3 11579568 0.053333 0.812500 1.687500 0 0.812500 2.500000 0

+	L3 11579568 0.053333 4.187500 1.687500 0 4.187500 2.500000 0

+	L3 11579568 0.053333 0.812500 -1.687500 0 0.812500 -2.500000 0

+	L3 11579568 0.053333 4.187500 -1.687500 0 4.187500 -2.500000 0

+	END