Merge tag 'upstream/4.2.4a'

Upstream version 4.2.4a

1 files changed, 271 insertions, 0 deletions

diff --git a/app/lib/params/nmra-o3.xtp b/app/lib/params/nmra-o3.xtp
new file mode 100644
index 0000000..d7443ce
--- /dev/null
+++ b/app/lib/params/nmra-o3.xtp
@@ -0,0 +1,271 @@
+CONTENTS NMRA RP-12.53 Feb 2015 On3 Scale Turnouts

+SUBCONTENTS NMRA On3 Scale Regular Turnouts

+TURNOUT On3 "NMRA On3	#4 Left	4L"

+	U "Regular Turnout" "" "NMRA On3" "#4 Left" "4L" "#4 Right" "4R" 9.281250 14.250033 1.500000 9.468750 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 9.468750 0.000000 90.000000

+	E 9.281250 1.500000 75.749967

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 9.468750 0.000000

+	C 0 0.000000 -21.000381 0.750028 21.000381 165.749891 14.250185

+	S 0 0.000000 5.919374 0.646178 9.281250 1.500000

+	END

+TURNOUT On3 "NMRA On3	#4 Right	4R"

+	U "Regular Turnout" "" "NMRA On3" "#4 Left" "4L" "#4 Right" "4R" 9.281250 14.250033 1.500000 9.468750 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 9.468750 0.000000 90.000000

+	E 9.281250 -1.500000 104.250033

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 9.468750 0.000000

+	C 0 0.000000 21.000381 0.749916 -21.000381 0.000076 14.250185

+	S 0 0.000000 5.919374 -0.646178 9.281250 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#5 Left	5L"

+	U "Regular Turnout" "" "NMRA On3" "#5 Left" "5L" "#5 Right" "5R" 10.675000 11.421186 1.500000 10.825000 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 10.825000 0.000000 90.000000

+	E 10.675000 1.500000 78.578814

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 10.825000 0.000000

+	C 0 0.000000 -25.000677 0.750033 25.000677 168.578738 11.421338

+	S 0 0.000000 5.700690 0.495075 10.675000 1.500000

+	END

+TURNOUT On3 "NMRA On3	#5 Right	5R"

+	U "Regular Turnout" "" "NMRA On3" "#5 Left" "5L" "#5 Right" "5R" 10.675000 11.421186 1.500000 10.825000 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 10.825000 0.000000 90.000000

+	E 10.675000 -1.500000 101.421186

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 10.825000 0.000000

+	C 0 0.000000 25.000677 0.749900 -25.000677 0.000076 11.421338

+	S 0 0.000000 5.700690 -0.495075 10.675000 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#6 Left	6L"

+	U "Regular Turnout" "" "NMRA On3" "#6 Left" "6L" "#6 Right" "6R" 12.062500 9.527283 1.500000 12.187500 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 12.187500 0.000000 90.000000

+	E 12.062500 1.500000 80.472717

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 12.187500 0.000000

+	C 0 0.000000 -28.501097 0.750038 28.501097 170.472641 9.527435

+	S 0 0.000000 5.467493 0.393130 12.062500 1.500000

+	END

+TURNOUT On3 "NMRA On3	#6 Right	6R"

+	U "Regular Turnout" "" "NMRA On3" "#6 Left" "6L" "#6 Right" "6R" 12.062500 9.527283 1.500000 12.187500 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 12.187500 0.000000 90.000000

+	E 12.062500 -1.500000 99.527283

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 12.187500 0.000000

+	C 0 0.000000 28.501097 0.749887 -28.501097 0.000076 9.527435

+	S 0 0.000000 5.467493 -0.393130 12.062500 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#7 Left	7L"

+	U "Regular Turnout" "" "NMRA On3" "#7 Left" "7L" "#7 Right" "7R" 15.384429 8.171234 1.500000 15.491571 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 15.491571 0.000000 90.000000

+	E 15.384429 1.500000 81.828766

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 15.491571 0.000000

+	C 0 0.000000 -58.633953 0.750078 58.633953 171.828690 8.171386

+	S 0 0.000000 9.083907 0.595290 15.384429 1.500000

+	END

+TURNOUT On3 "NMRA On3	#7 Right	7R"

+	U "Regular Turnout" "" "NMRA On3" "#7 Left" "7L" "#7 Right" "7R" 15.384429 8.171234 1.500000 15.491571 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 15.491571 0.000000 90.000000

+	E 15.384429 -1.500000 98.171234

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 15.491571 0.000000

+	C 0 0.000000 58.633953 0.749767 -58.633953 0.000076 8.171386

+	S 0 0.000000 9.083907 -0.595290 15.384429 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#8 Left	8L"

+	U "Regular Turnout" "" "NMRA On3" "#8 Left" "8L" "#8 Right" "8R" 16.766125 7.152669 1.500000 16.859875 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 16.859875 0.000000 90.000000

+	E 16.766125 1.500000 82.847331

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 16.859875 0.000000

+	C 0 0.000000 -65.010764 0.750086 65.010764 172.847255 7.152821

+	S 0 0.000000 8.844890 0.505941 16.766125 1.500000

+	END

+TURNOUT On3 "NMRA On3	#8 Right	8R"

+	U "Regular Turnout" "" "NMRA On3" "#8 Left" "8L" "#8 Right" "8R" 16.766125 7.152669 1.500000 16.859875 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 16.859875 0.000000 90.000000

+	E 16.766125 -1.500000 97.152669

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 16.859875 0.000000

+	C 0 0.000000 65.010764 0.749741 -65.010764 0.000076 7.152821

+	S 0 0.000000 8.844890 -0.505941 16.766125 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#9 Left	9L"

+	U "Regular Turnout" "" "NMRA On3" "#9 Left" "9L" "#9 Right" "9R" 18.146333 6.359660 1.500000 18.229667 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 18.229667 0.000000 90.000000

+	E 18.146333 1.500000 83.640340

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 18.229667 0.000000

+	C 0 0.000000 -70.887765 0.750094 70.887765 173.640264 6.359812

+	S 0 0.000000 8.602363 0.436252 18.146333 1.500000

+	END

+TURNOUT On3 "NMRA On3	#9 Right	9R"

+	U "Regular Turnout" "" "NMRA On3" "#9 Left" "9L" "#9 Right" "9R" 18.146333 6.359660 1.500000 18.229667 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 18.229667 0.000000 90.000000

+	E 18.146333 -1.500000 96.359660

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 18.229667 0.000000

+	C 0 0.000000 70.887765 0.749718 -70.887765 0.000076 6.359812

+	S 0 0.000000 8.602363 -0.436252 18.146333 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#10 Left	10L"

+	U "Regular Turnout" "" "NMRA On3" "#10 Left" "10L" "#10 Right" "10R" 19.525500 5.724810 1.500000 19.600500 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 19.600500 0.000000 90.000000

+	E 19.525500 1.500000 84.275190

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 19.600500 0.000000

+	C 0 0.000000 -76.265000 0.750101 76.265000 174.275114 5.724962

+	S 0 0.000000 8.357676 0.380394 19.525500 1.500000

+	END

+TURNOUT On3 "NMRA On3	#10 Right	10R"

+	U "Regular Turnout" "" "NMRA On3" "#10 Left" "10L" "#10 Right" "10R" 19.525500 5.724810 1.500000 19.600500 0.000000 0.000000 0

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 19.600500 0.000000 90.000000

+	E 19.525500 -1.500000 95.724810

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	S 0 0.000000 0.750000 0.000000 19.600500 0.000000

+	C 0 0.000000 76.265000 0.749696 -76.265000 0.000076 5.724962

+	S 0 0.000000 8.357676 -0.380394 19.525500 -1.500000

+	END

+

+SUBCONTENTS NMRA On3 Scale WYE Turnouts

+TURNOUT On3 "NMRA On3	#2 WYE	2Y"

+	U "Wye Turnout" "" "NMRA On3" "#2 WYE" "2Y" 9.281250 14.250033 1.500000 1.500000 14.250033 9.281250 0.000000 0.000000 0

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 9.281250 1.500000 75.749967

+	E 9.281250 -1.500000 104.250033

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	C 0 0.000000 -21.000381 0.750028 21.000381 165.749891 14.250185

+	S 0 0.000000 5.919374 0.646178 9.281250 1.500000

+	C 0 0.000000 21.000381 0.749916 -21.000381 0.000076 14.250185

+	S 0 0.000000 5.919374 -0.646178 9.281250 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#2.5 WYE	2.5Y"

+	U "Wye Turnout" "" "NMRA On3" "#2.5 WYE" "2.5Y" 10.675000 11.421186 1.500000 1.500000 11.421186 10.675000 0.000000 0.000000 0

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 10.675000 1.500000 78.578814

+	E 10.675000 -1.500000 101.421186

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	C 0 0.000000 -25.000677 0.750033 25.000677 168.578738 11.421338

+	S 0 0.000000 5.700690 0.495075 10.675000 1.500000

+	C 0 0.000000 25.000677 0.749900 -25.000677 0.000076 11.421338

+	S 0 0.000000 5.700690 -0.495075 10.675000 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#3 WYE	3Y"

+	U "Wye Turnout" "" "NMRA On3" "#3 WYE" "3Y" 12.062500 9.527283 1.500000 1.500000 9.527283 12.062500 0.000000 0.000000 0

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 12.062500 1.500000 80.472717

+	E 12.062500 -1.500000 99.527283

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	C 0 0.000000 -28.501097 0.750038 28.501097 170.472641 9.527435

+	S 0 0.000000 5.467493 0.393130 12.062500 1.500000

+	C 0 0.000000 28.501097 0.749887 -28.501097 0.000076 9.527435

+	S 0 0.000000 5.467493 -0.393130 12.062500 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#4 WYE	4Y"

+	U "Wye Turnout" "" "NMRA On3" "#4 WYE" "4Y" 15.328125 7.152669 1.500000 1.500000 7.152669 15.328125 0.000000 0.000000 0

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 15.328125 1.500000 82.847331

+	E 15.328125 -1.500000 97.152669

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	C 0 0.000000 -42.002502 0.750056 42.002502 172.847255 7.152821

+	S 0 0.000000 5.979990 0.326881 15.328125 1.500000

+	C 0 0.000000 42.002502 0.749833 -42.002502 0.000076 7.152821

+	S 0 0.000000 5.979990 -0.326881 15.328125 -1.500000

+	END

+TURNOUT On3 "NMRA On3	#5 WYE	5Y"

+	U "Wye Turnout" "" "NMRA On3" "#5 WYE" "5Y" 18.212500 5.724810 1.500000 1.500000 5.724810 18.212500 0.000000 0.000000 0

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 18.212500 1.500000 84.275190

+	E 18.212500 -1.500000 95.724810

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	C 0 0.000000 -50.004629 0.750066 50.004629 174.275114 5.724962

+	S 0 0.000000 5.738120 0.249412 18.212500 1.500000

+	C 0 0.000000 50.004629 0.749801 -50.004629 0.000076 5.724962

+	S 0 0.000000 5.738120 -0.249412 18.212500 -1.500000

+	END

+

+SUBCONTENTS NMRA On3 Scale 3-WAY Turnouts

+TURNOUT On3 "NMRA On3	#6 3-WAY (SYMMETRICAL)	6-3WS"

+	U "3-way Turnout" "" "NMRA On3" "#6 3-WAY (SYMMETRICAL)" "6-3WS" 12.062500 9.527283 1.500000 12.187500 1.500000 9.527283 12.062500 0.000000 0.000000 0

+	P "Left" 1 2 3

+	P "Normal" 1 6

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 12.062500 1.500000 80.472717

+	E 12.062500 -1.500000 99.527283

+	E 12.187500 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	C 0 0.000000 -28.501097 0.750038 28.501097 170.472641 9.527435

+	S 0 0.000000 5.467493 0.393130 12.062500 1.500000

+	C 0 0.000000 28.501097 0.749887 -28.501097 0.000076 9.527435

+	S 0 0.000000 5.467493 -0.393130 12.062500 -1.500000

+	S 0 0.000000 0.750000 0.000000 12.187500 0.000000

+	END

+TURNOUT On3 "NMRA On3	#8 3-WAY (SYMMETRICAL)	8-3WS"

+	U "3-way Turnout" "" "NMRA On3" "#8 3-WAY (SYMMETRICAL)" "8-3WS" 16.766125 7.152669 1.500000 16.859875 1.500000 7.152669 16.766125 0.000000 0.000000 0

+	P "Left" 1 2 3

+	P "Normal" 1 6

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 16.766125 1.500000 82.847331

+	E 16.766125 -1.500000 97.152669

+	E 16.859875 0.000000 90.000000

+	S 0 0.000000 0.000000 0.000000 0.750000 0.000000

+	C 0 0.000000 -65.010764 0.750086 65.010764 172.847255 7.152821

+	S 0 0.000000 8.844890 0.505941 16.766125 1.500000

+	C 0 0.000000 65.010764 0.749741 -65.010764 0.000076 7.152821

+	S 0 0.000000 8.844890 -0.505941 16.766125 -1.500000

+	S 0 0.000000 0.750000 0.000000 16.859875 0.000000

+	END