From 89b94a97d082aac706ebc3b8b5cb3ec668e2e926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bro=C3=9F?= <jan.bross@sap.com>
Date: Mon, 21 Mar 2016 11:14:57 +0100
Subject: [PATCH] =?UTF-8?q?Bug=203426:=20=C2=96Open=20device=20mapping=20i?=
 =?UTF-8?q?ntervals=20cause=20mapping=20chart=20to=20extend=20too=20far=20?=
 =?UTF-8?q?to=20the=20right?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...egattaLogTrackingDeviceMappingsDialog.java | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogTrackingDeviceMappingsDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogTrackingDeviceMappingsDialog.java
index 7224931137e..f953fada44f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogTrackingDeviceMappingsDialog.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogTrackingDeviceMappingsDialog.java
@@ -40,6 +40,8 @@ import com.sap.sse.gwt.client.ErrorReporter;
 import com.sap.sse.gwt.client.dialog.DataEntryDialog;
 
 public class RegattaLogTrackingDeviceMappingsDialog extends DataEntryDialog<Void> {
+    private static final int HOURS_TO_EXPAND_FOR_OPEN_END = 2;
+
     protected final String leaderboardName;
 
     public static final double PERCENTAGE_OF_TIMESPAN_TO_EXTEND_OPEN_ENDS = 0.1;
@@ -165,16 +167,19 @@ public class RegattaLogTrackingDeviceMappingsDialog extends DataEntryDialog<Void
     }
 
     void updateChart() {
-        earliest = new Date(Long.MAX_VALUE);
-        latest = new Date(Long.MIN_VALUE);
+        earliest = null;
+        latest = null;
         for (DeviceMappingDTO mapping : mappings) {
             updateExtremes(mapping);
         }
         data = new Point[mappings.size()];
+        
+        handleOpenEndedIntervalls();
+        
         long earliestMillis = earliest.getTime();
         long latestMillis = latest.getTime();
         long range = latestMillis - earliestMillis;
-        long extension = (long) (range * PERCENTAGE_OF_TIMESPAN_TO_EXTEND_OPEN_ENDS); // TODO bug 3426: open intervals dominate the chart too badly
+        long extension = (long) (range * PERCENTAGE_OF_TIMESPAN_TO_EXTEND_OPEN_ENDS);
         long yMin = earliestMillis - extension;
         long yMax = latestMillis + extension;
         int i = 0;
@@ -192,20 +197,26 @@ public class RegattaLogTrackingDeviceMappingsDialog extends DataEntryDialog<Void
                 .setPoints(data));
         chart.getYAxis().setExtremes(yMin, yMax);
     }
+
+    private void handleOpenEndedIntervalls() {
+        if (earliest == null && latest == null){
+            //allMappingsAreOpenEnded in Both directions or no mappings present
+            earliest = new Date(0);
+            latest = new Date();
+        } else if (earliest == null && latest != null){
+            earliest = new Date(latest.getTime() - HOURS_TO_EXPAND_FOR_OPEN_END*1000*60*60);
+        } else if (latest == null && earliest != null){
+            latest = new Date(earliest.getTime() + HOURS_TO_EXPAND_FOR_OPEN_END*1000*60*60);
+        }
+    }
     
     private void updateExtremes(DeviceMappingDTO mapping) {
-        if (mapping.from != null && earliest.after(mapping.from)) {
+        if (mapping.from != null && (earliest == null || earliest.after(mapping.from))) {
             earliest = mapping.from;
         }
-        if (mapping.to != null && latest.before(mapping.to)) {
+        if (mapping.to != null && (latest == null || latest.before(mapping.to))) {
             latest = mapping.to;
         }
-        if (mapping.to != null && earliest.after(mapping.to)) {
-            earliest = mapping.to;
-        }
-        if (mapping.from != null && latest.before(mapping.from)) {
-            latest = mapping.from;
-        }
     }
     
     private void addMapping() {