Merge branch 'feature/upstream' into develop

1 files changed, 0 insertions, 369 deletions

diff --git a/app/lib/params/kato-n-DblTrk.xtp b/app/lib/params/kato-n-DblTrk.xtp
deleted file mode 100644
index ec6b0c6..0000000
--- a/app/lib/params/kato-n-DblTrk.xtp
+++ /dev/null
@@ -1,369 +0,0 @@
-CONTENTS Kato Unitrack N-Scale Double Track Line
-#Created By Dwyane Ward 05-Jul-2007
-
-SUBCONTENTS Kato Unitrack N-Scale Dbl Trk Crossovers
-TURNOUT N  "Kato Unitrack	Dbl Trk Single Crossover (left) 9.75 248mm	20-230"
-	P "Normal" 1 2 0 3 4
-	P "Reverse" 1 5 6 7 4
-	E 0.000000 0.000000 270.000000
-	E 9.763779 0.000000 90.000000
-	E 0.000000 1.299212 270.000000
-	E 9.763779 1.299212 90.000000
-	S 0 0.000000 0.000000 0.000000 0.617287 0.000000
-	S 0 0.000000 0.617287 0.000000 9.763779 0.000000
-	S 0 0.000000 0.000000 1.299212 9.146492 1.299212
-	S 0 0.000000 9.146492 1.299212 9.763779 1.299212
-	C 0 0.000000 -14.226684 0.617306 14.226684 163.988842 16.011234
-	S 0 0.000000 4.541371 0.551886 5.222408 0.747326
-	C 0 0.000000 14.226684 9.146510 -12.927467 343.988842 16.011234
-	L 11579568 0.053333 0.000000 -0.445774 9.763799 -0.445774
-	L 11579568 0.053333 0.000000 1.744986 9.763799 1.744986
-	END
-TURNOUT N  "Kato Unitrack	Dbl Trk Single Crossover (Right) 9.75 248mm	20-231"
-	P "Normal" 1 2 0 3 4
-	P "Reverse" 3 5 6 7 2
-	E 0.000000 0.000000 270.000000
-	E 9.763799 0.000000 90.000000
-	E 0.000000 1.299212 270.000000
-	E 9.763799 1.299212 90.000000
-	S 0 0.000000 0.000000 0.000000 9.146512 0.000000
-	S 0 0.000000 9.146512 0.000000 9.763799 0.000000
-	S 0 0.000000 0.000000 1.299212 0.617287 1.299212
-	S 0 0.000000 0.617287 1.299212 9.763799 1.299212
-	C 0 0.000000 14.226749 0.617230 -12.927537 0.000076 16.011200
-	S 0 0.000000 4.541380 0.747326 5.222419 0.551886
-	C 0 0.000000 -14.226749 9.146530 14.226744 180.000076 16.011200
-	L 11579568 0.053333 0.000000 -0.445774 9.763799 -0.445774
-	L 11579568 0.053333 0.000000 1.744986 9.763799 1.744986
-	END
-
-SUBCONTENTS Kato Unitrack N-Scale Dbl Trk Straight Viaduct Track
-TURNOUT N  "Kato Unitrack	Dbl Trk Straight Viaduct 4 7/8 124mm	20-422"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 4.881889 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 4.881889 -1.299212 90.000000
-	S 0 0 0.000000 0.000000 4.881889 0.000000
-	S 0 0 0.000000 -1.299212 4.881889 -1.299212
-	L 11579568 0.053333 0.000000 0.445774 4.881889 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 4.881889 -1.744986
-	END
-
-SUBCONTENTS Kato Unitrack N-Scale Dbl Trk Plate Straight Track
-TURNOUT N  "Kato Unitrack	Dbl Trk Plate Straight 9.75 248mm	20-001"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 9.763799 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 9.763799 -1.299212 90.000000
-	S 0 0 0.000000 0.000000 9.763799 0.000000
-	S 0 0 0.000000 -1.299212 9.763799 -1.299212
-	L 11579568 0.053333 0.000000 0.445774 9.763799 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 9.763799 -1.744986
-	END
-TURNOUT N  "Kato Unitrack	Dbl Trk Feeder Trk 9.75 248mm	20-002"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 9.763799 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 9.763799 -1.299212 90.000000
-	S 0 0 0.000000 0.000000 9.763799 0.000000
-	S 0 0 0.000000 -1.299212 9.763799 -1.299212
-	L 11579568 0.053333 0.000000 0.445774 9.763799 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 9.763799 -1.744986
-	L 0 0.026667 9.322855 -1.798086 9.322855 -1.998086
-	L 0 0.026667 9.322855 -1.998086 9.422855 -2.098086
-	L 0 0.026667 9.322855 -1.998086 9.222855 -2.098086
-	L 16711680 0.026667 9.122855 -1.798086 9.122855 -1.998086
-	L 16711680 0.026667 9.122855 -1.998086 9.222855 -2.098086
-	L 16711680 0.026667 9.122855 -1.998086 9.022855 -2.098086
-	END
-TURNOUT N  "Kato Unitrack	Dbl Trk Str Incline 9.75 248mm	20-003"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 9.763799 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 9.763799 -1.299212 90.000000
-	S 0 0 0.000000 0.000000 9.763799 0.000000
-	S 0 0 0.000000 -1.299212 9.763799 -1.299212
-	L 11579568 0.053333 0.000000 0.445774 9.763799 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 9.763799 -1.744986
-	END
-TURNOUT N  "Kato Unitrack	Dbl Trk Straight 9.75 248mm	20-004/401"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 9.763799 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 9.763799 -1.299212 90.000000
-	S 0 0 0.000000 0.000000 9.763799 0.000000
-	S 0 0 0.000000 -1.299212 9.763799 -1.299212
-	L 11579568 0.053333 0.000000 0.445774 9.763799 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 9.763799 -1.744986
-	END
-TURNOUT N  "Kato Unitrack	Dbl Trk Straight 7 5/16 186mm	20-012/411"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 7.322834 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 7.322834 -1.299212 90.000000
-	S 0 0 0.000000 0.000000 7.322834 0.000000
-	S 0 0 0.000000 -1.299212 7.322834 -1.299212
-	L 11579568 0.053333 0.000000 0.445774 7.322834 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 7.322834 -1.744986
-	END
-TURNOUT N  "Kato Unitrack	Dbl Trk Straight 4 7/8 124mm	20-022/023"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 4.881889 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 4.881889 -1.299212 90.000000
-	S 0 0 0.000000 0.000000 4.881889 0.000000
-	S 0 0 0.000000 -1.299212 4.881889 -1.299212
-	L 11579568 0.053333 0.000000 0.445774 4.881889 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 4.881889 -1.744986
-	END
-TURNOUT N  "Kato Unitrack	Dbl Trk Straight 2 7/16 62mm	20-042"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 2.440944 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 2.440944 -1.299212 90.000000
-	S 0 0 0.000000 0.000000 2.440944 0.000000
-	S 0 0 0.000000 -1.299212 2.440944 -1.299212
-	L 11579568 0.053333 0.000000 0.445774 2.440944 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 2.440944 -1.744986
-	END
-TURNOUT N  "Kato Unitrack	Dbl Trk Feeder Track 62mm	20-043"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 2.440944 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 2.440944 -1.299212 90.000000
-	S 0 0 0.000000 0.000000 2.440944 0.000000
-	S 0 0 0.000000 -1.299212 2.440944 -1.299212
-	L 11579568 0.053333 0.000000 0.445774 2.440944 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 2.440944 -1.744986
-	L 0 0.026667 2.000000 -1.798086 2.000000 -1.998086
-	L 0 0.026667 2.000000 -1.998086 2.100000 -2.098086
-	L 0 0.026667 2.000000 -1.998086 1.900000 -2.098086
-	L 16711680 0.026667 1.800000 -1.798086 1.800000 -1.998086
-	L 16711680 0.026667 1.800000 -1.998086 1.900000 -2.098086
-	L 16711680 0.026667 1.800000 -1.998086 1.700000 -2.098086
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk Widening Section 310mm	20-051 Left"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 12.204724 0.000000 90.000000
-	E 0.000000 1.299212 270.000000
-	E 12.204724 2.598425 90.000000
-	S 0 0 0.000000 0.000000 12.204724 0.000000
-	S 0 0 0.000000 1.299212 0.980334 1.299212
-	C 0 0 17.598425 0.980334 18.897637 169.500000 10.500000
-	S 0 0 4.187392 1.593899 8.017332 2.303737
-	C 0 0 17.598425 11.224390 -15.000001 349.500000 10.500000
-	S 0 0 11.224390 2.598425 12.204724 2.598425
-	L 11579568 0.053333 0.000000 -0.445774 12.204724 -0.445774
-	L 11579568 0.053333 0.000000 1.744986 0.980334 1.744986
-	A 11579568 0.053333 17.152651 0.980334 18.897637 169.500000 10.500000
-	L 11579568 0.053333 4.187392 2.039673 8.017332 2.749511
-	A 11579568 0.053333 18.044199 11.224390 -15.000001 349.500000 10.500000
-	L 11579568 0.053333 11.224390 3.044199 12.204724 3.044199
-	L 11579568 0.053333 11.704724 0.445774 12.204724 0.445774
-	L 11579568 0.053333 11.704724 0.445774 11.704724 2.152651
-	L 11579568 0.053333 11.704724 2.152651 12.204724 2.152651
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk Widening Section 310mm	20-052 Right"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 12.204724 0.000000 90.000000
-	E 0.000000 -1.299212 270.000000
-	E 12.204724 -2.598425 90.000000
-	S 0 0 0.000000 0.000000 12.204724 0.000000
-	S 0 0 0.000000 -1.299212 0.980334 -1.299212
-	C 0 0 17.598425 0.980334 -18.897637 0.000000 10.500000
-	S 0 0 4.187392 -1.593899 8.017332 -2.303737
-	C 0 0 17.598425 11.224390 15.000001 180.000000 10.500000
-	S 0 0 11.224390 -2.598425 12.204724 -2.598425
-	L 11579568 0.053333 0.000000 0.445774 12.204724 0.445774
-	L 11579568 0.053333 0.000000 -1.744986 0.980334 -1.744986
-	A 11579568 0.053333 17.152651 0.980334 -18.897637 0.000000 10.500000
-	L 11579568 0.053333 4.187392 -2.039673 8.017332 -2.749511
-	A 11579568 0.053333 18.044199 11.224390 15.000001 180.000000 10.500000
-	L 11579568 0.053333 11.224390 -3.044199 12.204724 -3.044199
-	L 11579568 0.053333 11.704724 -0.445774 12.204724 -0.445774
-	L 11579568 0.053333 11.704724 -0.445774 11.704724 -2.152651
-	L 11579568 0.053333 11.704724 -2.152651 12.204724 -2.152651
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Single Trk Straight 9.75 248mm	20-875"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 9.763799 0.000000 90.000000
-	S 0 0 0.000000 0.000000 9.763799 0.000000
-	L 11579568 0.053333 0.000000 0.445774 9.763799 0.445774
-	L 11579568 0.053333 0.000000 -0.445774 9.763799 -0.445774
-	END
-
-
-SUBCONTENTS Kato Unitrack N-Scale Dbl Trk Plate  Curved Track
-TURNOUT N  "Kato Unitrack	Dbl Trk Plate Curve 12.375/11R 315/282mm 45°	20-112"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 0.000000 -1.299212 270.000000
-	E 8.769238 -3.632337 135.000000
-	E 7.850556 -4.551019 135.000000
-	C 0 0 12.401575 0.000000 -12.401575 0.000000 45.000000
-	C 0 0 11.102362 0.000000 -12.401575 0.000000 45.000000
-	A 11579568 0.053333 12.847349 0.000000 -12.401575 0.000000 45.000000
-	A 11579568 0.053333 10.656588 0.000000 -12.401575 0.000000 45.000000
-	END
-
-SUBCONTENTS Kato Unitrack N-Scale Dbl Trk SupElev Curved Track
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk SupElev Curve 16.3/15R 414/381mm 45°	20-181"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 11.525283 -4.773929 135.000000
-	E 0.000000 -1.299212 270.000000
-	E 10.606602 -5.692610 135.000000
-	C 0 0 16.299212 0.000000 -16.299212 0.000000 45.000000
-	C 0 0 15.000000 0.000000 -16.299212 0.000000 45.000000
-	A 11579568 0.053333 16.744986 0.000000 -16.299212 0.000000 45.000000
-	A 11579568 0.053333 14.554226 0.000000 -16.299212 0.000000 45.000000
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk SupElev Easement Curve (R) Appr 16.3/15R 414/381mm 22.5°	20-182 Right"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 6.237438 -1.240704 112.500000
-	E 0.000000 -1.299212 270.000000
-	E 5.740251 -2.441019 112.500000
-	C 0 0 16.299212 0.000000 -16.299212 0.000000 22.500000
-	C 0 0 15.000000 0.000000 -16.299212 0.000000 22.500000
-	A 11579568 0.053333 16.744986 0.000000 -16.299212 0.000000 22.500000
-	A 11579568 0.053333 14.554226 0.000000 -16.299212 0.000000 22.500000
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk SupElev Easement Curve (L) Appr 16.3/15R 414/381mm 22.5°	20-182 Left"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 6.237438 -1.240704 112.500000
-	E 0.000000 -1.299212 270.000000
-	E 5.740251 -2.441019 112.500000
-	C 0 0 16.299212 0.000000 -16.299212 0.000000 22.500000
-	C 0 0 15.000000 0.000000 -16.299212 0.000000 22.500000
-	A 11579568 0.053333 16.744986 0.000000 -16.299212 0.000000 22.500000
-	A 11579568 0.053333 14.554226 0.000000 -16.299212 0.000000 22.500000
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk SupElev Curve 12.375/11R 315/282mm 45°	20-183"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 0.000000 -1.299212 270.000000
-	E 8.769238 -3.632337 135.000000
-	E 7.850556 -4.551019 135.000000
-	C 0 0 12.401575 0.000000 -12.401575 0.000000 45.000000
-	C 0 0 11.102362 0.000000 -12.401575 0.000000 45.000000
-	A 11579568 0.053333 12.847349 0.000000 -12.401575 0.000000 45.000000
-	A 11579568 0.053333 10.656588 0.000000 -12.401575 0.000000 45.000000
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk SupElev Easement Curve 12.375/11R 315/282mm 22.5°	20-184 Right"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 0.000000 -1.299212 270.000000
-	E 4.745877 -0.944014 112.500000
-	E 4.248690 -2.144330 112.500000
-	C 0 0 12.401575 0.000000 -12.401575 0.000000 22.500000
-	C 0 0 11.102362 0.000000 -12.401575 0.000000 22.500000
-	A 11579568 0.053333 12.847349 0.000000 -12.401575 0.000000 22.500000
-	A 11579568 0.053333 10.656588 0.000000 -12.401575 0.000000 22.500000
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk SupElev Easement Curve 12.375/11R 315/282mm 22.5°	20-184 Left"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 0.000000 -1.299212 270.000000
-	E 4.745877 -0.944014 112.500000
-	E 4.248690 -2.144330 112.500000
-	C 0 0 12.401575 0.000000 -12.401575 0.000000 22.500000
-	C 0 0 11.102362 0.000000 -12.401575 0.000000 22.500000
-	A 11579568 0.053333 12.847349 0.000000 -12.401575 0.000000 22.500000
-	A 11579568 0.053333 10.656588 0.000000 -12.401575 0.000000 22.500000
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk SupElev Curve 18.875/17.625R 480/447mm 45°	20-185"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 13.362648 -5.534990 135.000000
-	E 0.000000 -1.299212 270.000000
-	E 12.443966 -6.453672 135.000000
-	C 0 0 18.897638 0.000000 -18.897638 0.000000 45.000000
-	C 0 0 17.598425 0.000000 -18.897638 0.000000 45.000000
-	A 11579568 0.053333 19.343412 0.000000 -18.897638 0.000000 45.000000
-	A 11579568 0.053333 17.152651 0.000000 -18.897638 0.000000 45.000000
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk SupElev Easement Curve (R) Appr 18.875/17.625R 480/447mm 22.5°	20-186 Right"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 7.231813 -1.438497 112.500000
-	E 0.000000 -1.299212 270.000000
-	E 6.734626 -2.638813 112.500000
-	C 0 0 18.897638 0.000000 -18.897638 0.000000 22.500000
-	C 0 0 17.598425 0.000000 -18.897638 0.000000 22.500000
-	A 11579568 0.053333 19.343412 0.000000 -18.897638 0.000000 22.500000
-	A 11579568 0.053333 17.152651 0.000000 -18.897638 0.000000 22.500000
-	END
-TURNOUT N  "Kato Unitrack	Conc Tie Dbl Trk SupElev Easement Curve (L) Appr 18.875/17.625R 480/447mm 22.5°	20-186 Left"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 7.231813 -1.438497 112.500000
-	E 0.000000 -1.299212 270.000000
-	E 6.734626 -2.638813 112.500000
-	C 0 0 18.897638 0.000000 -18.897638 0.000000 22.500000
-	C 0 0 17.598425 0.000000 -18.897638 0.000000 22.500000
-	A 11579568 0.053333 19.343412 0.000000 -18.897638 0.000000 22.500000
-	A 11579568 0.053333 17.152651 0.000000 -18.897638 0.000000 22.500000
-	END
-
-SUBCONTENTS Kato Unitrack N-Scale Dbl Trk Curved Viaduct Track
-TURNOUT N  "Kato Unitrack	Dbl Trk Curve Viadut 16.3/15R 414/381mm 45°	20-541"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 11.525283 -4.773929 135.000000
-	E 0.000000 -1.299212 270.000000
-	E 10.606602 -5.692610 135.000000
-	C 0 0 16.299212 0.000000 -16.299212 0.000000 45.000000
-	C 0 0 15.000000 0.000000 -16.299212 0.000000 45.000000
-	A 11579568 0.053333 16.744986 0.000000 -16.299212 0.000000 45.000000
-	A 11579568 0.053333 14.554226 0.000000 -16.299212 0.000000 45.000000
-	END
-
-SUBCONTENTS Kato Unitrack N-Scale Dbl Viaduct Trk SupElev Curved Track
-TURNOUT N  "Kato Unitrack	Dbl Viaduct Trk Sup Elev Curve 16.3/15R 414/381mm 45°	20-544"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 11.525283 -4.773929 135.000000
-	E 0.000000 -1.299212 270.000000
-	E 10.606602 -5.692610 135.000000
-	C 0 0 16.299212 0.000000 -16.299212 0.000000 45.000000
-	C 0 0 15.000000 0.000000 -16.299212 0.000000 45.000000
-	A 11579568 0.053333 16.744986 0.000000 -16.299212 0.000000 45.000000
-	A 11579568 0.053333 14.554226 0.000000 -16.299212 0.000000 45.000000
-	END
-TURNOUT N  "Kato Unitrack	Dbl Viaduct Trk SupElev Easement Curve (R) Appr 16.3/15R 414/381mm 22.5°	20-545 Right"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 6.237438 -1.240704 112.500000
-	E 0.000000 -1.299212 270.000000
-	E 5.740251 -2.441019 112.500000
-	C 0 0 16.299212 0.000000 -16.299212 0.000000 22.500000
-	C 0 0 15.000000 0.000000 -16.299212 0.000000 22.500000
-	A 11579568 0.053333 16.744986 0.000000 -16.299212 0.000000 22.500000
-	A 11579568 0.053333 14.554226 0.000000 -16.299212 0.000000 22.500000
-	END
-TURNOUT N  "Kato Unitrack	Dbl Viaduct Trk SupElev Easement Curve (L) Appr 16.3/15R 414/381mm 22.5°	20-545 Left"
-	P "Normal" 1 0 2
-	E 0.000000 0.000000 270.000000
-	E 6.237438 -1.240704 112.500000
-	E 0.000000 -1.299212 270.000000
-	E 5.740251 -2.441019 112.500000
-	C 0 0 16.299212 0.000000 -16.299212 0.000000 22.500000
-	C 0 0 15.000000 0.000000 -16.299212 0.000000 22.500000
-	A 11579568 0.053333 16.744986 0.000000 -16.299212 0.000000 22.500000
-	A 11579568 0.053333 14.554226 0.000000 -16.299212 0.000000 22.500000
-	END
-