From e364f0bca3389d7fe9ca7b5c7bfb09a85afd8f43 Mon Sep 17 00:00:00 2001
From: Alessandro Stoltenberg <alessandro.stoltenberg@sap.com>
Date: Tue, 17 Jul 2018 17:14:29 +0200
Subject: [PATCH] bug4670: Use equals for comparison in
 RaceMap#updateSettings() for getBouyZone(). Changed order in updateSettings()
 so that showManeuvers() call has the correct new settings.

---
 .../gwt/ui/client/shared/racemap/RaceMap.java     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
index ef4ef34addd..1994eb941d9 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
@@ -2634,12 +2634,6 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
                 maneuverTypeSelectionChanged = true;
             }
         }
-        if (maneuverTypeSelectionChanged) {
-            if (!(timer.getPlayState() == PlayStates.Playing) && lastManeuverResult != null) {
-                removeAllManeuverMarkers();
-                showManeuvers(lastManeuverResult);
-            }
-        }
         if (newSettings.isShowDouglasPeuckerPoints() != settings.isShowDouglasPeuckerPoints()) {
             if (!(timer.getPlayState() == PlayStates.Playing) && lastDouglasPeuckerResult != null && newSettings.isShowDouglasPeuckerPoints()) {
                 removeAllMarkDouglasPeuckerpoints();
@@ -2651,7 +2645,7 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
         if (newSettings.getTailLengthInMilliseconds() != settings.getTailLengthInMilliseconds()) {
             requiresRedraw = true;
         }
-        if (newSettings.getBuoyZoneRadius() != settings.getBuoyZoneRadius()) {
+        if (!newSettings.getBuoyZoneRadius().equals(settings.getBuoyZoneRadius())) {
             requiresRedraw = true;
         }
         if (newSettings.isShowOnlySelectedCompetitors() != settings.isShowOnlySelectedCompetitors()) {
@@ -2697,6 +2691,13 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
         }
         this.settings = newSettings;
         
+        if (maneuverTypeSelectionChanged) {
+            if (!(timer.getPlayState() == PlayStates.Playing) && lastManeuverResult != null) {
+                removeAllManeuverMarkers();
+                showManeuvers(lastManeuverResult);
+            }
+        }
+        
         if (requiresUpdateCoordinateSystem) {
             updateCoordinateSystemFromSettings();
         }