From a53cf593edd45c432a487ee1e4ebd9ee03a9130b Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Tue, 11 Sep 2018 18:35:01 +0900 Subject: [PATCH] bug4134_2: wind speed spread in Swarm.java is now a constant. Removed unneccessary check in Swarm.java --- .../sailing/gwt/ui/simulator/streamlets/Swarm.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java index 2d371bd3a7a..95ccc303b4f 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java @@ -72,6 +72,12 @@ public class Swarm implements TimeListener { private final ColorMapper colorMapper; private boolean clearNextFrame = false; + + /** + * For a windfield that has no wind speed spread, e.g. only one wind speed source, this value will be used to define + * a {@link ValueRangeFlexibleBoundaries} for this swarm. + */ + private static double WINDSPEED_DEFAULT_SPREAD_IN_KNOTS = 0.1; public Swarm(FullCanvasOverlay fullcanvas, MapWidget map, com.sap.sse.gwt.client.player.Timer timer, VectorField vectorField, StreamletParameters streamletPars) { @@ -346,11 +352,8 @@ public class Swarm implements TimeListener { } } } - if (maxSpeedInKnots == minSpeedInKnots) { - valueRange.setMinMax(minSpeedInKnots - 0.1, maxSpeedInKnots + 0.1); - } - else if (Math.abs(maxSpeedInKnots - minSpeedInKnots) <= 0.1 && minSpeedInKnots < maxSpeedInKnots) { - valueRange.setMinMax(minSpeedInKnots - 0.1, maxSpeedInKnots + 0.1); + if (Math.abs(maxSpeedInKnots - minSpeedInKnots) <= WINDSPEED_DEFAULT_SPREAD_IN_KNOTS && minSpeedInKnots <= maxSpeedInKnots) { + valueRange.setMinMax(minSpeedInKnots - WINDSPEED_DEFAULT_SPREAD_IN_KNOTS, maxSpeedInKnots + WINDSPEED_DEFAULT_SPREAD_IN_KNOTS); } else if (minSpeedInKnots <= maxSpeedInKnots) { valueRange.setMinMax(minSpeedInKnots, maxSpeedInKnots); }