renamed side track to secondary track

master
martin 2019-08-30 15:29:30 +02:00
parent 790af4100b
commit 317c4affb6
24 changed files with 72 additions and 34 deletions

View File

@ -27,9 +27,9 @@
{ % tracks
\draw[MainTrack] ( 1.5, 0) -- ++(37,0);
\draw[MainTrack] (15 , 0) -- ++( 1,1) -- ++(10,0) -- ++(1,-1);
\draw[SideTrack] (11 ,-1) -- ++( 2,0) -- ++( 1,1);
\draw[SideTrack] ( 9 , 1) -- ++( 7,0);
\draw[SideTrack] (14 , 1) -- ++( 1,1) -- ++(10,0);
\draw[SecondaryTrack] (11 ,-1) -- ++( 2,0) -- ++( 1,1);
\draw[SecondaryTrack] ( 9 , 1) -- ++( 7,0);
\draw[SecondaryTrack] (14 , 1) -- ++( 1,1) -- ++(10,0);
% track numbers
\node[fill=background] at (11.7, 1) {12};
\node[fill=background] at (11.7,-1) {10};

View File

@ -31,7 +31,7 @@
\draw[MainTrack] (14 , 0) -- ++( 1,-1) -- ++(10.5,0) -- ++( 1,1);
\draw[MainTrack] (27 , 1) -- ++( 1,-1);
\draw[MainTrack] (29 , 0) -- ++( 5, 5);
\draw[SideTrack] ( 9 , 1) -- ++( 7, 0);
\draw[SecondaryTrack] ( 9 , 1) -- ++( 7, 0);
% % track numbers
\node[fill=background] at (12.5, 1) {11};
\node[fill=background] at (21.75, 1) { 1};

View File

@ -25,15 +25,15 @@
\draw[MainTrack] (O2R-2) -- (O2S-2); % track 2
\draw[MainTrack] ( 5, 1) -- ++( 1,-1); % track W1/W2
\draw[MainTrack] ( 7, 0) -- ++( 1, 1); % track W3/W4
\draw[SideTrack] ( 7, 2) -- ++(-3, 3) -- ++(-0.5,0); % track 132
\draw[SecondaryTrack] ( 7, 2) -- ++(-3, 3) -- ++(-0.5,0); % track 132
\draw[MainTrack] ( 8, 0) -- ++( 1,-1) -- ++(13. ,0) -- ++( 1. , 1); % track 10
\draw[MainTrack] ( 9, 1) -- ++( 1, 1) -- ++(11. ,0) -- ++( 1. ,-1); % track 13
\draw[SideTrack] (10, 2) -- ++(-4, 0) -- ++(-2. ,2) -- ++(-0.5, 0); % track 131
\draw[SecondaryTrack] (10, 2) -- ++(-4, 0) -- ++(-2. ,2) -- ++(-0.5, 0); % track 131
\draw[MainTrack] (10, 2) -- ++( 1, 1) -- ++( 9. ,0) -- ++( 1. ,-1); % track 14
\draw[SideTrack] (11, 3) -- ++( 1, 1) -- ++( 7. ,0) -- ++( 1. ,-1); % track 15
\draw[SideTrack] (19, 4) -- ++( 4, 0); % track 215
\draw[SecondaryTrack] (11, 3) -- ++( 1, 1) -- ++( 7. ,0) -- ++( 1. ,-1); % track 15
\draw[SecondaryTrack] (19, 4) -- ++( 4, 0); % track 215
\draw[MainTrack] (23, 1) -- ++( 1,-1); % track W16/W18
\draw[SideTrack] (32, 0) -- ++( 1.5,-1.5) -- ++( 4, 0); % track 410
\draw[SecondaryTrack] (32, 0) -- ++( 1.5,-1.5) -- ++( 4, 0); % track 410
\draw[MainTrack] (35, 0) -- ++( 1, 1); % track W21/W22
}
{ %% track numbers

View File

@ -22,7 +22,7 @@
\draw[MainTrack] ( 5,0) -- ++(1,1) -- ++(14,0) -- ++(1,-1); % track 2
\draw[MainTrack] ( 7,1) -- ++(1,1) -- ++(11,0) -- ++(1,-1); % track 3
\draw[MainTrack] ( P2M) -- ++(5,5);
\draw[SideTrack] (22,0) -- ++(1.5,-1.5) -- ++(3,0); % track 10
\draw[SecondaryTrack] (22,0) -- ++(1.5,-1.5) -- ++(3,0); % track 10
}
{ %% track numbers
\node[fill=background] at (13.5, 0) { 1};

View File

@ -23,15 +23,15 @@
\draw[MainTrack] (R2W-1) -- (R2O-1); % track 1
\draw[MainTrack] ( 5, 0) -- ++( 1, 1);
\draw[MainTrack] (R2W-2) -- ++( 8, 0) -- ++(2,2) -- ++(26,0) -- ++(2,-2) -- (R2O-2); % track 3
\draw[SideTrack] ( 9, 1) -- ++( 6, 0); % track 21
\draw[SideTrack] ( 8, 4) -- ++( 7, 0); % track 41
\draw[SideTrack] (12, 4) -- ++( 1,-1);
\draw[SecondaryTrack] ( 9, 1) -- ++( 6, 0); % track 21
\draw[SecondaryTrack] ( 8, 4) -- ++( 7, 0); % track 41
\draw[SecondaryTrack] (12, 4) -- ++( 1,-1);
\draw[MainTrack] (14, 3) -- (15, 4) -- (R2P); % track 4
\draw[MainTrack] (14, 0) -- ++( 1, 1) -- ++(18, 0); % track 2
\draw[MainTrack] (15, 3) -- ++( 2,-2);
\draw[MainTrack] (16, 4) -- (17, 5) -- (29, 5) -- ++(5,-5); % track 5
\draw[MainTrack] (28, 1) -- ++( 1, 1) -- ++( 5, 0) -- ++(2, 2);
\draw[SideTrack] (26, 5) -- ++( 1, 1) -- ++( 3, 0); % track 51
\draw[SecondaryTrack] (26, 5) -- ++( 1, 1) -- ++( 3, 0); % track 51
}
{ %% track numbers
\node[fill=background] at ( 9.0, 4) {41};

View File

@ -27,11 +27,11 @@
\draw[MainTrack] ( 5, 0) -- ++( 1, 1); % track W2/W3
\draw[MainTrack] (16, 1) -- ++( 1,-1); % track W4/W5
\draw[MainTrack] (18, 0) -- ++( 1, 1); % track W6/W7
\draw[SideTrack] (23, 2) -- ++( -5, 0); % track 41
\draw[SecondaryTrack] (23, 2) -- ++( -5, 0); % track 41
\draw[MainTrack] (22, 0) -- ++( 1,-1) -- ++(13. ,0) -- ++( 1. , 1); % track 1
\draw[MainTrack] (22, 1) -- ++( 1, 1) -- ++(13. ,0) -- ++( 1. ,-1); % track 4
\draw[SideTrack] (24, 2) -- ++( 1, 1) -- ++(10. ,0) -- ++( 1. ,-1); % track 5
\draw[SideTrack] (36,-1) -- ++( 5, 0); % track 11
\draw[SecondaryTrack] (24, 2) -- ++( 1, 1) -- ++(10. ,0) -- ++( 1. ,-1); % track 5
\draw[SecondaryTrack] (36,-1) -- ++( 5, 0); % track 11
\draw[MainTrack] (38, 1) -- ++( 1,-1); % track W18/W19
}
{ %% track numbers

Binary file not shown.

View File

@ -50,7 +50,7 @@
\hline
\No & track distance (in \si{\metre}) & \symbol{track_distance.tikz} & \code{track_distance.tikz} & \texttt{topology} \\
\hline
\No & side track & \symbol{side_track.tikz} & \code{side_track.tikz} & \texttt{topology} \\
\No & secondary track & \symbol{secondary_track.tikz} & \code{secondary_track.tikz} & \texttt{topology} \\
\hline
\No & track number & \symbol{track_number.tikz} & \code{track_number.tikz} & \texttt{topology} \\
\hline

View File

@ -4,5 +4,5 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (0,0) -- ++(2.5,0);
\draw[SecondaryTrack] (0,0) -- ++(2.5,0);
\pic at (0,0) {bufferstop_backward};

View File

@ -4,5 +4,5 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(2.5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(2.5,0);
\pic at (0,0) {bufferstop_forward};

View File

@ -5,5 +5,6 @@
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[MainTrack] (-2.5,0) -- ++(5,0);
\pic at (0,0) {block_signal_forward};
\pic at (0,0) {distant_signal_forward};
\pic at (0,0) {block_signal_forward={S}}; % Order 1
% replace the S with desired speed or remove
\pic at (0,0) {distant_signal_forward}; % Order 2

View File

@ -4,5 +4,5 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(5,0);
\pic at (0,0) {derailer_left_backward};

View File

@ -4,5 +4,5 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(5,0);
\pic at (0,0) {derailer_left_forward};

View File

@ -4,5 +4,5 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(5,0);
\pic at (0,0) {derailer_right_backward};

View File

@ -4,5 +4,5 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(5,0);
\pic at (0,0) {derailer_right_forward};

View File

@ -4,5 +4,5 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(5,0);
\pic at (0,0) {hump};

View File

@ -4,4 +4,4 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(5,0);

View File

@ -4,6 +4,6 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(5,0);
\pic at (-0.5,0) {vehicles=1};
% change the 1 to desired length

View File

@ -4,5 +4,5 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(5,0);
\pic at (-2,0) {vehicles};

View File

@ -4,6 +4,6 @@
% Copyright 2019 Martin Scheidt (ISC license)
% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
\draw[SideTrack] (-2.5,0) -- ++(5,0);
\draw[SecondaryTrack] (-2.5,0) -- ++(5,0);
\pic at (-2,0) {vehicles};
\node[font=\sffamily] at (0,0) {label};

View File

@ -10,7 +10,7 @@
\colorlet{foreground}{black}
\tikzset{MainTrack/.style={line width=2pt,foreground}}%
\tikzset{SideTrack/.style={line width=0.7pt,foreground}}%
\tikzset{SecondaryTrack/.style={line width=0.7pt,foreground}}%
\tikzset{
pics/track_number/.default=,

View File

@ -349,4 +349,40 @@
},
}
\tikzset{
opposing_protection_forward/.pic={
\path[draw=foreground, fill=background] (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle;
};
}
\tikzset{
opposing_protection_backward/.pic={
\path[draw=foreground, fill=background] (0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle;
};
}
\tikzset{
opposing_protection_granted_forward/.pic={
\fill[foreground] (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle;
};
}
\tikzset{
opposing_protection_granted_backward/.pic={
\fill[foreground] (0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle;
};
}
\tikzset{
opposing_protection_declined_forward/.pic={
\path[draw=foreground, fill=background, densely dotted] (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle;
};
}
\tikzset{
opposing_protection_declined_backward/.pic={
\path[draw=foreground, fill=background, densely dotted] (0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle;
};
}
\endinput

Binary file not shown.

View File

@ -48,7 +48,7 @@
\hline
\No & track distance (in \si{\metre}) & \symbol{track_distance.tikz} \\
\hline
\No & side track & \symbol{side_track.tikz} \\
\No & secondary track & \symbol{secondary_track.tikz} \\
\hline
\No & track number & \symbol{track_number.tikz} \\
\hline
@ -122,7 +122,8 @@
\hline
\No & transmitter bidirectional & \symbol{transmitter_below_bidirectional.tikz} \\
\hline
\No & block end marker & \symbol{block_end_marker_forward.tikz} \\
\No & \parbox[c]{4cm}{block end marker\\(end of movement authority)}
& \symbol{block_end_marker_forward.tikz} \\
\hline
\No & block clearing point & \symbol{block_clearing_point_forward.tikz} \\
\hline