From 1f81f4074bc04480cbe3188e5fdf3e4f590887f9 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Tue, 21 Feb 2012 04:05:05 +0100
Subject: [PATCH] bug 317: set default tail length to 300s; default zoom to
 include buoys

---
 .../com/sap/sailing/gwt/ui/adminconsole/RaceMapSettings.java    | 2 +-
 .../sap/sailing/gwt/ui/adminconsole/RaceMapZoomSettings.java    | 1 +
 .../src/main/java/com/sap/sailing/gwt/ui/client/Timer.java      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapSettings.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapSettings.java
index 65dec9b6029..faee00e8ef5 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapSettings.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapSettings.java
@@ -15,7 +15,7 @@ public class RaceMapSettings {
     
     private RaceMapZoomSettings zoomSettings;
     
-    private long tailLengthInMilliseconds = 30000l;
+    private long tailLengthInMilliseconds = 300000l;
 
     public RaceMapSettings() {
         maneuverTypesToShow = new HashSet<ManeuverType>();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapZoomSettings.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapZoomSettings.java
index bd7b250233b..ac6015ae01c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapZoomSettings.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapZoomSettings.java
@@ -39,6 +39,7 @@ public class RaceMapZoomSettings {
         typesToConsiderOnZoom = new ArrayList<ZoomTypes>();
         typesToConsiderOnZoom.add(ZoomTypes.BOATS);
         typesToConsiderOnZoom.add(ZoomTypes.TAILS);
+        typesToConsiderOnZoom.add(ZoomTypes.BUOYS);
         zoomToSelectedCompetitors = false;
     }
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/Timer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/Timer.java
index 2fdf363a2ff..b7169db79c7 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/Timer.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/Timer.java
@@ -198,7 +198,7 @@ public class Timer {
                     if (playMode == PlayModes.Replay) {
                         newTime += (long) playSpeedFactor * refreshInterval;
                     } else {
-                        newTime = System.currentTimeMillis() - getLivePlayDelayInMillis();
+                        newTime = System.currentTimeMillis() - getLivePlayDelayInMillis(); 
                     }
                     setTime(newTime);
                 }