New upstream version 5.2.0Beta2.1upstream/5.2.0Beta2.1

1 files changed, 179 insertions, 92 deletions

diff --git a/app/lib/params/HO-HornbyHO.xtp b/app/lib/params/HO-HornbyHO.xtp
index d291293..ab384c8 100644
--- a/app/lib/params/HO-HornbyHO.xtp
+++ b/app/lib/params/HO-HornbyHO.xtp
@@ -1,4 +1,105 @@
 CONTENTS Hornby Points & Track Sections
+SUBCONTENTS Straight sections
+TURNOUT HO "Hornby	Straight	R.600"
+	U "Straight Section" "Open Registration" "Hornby" "Straight" "R.600" 6.614173 0.000000 0.000000 0
+	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
+TURNOUT HO "Hornby	Double Straight	R.601"
+	U "Straight Section" "Open Registration" "Hornby" "Double Straight" "R.601" 13.188976 0.000000 0.000000 0
+	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
+TURNOUT HO "Hornby	Short Straight	R.610"
+	U "Straight Section" "Open Registration" "Hornby" "Short Straight" "R.610" 1.496063 0.000000 0.000000 0
+	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
+TURNOUT HO "Hornby	Long straight	R.603"
+	U "Straight Section" "Open Registration" "Hornby" "Long straight" "R.603" 26.377953 0.000000 0.000000 0
+	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
+SUBCONTENTS Curved sections
+TURNOUT HO "Hornby	Curve 1st Radius	R.604"
+	U "Curved Section" "Open Registration" "Hornby" "Curve 1st Radius" "R.604" 14.606299 22.500000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 5.589584 1.111836 67.500000
+	C 0 0.000000 -14.606299 0.000019 14.606299 157.500076 22.500000
+	END
+TURNOUT HO "Hornby	Double Curve 1st Radius	R.605"
+	U "Curved Section" "Open Registration" "Hornby" "Double Curve 1st Radius" "R.605" 14.606299 45.000000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 10.328206 4.278079 45.000000
+	C 0 0.000000 -14.606299 0.000019 14.606299 135.000076 45.000000
+	END
+TURNOUT HO "Hornby	Curve 2nd Radius	R.606"
+	U "Curved Section" "Open Registration" "Hornby" "Curve 2nd Radius" "R.606" 17.244094 22.500000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.599024 1.312626 67.500000
+	C 0 0.000000 -17.244094 0.000023 17.244094 157.500076 22.500000
+	END
+TURNOUT HO "Hornby	Double Curve 2nd Radius	R607"
+	U "Curved Section" "Open Registration" "Hornby" "Double Curve 2nd Radius" "R607" 17.244094 45.000000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 12.193408 5.050670 45.000000
+	C 0 0.000000 -17.244094 0.000023 17.244094 135.000076 45.000000
+	END
+TURNOUT HO "Hornby	Curve 3rd Radius	R.608"
+	U "Curved Section" "Open Registration" "Hornby" "Curve 3rd Radius" "R.608" 19.881890 22.500000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 7.608464 1.513416 67.500000
+	C 0 0.000000 -19.881890 0.000026 19.881890 157.500076 22.500000
+	END
+TURNOUT HO "Hornby	Double Curve 3rd Radius	R.609"
+	U "Curved Section" "Open Registration" "Hornby" "Double Curve 3rd Radius" "R.609" 19.881890 45.000000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 14.058610 5.823261 45.000000
+	C 0 0.000000 -19.881890 0.000026 19.881890 135.000076 45.000000
+	END
+TURNOUT HO "Hornby	Curve	R.628"
+	U "Curved Section" "Open Registration" "Hornby" "Curve" "R.628" 33.543307 11.250000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 6.543969 0.644524 78.750000
+	C 0 0.000000 -33.543307 0.000045 33.543307 168.750076 11.250000
+	END
+TURNOUT HO "Hornby	2nd Radius Half Curve	R643"
+	U "Curved Section" "Open Registration" "Hornby" "2nd Radius Half Curve" "R643" 17.244094 11.250000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 3.364153 0.331340 78.750000
+	C 0 0.000000 -17.244094 0.000023 17.244094 168.750076 11.250000
+	END
+TURNOUT HO "Hornby	4th Radius Single Curve	R8261"
+	U "Curved Section" "" "Hornby" "4th Radius Single Curve" "R8261" 22.519685 22.500000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 8.617903 1.714206 67.500000
+	C 0 0.000000 -22.519685 0.000030 22.519685 157.500076 22.500000
+	END
+TURNOUT HO "Hornby	4th Radius Double Curve	R8262"
+	U "Curved Section" "" "Hornby" "4th Radius Double Curve" "R8262" 22.519685 45.000000 0.000000 0.000000 0
+	P "Normal" 1
+	E 0.000000 0.000000 270.000000
+	E 15.923811 6.595852 45.000000
+	C 0 0.000000 -22.519685 0.000030 22.519685 135.000076 45.000000
+	END
+SUBCONTENTS Crossings
 TURNOUT HO "Hornby	Left Hand Diamond Crossing	R.614"
 	U "Crossing" "Open Registration" "Hornby" "Left Hand Diamond Crossing" "R.614" 7.125984 22.500000 6.614173 0.000000 0.000000 0
 	P "Normal" 1 0 2
@@ -19,13 +120,14 @@ TURNOUT HO "Hornby	Right Hand Diamond Crossing	R.615"
 	S 0 0.000000 0.000000 0.000000 6.614173 0.000000
 	S 0 0.000000 0.015309 1.363493 6.598864 -1.363493
 	END
-TURNOUT HO "Hornby	Curve 1st Radius	R.604"
-	U "Curved Section" "Open Registration" "Hornby" "Curve 1st Radius" "R.604" 14.606299 22.500000 0.000000 0.000000 0
+TURNOUT HO "Hornby	Curve	R.628"
+	U "Curved Section" "Open Registration" "Hornby" "Curve" "R.628" 33.543307 11.250000 0.000000 0.000000 0
 	P "Normal" 1
 	E 0.000000 0.000000 270.000000
-	E 5.589584 1.111836 67.500000
-	C 0 0.000000 -14.606299 0.000019 14.606299 157.500076 22.500000
+	E 6.543969 0.644524 78.750000
+	C 0 0.000000 -33.543307 0.000045 33.543307 168.750076 11.250000
 	END
+SUBCONTENTS Turnouts / Points
 TURNOUT HO "Hornby	Y Point	R632"
 	U "Wye Turnout" "Open Registration" "Hornby" "Y Point" "R632" 6.614173 11.250000 0.679134 0.679134 11.250000 6.614173 0.000000 0.000000 0
 	P "Left" 1 2 3
@@ -39,13 +141,6 @@ TURNOUT HO "Hornby	Y Point	R632"
 	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
-TURNOUT HO "Hornby	2nd Radius Half Curve	R643"
-	U "Curved Section" "Open Registration" "Hornby" "2nd Radius Half Curve" "R643" 17.244094 11.250000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 3.364153 0.331340 78.750000
-	C 0 0.000000 -17.244094 0.000023 17.244094 168.750076 11.250000
-	END
 TURNOUT HO "Hornby	Left Hand Curved Point	R.640"
 	U "Curved Turnout" "Open Registration" "Hornby" "Left Hand Curved Point" "R.640" "Right Hand Curved Point" "R.641" 9.645669 33.750000 2.637795 22.500000 1.318898 9.251969 0.000000 0.000000 0
 	P "Normal" 1 6 4 5
@@ -73,77 +168,7 @@ TURNOUT HO "Hornby	Right Hand Curved Point	R.641"
 	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
-TURNOUT HO "Hornby	Double Curve 3rd Radius	R.609"
-	U "Curved Section" "Open Registration" "Hornby" "Double Curve 3rd Radius" "R.609" 19.881890 45.000000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 14.058610 5.823261 45.000000
-	C 0 0.000000 -19.881890 0.000026 19.881890 135.000076 45.000000
-	END
-TURNOUT HO "Hornby	Double Curve 2nd Radius	R607"
-	U "Curved Section" "Open Registration" "Hornby" "Double Curve 2nd Radius" "R607" 17.244094 45.000000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 12.193408 5.050670 45.000000
-	C 0 0.000000 -17.244094 0.000023 17.244094 135.000076 45.000000
-	END
-TURNOUT HO "Hornby	Double Curve 1st Radius	R.605"
-	U "Curved Section" "Open Registration" "Hornby" "Double Curve 1st Radius" "R.605" 14.606299 45.000000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 10.328206 4.278079 45.000000
-	C 0 0.000000 -14.606299 0.000019 14.606299 135.000076 45.000000
-	END
-TURNOUT HO "Hornby	Curve 3rd Radius	R.608"
-	U "Curved Section" "Open Registration" "Hornby" "Curve 3rd Radius" "R.608" 19.881890 22.500000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 7.608464 1.513416 67.500000
-	C 0 0.000000 -19.881890 0.000026 19.881890 157.500076 22.500000
-	END
-TURNOUT HO "Hornby	Curve 2nd Radius	R.606"
-	U "Curved Section" "Open Registration" "Hornby" "Curve 2nd Radius" "R.606" 17.244094 22.500000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.599024 1.312626 67.500000
-	C 0 0.000000 -17.244094 0.000023 17.244094 157.500076 22.500000
-	END
-TURNOUT HO "Hornby	Curve	R.628"
-	U "Curved Section" "Open Registration" "Hornby" "Curve" "R.628" 33.543307 11.250000 0.000000 0.000000 0
-	P "Normal" 1
-	E 0.000000 0.000000 270.000000
-	E 6.543969 0.644524 78.750000
-	C 0 0.000000 -33.543307 0.000045 33.543307 168.750076 11.250000
-	END
-TURNOUT HO "Hornby	Straight	R.600"
-	U "Straight Section" "Open Registration" "Hornby" "Straight" "R.600" 6.614173 0.000000 0.000000 0
-	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
-TURNOUT HO "Hornby	Short Straight	R.610"
-	U "Straight Section" "Open Registration" "Hornby" "Short Straight" "R.610" 1.496063 0.000000 0.000000 0
-	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
-TURNOUT HO "Hornby	Long straight	R.603"
-	U "Straight Section" "Open Registration" "Hornby" "Long straight" "R.603" 26.377953 0.000000 0.000000 0
-	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
-TURNOUT HO "Hornby	Double Straight	R.601"
-	U "Straight Section" "Open Registration" "Hornby" "Double Straight" "R.601" 13.188976 0.000000 0.000000 0
-	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
+  END
 TURNOUT HO "Hornby	Left Hand Point	R.612"
 	U "Regular Turnout" "Open Registration" "Hornby" "Left Hand Point" "R.612" "Right Hand Point" "R.613" 6.614173 22.500000 1.318898 6.614173 0.000000 0.000000 0
 	P "Normal" 1 2
@@ -192,17 +217,79 @@ TURNOUT HO "Hornby	Right Hand Express Point	R.623"
 	C 0 0.000000 27.625934 0.648490 -27.625934 0.000076 11.250152
 	S 0 0.000000 6.038220 -0.530838 10.000000 -1.318898
 	END
-TURNOUT HO "Hornby	4th Radius Single Curve	R8261"
-	U "Curved Section" "" "Hornby" "4th Radius Single Curve" "R8261" 22.519685 22.500000 0.000000 0.000000 0
-	P "Normal" 1
+TURNOUT HO "Hornby	Left Hand Point	R.8072"
+	U "Regular Turnout" "Open Registration" "Hornby" "Left Hand Point" "R.8072" "Right Hand Point" "R.8073" 6.614173 22.500000 1.318898 6.614173 0.000000 0.000000 0
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
 	E 0.000000 0.000000 270.000000
-	E 8.617903 1.714206 67.500000
-	C 0 0.000000 -22.519685 0.000030 22.519685 157.500076 22.500000
+	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
-TURNOUT HO "Hornby	4th Radius Double Curve	R8262"
-	U "Curved Section" "" "Hornby" "4th Radius Double Curve" "R8262" 22.519685 45.000000 0.000000 0.000000 0
-	P "Normal" 1
+TURNOUT HO "Hornby	Right Hand Point	R.8073"
+	U "Regular Turnout" "Open Registration" "Hornby" "Left Hand Point" "R.8072" "Right Hand Point" "R.8073" 6.614173 22.500000 1.318898 6.614173 0.000000 0.000000 0
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
 	E 0.000000 0.000000 270.000000
-	E 15.923811 6.595852 45.000000
-	C 0 0.000000 -22.519685 0.000030 22.519685 135.000076 45.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
+TURNOUT HO "Hornby	Left Hand Express Point	R.8077"
+	U "Regular Turnout" "Open Registration" "Hornby" "Left Hand Express Point" "R.8077" "Right Hand Express Point" "R.8078" 9.645500 11.250000 1.318898 9.645500 0.000000 0.000000 0
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 9.645500 0.000000 90.000000
+	E 9.645500 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.645500 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.645500 1.318898
+	END
+TURNOUT HO "Hornby	Right Hand Express Point	R.8078"
+	U "Regular Turnout" "Open Registration" "Hornby" "Left Hand Express Point" "R.8077" "Right Hand Express Point" "R.8078" 9.645500 11.250000 1.318898 9.645500 0.000000 0.000000 0
+	P "Normal" 1 2
+	P "Reverse" 1 3 4
+	E 0.000000 0.000000 270.000000
+	E 9.645500 0.000000 90.000000
+	E 9.645500 -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.645500 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.645500 -1.318898
+	END
+TURNOUT HO "Hornby	Left Hand Curved Point	R.8074"
+	U "Curved Turnout" "Open Registration" "Hornby" "Left Hand Curved Point" "R.8074" "Right Hand Curved Point" "R.8075" 9.645669 33.750000 2.637795 22.500000 1.318898 9.251969 0.000000 0.000000 0
+	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
+TURNOUT HO "Hornby	Right Hand Curved Point	R.8075"
+	U "Curved Turnout" "Open Registration" "Hornby" "Left Hand Curved Point" "R.8074" "Right Hand Curved Point" "R.8075" 9.645669 33.750000 2.637795 22.500000 1.318898 9.251969 0.000000 0.000000 0
+	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