Merge branch 'feature/upstream' into develop

1 files changed, 242 insertions, 0 deletions

diff --git a/app/lib/params/HO-Jouef(Hornby)HO.xtp b/app/lib/params/HO-Jouef(Hornby)HO.xtp
new file mode 100644
index 0000000..0a3579e
--- /dev/null
+++ b/app/lib/params/HO-Jouef(Hornby)HO.xtp
@@ -0,0 +1,242 @@
+CONTENTS Jouef Points & Track Sections
+SUBCONTENTS Jouef Track - Crossings
+TURNOUT HO "Jouef	Left Hand Diamond Crossing	R.614"
+	P "Normal" 1 0 2
+	E 0.000000 0.000000 270.000000
+	E 6.614173 0.000000 90.000000
+	E 0.015311 -1.363498 247.500000
+	E 6.598862 1.363498 67.500000
+	S 0 0.000000 0.000000 0.000000 6.614173 0.000000
+	S 0 0.000000 0.015311 -1.363498 6.598862 1.363498
+	END$SEGS
+TURNOUT HO "Jouef	Right Hand Diamond Crossing	R.615"
+	P "Normal" 1 0 2
+	E 0.000000 0.000000 270.000000
+	E 6.614173 0.000000 90.000000
+	E 0.015311 1.363498 292.500000
+	E 6.598862 -1.363498 112.500000
+	S 0 0.000000 0.000000 0.000000 6.614173 0.000000
+	S 0 0.000000 0.015311 1.363498 6.598862 -1.363498
+	END$SEGS
+
+
+SUBCONTENTS Jouef Track - Curves
+TURNOUT HO "Jouef	22.5d Curve 1st Radius (371mm)	R.604"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 5.589589 -1.111838 112.500000
+	C 0 0.000000 14.606299 0.000000 -14.606299 0.000000 22.500000
+	END$SEGS
+TURNOUT HO "Jouef	45d Curve 1st Radius (371mm)	R.605"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 10.328213 -4.278086 135.000000
+	C 0 0.000000 14.606299 0.000000 -14.606299 0.000000 45.000000
+	END$SEGS
+TURNOUT HO "Jouef	11.25d Curve 2nd Radius (438mm)	R.643"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 3.364156 -0.331340 101.250000
+	C 0 0.000000 17.244094 0.000000 -17.244094 0.000000 11.250000
+	END$SEGS
+TURNOUT HO "Jouef	22.5d Curve 2nd Radius (438mm)	R.606"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.599029 -1.312626 112.500000
+	C 0 0.000000 17.244094 0.000023 -17.244094 0.000000 22.500000
+	END$SEGS
+TURNOUT HO "Jouef	45d Curve 2nd Radius (438mm)	R.607"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 12.193416 -5.050678 135.000000
+	C 0 0.000000 17.244094 0.000000 -17.244094 0.000000 45.000000
+	END$SEGS
+TURNOUT HO "Jouef	22.5d Curve 3rd Radius (505mm)	R.608"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 7.608470 -1.513419 112.500000
+	C 0 0.000000 19.881890 0.000000 -19.881890 0.000000 22.500000
+	END$SEGS
+TURNOUT HO "Jouef	45d Curve 3rd Radius (505mm)	R.609"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 14.058619 -5.823271 135.000000
+	C 0 0.000000 19.881890 0.000000 -19.881890 0.000000 45.000000
+	END$SEGS
+TURNOUT HO "Jouef	22.5d Curve 4th Radius (572mm)	R.8261"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 8.617910 -1.714209 112.500000
+	C 0 0.000000 22.519685 0.000023 -22.519685 0.000000 22.500000
+	END$SEGS
+TURNOUT HO "Jouef	45d Curve 4th Radius (572mm)	R.8262"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 15.923822 -6.595863 135.000000
+	C 0 0.000000 22.519685 0.000000 -22.519685 0.000000 45.000000
+	END$SEGS
+TURNOUT HO "Jouef	11.25d Large Radius Curve (852mm)	R.628"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.543975 -0.644525 101.250000
+	C 0 0.000000 33.543307 0.000000 -33.543307 0.000000 11.250000
+	END$SEGS
+
+
+
+
+SUBCONTENTS Jouef Track - Wye Points
+TURNOUT HO "Jouef	WYE Point	R.8076"
+	P "Left" 1 2 3
+	P "Right" 1 4 5
+	E 0.000000 0.000000 270.000000
+	E 6.614173 0.679134 78.750000
+	E 6.614173 -0.679134 101.250000
+	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
+	C 0 0.000000 -25.904606 0.648634 25.904606 168.749924 11.250152
+	S 0 0.000000 5.702401 0.497762 6.614173 0.679134
+	C 0 0.000000 25.904606 0.648497 -25.904606 0.000076 11.250152
+	S 0 0.000000 5.702401 -0.497762 6.614173 -0.679134
+	END$SEGS
+
+SUBCONTENTS Jouef Track - Straight Points
+TURNOUT HO "Jouef	Left Hand Std Point	R.8073"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 6.614173 0.000000 90.000000
+	E 6.614173 1.318898 67.500000
+	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
+	S 0 0.000000 0.648600 0.000000 6.614173 0.000000
+	C 0 0.000000 -13.983514 0.648619 13.983514 157.499924 22.500152
+	S 0 0.000000 5.999889 1.064444 6.614173 1.318898
+	END$SEGS
+TURNOUT HO "Jouef	Right Hand Std Point	R.8072"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 6.614173 0.000000 90.000000
+	E 6.614173 -1.318898 112.500000
+	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
+	S 0 0.000000 0.648600 0.000000 6.614173 0.000000
+	C 0 0.000000 13.983514 0.648544 -13.983514 0.000076 22.500152
+	S 0 0.000000 5.999889 -1.064444 6.614173 -1.318898
+	END$SEGS
+TURNOUT HO "Jouef	Left Hand Express(Long) Point	R.8077"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 9.645669 0.000000 90.000000
+	E 9.645669 1.318898 78.750000
+	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
+	S 0 0.000000 0.648600 0.000000 9.645669 0.000000
+	C 0 0.000000 -27.625934 0.648637 27.625934 168.749924 11.250152
+	S 0 0.000000 6.038220 0.530838 9.645669 1.318898
+	END$SEGS
+TURNOUT HO "Jouef	Right Hand Express(Long) Point	R.8078"
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 9.645669 0.000000 90.000000
+	E 9.645669 -1.318898 101.250000
+	S 0 0.000000 0.000000 0.000000 0.648600 0.000000
+	S 0 0.000000 0.648600 0.000000 9.645669 0.000000
+	C 0 0.000000 27.625934 0.648490 -27.625934 0.000076 11.250152
+	S 0 0.000000 6.038220 -0.530838 9.645669 -1.318898
+	END$SEGS
+
+
+SUBCONTENTS Jouef Track - Curve Points
+TURNOUT HO "Jouef	Left Hand Curved Point	R.8074"
+	P "Normal" 1 6 4 5
+	P "Reverse" 1 2 3
+	E 0.000000 0.000000 270.000000
+	E 9.251969 1.318898 67.500000
+	E 9.645669 2.637795 56.250000
+	S 0 0.000000 0.000000 0.000000 1.598662 0.000000
+	C 0 0.000000 -13.513549 1.598679 13.513549 146.249924 33.750152
+	S 0 0.000000 9.106411 2.277460 9.645669 2.637795
+	C 0 0.000000 -14.065585 3.270099 14.065585 157.499924 22.500152
+	S 0 0.000000 8.652776 1.070691 9.251969 1.318898
+	S 0 0.000000 1.598662 0.000000 3.270080 0.000000
+	END$SEGS
+TURNOUT HO "Jouef	Right Hand Curved Point	R.8075"
+	P "Normal" 1 6 4 5
+	P "Reverse" 1 2 3
+	E 0.000000 0.000000 270.000000
+	E 9.251969 -1.318898 112.500000
+	E 9.645669 -2.637795 123.750000
+	S 0 0.000000 0.000000 0.000000 1.598662 0.000000
+	C 0 0.000000 13.513549 1.598608 -13.513549 0.000076 33.750152
+	S 0 0.000000 9.106411 -2.277460 9.645669 -2.637795
+	C 0 0.000000 14.065585 3.270024 -14.065585 0.000076 22.500152
+	S 0 0.000000 8.652776 -1.070691 9.251969 -1.318898
+	S 0 0.000000 1.598662 0.000000 3.270080 0.000000
+	END$SEGS
+
+
+
+
+SUBCONTENTS Jouef Track - Straights
+TURNOUT HO "Jouef	Straight	R.600"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.614173 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 6.614173 0.000000
+	END$SEGS
+TURNOUT HO "Jouef	Double Straight	R.601"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 13.188976 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 13.188976 0.000000
+	END$SEGS
+TURNOUT HO "Jouef	Long straight	R.603"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 26.377953 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 26.377953 0.000000
+	END$SEGS
+TURNOUT HO "Jouef	Short Straight	R.610"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 1.496063 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 1.496063 0.000000
+	END$SEGS
+
+
+SUBCONTENTS Jouef Track - Misc 
+TURNOUT HO "Jouef	Power Track	R.8206"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.614173 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 6.614173 0.000000 
+#14.60629
+	F4 12566463 0.000000 4 0
+		3.500000 -0.625000 0
+		4.409450 -0.625000 0
+		4.409450 -1.125000 0
+		3.500000 -1.125000 0
+	END$SEGS
+TURNOUT HO "Jouef	Isolating Track	R.618"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.614173 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 6.614173 0.000000
+	L3 0 0.050000 0.500000 0.750000 0 1.500000 0.750000 0
+	L3 0 0.050000 1.500000 0.750000 0 1.500000 -0.750000 0
+	L3 0 0.050000 0.500000 -0.750000 0 1.500000 -0.750000 0
+	L3 0 0.050000 0.500000 0.750000 0 0.500000 -0.750000 0
+	END$SEGS
+TURNOUT HO "Jouef	Railer/Uncoupler Track	R.620"
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.614173 0.000000 90.000000
+	S 0 0.000000 0.000000 0.000000 6.614173 0.000000
+	F4 12566463 0.000000 6 0
+		0.000000 0.000000 0
+		0.600000 0.250000 0
+		6.014173 0.250000 0
+		6.614173 0.000000 0
+		6.014173 -0.250000 0
+		0.600000 -0.250000 0
+	END$SEGS