Update upstream source from tag 'upstream/5.2.2GA'

Update to upstream version '5.2.2GA'
with Debian dir 9c80045d0b4f9e463647bc8af8c090a673df4132

1 files changed, 77 insertions, 73 deletions

diff --git a/app/lib/params/N-Tomix Track.xtp b/app/lib/params/N-Tomix Track.xtp
index ef7c10a..bcde80a 100644
--- a/app/lib/params/N-Tomix Track.xtp
+++ b/app/lib/params/N-Tomix Track.xtp
@@ -264,7 +264,7 @@ TURNOUT N  "Tomix Fine Track PC	Buffer Trk(LED) 80mm	1427"
 

 

 SUBCONTENTS Tomix N-Scale Fine Track - Curved Track

-TURNOUT N  "Tomix Fine Track	Mini Curve 4.05R 103mm 30°	1111A"

+TURNOUT N  "Tomix Fine Track	Mini Curve 4.05R 103mm 30°	1111A"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 2.027559 -0.543345 120.000000

@@ -272,7 +272,7 @@ TURNOUT N  "Tomix Fine Track	Mini Curve 4.05R 103mm 30°	1111A"
 	A 11579568 0.053333 3.690945 0.000000 -4.055118 0.000000 30.000000

 	A 11579568 0.053333 4.419291 0.000000 -4.055118 0.000000 30.000000

 	END

-TURNOUT N  "Tomix Fine Track	Mini Curve 4.05R 103mm 60°	1111B"

+TURNOUT N  "Tomix Fine Track	Mini Curve 4.05R 103mm 60°	1111B"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.511835 -2.027559 150.000000

@@ -280,7 +280,7 @@ TURNOUT N  "Tomix Fine Track	Mini Curve 4.05R 103mm 60°	1111B"
 	A 11579568 0.053333 3.690945 0.000000 -4.055118 0.000000 60.000000

 	A 11579568 0.053333 4.419291 0.000000 -4.055118 0.000000 60.000000

 	END

-TURNOUT N  "Tomix Fine Track	Mini Curve 5.51R 140mm 30°	1112A"

+TURNOUT N  "Tomix Fine Track	Mini Curve 5.51R 140mm 30°	1112A"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 2.755906 -0.738443 120.000000

@@ -288,7 +288,7 @@ TURNOUT N  "Tomix Fine Track	Mini Curve 5.51R 140mm 30°	1112A"
 	A 11579568 0.053333 5.147638 0.000000 -5.511811 0.000000 30.000000

 	A 11579568 0.053333 5.875984 0.000000 -5.511811 0.000000 30.000000

 	END

-TURNOUT N  "Tomix Fine Track	Mini Curve 5.51R 140mm 60°	1112B"

+TURNOUT N  "Tomix Fine Track	Mini Curve 5.51R 140mm 60°	1112B"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 4.773368 -2.755905 150.000000

@@ -296,7 +296,7 @@ TURNOUT N  "Tomix Fine Track	Mini Curve 5.51R 140mm 60°	1112B"
 	A 11579568 0.053333 5.147638 0.000000 -5.511811 0.000000 60.000000

 	A 11579568 0.053333 5.875984 0.000000 -5.511811 0.000000 60.000000

 	END

-TURNOUT N  "Tomix Fine Track	Mini Curve 6.96R 177mm 30°	1113A"

+TURNOUT N  "Tomix Fine Track	Mini Curve 6.96R 177mm 30°	1113A"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.484252 -0.933603 120.000000

@@ -304,7 +304,7 @@ TURNOUT N  "Tomix Fine Track	Mini Curve 6.96R 177mm 30°	1113A"
 	A 11579568 0.053333 6.604331 0.000000 -6.968504 0.000000 30.000000

 	A 11579568 0.053333 7.332677 0.000000 -6.968504 0.000000 30.000000

 	END

-TURNOUT N  "Tomix Fine Track	Mini Curve 6.96R 177mm 60°	1113B"

+TURNOUT N  "Tomix Fine Track	Mini Curve 6.96R 177mm 60°	1113B"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 6.034901 -3.484252 150.000000

@@ -312,7 +312,7 @@ TURNOUT N  "Tomix Fine Track	Mini Curve 6.96R 177mm 60°	1113B"
 	A 11579568 0.053333 6.604331 0.000000 -6.968504 0.000000 60.000000

 	A 11579568 0.053333 7.332677 0.000000 -6.968504 0.000000 60.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 9.56R 243mm 15°	1143"

+TURNOUT N  "Tomix Fine Track	Curve 9.56R 243mm 15°	1143"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 2.476103 -0.325985 105.000000

@@ -320,7 +320,7 @@ TURNOUT N  "Tomix Fine Track	Curve 9.56R 243mm 15°	1143"
 	A 11579568 0.053333 9.202756 0.000000 -9.566929 0.000000 15.000000

 	A 11579568 0.053333 9.931102 0.000000 -9.566929 0.000000 15.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 9.56R 243mm 45°	1125"

+TURNOUT N  "Tomix Fine Track	Curve 9.56R 243mm 45°	1125"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 6.764840 -2.802089 135.000000

@@ -328,7 +328,7 @@ TURNOUT N  "Tomix Fine Track	Curve 9.56R 243mm 45°	1125"
 	A 11579568 0.053333 9.202756 0.000000 -9.566929 0.000000 45.000000

 	A 11579568 0.053333 9.931102 0.000000 -9.566929 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 11.02R 280mm 15°	1124"

+TURNOUT N  "Tomix Fine Track	Curve 11.02R 280mm 15°	1124"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 2.853123 -0.375621 105.000000

@@ -336,7 +336,7 @@ TURNOUT N  "Tomix Fine Track	Curve 11.02R 280mm 15°	1124"
 	A 11579568 0.053333 10.659449 0.000000 -11.023622 0.000000 15.000000

 	A 11579568 0.053333 11.387796 0.000000 -11.023622 0.000000 15.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 11.02R 280mm 45°	1121"

+TURNOUT N  "Tomix Fine Track	Curve 11.02R 280mm 45°	1121"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.794878 -3.228744 135.000000

@@ -344,7 +344,7 @@ TURNOUT N  "Tomix Fine Track	Curve 11.02R 280mm 45°	1121"
 	A 11579568 0.053333 10.659449 0.000000 -11.023622 0.000000 45.000000

 	A 11579568 0.053333 11.387796 0.000000 -11.023622 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 12.48R 317mm 15°	1127"

+TURNOUT N  "Tomix Fine Track	Curve 12.48R 317mm 15°	1127"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.230143 -0.425256 105.000000

@@ -352,7 +352,7 @@ TURNOUT N  "Tomix Fine Track	Curve 12.48R 317mm 15°	1127"
 	A 11579568 0.053333 12.116143 0.000000 -12.480315 0.000000 15.000000

 	A 11579568 0.053333 12.844488 0.000000 -12.480315 0.000000 15.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 12.48R 317mm 45°	1122"

+TURNOUT N  "Tomix Fine Track	Curve 12.48R 317mm 45°	1122"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 8.824915 -3.655400 135.000000

@@ -360,7 +360,7 @@ TURNOUT N  "Tomix Fine Track	Curve 12.48R 317mm 45°	1122"
 	A 11579568 0.053333 12.116143 0.000000 -12.480315 0.000000 45.000000

 	A 11579568 0.053333 12.844488 0.000000 -12.480315 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 13.93R 354mm 15°	1144"

+TURNOUT N  "Tomix Fine Track	Curve 13.93R 354mm 15°	1144"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.607163 -0.474892 105.000000

@@ -368,7 +368,7 @@ TURNOUT N  "Tomix Fine Track	Curve 13.93R 354mm 15°	1144"
 	A 11579568 0.053333 13.572835 0.000000 -13.937008 0.000000 15.000000

 	A 11579568 0.053333 14.301181 0.000000 -13.937008 0.000000 15.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 13.93R 354mm 45°	1126"

+TURNOUT N  "Tomix Fine Track	Curve 13.93R 354mm 45°	1126"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 9.854953 -4.082055 135.000000

@@ -376,7 +376,7 @@ TURNOUT N  "Tomix Fine Track	Curve 13.93R 354mm 45°	1126"
 	A 11579568 0.053333 13.572835 0.000000 -13.937008 0.000000 45.000000

 	A 11579568 0.053333 14.301181 0.000000 -13.937008 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 15.39R 391mm 15°	1145"

+TURNOUT N  "Tomix Fine Track	Curve 15.39R 391mm 15°	1145"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 3.984183 -0.524528 105.000000

@@ -384,7 +384,7 @@ TURNOUT N  "Tomix Fine Track	Curve 15.39R 391mm 15°	1145"
 	A 11579568 0.053333 15.029528 0.000000 -15.393701 0.000000 15.000000

 	A 11579568 0.053333 15.757874 0.000000 -15.393701 0.000000 15.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 15.39R 391mm 45°	1128"

+TURNOUT N  "Tomix Fine Track	Curve 15.39R 391mm 45°	1128"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 10.884990 -4.508711 135.000000

@@ -392,7 +392,7 @@ TURNOUT N  "Tomix Fine Track	Curve 15.39R 391mm 45°	1128"
 	A 11579568 0.053333 15.029528 0.000000 -15.393701 0.000000 45.000000

 	A 11579568 0.053333 15.757874 0.000000 -15.393701 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 21.29R 541mm 15°	1123"

+TURNOUT N  "Tomix Fine Track	Curve 21.29R 541mm 15°	1123"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 5.512642 -0.725753 105.000000

@@ -400,7 +400,7 @@ TURNOUT N  "Tomix Fine Track	Curve 21.29R 541mm 15°	1123"
 	A 11579568 0.053333 20.935040 0.000000 -21.299213 0.000000 15.000000

 	A 11579568 0.053333 21.663386 0.000000 -21.299213 0.000000 15.000000

 	END

-TURNOUT N  "Tomix Fine Track	Curve 23.82R 605mm 10°	1150"

+TURNOUT N  "Tomix Fine Track	Curve 23.82R 605mm 10°	1150"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 4.136108 -0.361863 100.000000

@@ -410,7 +410,7 @@ TURNOUT N  "Tomix Fine Track	Curve 23.82R 605mm 10°	1150"
 	END

 

 SUBCONTENTS Tomix N-Scale Fine Track - Curved PC Track

-TURNOUT N  "Tomix Fine Track PC	Curve 11.02R 280mm 15°	1194"

+TURNOUT N  "Tomix Fine Track PC	Curve 11.02R 280mm 15°	1194"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 2.853123 -0.375621 105.000000

@@ -418,7 +418,7 @@ TURNOUT N  "Tomix Fine Track PC	Curve 11.02R 280mm 15°	1194"
 	A 11579568 0.053333 10.659449 0.000000 -11.023622 0.000000 15.000000

 	A 11579568 0.053333 11.387796 0.000000 -11.023622 0.000000 15.000000

 	END

-TURNOUT N  "Tomix Fine Track PC	Curve 11.02R 280mm 45°	1191"

+TURNOUT N  "Tomix Fine Track PC	Curve 11.02R 280mm 45°	1191"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.794878 -3.228744 135.000000

@@ -426,7 +426,7 @@ TURNOUT N  "Tomix Fine Track PC	Curve 11.02R 280mm 45°	1191"
 	A 11579568 0.053333 10.659449 0.000000 -11.023622 0.000000 45.000000

 	A 11579568 0.053333 11.387796 0.000000 -11.023622 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track PC	Curve 9.56R 243mm 45°	1195"

+TURNOUT N  "Tomix Fine Track PC	Curve 9.56R 243mm 45°	1195"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 6.764840 -2.802089 135.000000

@@ -434,7 +434,7 @@ TURNOUT N  "Tomix Fine Track PC	Curve 9.56R 243mm 45°	1195"
 	A 11579568 0.053333 9.202756 0.000000 -9.566929 0.000000 45.000000

 	A 11579568 0.053333 9.931102 0.000000 -9.566929 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track PC	Curve 12.48R 317mm 45°	1192"

+TURNOUT N  "Tomix Fine Track PC	Curve 12.48R 317mm 45°	1192"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 8.824915 -3.655400 135.000000

@@ -442,7 +442,7 @@ TURNOUT N  "Tomix Fine Track PC	Curve 12.48R 317mm 45°	1192"
 	A 11579568 0.053333 12.116143 0.000000 -12.480315 0.000000 45.000000

 	A 11579568 0.053333 12.844488 0.000000 -12.480315 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track PC	Curve 13.93R 354mm 45°	1196"

+TURNOUT N  "Tomix Fine Track PC	Curve 13.93R 354mm 45°	1196"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 9.854953 -4.082055 135.000000

@@ -450,7 +450,7 @@ TURNOUT N  "Tomix Fine Track PC	Curve 13.93R 354mm 45°	1196"
 	A 11579568 0.053333 13.572835 0.000000 -13.937008 0.000000 45.000000

 	A 11579568 0.053333 14.301181 0.000000 -13.937008 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track PC	Curve 15.39R 391mm 45°	1198"

+TURNOUT N  "Tomix Fine Track PC	Curve 15.39R 391mm 45°	1198"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 10.884990 -4.508711 135.000000

@@ -458,7 +458,7 @@ TURNOUT N  "Tomix Fine Track PC	Curve 15.39R 391mm 45°	1198"
 	A 11579568 0.053333 15.029528 0.000000 -15.393701 0.000000 45.000000

 	A 11579568 0.053333 15.757874 0.000000 -15.393701 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track PC	Curve 21.29R 541mm 15°	1193"

+TURNOUT N  "Tomix Fine Track PC	Curve 21.29R 541mm 15°	1193"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 5.512642 -0.725753 105.000000

@@ -466,7 +466,7 @@ TURNOUT N  "Tomix Fine Track PC	Curve 21.29R 541mm 15°	1193"
 	A 11579568 0.053333 20.935040 0.000000 -21.299213 0.000000 15.000000

 	A 11579568 0.053333 21.663386 0.000000 -21.299213 0.000000 15.000000

 	END

-TURNOUT N  "Tomix Fine Track PC	Curve 23.82R 605mm 10°	1190"

+TURNOUT N  "Tomix Fine Track PC	Curve 23.82R 605mm 10°	1190"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 4.136108 -0.361863 100.000000

@@ -476,7 +476,7 @@ TURNOUT N  "Tomix Fine Track PC	Curve 23.82R 605mm 10°	1190"
 	END

 

 SUBCONTENTS Tomix N-Scale Fine Track - Widetrack PC Curved Track

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 11.02R 280mm 22.5°	1751/1781"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 11.02R 280mm 22.5°	1751/1781"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 4.218558 -0.839123 112.500000

@@ -484,7 +484,7 @@ TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 11.02R 280mm 22.5°	1751/1781"
 	A 11579568 0.053333 10.295276 0.000000 -11.023622 0.000000 22.500000

 	A 11579568 0.053333 11.751968 0.000000 -11.023622 0.000000 22.500000

 	END

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 11.02R 280mm 45°	1741/1771"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 11.02R 280mm 45°	1741/1771"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.794878 -3.228744 135.000000

@@ -492,7 +492,7 @@ TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 11.02R 280mm 45°	1741/1771"
 	A 11579568 0.053333 10.295276 0.000000 -11.023622 0.000000 45.000000

 	A 11579568 0.053333 11.751968 0.000000 -11.023622 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 12.48R 317mm 22.5°	1752/1782"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 12.48R 317mm 22.5°	1752/1782"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 4.776010 -0.950007 112.500000

@@ -500,7 +500,7 @@ TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 12.48R 317mm 22.5°	1752/1782"
 	A 11579568 0.053333 11.751968 0.000000 -12.480315 0.000000 22.500000

 	A 11579568 0.053333 13.208661 0.000000 -12.480315 0.000000 22.500000

 	END

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 12.48R 317mm 45°	1742/1772"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 12.48R 317mm 45°	1742/1772"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 8.824915 -3.655400 135.000000

@@ -508,7 +508,7 @@ TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 12.48R 317mm 45°	1742/1772"
 	A 11579568 0.053333 11.751968 0.000000 -12.480315 0.000000 45.000000

 	A 11579568 0.053333 13.208661 0.000000 -12.480315 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 13.93R 354mm 22.5°	1753/1783"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 13.93R 354mm 22.5°	1753/1783"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 5.333462 -1.060892 112.500000

@@ -516,7 +516,7 @@ TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 13.93R 354mm 22.5°	1753/1783"
 	A 11579568 0.053333 13.208661 0.000000 -13.937008 0.000000 22.500000

 	A 11579568 0.053333 14.665354 0.000000 -13.937008 0.000000 22.500000

 	END

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 13.93R 354mm 45°	1743/1773"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 13.93R 354mm 45°	1743/1773"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 9.854953 -4.082055 135.000000

@@ -524,7 +524,7 @@ TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 13.93R 354mm 45°	1743/1773"
 	A 11579568 0.053333 13.208661 0.000000 -13.937008 0.000000 45.000000

 	A 11579568 0.053333 14.665354 0.000000 -13.937008 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 15.39R 391mm 22.5°	1754/1784"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 15.39R 391mm 22.5°	1754/1784"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 5.890914 -1.171776 112.500000

@@ -532,7 +532,7 @@ TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 15.39R 391mm 22.5°	1754/1784"
 	A 11579568 0.053333 14.665354 0.000000 -15.393701 0.000000 22.500000

 	A 11579568 0.053333 16.122047 0.000000 -15.393701 0.000000 22.500000

 	END

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 15.39R 391mm 45°	1744/1774"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 15.39R 391mm 45°	1744/1774"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 10.884990 -4.508711 135.000000

@@ -540,7 +540,7 @@ TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 15.39R 391mm 45°	1744/1774"
 	A 11579568 0.053333 14.665354 0.000000 -15.393701 0.000000 45.000000

 	A 11579568 0.053333 16.122047 0.000000 -15.393701 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 21.29R 541mm 15°	1740/1770"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 21.29R 541mm 15°	1740/1770"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 5.512642 -0.725753 105.000000

@@ -548,7 +548,7 @@ TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 21.29R 541mm 15°	1740/1770"
 	A 11579568 0.053333 20.570867 0.000000 -21.299213 0.000000 15.000000

 	A 11579568 0.053333 22.027559 0.000000 -21.299213 0.000000 15.000000

 	END

-TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 23.82R 605mm 10°	1750"

+TURNOUT N  "Tomix Fine Track	Widetrack PC Curve 23.82R 605mm 10°	1750"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 4.136108 -0.361863 100.000000

@@ -590,7 +590,7 @@ TURNOUT N  "Tomix Fine Track	Viaduct Straight 11.02 280mm	1072"
 	L 11579568 0.053333 0.000000 0.701680 11.023622 0.701680

 	L 11579568 0.053333 0.000000 -0.701680 11.023622 -0.701680

 	END

-TURNOUT N  "Tomix Fine Track	Viaduct Curve 9.56R 243mm 45°	1173"

+TURNOUT N  "Tomix Fine Track	Viaduct Curve 9.56R 243mm 45°	1173"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 6.764840 -2.802089 135.000000

@@ -598,7 +598,7 @@ TURNOUT N  "Tomix Fine Track	Viaduct Curve 9.56R 243mm 45°	1173"
 	A 11579568 0.053333 8.865249 0.000000 -9.566929 0.000000 45.000000

 	A 11579568 0.053333 10.268609 0.000000 -9.566929 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Viaduct Curve 11.02R 280mm 45°	1171"

+TURNOUT N  "Tomix Fine Track	Viaduct Curve 11.02R 280mm 45°	1171"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.794878 -3.228744 135.000000

@@ -606,7 +606,7 @@ TURNOUT N  "Tomix Fine Track	Viaduct Curve 11.02R 280mm 45°	1171"
 	A 11579568 0.053333 10.321942 0.000000 -11.023622 0.000000 45.000000

 	A 11579568 0.053333 11.725302 0.000000 -11.023622 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Viaduct Curve 12.48R 317mm 45°	1127"

+TURNOUT N  "Tomix Fine Track	Viaduct Curve 12.48R 317mm 45°	1127"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 8.824915 -3.655400 135.000000

@@ -614,7 +614,7 @@ TURNOUT N  "Tomix Fine Track	Viaduct Curve 12.48R 317mm 45°	1127"
 	A 11579568 0.053333 11.778635 0.000000 -12.480315 0.000000 45.000000

 	A 11579568 0.053333 13.181995 0.000000 -12.480315 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Viaduct Curve 13.93R 354mm 45°	1174"

+TURNOUT N  "Tomix Fine Track	Viaduct Curve 13.93R 354mm 45°	1174"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 9.854953 -4.082055 135.000000

@@ -656,7 +656,7 @@ TURNOUT N  "Tomix Fine Track	Overhead PC Straight 11.02 280mm	1822"
 	L 11579568 0.053333 0.000000 0.701680 11.023622 0.701680

 	L 11579568 0.053333 0.000000 -0.701680 11.023622 -0.701680

 	END

-TURNOUT N  "Tomix Fine Track	Overhead PC Curve 9.56R 243mm 45°	1873"

+TURNOUT N  "Tomix Fine Track	Overhead PC Curve 9.56R 243mm 45°	1873"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 6.764840 -2.802089 135.000000

@@ -664,7 +664,7 @@ TURNOUT N  "Tomix Fine Track	Overhead PC Curve 9.56R 243mm 45°	1873"
 	A 11579568 0.053333 8.865249 0.000000 -9.566929 0.000000 45.000000

 	A 11579568 0.053333 10.268609 0.000000 -9.566929 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Overhead PC Curve 11.02R 280mm 45°	1871"

+TURNOUT N  "Tomix Fine Track	Overhead PC Curve 11.02R 280mm 45°	1871"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 7.794878 -3.228744 135.000000

@@ -672,7 +672,7 @@ TURNOUT N  "Tomix Fine Track	Overhead PC Curve 11.02R 280mm 45°	1871"
 	A 11579568 0.053333 10.321942 0.000000 -11.023622 0.000000 45.000000

 	A 11579568 0.053333 11.725302 0.000000 -11.023622 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Overhead PC Curve 12.48R 317mm 45°	1872"

+TURNOUT N  "Tomix Fine Track	Overhead PC Curve 12.48R 317mm 45°	1872"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 8.824915 -3.655400 135.000000

@@ -680,7 +680,7 @@ TURNOUT N  "Tomix Fine Track	Overhead PC Curve 12.48R 317mm 45°	1872"
 	A 11579568 0.053333 11.778635 0.000000 -12.480315 0.000000 45.000000

 	A 11579568 0.053333 13.181995 0.000000 -12.480315 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Overhead PC Curve 13.93R 354mm 45°	1874"

+TURNOUT N  "Tomix Fine Track	Overhead PC Curve 13.93R 354mm 45°	1874"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

 	E 9.854953 -4.082055 135.000000

@@ -723,7 +723,7 @@ TURNOUT N  "Tomix Fine Track	Overhead Dbl Trk Straight 44.09 1120mm	1069"
 	L 11579568 0.053333 0.000000 1.456692 44.094488 1.456692

 	L 11579568 0.053333 0.000000 -1.456692 44.094488 -1.456692

 	END

-TURNOUT N  "Tomix Fine Track	Overhead Dbl Trk Curve 11.02/12.48R 280/317mm 45°	1161"

+TURNOUT N  "Tomix Fine Track	Overhead Dbl Trk Curve 11.02/12.48R 280/317mm 45°	1161"

 	P "Normal" 1 0 2

 	E 0.000000 0.728346 270.000000

 	E 0.000000 -0.728346 270.000000

@@ -734,7 +734,7 @@ TURNOUT N  "Tomix Fine Track	Overhead Dbl Trk Curve 11.02/12.48R 280/317mm 45°	1
 	A 11579568 0.053333 13.208661 0.000000 -11.751968 0.000000 45.000000

 	A 11579568 0.053333 10.295276 0.000000 -11.751968 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Overhead Dbl Trk Curve 13.93/15.39R 354/391mm 45°	1162"

+TURNOUT N  "Tomix Fine Track	Overhead Dbl Trk Curve 13.93/15.39R 354/391mm 45°	1162"

 	P "Normal" 1 0 2

 	E 0.000000 0.728346 270.000000

 	E 0.000000 -0.728346 270.000000

@@ -745,7 +745,7 @@ TURNOUT N  "Tomix Fine Track	Overhead Dbl Trk Curve 13.93/15.39R 354/391mm 45°	1
 	A 11579568 0.053333 16.122047 0.000000 -14.663354 0.000000 45.000000

 	A 11579568 0.053333 13.208662 0.000000 -14.663354 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Overhead Dbl Trk Curve 16.85/18.30R 428/465mm 45°	1163"

+TURNOUT N  "Tomix Fine Track	Overhead Dbl Trk Curve 16.85/18.30R 428/465mm 45°	1163"

 	P "Normal" 1 0 2

 	E 0.000000 0.728346 270.000000

 	E 0.000000 -0.728346 270.000000

@@ -791,7 +791,7 @@ TURNOUT N  "Tomix Fine Track	Viaduct Dbl Trk Straight 44.09 1120mm (slab type)	1
 	L 11579568 0.053333 0.000000 1.456692 44.094488 1.456692

 	L 11579568 0.053333 0.000000 -1.456692 44.094488 -1.456692

 	END

-TURNOUT N  "Tomix Fine Track	Viaduct Dbl Trk Curve 16.85/18.30R 428/465mm 45°(slab type)	1168"

+TURNOUT N  "Tomix Fine Track	Viaduct Dbl Trk Curve 16.85/18.30R 428/465mm 45°(slab type)	1168"

 	P "Normal" 1 0 2

 	E 0.000000 0.728346 270.000000

 	E 0.000000 -0.728346 270.000000

@@ -802,7 +802,7 @@ TURNOUT N  "Tomix Fine Track	Viaduct Dbl Trk Curve 16.85/18.30R 428/465mm 45°(sl
 	A 11579568 0.053333 19.035433 0.000000 -17.578740 0.000000 45.000000

 	A 11579568 0.053333 16.122048 0.000000 -17.578740 0.000000 45.000000

 	END

-TURNOUT N  "Tomix Fine Track	Viaduct Dbl Trk Curve 19.76/21.22R 502/539mm 22.5°(slab type)	1169"

+TURNOUT N  "Tomix Fine Track	Viaduct Dbl Trk Curve 19.76/21.22R 502/539mm 22.5°(slab type)	1169"

 	P "Normal" 1 0 2

 	E 0.000000 0.728346 270.000000

 	E 0.000000 -0.728346 270.000000

@@ -1076,7 +1076,7 @@ TURNOUT N  "Tomix Fine Track	Turnout 317/280mm Curve-L45 (elec)	1249"
 	END

 TURNOUT N  "Tomix Fine Track	Double Crossover	1247"

 	P "Normal" 1 2 3 0 4 5 6

-	P "Reverse" 1 7 8 9 6 0 4 10 11 12 3  

+	P "Reverse" 1 7 8 9 6 0 4 10 11 12 3

 	E 0.000000 0.000000 270.000000

 	E 11.023622 0.000000 90.000000

 	E 0.000000 1.456693 270.000000

@@ -1102,9 +1102,11 @@ TURNOUT N  "Tomix Fine Track	Double Crossover	1247"
 	L 11579568 0.053333 9.523622 0.364173 9.523622 1.092520

 	L 11579568 0.053333 0.000000 1.820866 11.023622 1.820866

 	END

-TURNOUT N  "Tomix Fine Track	Double Slip 140mm-15R	1245"

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

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

+TURNOUT N  "Tomix Fine Track	Double Slip 140mm-15R	1245" 512

+	P "Cross1" 1 2 3

+	P "Cross2" 4 5 6

+	P "Slip1" 1 7 6

+	P "Slip2" 4 8 3

 	E 5.511811 0.000000 90.000000

 	E 0.000000 0.000000 270.000000

 	E 0.000000 0.738443 285.000000

@@ -1138,9 +1140,11 @@ TURNOUT N  "Tomix Fine Track	Double Slip 140mm-15R	1245"
 		4.062500 -1.220774 0

 		4.062500 -0.764173 0

 	END

-TURNOUT N  "Tomix Fine Track	Double Slip 140mm-15L	1246"

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

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

+TURNOUT N  "Tomix Fine Track	Double Slip 140mm-15L	1246" 512

+	P "Cross1" 1 2 3

+	P "Cross2" 4 5 6

+	P "Slip1" 1 8 6

+	P "Slip2" 4 7 3

 	E 0.000000 0.000000 270.000000

 	E 5.511811 0.000000 90.000000

 	E 0.000000 -0.738443 255.000000

@@ -1176,7 +1180,7 @@ TURNOUT N  "Tomix Fine Track	Double Slip 140mm-15L	1246"
 	END

 

 SUBCONTENTS Tomix N-Scale Fine Track - Crossings

-TURNOUT N  "Tomix Fine Track	Crossing 15° 140mm(R)	1322"

+TURNOUT N  "Tomix Fine Track	Crossing 15° 140mm(R)	1322"

 	P "Normal" 1 0 2

 	E 5.511811 0.000000 90.000000

 	E 0.000000 0.000000 270.000000

@@ -1189,7 +1193,7 @@ TURNOUT N  "Tomix Fine Track	Crossing 15° 140mm(R)	1322"
 	L 11579568 0.053333 0.000000 -0.364173 2.755906 -0.364173

 	L 11579568 0.053333 2.755906 -0.364173 5.411811 -1.102616

 	END

-TURNOUT N  "Tomix Fine Track	Crossing 15° 140mm(L)	1333"

+TURNOUT N  "Tomix Fine Track	Crossing 15° 140mm(L)	1333"

 	P "Normal" 1 0 2

 	E 0.000000 0.000000 270.000000

 	E 5.511811 0.000000 90.000000

@@ -1202,7 +1206,7 @@ TURNOUT N  "Tomix Fine Track	Crossing 15° 140mm(L)	1333"
 	L 11579568 0.053333 0.000000 0.364173 2.755906 0.364173

 	L 11579568 0.053333 2.755906 0.364173 5.411811 1.102616

 	END

-TURNOUT N  "Tomix Fine Track	Crossing 30° 72.5mm	1321"

+TURNOUT N  "Tomix Fine Track	Crossing 30° 72.5mm	1321"

 	P "Normal" 1 0 2

 	E 0.000000 0.000000 270.000000

 	E 2.854331 0.000000 90.000000

@@ -1215,7 +1219,7 @@ TURNOUT N  "Tomix Fine Track	Crossing 30° 72.5mm	1321"
 	L 11579568 0.053333 0.400000 -1.027756 1.527166 -0.364173

 	L 11579568 0.053333 1.527166 -0.364173 2.854331 -0.364173

 	END

-TURNOUT N  "Tomix Fine Track	Crossing 90°	1324"

+TURNOUT N  "Tomix Fine Track	Crossing 90°	1324"

 	P "Normal" 1 0 2

 	E 0.000000 0.000000 270.000000

 	E 1.456693 0.000000 90.000000

@@ -1349,7 +1353,7 @@ TURNOUT N  "Tomix Fine Track	Deck Grider Bridge(DK Green) 5.51 140mm	3241"
 	END

 

 SUBCONTENTS Tomix N-Scale Fine Track - Turn Table

-TURNOUT N  "Tomix Fine Track	Turn Table 8.34 212mm	1631"

+TURNOUT N  "Tomix Fine Track	Turn Table 8.34 212mm	1631" 512

 # TT was designed with 212mm bridge, outside dia. is approx., 15 degree spacing

 	P "1" 1 2 3

 	P "2" 4 5 6

@@ -1391,31 +1395,31 @@ TURNOUT N  "Tomix Fine Track	Turn Table 8.34 212mm	1631"
 	S 0 0 0.000000 4.173228 0.000000 3.676228

 	S 16777215 0 0.000000 3.676228 0.000000 -3.676228

 	S 0 0 0.000000 -3.676228 0.000000 -4.173228

-#15/195	

+#15/195

 	S 0 0 1.080111 4.031029 0.950701 3.548066

 	S 16777215 0 0.950701 3.548066 -0.950701 -3.548066

 	S 0 0 -0.950701 -3.548066 -1.080111 -4.031029

-#30/210	

+#30/210

 	S 0 0 2.086614 3.614121 1.836614 3.181109

 	S 16777215 0 1.836614 3.181109 -1.836614 -3.181109

 	S 0 0 -1.836614 -3.181109 -2.086614 -3.614121

-#45/225	

+#45/225

 	S 0 0 2.950918 2.950918 2.597364 2.597364

 	S 16777215 0 2.597364 2.597364 -2.597364 -2.597364

 	S 0 0 -2.597364 -2.597364 -2.950918 -2.950918

-#60/240	

+#60/240

 	S 0 0 3.614121 2.086614 3.181109 1.836614

 	S 16777215 0 3.181109 1.836614 -3.181109 -1.836614

 	S 0 0 -3.181109 -1.836614 -3.614121 -2.086614

-#75/255	

+#75/255

 	S 0 0 4.031029 1.080111 3.548066 0.950701

 	S 16777215 0 3.548066 0.950701 -3.548066 -0.950701

 	S 0 0 -3.548066 -0.950701 -4.031029 -1.080111

-#90/270	

+#90/270

 	S 0 0 4.173228 0.000000 3.676228 0.000000

 	S 16777215 0 3.676228 0.000000 -3.676228 0.000000

 	S 0 0 -3.676228 0.000000 -4.173228 0.000000

-#105/285	

+#105/285

 	S 0 0 4.031029 -1.080111 3.548066 -0.950701

 	S 16777215 0 3.548066 -0.950701 -3.548066 0.950701

 	S 0 0 -3.548066 0.950701 -4.031029 1.080111

@@ -1511,7 +1515,7 @@ SUBCONTENTS Tomix N-Scale Fine Track - Misc Track
 TURNOUT N "Tomix Fine Track	Re-Railer 140mm	1523"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

-	E 5.511811 0.000000 90.000000 

+	E 5.511811 0.000000 90.000000

 	S 0 0.000000 0.000000 0.000000 5.511811 0.000000

 	L 11579568 0.053333 0.000000 0.364173 5.511811 0.364173

 	L 11579568 0.053333 0.000000 -0.364173 5.511811 -0.364173

@@ -1523,7 +1527,7 @@ TURNOUT N "Tomix Fine Track	Re-Railer 140mm	1523"
 TURNOUT N "Tomix Fine Track PC	Re-Railer 140mm	1524"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

-	E 5.511811 0.000000 90.000000 

+	E 5.511811 0.000000 90.000000

 	S 0 0.000000 0.000000 0.000000 5.511811 0.000000

 	L 11579568 0.053333 0.000000 0.364173 5.511811 0.364173

 	L 11579568 0.053333 0.000000 -0.364173 5.511811 -0.364173

@@ -1573,7 +1577,7 @@ TURNOUT N  "Tomix Fine Track PC	Adjustable 70-90mm	1526"
 TURNOUT N "Tomix Fine Track	Wheel Cleaner Rail 140mm	6414"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

-	E 5.511811 0.000000 90.000000 

+	E 5.511811 0.000000 90.000000

 	S 0 0.000000 0.000000 0.000000 5.511811 0.000000

 	L 11579568 0.053333 0.000000 0.364173 5.511811 0.364173

 	L 11579568 0.053333 0.000000 -0.364173 5.511811 -0.364173

@@ -1586,7 +1590,7 @@ TURNOUT N "Tomix Fine Track	Wheel Cleaner Rail 140mm	6414"
 TURNOUT N "Tomix Fine Track PC	Wheel Cleaner Rail 140mm	6415"

 	P "Normal" 1

 	E 0.000000 0.000000 270.000000

-	E 5.511811 0.000000 90.000000 

+	E 5.511811 0.000000 90.000000

 	S 0 0.000000 0.000000 0.000000 5.511811 0.000000

 	L 11579568 0.053333 0.000000 0.364173 5.511811 0.364173

 	L 11579568 0.053333 0.000000 -0.364173 5.511811 -0.364173

@@ -1702,4 +1706,4 @@ E 0.728346 0.728346 360.000000
 E 0.728346 -0.728346 180.000000

 S 0 0.000000 0.000000 0.000000 1.456693 0.000000

 S 0 0.000000 0.728346 0.728346 0.728346 -0.728346

-END 

+END