From d89bd4a364ad9c860e204d46d37e0617c3c58918 Mon Sep 17 00:00:00 2001
From: Stephan Richter <github@keawe.de>
Date: Fri, 27 Nov 2020 16:45:02 +0100
Subject: [PATCH] bugfixes

---
 pom.xml                                                | 2 +-
 resources/svg/SignalE.svg                              | 8 ++++----
 resources/svg/SignalN.svg                              | 8 ++++----
 resources/svg/SignalS.svg                              | 8 ++++----
 resources/svg/SignalW.svg                              | 8 ++++----
 resources/translations/Application.de.translation      | 3 ++-
 src/main/java/de/srsoftware/web4rail/Plan.java         | 2 +-
 src/main/java/de/srsoftware/web4rail/Route.java        | 2 +-
 src/main/java/de/srsoftware/web4rail/moving/Train.java | 8 ++++++--
 9 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 519e71f..65b0123 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
diff --git a/resources/svg/SignalE.svg b/resources/svg/SignalE.svg
index 53e18c2..490188b 100644
--- a/resources/svg/SignalE.svg
+++ b/resources/svg/SignalE.svg
@@ -1,7 +1,7 @@
 <svg width="%width%" height="100" viewbox="0 0 100 100">
 	<rect x="0" y="35" width="100" height="30" />
-	<rect class="sig_a" x="5" y="5" height="20" width="20" />
-	<rect class="sig_B" x="25" y="5" height="20" width="20" />
-	<line x1="45" y1="15" x2="70" y2="15" />
-	<line x1="70" y1="10" x2="70" y2="20" />
+	<rect class="sig_a" x="75" y="75" height="20" width="20" />
+	<rect class="sig_B" x="55" y="75" height="20" width="20" />
+	<line x1="30" y1="85" x2="55" y2="85" />
+	<line x1="30" y1="80" x2="30" y2="90" />
 </svg>
\ No newline at end of file
diff --git a/resources/svg/SignalN.svg b/resources/svg/SignalN.svg
index f9796ff..dc0c620 100644
--- a/resources/svg/SignalN.svg
+++ b/resources/svg/SignalN.svg
@@ -1,7 +1,7 @@
 <svg width="100" height="" viewbox="0 0 100 100">
 	<rect x="35" y="0" width="30" height="100" />
-	<rect class="sig_a" x="5" y="75" height="20" width="20" />
-	<rect class="sig_B" x="5" y="55" height="20" width="20" />
-	<line x1="15" y1="30" x2="15" y2="55" />
-	<line x1="10" y1="30" x2="20" y2="30" />
+	<rect class="sig_a" x="75" y="5" height="20" width="20" />
+	<rect class="sig_B" x="75" y="25" height="20" width="20" />
+	<line x1="85" y1="45" x2="85" y2="70" />
+	<line x1="80" y1="70" x2="90" y2="70" />
 </svg>
\ No newline at end of file
diff --git a/resources/svg/SignalS.svg b/resources/svg/SignalS.svg
index dc0c620..f9796ff 100644
--- a/resources/svg/SignalS.svg
+++ b/resources/svg/SignalS.svg
@@ -1,7 +1,7 @@
 <svg width="100" height="" viewbox="0 0 100 100">
 	<rect x="35" y="0" width="30" height="100" />
-	<rect class="sig_a" x="75" y="5" height="20" width="20" />
-	<rect class="sig_B" x="75" y="25" height="20" width="20" />
-	<line x1="85" y1="45" x2="85" y2="70" />
-	<line x1="80" y1="70" x2="90" y2="70" />
+	<rect class="sig_a" x="5" y="75" height="20" width="20" />
+	<rect class="sig_B" x="5" y="55" height="20" width="20" />
+	<line x1="15" y1="30" x2="15" y2="55" />
+	<line x1="10" y1="30" x2="20" y2="30" />
 </svg>
\ No newline at end of file
diff --git a/resources/svg/SignalW.svg b/resources/svg/SignalW.svg
index 490188b..53e18c2 100644
--- a/resources/svg/SignalW.svg
+++ b/resources/svg/SignalW.svg
@@ -1,7 +1,7 @@
 <svg width="%width%" height="100" viewbox="0 0 100 100">
 	<rect x="0" y="35" width="100" height="30" />
-	<rect class="sig_a" x="75" y="75" height="20" width="20" />
-	<rect class="sig_B" x="55" y="75" height="20" width="20" />
-	<line x1="30" y1="85" x2="55" y2="85" />
-	<line x1="30" y1="80" x2="30" y2="90" />
+	<rect class="sig_a" x="5" y="5" height="20" width="20" />
+	<rect class="sig_B" x="25" y="5" height="20" width="20" />
+	<line x1="45" y1="15" x2="70" y2="15" />
+	<line x1="70" y1="10" x2="70" y2="20" />
 </svg>
\ No newline at end of file
diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation
index 9c75ba7..49cdc32 100644
--- a/resources/translations/Application.de.translation
+++ b/resources/translations/Application.de.translation
@@ -68,6 +68,7 @@ Firing {} : starte {}
 FinishRoute : Route abschließen
 Found {} routes. : {} Routen gefunden.
 FreeStartBlock : Start-Block freigeben
+Fullscreen : Vollbild
 Hardware settings : Hardware-Einstellungen
 Height : Höhe
 Help : Hilfe
@@ -140,7 +141,7 @@ Set speed to {} {} : Geschwindigkeit auf {} {} setzen
 Set {} to {} : {} auf {} setzen
 SetPower : Strom schalten
 Set speed to : Geschwindigkeit setzen
-Setup actions : Aktivierungs-Aktionen
+Setup actions : Vorbereitung-Aktionen
 ShowText : Text anzeigen
 Signals : Signale
 Simulating movement of {}... : Simuliere Fahrt von {}...
diff --git a/src/main/java/de/srsoftware/web4rail/Plan.java b/src/main/java/de/srsoftware/web4rail/Plan.java
index 5681802..157f070 100644
--- a/src/main/java/de/srsoftware/web4rail/Plan.java
+++ b/src/main/java/de/srsoftware/web4rail/Plan.java
@@ -245,7 +245,7 @@ public class Plan extends BaseClass{
 		Vector<Route> routes = new Vector<Route>();
 		for (Block block : blocks) {
 			for (Connector con : block.startPoints()) {
-				routes.addAll(follow(new Route().begin(block,con.from.inverse()),con));
+				routes.addAll(follow(new Route().begin(block,con.from),con));
 			}
 		}
 		for (Tile tile : tiles.values()) tile.routes().clear();
diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java
index bf916b9..f56f39b 100644
--- a/src/main/java/de/srsoftware/web4rail/Route.java
+++ b/src/main/java/de/srsoftware/web4rail/Route.java
@@ -290,7 +290,7 @@ public class Route extends BaseClass implements Comparable<Route>{
 		path = new Vector<Tile>();
 		turnouts = new HashMap<>();
 		startBlock = block;
-		startDirection = from;
+		startDirection = from.inverse();
 		path.add(block);
 		return this;
 	}
diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java
index 33d941e..176b6f4 100644
--- a/src/main/java/de/srsoftware/web4rail/moving/Train.java
+++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java
@@ -598,9 +598,13 @@ public class Train extends BaseClass implements Comparable<Train> {
 	}
 
 	public Object quitAutopilot() {
+		if (isSet(nextRoute)) {
+			nextRoute.reset();
+			nextRoute = null;
+		}
 		if (isSet(autopilot)) {
 			autopilot.stop = true;
-			autopilot = null;
+			autopilot = null;			
 			return t("{} stopping at next block.",this);
 		} else return t("autopilot not active.");
 	}
@@ -615,7 +619,7 @@ public class Train extends BaseClass implements Comparable<Train> {
 		
 		boolean error = !nextRoute.lockIgnoring(route);
 		error = error || !nextRoute.setTurnouts();
-		error = error || !route.fireSetupActions(context);
+		error = error || !nextRoute.fireSetupActions(context);
 
 		if (error) {
 			nextRoute.reset(); // may unlock tiles belonging to the current route.