From 237b4e1f8f4dff4b0a1b5d1a68e9bbdc873205ea Mon Sep 17 00:00:00 2001
From: Stephan Richter <github@keawe.de>
Date: Fri, 4 Dec 2020 00:56:14 +0100
Subject: [PATCH] bugfixes

---
 pom.xml                                                       | 2 +-
 src/main/java/de/srsoftware/web4rail/Route.java               | 4 +++-
 src/main/java/de/srsoftware/web4rail/moving/Train.java        | 2 +-
 .../java/de/srsoftware/web4rail/tiles/StretchableTile.java    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index d41e87c..5f62bad 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.2.13</version>
+	<version>1.2.14</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java
index 535139a..9d7c5c4 100644
--- a/src/main/java/de/srsoftware/web4rail/Route.java
+++ b/src/main/java/de/srsoftware/web4rail/Route.java
@@ -105,7 +105,9 @@ public class Route extends BaseClass implements Comparable<Route>{
 			train.setSpeed(0);
 			if (aborted) return;
 			long runtime = timestamp2 - timestamp;
-			int newTimeStep = 5*(int) runtime/(startSpeed - ENDSPEED);
+			int quotient = startSpeed - ENDSPEED;
+			if (quotient<1) quotient = 1;
+			int newTimeStep = 5*(int) runtime/quotient;
 			
 			int diff = newTimeStep - timeStep;
 			int absDiff = diff < 0 ? -diff : diff;
diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java
index 536ac28..fa105bc 100644
--- a/src/main/java/de/srsoftware/web4rail/moving/Train.java
+++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java
@@ -754,8 +754,8 @@ public class Train extends BaseClass implements Comparable<Train> {
 			nextRoute = null;
 		}
 		if (isSet(route)) {
-			route.reset();
 			route.brakeCancel();
+			route.reset();
 			route = null;
 		}
 		
diff --git a/src/main/java/de/srsoftware/web4rail/tiles/StretchableTile.java b/src/main/java/de/srsoftware/web4rail/tiles/StretchableTile.java
index a957f59..fbc528e 100644
--- a/src/main/java/de/srsoftware/web4rail/tiles/StretchableTile.java
+++ b/src/main/java/de/srsoftware/web4rail/tiles/StretchableTile.java
@@ -37,7 +37,7 @@ public abstract class StretchableTile extends Tile {
 	
 	@Override
 	protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
-		formInputs.add(stretchType(),new Input(STRETCH_LENGTH, stretch).addTo(new Tag("span")).content(NBSP+t("Tile(s)")));
+		formInputs.add(stretchType(),new Input(STRETCH_LENGTH, stretch).numeric().addTo(new Tag("span")).content(NBSP+t("Tile(s)")));
 		return super.properties(preForm, formInputs, postForm);
 	}