New upstream version 5.2.2GAupstream/5.2.2GA

1 files changed, 67 insertions, 46 deletions

diff --git a/app/lib/params/mrkhomde.xtp b/app/lib/params/mrkhomde.xtp
index 88d5487..9c5dbe3 100644
--- a/app/lib/params/mrkhomde.xtp
+++ b/app/lib/params/mrkhomde.xtp
@@ -233,9 +233,11 @@ TURNOUT HO " Maerklin M 	 R22.5° 	5139"
 	 A3 16754688 0.052083 10.174306 0.664340 -9.127565 0 0.000000 22.500000
 	 L3 16754688 0.052083 4.557878 0.272268 0 5.157107 0.024059 0
 	 END
-TURNOUT HO " Maerklin M 	 DKW30° 	5128"
-	 P "Normal" 1 2 3 0 4 5 6
-	 P "Reverse" 1 7 6 0 4 8 3
+TURNOUT HO " Maerklin M 	 DKW30° 	5128" 512
+	 P "Cross1" 1 2 3
+	 P "Cross2" 4 5 6
+	 P "Slip1" 1 7 6
+	 P "Slip2" 4 8 3
 	 E 0.215299 0.738192 255.000000
 	 E 7.554814 2.704807 75.000000
 	 E 0.215300 2.704809 285.000000
@@ -502,10 +504,12 @@ TURNOUT HO " Maerklin M 	 3WegW 	5214"
 	 L3 16754688 0.052083 6.205026 0.290474 0 6.796240 0.023738 0
 	 L3 16754688 0.052083 7.144743 1.486187 0 7.403399 1.369490 0
 	 END
-TURNOUT HO " Maerklin M 	 DKW24.3°P 	5207"
+TURNOUT HO " Maerklin M 	 DKW24.3°P 	5207" 512
 	U "DKW" "jr" " Maerklin M " " DKW24.3°P " "5207" 7.086614 24.283000 7.086614 1.476378 0.053333 16754688
-	P "P0" 5 3 8 0 7 4 6
-	P "P1" 7 2 8 0 5 1 6
+	P "Cross1" 5 3 8
+	P "Cross2" 7 4 6
+	P "Slip1" 7 2 8
+	P "Slip2" 5 1 6
 	E 0.000000 0.000000 270.000000
 	E 6.773121 -1.457164 114.282972
 	E 7.086614 0.000000 90.000000
@@ -918,10 +922,18 @@ TURNOUT HO " Maerklin M 	 3x30°P 	3x5200"
 	A3 16754688 0.051803 17.958661 0.000010 17.220483 0 90.000000 90.000000
 	A3 16754688 0.051803 16.482283 0.000010 17.220483 0 90.000000 90.000000
 	END
-TURNOUT HO " Maerklin M 	 HarfeL22°5 	2x5138 + 1x5207 + 2x5210"
-	P "P0" 6 5 0 16 10 15 0 1 2
-	P "P1" 16 11 13 18 8 7 5 0 1 3 4 17 14 12 15
-	P "P2" 1 3 4 17 14 9 13 18 8 7 5 0 16 10 15
+TURNOUT HO " Maerklin M 	 HarfeL22°5 	2x5138 + 1x5207 + 2x5210" 256
+#	P "1-3+4-6" 1 3 4 17 14 12 15 0 16 11 13 18 8 7 5 
+	P "2-3+4-6	Straight+Slip" 1 3 4 17 14 12 15 0 6 5
+#	P "1-4+3-6" 1 3 4 17 14 9 13 18 8 7 5 0 16 10 15
+	P "3-6	Slip+Slip" 1 3 4 17 14 9 13 18 8 7 5
+	P "1-3+5-6	Slip+Straight" 1 2 0 16 11 13 18 8 7 5
+	P "1-4+2-3+5-6	3 Straight" 1 2 0 6 5 0 16 10 15
+#	P "P4" 6 5 0 1 3 4 17 14 12 15
+#	P "P5" 16 11 13 18 8 7 5 0 1 2
+#	P "P6" 16 11 13 18 8 7 5 0 1 3 4 17 14 12 15
+#	P "P8" 16 10 15 0 1 3 4 17 14 9 13 18 8 7 5
+#	P "P9" 16 10 15 0 6 5 0 1 2
 	E 0.000000 0.000000 270.000000
 	E 5.925197 2.893718 270.000000
 	E 13.011811 2.893699 90.000000
@@ -980,10 +992,18 @@ TURNOUT HO " Maerklin M 	 HarfeL22°5 	2x5138 + 1x5207 + 2x5210"
 	L3 16754688 0.052083 7.276995 2.494345 0 6.469542 2.130053 0
 	L3 16754688 0.052083 7.884149 1.148590 0 7.076696 0.784298 0
 	END
-TURNOUT HO " Maerklin M 	 HarfeR22°5 	2x5139 + 1x5207 + 2x5210"
-	P "P0" 13 14 0 10 9 0 5 1 6
-	P "P1" 13 15 16 17 7 4 6 0 5 3 8 18 12 11 9
-	P "P2" 13 15 16 17 7 2 8 18 12 11 9 0 5 1 6
+TURNOUT HO " Maerklin M 	 HarfeR22°5 	2x5139 + 1x5207 + 2x5210" 256
+	P "1-5+2-3	Straight+Slip" 10 9 0 13 15 16 17 7 4 6
+#	P "1-5+2-4" 5 3 8 18 12 11 9 0 13 15 16 17 7 4 6
+	P "2-4+5-6	Slip+Straight" 5 3 8 18 12 11 9 0 13 14
+#	P "1-4+2-5" 5 1 6 0 13 15 16 17 7 2 8 18 12 11 9
+	P "2-5	Slip+Slip" 13 15 16 17 7 2 8 18 12 11 9
+	P "1-4+2-3+5-6	3 Straight" 5 1 6 0 10 9 0 13 14
+#	P "P1" 5 3 8 18 12 11 9 0 13 14
+#	P "P5" 13 15 16 17 7 4 6 0 5 3 8 18 12 11 9
+#	P "P6" 13 15 16 17 7 4 6 0 10 9
+#	P "P8" 5 1 6 0 13 15 16 17 7 2 8 18 12 11 9
+#	P "P9" 5 1 6 0 10 9 0 13 14
 	E 0.000000 0.000000 270.000018
 	E -5.687513 2.794784 270.000000
 	E 1.399101 2.794803 90.000000
@@ -1110,7 +1130,7 @@ TURNOUT HO " Maerklin M 	 WechselR22°5 	2x5139 + 5108"
 	END
 TURNOUT HO " Maerklin M 	 WechselLBogen 	5141 + 5142 + 5100 + 5200"
 	P "P0" 1 6 4 5 14 0 13 9 8 7
-	P "P1" 1 2 3 15 11 10 12 7
+	P "P1" 1 2 3 11 10 12 7
 	E 0.000000 0.000000 240.000000
 	E 7.086653 12.274344 0.000000
 	E 10.133945 12.274317 0.000000
@@ -1125,11 +1145,11 @@ TURNOUT HO " Maerklin M 	 WechselLBogen 	5141 + 5142 + 5100 + 5200"
 	C 0 0.000000 -11.752617 -4.665963 11.625742 90.000000 30.000000
 	S 0 0.000000 5.187810 5.187741 5.512110 5.749447
 	C 0 0.000000 -11.752624 -4.665966 8.578500 90.000000 30.000000
-	S 0 0.000000 5.187814 2.140497 5.512113 2.702201
+	S 0 0.000000 5.192787 2.149148 5.512113 2.702201
 	S 0 0.000000 7.086658 8.578515 7.086654 11.625757
 	C 0 0.000000 -14.173228 -7.086609 12.274379 120.000000 30.000000
 	C 0 0.000000 -17.220472 -7.086572 12.274344 90.000000 30.000000
-	S 0 0.000000 5.192787 2.149148 5.187787 2.140488
+#	S 0 0.000000 5.192787 2.149148 5.187787 2.140488
 	L3 16754688 0.063158 3.282436 0.598106 0 0.504676 -1.005632 0
 	L3 16754688 0.063158 -0.369715 -2.408937 0 0.504264 -1.005240 0
 	L3 16754688 0.052632 0.369087 -3.686537 0 3.569780 -1.838617 0
@@ -1157,9 +1177,10 @@ TURNOUT HO " Maerklin M 	 WechselLBogen 	5141 + 5142 + 5100 + 5200"
 	L3 16754688 0.052632 4.553496 2.518242 0 4.537748 2.490965 0
 	L3 16754688 0.052632 5.832078 1.780055 0 5.816330 1.752779 0
 	END
+
 TURNOUT HO " Maerklin M 	 WechselRBogen 	5141 + 5142 + 5100 + 5200"
 	P "P0" 1 6 4 5 14 0 13 9 8 7
-	P "P1" 1 2 3 15 11 10 12 7
+	P "P1" 1 2 3 11 10 12 7
 	E 0.000000 0.000000 0.000000
 	E 10.133827 -15.321626 120.000000
 	E 10.133814 -12.274406 120.000000
@@ -1174,11 +1195,11 @@ TURNOUT HO " Maerklin M 	 WechselRBogen 	5141 + 5142 + 5100 + 5200"
 	C 0 0.000000 11.752617 14.799868 -0.648581 240.000000 30.000000
 	S 0 0.000000 4.946113 -7.086608 4.621811 -6.524902
 	C 0 0.000000 11.752624 14.799879 -3.695823 240.000000 30.000000
-	S 0 0.000000 4.946117 -10.133852 4.621816 -9.572148
+	S 0 0.000000 4.946117 -10.1333866 4.621816 -9.572148
 	S 0 0.000000 3.047255 -3.695838 3.047251 -0.648596
 	C 0 0.000000 14.173228 17.220444 0.000003 210.000000 30.000000
 	C 0 0.000000 17.220472 17.220472 0.000023 240.000000 30.000000
-	S 0 0.000000 4.951063 -10.142526 4.946063 -10.133866
+#	S 0 0.000000 4.951063 -10.142526 4.946063 -10.133866
 	L3 16754688 0.063158 6.851431 -11.676247 0 9.629186 -13.279993 0
 	L3 16754688 0.063158 10.503574 -14.683299 0 9.629599 -13.279601 0
 	L3 16754688 0.052632 9.764731 -15.960915 0 6.564042 -14.112987 0
@@ -1486,7 +1507,7 @@ TURNOUT HO " Maerklin M 	 Bahnuebergang	7192"
 	L3 16777215 0.104167 5.568233 -2.316773 0 5.678962 -2.095316 0
 	L3 16777215 0.104167 5.678962 -2.316773 0 5.568233 -2.095316 0
 	END
-TURNOUT HO " Maerklin M 	 Drehscheibe 	7186"
+TURNOUT HO " Maerklin M 	 Drehscheibe 	7186" 512
 	P "1" 1 2 3
 	P "2" 4 5 6
 	P "3" 7 8 9
@@ -1511,30 +1532,30 @@ TURNOUT HO " Maerklin M 	 Drehscheibe 	7186"
 	P "22" 64 65 66
 	P "23" 67 68 69
 	P "24" 70 71 72
-	P "25" -3 -2 -1
-	P "26" -6 -5 -4
-	P "27" -9 -8 -7
-	P "28" -12 -11 -10
-	P "29" -15 -14 -13
-	P "30" -18 -17 -16
-	P "31" -21 -20 -19
-	P "32" -24 -23 -22
-	P "33" -27 -26 -25
-	P "34" -30 -29 -28
-	P "35" -33 -32 -31
-	P "36" -36 -35 -34
-	P "37" -39 -38 -37
-	P "38" -42 -41 -40
-	P "39" -45 -44 -43
-	P "40" -48 -47 -46
-	P "41" -51 -50 -49
-	P "42" -54 -53 -52
-	P "43" -57 -56 -55
-	P "44" -60 -59 -58
-	P "45" -63 -62 -61
-	P "46" -66 -65 -64
-	P "47" -69 -68 -67
-	P "48" -72 -71 -70
+#	P "25" -3 -2 -1
+#	P "26" -6 -5 -4
+#	P "27" -9 -8 -7
+#	P "28" -12 -11 -10
+#	P "29" -15 -14 -13
+#	P "30" -18 -17 -16
+#	P "31" -21 -20 -19
+#	P "32" -24 -23 -22
+#	P "33" -27 -26 -25
+#	P "34" -30 -29 -28
+#	P "35" -33 -32 -31
+#	P "36" -36 -35 -34
+#	P "37" -39 -38 -37
+#	P "38" -42 -41 -40
+#	P "39" -45 -44 -43
+#	P "40" -48 -47 -46
+#	P "41" -51 -50 -49
+#	P "42" -54 -53 -52
+#	P "43" -57 -56 -55
+#	P "44" -60 -59 -58
+#	P "45" -63 -62 -61
+#	P "46" -66 -65 -64
+#	P "47" -69 -68 -67
+#	P "48" -72 -71 -70
 	E 0.000000 7.598425 0.000000
 	E -0.000000 -7.598425 180.000000
 	E 0.991794 7.533420 7.500000
@@ -1658,7 +1679,7 @@ TURNOUT HO " Maerklin M 	 Drehscheibe 	7186"
 	A 16711680 0 7.598425 0.000000 0.000000 0.000000 360.000000
 	A 16711680 0 6.102362 0.000000 0.000000 0.000000 360.000000
 	END
-TURNOUT HO " Maerklin M 	 Schiebebuehne 	7294"
+TURNOUT HO " Maerklin M 	 Schiebebuehne 	7294" 512
 #	P "P0" 1 0 2 0 3 0 4 0 5 0 6 0 7 0 8 0 9 0 10
 #	P "P1" 
 	P "P0" 1 2 3