Merge branch 'release/debian/1%5.2.0Beta2.1-1' into masterdebian/1%5.2.0Beta2.1-1

1 files changed, 53 insertions, 48 deletions

diff --git a/app/lib/params/HO-Peco-Code75Finescale.xtp b/app/lib/params/HO-Peco-Code75Finescale.xtp
index f2a99a3..b697d67 100644
--- a/app/lib/params/HO-Peco-Code75Finescale.xtp
+++ b/app/lib/params/HO-Peco-Code75Finescale.xtp
@@ -69,70 +69,78 @@ TURNOUT HO "Peco	RH Long Turnout, Electrofrog	SL-E188"
 
 SUBCONTENTS Peco HO Scale Code 75 Curved Turnouts
 TURNOUT HO "Peco	Curved Left Turnout, Electrofrog	SL-E187"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
+	P "Normal" 1 2 3 4
+	P "Reverse" 1 2 5 6 7
 	E 0.000000 0.000000 270.000000
 	E 9.930000 0.830000 80.473000
-	E 9.680000 1.790000 69.666000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 -23.421390 0.649631 23.421390 159.665924 20.334152
-	S 0 0.000000 8.788401 1.459572 9.680000 1.790000
-	C 0 0.000000 -52.020505 0.649669 52.020505 170.472924 9.527152
-	S 0 0.000000 9.259766 0.717503 9.930000 0.830000
-END
+	E 9.680000 1.970000 69.666000
+	C 0 0.000000 60.000000 0.000000 60.000000 179.952254 0.047746
+	S 0 0.000000 0.050000 0.000021 0.549978 0.002473
+	C 0 0.000000 -59.997741 -0.016498 59.997539 170.505131 8.953896
+	C 0 0.000000 60.000000 -0.000742 60.002463 170.473000 0.047746
+	C 0 0.000000 -20.009032 0.514864 20.011474 166.525509 13.373944
+	C 0 0.000000 -42.289079 -5.246889 41.537410 159.398651 6.331063
+	C 0 0.000000 30.000000 -0.744764 30.100487 159.666000 0.095493
+	END
 TURNOUT HO "Peco	Curved Right Turnout, Electrofrog	SL-E186"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
+	P "Normal" 1 2 3 4
+	P "Reverse" 1 2 5 6 7
 	E 0.000000 0.000000 270.000000
 	E 9.930000 -0.830000 99.527000
-	E 9.680000 -1.790000 110.334000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 23.421390 0.649507 -23.421390 0.000076 20.334152
-	S 0 0.000000 8.788401 -1.459572 9.680000 -1.790000
-	C 0 0.000000 52.020505 0.649393 -52.020505 0.000076 9.527152
-	S 0 0.000000 9.259766 -0.717503 9.930000 -0.830000
-END
+	E 9.680000 -1.970000 110.334000
+	C 0 0.000000 60.000000 0.000000 -60.000000 0.000000 0.047746
+	S 0 0.000000 0.050000 -0.000021 0.549978 -0.002473
+	C 0 0.000000 59.997741 -0.016498 -59.997539 0.540973 8.953896
+	C 0 0.000000 60.000000 -0.000742 -60.002463 9.479254 0.047746
+	C 0 0.000000 20.009032 0.514864 -20.011474 0.100547 13.373944
+	C 0 0.000000 42.289079 -5.246889 -41.537410 14.270285 6.331063
+	C 0 0.000000 30.000000 -0.744764 -30.100487 20.238507 0.095493
+	END
 
 SUBCONTENTS Peco HO Scale Code 75 WYE Turnouts
 TURNOUT HO "Peco	Short Y Turnout, Electrofrog	SL-E197"
-	P "Left" 1 2 3
-	P "Right" 1 4 5
+	P "Left" 1 2 3 4 5
+	P "Right" 1 2 6 7 8
 	E 0.000000 0.000000 270.000000
-	E 5.733858 0.517913 78.000000
-	E 5.733858 -0.517913 102.000000
-	S 0 0.000000 0.000000 0.000000 1.455910 0.000000
-	C 0 0.000000 -17.519683 1.455934 17.519683 167.999924 12.000152
-	S 0 0.000000 5.098500 0.382856 5.733858 0.517913
-	C 0 0.000000 17.519683 1.455841 -17.519683 0.000076 12.000152
-	S 0 0.000000 5.098500 -0.382856 5.733858 -0.517913
+	E 5.733858 0.517717 78.000000
+	E 5.733858 -0.517717 102.000000
+	S 0 0.000000 0.000000 0.000000 0.050000 0.000000
+	S 0 0.000000 0.050000 0.000000 0.837008 0.000000
+	C 0 0.000000 -21.959287 1.049798 21.958256 174.182810 6.372407
+	C 0 0.000000 -25.426526 0.368265 25.371829 167.930412 5.504160
+	C 0 0.000000 23.701181 0.806106 23.700970 168.000000 0.120871
+	C 0 0.000000 21.967293 1.049905 -21.966261 359.444707 6.370099
+	C 0 0.000000 25.415926 0.370538 -25.361368 6.563042 5.506467
+	C 0 0.000000 23.701181 10.661611 22.665537 192.120871 0.120871
 END
 TURNOUT HO "Peco	Medium Y Turnout, Electrofrog	SL-E198"
-	P "Left" 1 2 3
-	P "Right" 1 4 5
+	P "Left" 1 2 3 4
+	P "Right" 1 2 5 6
 	E 0.000000 0.000000 270.000000
-	E 8.638189 0.479134 84.000556
-	E 8.638189 -0.479134 95.999444
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 -65.447085 0.649687 65.447085 174.000480 5.999596
-	S 0 0.000000 7.490219 0.358477 8.638189 0.479134
-	C 0 0.000000 65.447085 0.649339 -65.447085 0.000076 5.999596
-	S 0 0.000000 7.490219 -0.358477 8.638189 -0.479134
+	E 8.638189 0.479134 84.000000
+	E 8.638189 -0.479134 96.000000
+	S 0 0.000000 0.000000 0.000000 0.050000 0.000000
+	S 0 0.000000 0.050000 0.000000 0.855906 0.000000
+	C 0 0.000000 -56.219397 1.192646 56.218388 176.392954 3.950236
+	C 0 0.000000 -108.369470 -3.503854 108.166608 173.593356 2.049359
+	C 0 0.000000 54.238706 1.176210 -54.237760 359.661640 4.094836
+	C 0 0.000000 116.607497 -4.432846 -116.362546 4.506721 1.904748
 END
 TURNOUT HO "Peco	Asymmetric 3 Way Turnout	SL-E199"
 	P "Left" 1 2 3 4
 	P "Normal" 1 2 7
 	P "Right" 1 5 6
 	E 0.000000 0.000000 270.000000
-	E 10.630315 1.007480 78.088000
-	E 8.535433 -1.007480 101.912000
-	E 10.735433 0.000000 90.000000
+	E 10.748031 1.082677 77.500000
+	E 8.425197 -1.082677 102.500000
+	E 10.826772 0.000000 90.000000
 	S 0 0.000000 0.000000 0.000000 0.649600 -0.000000
-	S 0 0.000000 0.649600 -0.000000 1.623177 0.000000
-	C 0 0.000000 -40.557971 1.623231 40.557971 168.087924 11.912152
-	S 0 0.000000 9.994810 0.873405 10.630315 1.007480
-	C 0 0.000000 29.809939 0.649481 -29.809939 0.000076 11.912152
-	S 0 0.000000 6.802716 -0.641949 8.535433 -1.007480
-	S 0 0.000000 1.623177 0.000000 10.735433 0.000000
+	S 0 0.000000 0.649600 -0.000000 1.511778 0.000000
+	C 0 0.000000 -39.743423 1.511778 39.743423 167.500000 12.500000
+	S 0 0.000000 10.113829 0.942078 10.748031 1.082677
+	C 0 0.000000 26.406268 0.649600 -26.406268 0.000000 12.500000
+	S 0 0.000000 6.364962 -0.625934 8.425197 -1.082677
+	S 0 0.000000 1.511778 0.000000 10.826772 0.000000
 	END
 
 SUBCONTENTS Peco HO Scale Code 75 Slip Turnouts
@@ -172,7 +180,6 @@ TURNOUT HO "PECO	RH CatchPoint	SL-184"
 	P "Open" 1 3
 	E 0.000000 0.000000 270.000000
 	E 3.579921 0.000000 90.000000
-	E 2.500000 0.125000 85.000000
 	S 0 0.000000 0.000000 0.000000 0.649000 0.000000
 	S 0 0.000000 0.649000 0.000000 3.579921 0.000000
 	S 0 0.000000 0.649000 0.000000 2.500000 0.12500
@@ -182,7 +189,6 @@ TURNOUT HO "PECO	LH CatchPoint	SL-185"
 	P "Open" 1 3
 	E 0.000000 0.000000 270.000000
 	E 3.579921 0.000000 90.00000
-	E 2.500000 -0.12500 95.500000
 	S 0 0.000000 0.000000 0.000000 0.649000 0.000000
     S 0 0.000000 0.649000 0.000000 3.579921 0.000000
 	S 0 0.000000 0.649000 0.000000 2.500000 -0.12500
@@ -278,7 +284,6 @@ TURNOUT HO "Peco Code 75	Inspection Pit(Stair End)	LK-156A"
 	L 0 0.020000 0.000000 0.280000 1.948819 0.28000
 	L 0 0.020000 0.000000 -0.280000 1.948819 -0.280000
 	L 0 0.020000 0.000000 -0.551091 1.948819 -0.551091
-	
 END
 TURNOUT HO "Peco Code 75	Inspection Pit(Mid Section)	LK-156B"
 	P "Normal" 1