Rework north

- Change the 2 fork to be more geographical
- Tweak all nodes for label positioning
- Make the turn of the 2 less ridiculous
- Condense lines a bit

1 files changed, 69 insertions, 62 deletions

diff --git a/rnv/mannheim.tex b/rnv/mannheim.tex
index e98c0b5..842ee34 100644
--- a/rnv/mannheim.tex
+++ b/rnv/mannheim.tex
@@ -128,8 +128,9 @@
       -- (12,-3) 
       -- (10,-1)
       -- (7.8,-1)
-      -- (2.8,4)
-      -- (-5,4)
+      -- (1.8,5)
+      -- (-5,5)
+      -- (-5,10)
     ;
     \draw[river2] 
       (-1.5,-12.3)
@@ -162,7 +163,7 @@
     \node[stop4, rotate=-45] (Kunsthalle) at ($(135:-\rad-0.4)-(45:0.7)$) {};
     \node[stop7, rotate=-45, anchor=one half] (Hauptbahnhof) at ($(Kunsthalle.one half)-(45:1.7)$) {};
     \node[stop4, rotate=45] (Tattersall) at ($(Hauptbahnhof.center)!0.5!(Kunsthalle.center)+(135:-1.1)$) {};
-    \node[stop3, rotate=-45] (Theresienkrankenhaus) at ($(Nationaltheater)+(0:2.2)+(45:0.3)$) {};
+    \node[stop3, rotate=-45] (Theresienkrankenhaus) at ($(Nationaltheater)+(0:1.6)+(45:0.7)$) {};
     \node[stop1] (Collini-Center) at ($(Abendakademie.three quarter)+(45:1.4)+(135:-1)$) {};
     \node[stop1] (Lessingstr) at ($(Collini-Center)+(135:-3.0)$) {};
     \node[stop1] (Gewerkschaftshaus) at (20:\rad+0.5) {};
@@ -174,8 +175,8 @@
     \node[stop1] (Duale Hochschule) at ($(Neuostheim.two half)+(0:0.5)$) {};
     % Neckarstadt
     \node[stop5, rotate=-45] (Alte Feuerwache) at ($(45:\rad+2.8)+(135:-0.1)$) {};
-    \node[stop2, rotate=45] (Schafweide) at ($(Alte Feuerwache)+(45:0.6)+(135:-1.8)$) {};
-    \node[stop5, rotate=-45] (Universitätsklinikum) at ($(Schafweide)+(135:-2)+(45:0.6)$) {};
+    \node[stop2, rotate=45] (Schafweide) at ($(Alte Feuerwache)+(45:0.3)+(135:-1.6)$) {};
+    \node[stop5, rotate=-45] (Universitätsklinikum) at ($(Schafweide)+(135:-1.8)+(45:0.6)$) {};
     \node[stop3, rotate=-45, anchor=two half] (Lange Rötterstr) at ($(Universitätsklinikum.center)+(45:0.8)$) {};
     \node[stop3, rotate=-45] (Bonifatiuskirche) at ($(Lange Rötterstr)+(45:0.5)$) {};
     \node[stop2, rotate=-45, anchor=two half] (Exorzierplatz) at ($(Bonifatiuskirche.two half)+(45:0.5)$) {};
@@ -183,29 +184,29 @@
     \node[stop2, rotate=90] (Hauptfriedhof) at ($(Bibienastr)-(135:1.0)+(0:0.4)$) {};
     \node[stop2, rotate=90] (Pfeifferswörth) at ($(Hauptfriedhof)+(0:0.5)$) {};
     \node[stop2, rotate=90] (Neckarplatt) at ($(Pfeifferswörth)+(0:0.5)$) {};
-    \node[stop1] (Am Aubuckel) at ($(Neckarplatt)+(0:0.3)+(135:-0.6)$) {};
-    \node[stop1] (Liebfrauenstr) at ($(Am Aubuckel)-(135:0.5)$){};
-    \node[stop1] (Blücherstr) at ($(Liebfrauenstr)-(135:0.5)$){};
-    \node[stop1] (Feudenheim Kirche) at ($(Blücherstr)-(135:0.5)$){};
-    \node[stop1] (Neckarstr) at ($(Feudenheim Kirche)-(135:0.5)$){};
-    \node[stop1] (Feudenheim) at ($(Neckarstr)-(135:0.5)$){};
-    \node[stop2] (Carl-Benz-Str) at ($(Alte Feuerwache.center)+(45:0.5)+(90:1.4)$) {};
+    \node[stop1, rotate=45] (Am Aubuckel) at ($(Neckarplatt)+(0:0.3)+(135:-0.6)$) {};
+    \node[stop1, rotate=45] (Liebfrauenstr) at ($(Am Aubuckel)-(135:0.5)$){};
+    \node[stop1, rotate=45] (Blücherstr) at ($(Liebfrauenstr)-(135:0.5)$){};
+    \node[stop1, rotate=45] (Feudenheim Kirche) at ($(Blücherstr)-(135:0.5)$){};
+    \node[stop1, rotate=45] (Neckarstr) at ($(Feudenheim Kirche)-(135:0.5)$){};
+    \node[stop1, rotate=45] (Feudenheim) at ($(Neckarstr)-(135:0.5)$){};
+    \node[stop2] (Carl-Benz-Str) at ($(Alte Feuerwache.center)+(45:0.5)+(90:1.7)$) {};
     \node[stop2, above=0.3cm of Carl-Benz-Str] (Neuer Messplatz) {};
     \node[stop2, above=0.3cm of Neuer Messplatz] (Herzogenriedstr) {};
-    \node[stop1] (Neumarkt) at ($(Alte Feuerwache.one half)+(45:0.7)+(180:1.4)$) {};
-    \node[stop1, left=0.3cm of Neumarkt] (Bgm-Fuchs-Str) {};
-    \node[stop1, left=0.3cm of Bgm-Fuchs-Str] (Neckarstadt West) {};
+    \node[stop1, rotate=45] (Neumarkt) at ($(Alte Feuerwache.one half)+(45:0.2)+(135:0.8)$) {};
+    \node[stop1, rotate=45] (Bgm-Fuchs-Str) at ($(Neumarkt)+(135:0.5)$) {};
+    \node[stop1, rotate=45] (Neckarstadt West) at ($(Bgm-Fuchs-Str)+(135:0.5)$) {};
     % Luzenberg
     \node[stop2, above=0.3cm of Herzogenriedstr] (Untermühlaustr) {};
     \node[stop2, above=0.3cm of Untermühlaustr] (Luzenberg) {};
-    \node[stop1] (Stolberger Str) at ($(Luzenberg.one half)+(90:0.3)+(135:0.3)$) {};
-    \node[stop1] (Altrheinstr) at ($(Stolberger Str)+(135:0.5)$) {};
-    \node[stop1] (Roche) at ($(Altrheinstr)+(135:0.5)$) {};
-    \node[stop1] (Zellstofffabrik) at ($(Roche)+(135:0.5)$) {};
-    \node[stop1] (Papyrus) at ($(Zellstofffabrik)+(135:0.5)$) {};
-    \node[stop1] (Bürstädter Str) at ($(Papyrus)+(135:0.5)$) {};
-    \node[stop1] (Hanfstr) at ($(Bürstädter Str)+(135:0.5)$) {};
-    \node[stop1] (Sandhofen) at ($(Hanfstr)+(135:0.5)$) {};
+    \node[stop1, rotate=45] (Stolberger Str) at ($(Luzenberg.one half)+(90:0.3)+(135:0.3)$) {};
+    \node[stop1, rotate=45] (Altrheinstr) at ($(Stolberger Str)+(135:0.5)$) {};
+    \node[stop1, rotate=45] (Roche) at ($(Altrheinstr)+(135:0.5)$) {};
+    \node[stop1, rotate=45] (Zellstofffabrik) at ($(Roche)+(135:0.5)$) {};
+    \node[stop1, rotate=45] (Papyrus) at ($(Zellstofffabrik)+(135:0.5)$) {};
+    \node[stop1, rotate=45] (Bürstädter Str) at ($(Papyrus)+(135:0.5)$) {};
+    \node[stop1, rotate=45] (Hanfstr) at ($(Bürstädter Str)+(135:0.5)$) {};
+    \node[stop1, rotate=45] (Sandhofen) at ($(Hanfstr)+(135:0.5)$) {};
     % Waldhof
     \node[stop1, above=0.4cm of Luzenberg.two half] (Waldhof Bf) {};
     \node[stop1, above=0.3cm of Waldhof Bf] (Waldhof Nord) {};
@@ -220,30 +221,30 @@
     \node[stop2, rotate=-45] (Käfertal Bf) at ($(Mannheimer Str)+(45:0.5)$) {};
     \node[stop2, rotate=-45] (Bensheimer Str) at ($(Käfertal Bf)+(45:1.2)$) {};
     \node[stop1, rotate=-45] (Platz der Freundschaft) at ($(Bensheimer Str.two half)+(45:0.5)$) {};
-    \node[stop1] (Hochuferstr) at ($(Bonifatiuskirche.one half)+(45:0.2)+(90:0.3)$) {};
+    \node[stop1] (Hochuferstr) at ($(Bonifatiuskirche.one half)+(45:0.4)+(90:0.6)$) {};
     \node[stop1, above=0.3cm of Hochuferstr] (Landwehrsteg) {};
     \node[stop1, above=0.3cm of Landwehrsteg] (Ulmenweg) {};
     \node[stop1, above=0.3cm of Ulmenweg] (Jugendverkehrsschule) {};
     \node[stop1, above=0.3cm of Jugendverkehrsschule] (Hessische Str) {};
     \node[stop1, above=0.3cm of Hessische Str] (Speckweg) {};
     \node[stop1, above=0.3cm of Speckweg] (Herrmann-Gutzmann-Schule) {};
-    \node[stop1, above=0.4cm of Herrmann-Gutzmann-Schule] (Erlöserkirche) {};
-    \node[stop1, above=0.3cm of Erlöserkirche] (Waldstr) {};
-    \node[stop1, right=0.6cm of Waldstr] (Carl-Benz-Bad) {};
-    \node[stop1, above=0.3cm of Waldstr] (Freilichtbühne) {};
-    \node[stop1, above=0.3cm of Freilichtbühne] (Waldfriedhof) {};
-    \node[stop1, right=0.6cm of Waldfriedhof] (Käfertaler Wald) {};
+    \node[stop1, rotate=45] (Erlöserkirche) at ($(Herrmann-Gutzmann-Schule)+(90:0.4)+(135:0.4)$){};
+    \node[stop1, rotate=45] (Waldstr) at ($(Erlöserkirche)+(135:0.5)$){};
+    \node[stop1, rotate=-45] (Carl-Benz-Bad) at ($(Herrmann-Gutzmann-Schule)+(90:0.4)+(45:0.4)$){};
+    \node[stop1, rotate=-45] (Freilichtbühne) at ($(Waldstr)+(135:0.4)+(45:0.4)$) {};
+    \node[stop1, rotate=-45] (Waldfriedhof) at ($(Freilichtbühne)+(45:0.5)$) {};
+    \node[stop1, rotate=-45] (Käfertaler Wald) at ($(Carl-Benz-Bad)+(45:0.5)$) {};
     \node[stop2, rotate=45] (Im Rott) at ($(Käfertal Bf.two half)!0.65!(Bensheimer Str.two half)+(135:-1.7)$){};
     % Vogelstang
     \node[stop2, rotate=45] (Vogelstang West) at ($(Im Rott)-(135:1.7)$){};
-    \node[stop1] (Potsdamer Weg) at ($(Vogelstang West)+(45:0.7)$){};
-    \node[stop1] (Vogelstang Zentrum) at ($(Potsdamer Weg)+(45:0.5)$){};
-    \node[stop1] (Vogelstang) at ($(Vogelstang Zentrum)+(45:0.5)$){};
-    \node[stop1] (Kiesäcker) at ($(Vogelstang West)-(45:0.5)$) {};
-    \node[stop1] (Hölderlinstr) at ($(Kiesäcker)-(45:0.5)$) {};
-    \node[stop1] (Talstr) at ($(Hölderlinstr)-(45:0.5)$) {};
-    \node[stop1] (Adolf-Damaschke-Ring) at ($(Talstr)-(45:0.5)$) {};
-    \node[stop1] (Ziethenstr) at ($(Adolf-Damaschke-Ring)-(45:0.5)$) {};
+    \node[stop1, rotate=-45] (Potsdamer Weg) at ($(Vogelstang West)+(45:0.7)$){};
+    \node[stop1, rotate=-45] (Vogelstang Zentrum) at ($(Potsdamer Weg)+(45:0.5)$){};
+    \node[stop1, rotate=-45] (Vogelstang) at ($(Vogelstang Zentrum)+(45:0.5)$){};
+    \node[stop1, rotate=-45] (Kiesäcker) at ($(Vogelstang West)-(45:0.5)$) {};
+    \node[stop1, rotate=-45] (Hölderlinstr) at ($(Kiesäcker)-(45:0.5)$) {};
+    \node[stop1, rotate=-45] (Talstr) at ($(Hölderlinstr)-(45:0.5)$) {};
+    \node[stop1, rotate=-45] (Adolf-Damaschke-Ring) at ($(Talstr)-(45:0.5)$) {};
+    \node[stop1, rotate=-45] (Ziethenstr) at ($(Adolf-Damaschke-Ring)-(45:0.5)$) {};
     % Wallstadt
     \node[stop2, rotate=90, anchor=one half] (Wallstadt West) at ($(Vogelstang West.one half)-(135:0.4)+(0:0.4)$) {};
     \node[stop2, rotate=90] (Wallstadt Bf) at ($(Wallstadt West)+(0:0.5)$) {};
@@ -451,8 +452,8 @@
       (Neckarstadt West)
       -- (Bgm-Fuchs-Str)
       -- (Neumarkt)
-      {[rounded corners=0.3cm]
-      -- ($(Alte Feuerwache.one half)+(45:0.7)$)
+      {[rounded corners=0.1cm]
+      -- ($(Alte Feuerwache.one half)+(45:0.2)$)
       }
       -- (Alte Feuerwache.one half) 
       -- ($(45:\rad+0.1)+(135:0.3)$)
@@ -475,7 +476,7 @@
       arc[start angle=-40.0, end angle=-3.8, radius=\rad+0.5]
       -- (Nationaltheater.one half)
       {[rounded corners=0.3cm]
-      -- ($(Nationaltheater.one half)+(0:2.2+2*\offset)$)
+      -- ($(Nationaltheater.one half)+(0:1.6+2*\offset)$)
       }
       -- (Theresienkrankenhaus.two half)
       -- (Universitätsklinikum.two half)
@@ -563,14 +564,23 @@
     \draw[line, four] 
       (Herrmann-Gutzmann-Schule)
       {[rounded corners=0.2cm]
-      -- ($(Erlöserkirche)!0.5!(Herrmann-Gutzmann-Schule)$)
-      -| (Carl-Benz-Bad) 
+      -- ($(Herrmann-Gutzmann-Schule)+(90:0.4)$)
       }
+      -- (Carl-Benz-Bad) 
       -- (Käfertaler Wald)
+      (Erlöserkirche)
+      {[rounded corners=0.2cm]
+      -- ($(Herrmann-Gutzmann-Schule)+(90:0.4)$)
+      }
+      -- (Carl-Benz-Bad)
       (Waldfriedhof)
       -- (Freilichtbühne)
+      -- ($(Waldstr)+(135:0.4)$)
       -- (Waldstr)
       -- (Erlöserkirche)
+      {[rounded corners=0.2cm]
+      -- ($(Herrmann-Gutzmann-Schule)+(90:0.4)$)
+      }
       -- (Herrmann-Gutzmann-Schule)
       -- (Speckweg)
       -- (Hessische Str)
@@ -578,14 +588,14 @@
       -- (Ulmenweg)
       -- (Landwehrsteg)
       -- (Hochuferstr)
-      -- ($(Bonifatiuskirche.one half)+(45:0.2)$)
+      -- ($(Bonifatiuskirche.one half)+(45:0.4)$)
       -- (Bonifatiuskirche.one half)
       -- (Lange Rötterstr.one half)
       -- (Universitätsklinikum.one half)
       -- ($(Universitätsklinikum.one half)-(45:0.5)$)
       -- (Schafweide.two half) 
-      {[rounded corners=0.4cm]
-      -- ($(Alte Feuerwache.center)+(45:0.7)$)
+      {[rounded corners=0.3cm]
+      -- ($(Alte Feuerwache.center)+(45:0.4)$)
       }
       -- (Alte Feuerwache.center)
       -- (Abendakademie.two quarter)
@@ -672,7 +682,7 @@
       -- ($(135:-\rad-0.3)$)
       arc[start angle=-45, end angle=3.6, radius=\rad+0.3]
       -- (Nationaltheater.two half)
-      -- ($(Nationaltheater.two half)+(0:2.2-2*\offset)$)
+      -- ($(Nationaltheater.two half)+(0:1.6-2*\offset)$)
       -- (Theresienkrankenhaus.one half)
       -- (Universitätsklinikum.center)
       -- (Lange Rötterstr.two half)
@@ -833,7 +843,7 @@
       -- (Universitätsklinikum.three quarter)
       -- (Theresienkrankenhaus)
       {[rounded corners=0.2cm]
-      -- ($(Nationaltheater)+(0:2.2)$)
+      -- ($(Nationaltheater)+(0:1.6)$)
       }
       -- (Nationaltheater)
       -- ($(0:\rad+0.5)$)
@@ -993,9 +1003,7 @@
       -- ($(Universitätsklinikum.two quarter)-(45:0.7)$)
       }
       -- (Schafweide.one half)
-      {[rounded corners=0.2cm]
-      -- ($(Alte Feuerwache.two half)+(45:0.5)$)
-      }
+      -- ($(Alte Feuerwache.two half)+(45:0.2)$)
       -- (Alte Feuerwache.two half)
       -- ($(Abendakademie.four sixth)+(45:1.8)$)
       -- ($(Abendakademie.three quarter)+(45:1.4)$)
@@ -1205,8 +1213,8 @@
       Schönau/right/west/0,
       Käfertaler Wald/right/west/0,
       Collini-Center/right/west/0,
-      Freilichtbühne/left/east/0,
-      Waldfriedhof/left/east/0,
+      Freilichtbühne/right/west/0,
+      Waldfriedhof/right/west/0,
       Universitätsklinikum/left/east/-45,
       Bibienastr/left/east/45,
       Hauptfriedhof/right/west/45,
@@ -1225,9 +1233,9 @@
       Fernmeldeturm/left/east/45,
       Holbeinstr/left/east/45,
       Gewerkschaftshaus/left/east/45,
-      Neumarkt/above/east/-45,
-      Bgm-Fuchs-Str/above/east/-45,
-      Neckarstadt West/above/east/-45,
+      Neumarkt/left/east/0,
+      Bgm-Fuchs-Str/left/east/0,
+      Neckarstadt West/left/east/0,
       Wasserturm/left/east/0%
     } \node[label, \placement=0.05cm of \stop, rotate=\rotate, anchor=\anchor] {\contour{white}{\stop}};
     \node[label, left=0.1cm of ParadeplatzW, rotate=0, anchor=east] {\contour{white}{Paradeplatz}};
@@ -1235,15 +1243,14 @@
     \node[label, line name, fill=one, below=0.2cm of Rheinau Bf] (one lab) {\bf 1};
     \node[label, line name, fill=eight, right=0.1cm of one lab] (eight lab) {\bf 8};
     \node[label, eight, right=-0.05cm of eight lab] {\bf EX};
-    \node[label, line name, fill=two, left=0.2cm of Neckarstadt West] {\bf 2};
-    \node[label, line name, fill=two, left=0.2cm of Neckarstadt West] {\bf 2};
-    \node[label, line name, fill=two, right=0.2cm of Feudenheim] {\bf 2};
+    \node[label, line name, fill=two, above left=0.2cm of Neckarstadt West] {\bf 2};
+    \node[label, line name, fill=two] at ($(Feudenheim)+(0:0.5)$){\bf 2};
     \node[label, line name, fill=three, above=0.2cm of Sandhofen] {\bf 3};
     \node[label, line name, fill=three, below=0.2cm of Rheingoldhalle] {\bf 3};
-    \node[label, line name, fill=four, above=0.2cm of Waldfriedhof] {\bf 4};
+    \node[label, line name, fill=four] at ($(Waldfriedhof)+(90:0.5)$) {\bf 4};
     \node[label, line name, fill=four] (four lab) at ($(Bad Dürkheim)-(90:0.5)$) {\bf 4};
     \node[label, line name, fill=four, right=0.1cm of four lab] (four a lab) {\bf 4A};
-    \node[label, line name, fill=four, above=0.2cm of Käfertaler Wald] {\bf 4A};
+    \node[label, line name, fill=four, left=0.2cm of Käfertaler Wald] {\bf 4A};
     \node[label, line name, fill=five] at ($(Platz der Freundschaft)+(45:0.9)+(90:0.3)$) {\bf 5};
     \node[label, line name, fill=five] at ($(Duale Hochschule)+(0:1.6)-(135:1.9)$) {\bf 5};
     \node[label, line name, fill=five, right=0.2cm of Heddesheim Bf] {\bf 5A};
@@ -1251,7 +1258,7 @@
     \node[label, line name, fill=six, right=0.1cm of lab six] {\bf 6A};
     \node[label, line name, fill=six] (lab six west) at ($(Rheingönheim)-(90:0.5)$){\bf 6};
     \node[label, line name, fill=six, right=0.1cm of lab six west] {\bf 6A};
-    \node[label, line name, fill=seven, above=0.2cm of Vogelstang] {\bf 7};
+    \node[label, line name, fill=seven] at ($(Vogelstang)+(90:0.5)$) {\bf 7};
     \node[label, line name, fill=seven, right=0.2cm of Oppau] (seven lab west) {\bf 7};
     \node[label, line name, fill=eight, right=0.1cm of seven lab west] (eight lab west) {\bf 8};
     \node[label, eight, right=-0.05cm of eight lab west] {\bf EX};