X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tracks.dat;h=34eeef8a8b97f14eecb5fab25a66f49de08bd4aa;hb=759fee443361cdcafe6fb259df3ba1b05bea0b21;hp=0573c4b09c8faf9f9e1d0791fd4e34e526340aca;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/tracks.dat b/tracks.dat
index 0573c4b..34eeef8 100644
--- a/tracks.dat
+++ b/tracks.dat
@@ -1,46 +1,73 @@
 scale 1 87;
-gauge 16.5;
-rail_profile
-{
-	point 1.5 0.0;
-	smooth_point 1.5 0.3;
-	smooth_point 0.8 0.4;
-	smooth_point 0.8 1.4;
-	smooth_point 1.0 1.6;
-	smooth_point 1.0 2.1;
-	smooth_point 0.8 2.3;
-	smooth_point 0.2 2.3;
-	smooth_point 0.0 2.1;
-	smooth_point 0.0 1.6;
-	smooth_point 0.2 1.4;
-	smooth_point 0.2 0.4;
-	smooth_point -0.5 0.3;
-	point -0.5 0.0;
-};
-ballast_profile
-{
-	point 20.0 0.0;
-	point 14.0 8.0;
-	point -14.0 8.0;
-	point -20.0 0.0;
-};
-
-track_technique "track.technique";
+
+track_appearance "C"
+{
+	gauge 16.5;
+	rail_profile
+	{
+		point 1.5 0.0;
+		smooth_point 1.5 0.3;
+		smooth_point 0.8 0.4;
+		smooth_point 0.8 1.4;
+		smooth_point 1.0 1.6;
+		smooth_point 1.0 2.1;
+		smooth_point 0.8 2.3;
+		smooth_point 0.2 2.3;
+		smooth_point 0.0 2.1;
+		smooth_point 0.0 1.6;
+		smooth_point 0.2 1.4;
+		smooth_point 0.2 0.4;
+		smooth_point -0.5 0.3;
+		point -0.5 0.0;
+	};
+	ballast_profile
+	{
+		point 20.0 0.0;
+		point 14.0 7.5;
+		point -14.0 7.5;
+		point -20.0 0.0;
+	};
+	tie_profile
+	{
+		point 13.5 0.0;
+		point 13.5 0.5;
+		point -13.5 0.5;
+		point -13.5 0.0;
+	};
+	tie_length 2.2;
+	tie_spacing 7.8;
+
+	technique "track.technique";
+};
 
 // Straight
 
-track 24064
+track "24064"
 {
-	description "Straight, 64.3mm (R3-R4-R5)";
+	article_number
+	{
+		vendor "Märklin";
+		article "24064";
+	};
+	appearance "C";
+	name "Straight, 64.3 mm";
+	description "R3-R4-R5 spacing";
 	part
 	{
 		length 64.3;
 	};
 };
 
-track 24071
+track "24071"
 {
-	description "Straight, 70.8mm (for slim turnouts)";
+	article_number
+	{
+		vendor "Märklin";
+		article "24071";
+	};
+	appearance "C";
+	name "Straight, 70.8 mm";
+	description "For slim turnouts";
 	part
 	{
 		length 70.8;
@@ -48,9 +75,16 @@ track 24071
 	autofit_preference 0;
 };
 
-track 24077
+track "24077"
 {
-	description "Straight, 77.5mm (R1-R2-R3)";
+	article_number
+	{
+		vendor "Märklin";
+		article "24077";
+	};
+	appearance "C";
+	name "Straight, 77.5 mm";
+	description "R1-R2-R3 spacing";
 	part
 	{
 		length 77.5;
@@ -58,9 +92,15 @@ track 24077
 	autofit_preference 2;
 };
 
-track 24094
+track "24094"
 {
-	description "Straight, 94.2mm";
+	article_number
+	{
+		vendor "Märklin";
+		article "24094";
+	};
+	appearance "C";
+	name "Straight, 94.2 mm";
 	part
 	{
 		length 94.2;
@@ -68,9 +108,15 @@ track 24094
 	autofit_preference 2;
 };
 
-track 24172
+track "24172"
 {
-	description "Straight, 171.7mm";
+	article_number
+	{
+		vendor "Märklin";
+		article "24172";
+	};
+	appearance "C";
+	name "Straight, 171.7 mm";
 	part
 	{
 		length 171.7;
@@ -78,9 +124,16 @@ track 24172
 	autofit_preference 2;
 };
 
-track 24188
+track "24188"
 {
-	description "Straight, 188.3mm (turnout length)";
+	article_number
+	{
+		vendor "Märklin";
+		article "24188";
+	};
+	appearance "C";
+	name "Straight, 188.3 mm";
+	description "Turnout length";
 	part
 	{
 		length 188.3;
@@ -88,27 +141,46 @@ track 24188
 	autofit_preference 2;
 };
 
-track 24229
+track "24229"
 {
-	description "Straight, 229.3mm";
+	article_number
+	{
+		vendor "Märklin";
+		article "24229";
+	};
+	appearance "C";
+	name "Straight, 229.3 mm";
 	part
 	{
 		length 229.3;
 	};
 };
 
-track 24236
+track "24236"
 {
-	description "Straight, 236.1mm (slim turnout length)";
+	article_number
+	{
+		vendor "Märklin";
+		article "24236";
+	};
+	appearance "C";
+	name "Straight, 236.1 mm";
+	description "Slim turnout length";
 	part
 	{
 		length 236.1;
 	};
 };
 
-track 24360
+track "24360"
 {
-	description "Straight, 360mm";
+	article_number
+	{
+		vendor "Märklin";
+		article "24360";
+	};
+	appearance "C";
+	name "Straight, 360 mm";
 	part
 	{
 		length 360;
@@ -117,9 +189,16 @@ track 24360
 
 // Curves, R1
 
-track 24107
+track "24107"
 {
-	description "Curve, R1 = 360mm, 7.5°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24107";
+	};
+	appearance "C";
+	name "Curve, R1, 7.5°";
+	description "R = 360 mm";
 	part
 	{
 		length 7.5;
@@ -127,9 +206,16 @@ track 24107
 	};
 };
 
-track 24115
+track "24115"
 {
-	description "Curve, R1 = 360mm, 15°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24115";
+	};
+	appearance "C";
+	name "Curve, R1, 15°";
+	description "R = 360 mm";
 	part
 	{
 		length 15;
@@ -137,9 +223,16 @@ track 24115
 	};
 };
 
-track 24130
+track "24130"
 {
-	description "Curve, R1 = 360mm, 30°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24130";
+	};
+	appearance "C";
+	name "Curve, R1, 30°";
+	description "R = 360 mm";
 	part
 	{
 		length 30;
@@ -149,9 +242,16 @@ track 24130
 
 // Curves, R2
 
-track 24206
+track "24206"
 {
-	description "Curve, R2 = 437.5mm, 5.7° (turnout to 30°)";
+	article_number
+	{
+		vendor "Märklin";
+		article "24206";
+	};
+	appearance "C";
+	name "Curve, R2, 5.7°";
+	description "R = 437.5 mm, complements turnout to 30°";
 	part
 	{
 		length 5.7;
@@ -159,9 +259,16 @@ track 24206
 	};
 };
 
-track 24207
+track "24207"
 {
-	description "Curve, R2 = 437.5mm, 7.5°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24207";
+	};
+	appearance "C";
+	name "Curve, R2, 7.5°";
+	description "R = 437.5 mm";
 	part
 	{
 		length 7.5;
@@ -169,9 +276,16 @@ track 24207
 	};
 };
 
-track 24215
+track "24215"
 {
-	description "Curve, R2 = 437.5mm, 15°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24215";
+	};
+	appearance "C";
+	name "Curve, R2, 15°";
+	description "R = 437.5 mm";
 	part
 	{
 		length 15;
@@ -179,9 +293,16 @@ track 24215
 	};
 };
 
-track 24224
+track "24224"
 {
-	description "Curve, R2 = 437.5mm, 24.3° (turnout)";
+	article_number
+	{
+		vendor "Märklin";
+		article "24224";
+	};
+	appearance "C";
+	name "Curve, R2, 24.3°";
+	description "R = 437.5 mm, turnout angle";
 	part
 	{
 		length 24.3;
@@ -189,9 +310,16 @@ track 24224
 	};
 };
 
-track 24230
+track "24230"
 {
-	description "Curve, R2 = 437.5mm, 30°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24230";
+	};
+	appearance "C";
+	name "Curve, R2, 30°";
+	description "R = 437.5 mm";
 	part
 	{
 		length 30;
@@ -201,9 +329,16 @@ track 24230
 
 // Curves, R3
 
-track 24330
+track "24330"
 {
-	description "Curve, R3 = 515mm, 30°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24330";
+	};
+	appearance "C";
+	name "Curve, R3, 30°";
+	description "R = 515mm";
 	part
 	{
 		length 30;
@@ -213,9 +348,16 @@ track 24330
 
 // Curves, R4
 
-track 24430
+track "24430"
 {
-	description "Curve, R4 = 579.3mm, 30°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24430";
+	};
+	appearance "C";
+	name "Curve, R4, 30°";
+	description "R = 579.3mm";
 	part
 	{
 		length 30;
@@ -225,9 +367,16 @@ track 24430
 
 // Curves, R5
 
-track 24530
+track "24530"
 {
-	description "Curve, R5 = 643.6mm, 30°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24530";
+	};
+	appearance "C";
+	name "Curve, R5, 30°";
+	description "R = 643.6mm";
 	part
 	{
 		length 30;
@@ -237,9 +386,16 @@ track 24530
 
 // Curves, slim turnout
 
-track 24912
+track "24912"
 {
-	description "Curve, R = 1114.6mm, 12.1° (slim turnout)";
+	article_number
+	{
+		vendor "Märklin";
+		article "24912";
+	};
+	appearance "C";
+	name "Curve, 12.1°";
+	description "R = 1114.6mm, slim turnout angle";
 	part
 	{
 		length 12.1;
@@ -249,9 +405,16 @@ track 24912
 
 // Curved turnouts, R1
 
-track 24671
+track "24671"
 {
-	description "Curved turnout, left";
+	article_number
+	{
+		vendor "Märklin";
+		article "24671";
+	};
+	appearance "C";
+	name "Curved turnout, left";
+	description "R1, R = 360 mm, 30°";
 	part
 	{
 		length 77.5;
@@ -272,9 +435,16 @@ track 24671
 	};
 };
 
-track 24672
+track "24672"
 {
-	description "Curved turnout, right";
+	article_number
+	{
+		vendor "Märklin";
+		article "24672";
+	};
+	appearance "C";
+	name "Curved turnout, right";
+	description "R1, R = 360 mm, 30°";
 	part
 	{
 		length 77.5;
@@ -297,9 +467,16 @@ track 24672
 
 // Turnouts, R2
 
-track 24611
+track "24611"
 {
-	description "Turnout, left";
+	article_number
+	{
+		vendor "Märklin";
+		article "24611";
+	};
+	appearance "C";
+	name "Turnout, left";
+	description "R2, R = 437.5 mm, 24.3°";
 	part
 	{
 		length 188.3;
@@ -313,9 +490,16 @@ track 24611
 	};
 };
 
-track 24612
+track "24612"
 {
-	description "Turnout, right";
+	article_number
+	{
+		vendor "Märklin";
+		article "24612";
+	};
+	appearance "C";
+	name "Turnout, right";
+	description "R2, R = 437.5 mm, 24.3°";
 	part
 	{
 		length 188.3;
@@ -329,9 +513,16 @@ track 24612
 	};
 };
 
-track 24630
+track "24630"
 {
-	description "Turnout, 3-way";
+	article_number
+	{
+		vendor "Märklin";
+		article "24630";
+	};
+	appearance "C";
+	name "Turnout, 3-way";
+	description "R2, R = 437.5 mm, 24.3°";
 	part
 	{
 		length 188.3;
@@ -351,9 +542,16 @@ track 24630
 	};
 };
 
-track 24624
+track "24624"
 {
-	description "Turnout, double slip";
+	article_number
+	{
+		vendor "Märklin";
+		article "24624";
+	};
+	appearance "C";
+	name "Turnout, double slip";
+	description "R2, R = 437.5 mm, 24.3°";
 	state_bits 1;
 	part
 	{
@@ -383,9 +581,16 @@ track 24624
 
 // Slim turnouts
 
-track 24711
+track "24711"
 {
-	description "Slim turnout, left";
+	article_number
+	{
+		vendor "Märklin";
+		article "24711";
+	};
+	appearance "C";
+	name "Slim turnout, left";
+	description "R = 1114.6mm, 12.1°";
 	part
 	{
 		length 236.1;
@@ -399,9 +604,16 @@ track 24711
 	};
 };
 
-track 24712
+track "24712"
 {
-	description "Slim turnout, right";
+	article_number
+	{
+		vendor "Märklin";
+		article "24712";
+	};
+	appearance "C";
+	name "Slim turnout, right";
+	description "R = 1114.6mm, 12.1°";
 	part
 	{
 		length 236.1;
@@ -417,9 +629,16 @@ track 24712
 
 // Crossings
 
-track 24640
+track "24640"
 {
-	description "Crossing, 24.3°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24640";
+	};
+	appearance "C";
+	name "Crossing, 24.3°";
+	description "Turnout angle";
 	part
 	{
 		length 188.3;
@@ -431,9 +650,16 @@ track 24640
 	};
 };
 
-track 24649
+track "24649"
 {
-	description "Crossing, 48.6°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24649";
+	};
+	appearance "C";
+	name "Crossing, 48.6°";
+	description "2× turnout angle";
 	part
 	{
 		length 103.3;
@@ -445,9 +671,16 @@ track 24649
 	};
 };
 
-track 24740
+track "24740"
 {
-	description "Slim crossing, 12.1°";
+	article_number
+	{
+		vendor "Märklin";
+		article "24740";
+	};
+	appearance "C";
+	name "Slim crossing, 12.1°";
+	description "Slim turnout angle";
 	part
 	{
 		length 236.1;
@@ -461,9 +694,15 @@ track 24740
 
 // Specials
 
-track 24977
+track "24977"
 {
-	description "Bumper";
+	article_number
+	{
+		vendor "Märklin";
+		article "24977";
+	};
+	appearance "C";
+	name "Bumper";
 	object "bumper.object";
 	part
 	{
@@ -472,173 +711,206 @@ track 24977
 	};
 };
 
+// Signals
+
+signal "7039"
+{
+	article_number
+	{
+		vendor "Märklin";
+		article "7039";
+	};
+	name "Home signal";
+	indication "Hp1"
+	{
+		aspect 0;
+		free_blocks 1;
+	};
+	indication "Hp0"
+	{
+		aspect 1;
+		free_blocks 0;
+	};
+	object "homesignal.object";
+};
+
 // Layout for selecting tracks
 
 layout
 {
-	track 24115
+	beamgate
+	{
+		position -0.3876098 0.3496740 0.000000;
+		rotation 1.570800;
+	};
+	track "24115"
 	{
 		position 0.0806517 0.139002 0;
 		rotation 2.22529;
 	};
-	track 24612
+	track "24612"
 	{
 		position -0.310086 -0.38055 0;
 		rotation 1.5708;
 	};
-	track 24172
+	track "24172"
 	{
 		position -0.232565 -0.0797749 0;
 		rotation 1.5708;
 	};
-	track 24611
+	track "24611"
 	{
 		position -0.387608 -0.380475 0;
 		rotation 1.5708;
 	};
-	track 24130
+	track "24130"
 	{
 		position 0.155044 -0.08015 0;
 		rotation 1.5708;
 	};
-	track 24230
+	track "24230"
 	{
 		position 0.232566 -0.0802249 0;
 		rotation 1.5708;
 	};
-	track 24107
+	track "24107"
 	{
 		position -0.0249545 0.231617 0;
 		rotation 2.61799;
 	};
-	track 24224
+	track "24224"
 	{
 		position -0.465131 -0.38055 0;
 		rotation 1.5708;
 	};
-	track 24330
+	track "24330"
 	{
 		position 0.310088 -0.0803 0;
 		rotation 1.5708;
 	};
-	track 24215
+	track "24215"
 	{
 		position 0.142158 0.186105 0;
 		rotation 2.2253;
 	};
-	track 24207
+	track "24207"
 	{
 		position 0.0138165 0.298658 0;
 		rotation 2.61799;
 	};
-	track 24711
+	track "24711"
 	{
 		position 0.374455 -0.381008 0;
 		rotation 1.5708;
 	};
-	track 24530
+	track "24530"
 	{
 		position 0.438821 -0.0809179 0;
 		rotation 1.5708;
 	};
-	track 24430
+	track "24430"
 	{
 		position 0.374455 -0.080609 0;
 		rotation 1.5708;
 	};
-	track 24630
+	track "24630"
 	{
 		position -0.19005 -0.380551 0;
 		rotation 1.5708;
 	};
-	track 24712
+	track "24712"
 	{
 		position 0.438821 -0.381316 0;
 		rotation 1.5708;
 	};
-	track 24624
+	track "24624"
 	{
 		position -0.0775215 -0.380625 0;
 		rotation 1.5708;
 	};
-	track 24640
+	track "24640"
 	{
 		position -0.232565 0.185972 0;
 		rotation 1.5708;
 	};
-	track 24671
+	track "24671"
 	{
 		position 0.0775225 -0.380624 0;
 		rotation 1.5708;
 	};
-	track 24977
+	track "24977"
 	{
 		position -0.465131 0.186196 0;
 		rotation 1.5708;
 	};
-	track 24672
+	track "24672"
 	{
 		position 0.155044 -0.380699 0;
 		rotation 1.5708;
 	};
-	track 24649
+	track "24649"
 	{
 		position -0.348827 0.194312 0;
 		rotation 1.99491;
 	};
-	track 24064
+	track "24064"
 	{
 		position 0.0775223 -0.080075 0;
 		rotation 1.5708;
 	};
-	track 24077
+	track "24077"
 	{
 		position -0.0775215 -0.079925 0;
 		rotation 1.5708;
 	};
-	track 24229
+	track "24229"
 	{
 		position -0.387609 -0.079626 0;
 		rotation 1.5708;
 	};
-	track 24071
+	track "24071"
 	{
 		position 2.56295e-07 -0.0799999 0;
 		rotation 1.5708;
 	};
-	track 24094
+	track "24094"
 	{
 		position -0.155042 -0.07985 0;
 		rotation 1.5708;
 	};
-	track 24188
+	track "24188"
 	{
 		position -0.310087 -0.0797 0;
 		rotation 1.5708;
 	};
-	track 24236
+	track "24236"
 	{
 		position -0.465131 -0.0795509 0;
 		rotation 1.5708;
 	};
-	track 24912
+	track "24912"
 	{
 		position 0.310088 -0.380699 0;
 		rotation 1.5708;
 	};
-	track 24206
+	track "24206"
 	{
 		position -0.446223 -0.161726 0;
 		rotation 2.0944;
 	};
-	track 24740
+	track "24740"
 	{
 		position -0.112537 0.138174 0;
 		rotation 1.5708;
 	};
-	track 24360
+	track "24360"
 	{
 		position -0.542646 -0.0794758 0;
 		rotation 1.5708;
 	};
+	signal "7039"
+	{
+		position -0.5020055 0.3153508 0.000000;
+		rotation 1.570800;
+	};
 };