New upstream version 4.3.0upstream/4.3.0

1 files changed, 145 insertions, 126 deletions

diff --git a/app/lib/params/pecoho83.xtp b/app/lib/params/pecoho83.xtp
index 727ecaf..7af3cc2 100644
--- a/app/lib/params/pecoho83.xtp
+++ b/app/lib/params/pecoho83.xtp
@@ -1,126 +1,145 @@
-CONTENTS Peco North American Code 83 HO Scale Turnouts
-SUBCONTENTS Peco Code 83 HO Turnouts
-TURNOUT HO "PECO Code 83	#5 Left Hand Turnout	SL-8352/SLE-8352"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 8.307087 0.000000 90.000000
-	E 8.307087 1.019252 78.463031
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	S 0 0.000000 0.649600 0.000000 8.307087 0.000000
-	C 0 0.000000 -26.373333 0.649635 26.373333 168.462955 11.537121
-	S 0 0.000000 5.924335 0.532864 8.307087 1.019252
-	END
-TURNOUT HO "PECO Code 83	#5 Right Hand Turnout	SL-8351/SLE-8351"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 8.307087 0.000000 90.000000
-	E 8.307087 -1.019252 101.536969
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	S 0 0.000000 0.649600 0.000000 8.307087 0.000000
-	C 0 0.000000 26.373333 0.649495 -26.373333 0.000076 11.537121
-	S 0 0.000000 5.924335 -0.532864 8.307087 -1.019252
-	END
-TURNOUT HO "PECO Code 83	#6 Left Hand Turnout	SL-8362/SLE-8362"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 9.173228 0.000000 90.000000
-	E 9.173228 1.023622 77.000000
-	S 0 0.000000 0.000000 0.000000 0.838713 0.000000
-	S 0 0.000000 0.838713 0.000000 9.173228 0.000000
-	C 0 0.000000 -34.236656 0.838759 34.236656 166.999924 13.000152
-	S 0 0.000000 8.540367 0.877502 9.173228 1.023622
-	END
-TURNOUT HO "PECO Code 83	#6 Right Hand Turnout	SL-8361/SLE-8361"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 9.173228 0.000000 90.000000
-	E 9.173228 -1.023622 103.000000
-	S 0 0.000000 0.000000 0.000000 0.838713 0.000000
-	S 0 0.000000 0.838713 0.000000 9.173228 0.000000
-	C 0 0.000000 34.236656 0.838577 -34.236656 0.000076 13.000152
-	S 0 0.000000 8.540367 -0.877502 9.173228 -1.023622
-	END
-TURNOUT HO "PECO Code 83	#8 Left Hand Turnout	SL-8382/SLE-8382"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 12.677165 0.000000 90.000000
-	E 12.677165 1.019213 82.819238
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	S 0 0.000000 0.649600 0.000000 12.677165 0.000000
-	C 0 0.000000 -62.760069 0.649683 62.760069 172.819162 7.180914
-	S 0 0.000000 8.494774 0.492264 12.677165 1.019213
-	END
-TURNOUT HO "PECO Code 83	#8 Right Hand Turnout	SL-8381/SLE-8381"
-	P "Normal" 1 2
-	P "Reverse" 1 3 4
-	E 0.000000 0.000000 270.000000
-	E 12.677165 0.000000 90.000000
-	E 12.677165 -1.019213 97.180762
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	S 0 0.000000 0.649600 0.000000 12.677165 0.000000
-	C 0 0.000000 62.760069 0.649350 -62.760069 0.000076 7.180914
-	S 0 0.000000 8.494774 -0.492264 12.677165 -1.019213
-	END
-TURNOUT HO "PECO Code 83	#4 WYE Turnout	SL-8348/SLE-8348"
-	P "Left" 1 2 3
-	P "Right" 1 4 5
-	E 0.000000 0.000000 270.000000
-	E 7.159055 0.500000 82.850000
-	E 7.159055 -0.500000 97.150000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 -40.393551 0.649654 40.393551 172.849924 7.150152
-	S 0 0.000000 5.677382 0.314125 7.159055 0.500000
-	C 0 0.000000 40.393551 0.649439 -40.393551 0.000076 7.150152
-	S 0 0.000000 5.677382 -0.314125 7.159055 -0.500000
-	END
-
-SUBCONTENTS Peco Code 83 HO Crossings
-TURNOUT HO "PECO Code 83	#6 Diamond Crossing	SL-8364/SLE-8364"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 12.035433 0.000000 90.000000
-	E 0.084167 1.002945 279.594076
-	E 11.951266 -1.002945 99.594076
-	S 0 0.000000 0.000000 0.000000 12.035433 0.000000
-	S 0 0.000000 0.084167 1.002945 11.951266 -1.002945
-	END
-TURNOUT HO "PECO Code 83	90d Crossing	SL-8390"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 2.000000 0.000000 90.000000
-	E 1.000000 -1.000000 180.000000
-	E 1.000000 1.000000 0.000000
-	S 0 0.000000 0.000000 0.000000 2.000000 0.000000
-	S 0 0.000000 1.000000 1.000000 1.000000 -1.000000
-	END
-
-SUBCONTENTS Peco Code 83 HO Curved Turnouts
-TURNOUT HO "Peco Code 83	#7 Curved Left Turnout	SL-8377/SLE-8377"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
-	E 0.000000 0.000000 270.000000
-	E 11.106693 0.984252 81.000000
-	E 10.865748 1.968504 72.000000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 -26.251070 0.649635 26.251070 161.999924 18.000152
-	S 0 0.000000 8.761686 1.284838 10.865748 1.968504
-	C 0 0.000000 -53.910688 0.649672 53.910688 170.999924 9.000152
-	S 0 0.000000 9.083224 0.663751 11.106693 0.984252
-	END
-TURNOUT HO "Peco Code 83	#7 Curved Right Turnout	SL-8376/SLE-8376"
-	P "Normal" 1 4 5
-	P "Reverse" 1 2 3
-	E 0.000000 0.000000 270.000000
-	E 11.106693 -0.984252 99.000000
-	E 10.865748 -1.968504 108.000000
-	S 0 0.000000 0.000000 0.000000 0.649600 0.000000
-	C 0 0.000000 26.251070 0.649496 -26.251070 0.000076 18.000152
-	S 0 0.000000 8.761686 -1.284838 10.865748 -1.968504
-	C 0 0.000000 53.910688 0.649385 -53.910688 0.000076 9.000152
-	S 0 0.000000 9.083224 -0.663751 11.106693 -0.984252
-	END
+CONTENTS Peco North American Code 83 HO Scale Turnouts

+#Updated based on PECO Website and PDF's

+SUBCONTENTS Peco Code 83 HO Turnouts

+TURNOUT HO "PECO Code 83	#5 Left Hand Turnout	SL-8352/SLE-8352"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 8.259842 0.000000 90.000000

+	E 8.259842 1.000000 78.600000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 8.259842 0.000000

+	C 0 0.000000 -26.558075 0.649635 26.558075 168.599924 11.400152

+	S 0 0.000000 5.899063 0.523973 8.259842 1.000000

+	END

+TURNOUT HO "PECO Code 83	#5 Right Hand Turnout	SL-8351/SLE-8351"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 8.259842 0.000000 90.000000

+	E 8.259842 -1.000000 101.400000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 8.259842 0.000000

+	C 0 0.000000 26.558075 0.649494 -26.558075 0.000076 11.400152

+	S 0 0.000000 5.899063 -0.523973 8.259842 -1.000000

+	END

+TURNOUT HO "PECO Code 83	#6 Left Hand Turnout	SL-8362/SLE-8362"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 9.192913 0.000000 90.000000

+	E 9.192913 1.000000 80.500000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 9.192913 0.000000

+	C 0 0.000000 -30.900336 0.649641 30.900336 170.499924 9.500152

+	S 0 0.000000 5.749703 0.423792 9.192913 1.000000

+	END

+TURNOUT HO "PECO Code 83	#6 Right Hand Turnout	SL-8361/SLE-8361"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 9.192913 0.000000 90.000000

+	E 9.192913 -1.000000 99.500000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 9.192913 0.000000

+	C 0 0.000000 30.900336 0.649477 -30.900336 0.000076 9.500152

+	S 0 0.000000 5.749703 -0.423792 9.192913 -1.000000

+	END

+TURNOUT HO "PECO Code 83	#8 Left Hand Turnout	SL-8382/SLE-8382"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 12.649606 0.000000 90.000000

+	E 12.649606 1.000000 82.850000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 12.649606 0.000000

+	C 0 0.000000 -64.478236 0.649686 64.478236 172.849924 7.150152

+	S 0 0.000000 8.675202 0.501423 12.649606 1.000000

+	END

+TURNOUT HO "PECO Code 83	#8 Right Hand Turnout	SL-8381/SLE-8381"

+	P "Normal" 1 2

+	P "Reverse" 1 3 4

+	E 0.000000 0.000000 270.000000

+	E 12.649606 0.000000 90.000000

+	E 12.649606 -1.000000 97.150000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	S 0 0.000000 0.649600 0.000000 12.649606 0.000000

+	C 0 0.000000 64.478236 0.649343 -64.478236 0.000076 7.150152

+	S 0 0.000000 8.675202 -0.501423 12.649606 -1.000000

+	END

+SUBCONTENTS Peco Code 83 HO Wye Turnouts

+TURNOUT HO "PECO Code 83	#4 WYE Turnout	SL-8348/SLE-8348"

+	P "Left" 1 2 3

+	P "Right" 1 4 5

+	E 0.000000 0.000000 270.000000

+	E 7.159055 0.500000 82.850000

+	E 7.159055 -0.500000 97.150000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	C 0 0.000000 -40.393551 0.649654 40.393551 172.849924 7.150152

+	S 0 0.000000 5.677382 0.314125 7.159055 0.500000

+	C 0 0.000000 40.393551 0.649439 -40.393551 0.000076 7.150152

+	S 0 0.000000 5.677382 -0.314125 7.159055 -0.500000

+	END

+

+SUBCONTENTS Peco Code 83 HO Crossings

+TURNOUT HO "PECO Code 83	#6 Diamond Crossing	SL-8364/SLE-8364"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 12.035433 0.000000 90.000000

+	E 0.082528 0.993201 279.500000

+	E 11.952905 -0.993201 99.500000

+	S 0 0.000000 0.000000 0.000000 12.035433 0.000000

+	S 0 0.000000 0.082528 0.993201 11.952905 -0.993201

+	END

+TURNOUT HO "PECO Code 83	90d Crossing	SL-8390"

+	P "Normal" 1 0 2

+	E 0.000000 0.000000 270.000000

+	E 2.000000 0.000000 90.000000

+	E 1.000000 -1.000000 180.000000

+	E 1.000000 1.000000 0.000000

+	S 0 0.000000 0.000000 0.000000 2.000000 0.000000

+	S 0 0.000000 1.000000 1.000000 1.000000 -1.000000

+	END

+

+SUBCONTENTS Peco Code 83 HO Curved Turnouts

+TURNOUT HO "Peco Code 83	#7 Curved Left Turnout	SL-8377/SLE-8377"

+	P "Normal" 1 4 5

+	P "Reverse" 1 2 3

+	E 0.000000 0.000000 270.000000

+	E 11.106693 0.984252 81.000000

+	E 10.865748 1.968504 72.000000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	C 0 0.000000 -26.251070 0.649635 26.251070 161.999924 18.000152

+	S 0 0.000000 8.761686 1.284838 10.865748 1.968504

+	C 0 0.000000 -53.910688 0.649672 53.910688 170.999924 9.000152

+	S 0 0.000000 9.083224 0.663751 11.106693 0.984252

+	END

+TURNOUT HO "Peco Code 83	#7 Curved Right Turnout	SL-8376/SLE-8376"

+	P "Normal" 1 4 5

+	P "Reverse" 1 2 3

+	E 0.000000 0.000000 270.000000

+	E 11.106693 -0.984252 99.000000

+	E 10.865748 -1.968504 108.000000

+	S 0 0.000000 0.000000 0.000000 0.649600 0.000000

+	C 0 0.000000 26.251070 0.649496 -26.251070 0.000076 18.000152

+	S 0 0.000000 8.761686 -1.284838 10.865748 -1.968504

+	C 0 0.000000 53.910688 0.649385 -53.910688 0.000076 9.000152

+	S 0 0.000000 9.083224 -0.663751 11.106693 -0.984252

+	END

+SUBCONTENTS Peco Code 83 HO Slip Turnouts

+TURNOUT HO "Peco Code 83	#6 Double Slip Switch	SL-U8363"

+	P "Normal" 1 2 3 0 4 5 6

+	P "Reverse" 1 7 6 0 4 8 3

+	E 0.000000 0.000000 270.000000

+	E 12.035433 0.000000 90.000000

+	E 0.082528 0.993201 279.500000

+	E 11.952905 -0.993201 99.500000

+	S 0 0.000000 0.000000 0.000000 1.299468 0.000000

+	S 0 0.000000 1.299468 0.000000 10.735965 0.000000

+	S 0 0.000000 10.735965 0.000000 12.035433 0.000000

+	S 0 0.000000 0.082528 0.993201 1.363761 0.778782

+	S 0 0.000000 1.363761 0.778782 10.671672 -0.778782

+	S 0 0.000000 10.671672 -0.778782 11.952905 -0.993201

+	C 0 0.000000 56.784006 1.299241 -56.784006 0.000076 9.500152

+	C 0 0.000000 -56.784006 10.736040 56.783993 180.000076 9.500152

+	END