");
if (value != null) {
sb.appendHtmlConstant(value.getA());
}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableStyle.css b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableStyle.css
index beddf87f241..6fa2b7a3807 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableStyle.css
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableStyle.css
@@ -1,37 +1,52 @@
@CHARSET "UTF-8";
.cellTableHeader {
-padding-left: 10px;
-color: black;
-font-size: 9pt;
-background-image: none;
-background-color: white;
-height: 30px;
-vertical-align: middle;
-font-weight: bold;
-text-shadow: 0 1px 1px rgba(255,255,255,.7);
+ padding: 7px;
+ padding-left: 10px;
+ color: black;
+ background-image: none;
+ background-color: white;
+ font-family: 'Open Sans' !important;
+ font-size: 13px;
+ font-weight: bold;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, .7);
+ border-bottom-color: lightgrey !important;
+ border: none !important;
+ vertical-align: bottom;
}
.cellTableCell {
-padding: 5px;
-overflow: hidden;
-font-size: 10pt;
-height: 20px;
-color: black;
-background-color: white;
-border:none;
+ padding-bottom: 8px;
+ padding-left: 10px;
+ overflow: hidden;
+ font-family: 'Open Sans' !important;
+ font-size: 13px;
+ color: #848484;
+ background-color: white;
+ border: none !important;
+ margin: 100px !important;
+ border-spacing: 0px !important;
}
-.cellTableEvenRow {
-background-color: white;
-border:none;
+.cellTableOddRowCell {
+ background-color: white;
+ border: none !important;
+ padding: 0px;
+ padding-left: 10px;
+ padding-bottom: 10px;
+ margin: 0px !important;
+ border-spacing: 0px !important;
+ font-family: 'Open Sans' !important;
}
-.cellTableOddRow {
-background-color: white;
-border:none;
+
+.cellTableEvenRowCell {
+ background-color: white;
+ border: none !important;
+ padding: 0px;
+ padding-left: 10px;
+ padding-bottom: 10px;
+ maring: 0px !important;
+ border-spacing: 0px !important;
+ font-family: 'Open Sans' !important;
}
-cellTableOddRowCell{
-background-color: white;
-border:none;
-}
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableTeamCell.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableTeamCell.java
deleted file mode 100644
index 20baef7dfe9..00000000000
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableTeamCell.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sap.sailing.dashboards.gwt.client.widgets.startanalysis.rankingtable;
-
-import com.google.gwt.cell.client.AbstractCell;
-import com.google.gwt.cell.client.Cell;
-import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
-import com.sap.sse.common.Util.Pair;
-
-public class StartAnalysisStartRankTableTeamCell extends AbstractCell
> implements Cell> {
-
- public StartAnalysisStartRankTableTeamCell() {
- }
-
- @Override
- public void render(com.google.gwt.cell.client.Cell.Context context, Pair value, SafeHtmlBuilder sb) {
-
- sb.appendHtmlConstant("");
- if (value != null) {
- sb.appendHtmlConstant(value.getA());
- sb.appendHtmlConstant("
");
- }
- sb.appendHtmlConstant("
");
+ if (value != null) {
+ sb.appendHtmlConstant(value);
+ }
+ sb.appendHtmlConstant("
");
+ }
+}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableTextColumn.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableTextColumn.java
new file mode 100644
index 00000000000..d585946773a
--- /dev/null
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/rankingtable/StartAnalysisStartRankTableTextColumn.java
@@ -0,0 +1,21 @@
+package com.sap.sailing.dashboards.gwt.client.widgets.startanalysis.rankingtable;
+
+import com.google.gwt.user.cellview.client.Column;
+
+/**
+ * @author Alexander Ries (D062114)
+ *
+ */
+
+public abstract class StartAnalysisStartRankTableTextColumn extends Column {
+
+ public StartAnalysisStartRankTableTextColumn() {
+ super(new StartAnalysisStartRankTableTextCell());
+ }
+
+ @Override
+ public String getValue(T object) {
+ return null;
+ }
+}
+
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartLineAdvantageByGeometryWidget.gss b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartLineAdvantageByGeometryWidget.gss
deleted file mode 100644
index 77918068ae3..00000000000
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartLineAdvantageByGeometryWidget.gss
+++ /dev/null
@@ -1,31 +0,0 @@
-@require 'theme';
-
-.startLineAdvantageComponent_liveAveragePanel {
- bottom: 5pt;
- margin-top: 4pt;
-}
-
-.startLineAdvantageComponent_header {
- font-size: 14pt;
-}
-
-.startLineAdvantageComponent_livePanel {
- top: 35%;
- bottom: 20%;
-}
-
-.startLineAdvantageComponent_averagePanel {
- top: 35%;
- bottom: 20%;
-}
-
-.startLineAdvantageComponent_middleLine {
- top: 35%;
- bottom: 20%;
-}
-
-.startLineAdvantageComponent_wrapper {
- position: absolute;
- width: 100%;
- height: 100%;
-}
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartLineAdvantageByGeometryWidget.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartLineAdvantageByGeometryWidget.java
deleted file mode 100644
index e930a70fa76..00000000000
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartLineAdvantageByGeometryWidget.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.course;
-
-import java.util.Date;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.google.gwt.i18n.client.NumberFormat;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.sap.sailing.dashboards.gwt.client.DashboardClientFactory;
-import com.sap.sailing.dashboards.gwt.client.actions.GetStartlineAdvantageByGeometryAction;
-import com.sap.sailing.dashboards.gwt.client.widgets.PollsLiveDataEvery5Seconds;
-import com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.util.LiveAverageComponent;
-import com.sap.sailing.dashboards.gwt.shared.DashboardURLParameters;
-import com.sap.sailing.dashboards.gwt.shared.dto.StartLineAdvantageDTO;
-import com.sap.sailing.gwt.ui.client.StringMessages;
-
-/**
- * The purpose of the class is to display the live and average start line advantage either by wind or by geometry. There
- * is only one advantage display at once, so the user can switch between these following two
- * {@link StartLineAdvantageComponentState}s {@link StartLineAdvantageComponentStateShowsAdvantageByWind} and
- * {@link StartLineAdvantageComponentStateShowsAdvantageByGeometry} by tabing somewhere at the widget. The class extends
- * from {@link LiveAverageComponent} to get necessary Ui Elements but customizes these with own CSS.
- *
- * @author Alexander Ries (D062114)
- *
- */
-public class StartLineAdvantageByGeometryWidget extends LiveAverageComponent implements PollsLiveDataEvery5Seconds {
-
- private DashboardClientFactory dashboardClientFactory;
-
- private static StringMessages stringConstants = StringMessages.INSTANCE;
- private static final Logger logger = Logger.getLogger(StartLineAdvantageByGeometryWidget.class.getName());
-
- public StartLineAdvantageByGeometryWidget(DashboardClientFactory dashboardClientFactory) {
- super(stringConstants.dashboardStartlineAdvantageByGeometry(), "m");
- this.dashboardClientFactory = dashboardClientFactory;
- StartLineAdvantageByGeometryWidgetRessources.INSTANCE.gss().ensureInjected();
- this.header.setInnerText(stringConstants.dashboardStartlineAdvantageByGeometry());
- this.header.addClassName(StartLineAdvantageByGeometryWidgetRessources.INSTANCE.gss().startLineAdvantageComponent_header());
- liveAveragePanel.getElement().addClassName(StartLineAdvantageByGeometryWidgetRessources.INSTANCE.gss().startLineAdvantageComponent_liveAveragePanel());
- livePanel.getElement().addClassName(StartLineAdvantageByGeometryWidgetRessources.INSTANCE.gss().startLineAdvantageComponent_livePanel());
- middleLine.getElement().addClassName(StartLineAdvantageByGeometryWidgetRessources.INSTANCE.gss().startLineAdvantageComponent_middleLine());
- averagePanel.getElement().addClassName(StartLineAdvantageByGeometryWidgetRessources.INSTANCE.gss().startLineAdvantageComponent_averagePanel());
- this.liveLabel.setInnerHTML(stringConstants.dashboardLiveWind());
- this.averageLabel.setInnerHTML(stringConstants.dashboardAverageWind()+"
"+stringConstants.dashboardAverageWindMinutes(15));
- registerForDashboardFiveSecondsTimer(dashboardClientFactory);
- }
-
- @Override
- public void timeChanged(Date newTime, Date oldTime) {
- String leaderboardNameParameterValue = DashboardURLParameters.LEADERBOARD_NAME.getValue();
- if (leaderboardNameParameterValue != null) {
- dashboardClientFactory.getDispatch().execute(
- new GetStartlineAdvantageByGeometryAction(leaderboardNameParameterValue),
- new AsyncCallback() {
-
- @Override
- public void onFailure(Throwable caught) {
- logger.log(Level.INFO, "Failed to received startline advantage by geometry");
- }
-
- @Override
- public void onSuccess(StartLineAdvantageDTO result) {
- if (result.startLineAdvantage != null) {
- logger.log(Level.INFO, "Updating UI with RibDashboardRaceInfoDTO.startLineAdvantageDTO");
- setLiveValue(NumberFormat.getFormat("#0.0").format(result.startLineAdvantage.doubleValue()));
- setAverageValue(NumberFormat.getFormat("#0.0").format(result.average.doubleValue()));
- } else {
- logger.log(Level.INFO, "RibDashboardRaceInfoDTO.startLineAdvantageDTO is 0");
- }
- }
- });
- }
- }
-
- @Override
- public void registerForDashboardFiveSecondsTimer(DashboardClientFactory dashboardClientFactory) {
- if (dashboardClientFactory != null) {
- dashboardClientFactory.getDashboardFiveSecondsTimer().addTimeListener(this);
- }
- }
-}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidget.gss b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidget.gss
new file mode 100644
index 00000000000..b8fccaeba4b
--- /dev/null
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidget.gss
@@ -0,0 +1,17 @@
+@require 'theme';
+
+.start_line_advantage_by_geometry_widget {
+ position: absolute;
+ height: 100%;
+ width: 100%;
+ background-color: LIGHT_GREY;
+ border-radius: DASHBOARD_BORDER_RADIUS;
+ overflow: hidden;
+}
+
+.advantage_maximum_live_average {
+ position: absolute;
+ width: 100%;
+ top: DASHBOARD_SPACE_MEDIUM;
+ height: auto;
+}
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidget.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidget.java
new file mode 100644
index 00000000000..c9b027fee99
--- /dev/null
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidget.java
@@ -0,0 +1,148 @@
+package com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.course;
+
+import java.util.Date;
+import java.util.Iterator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.i18n.client.NumberFormat;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTMLPanel;
+import com.google.gwt.user.client.ui.HasWidgets;
+import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.dashboards.gwt.client.DashboardClientFactory;
+import com.sap.sailing.dashboards.gwt.client.actions.GetStartlineAdvantageByGeometryAction;
+import com.sap.sailing.dashboards.gwt.client.widgets.PollsLiveDataEvery5Seconds;
+import com.sap.sailing.dashboards.gwt.client.widgets.header.DashboardWidgetHeaderAndNoDataMessage;
+import com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.util.LiveAverageComponent;
+import com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.wind.StartlineAdvantagesByWindWidget;
+import com.sap.sailing.dashboards.gwt.shared.DashboardURLParameters;
+import com.sap.sailing.dashboards.gwt.shared.dto.StartLineAdvantageDTO;
+import com.sap.sailing.gwt.ui.client.StringMessages;
+
+/**
+ * @author Alexander Ries (D062114)
+ *
+ */
+public class StartlineAdvantageByGeometryWidget extends Composite implements HasWidgets, PollsLiveDataEvery5Seconds {
+
+ private static StartlineAdvantageByGeometryWidgetUiBinder uiBinder = GWT
+ .create(StartlineAdvantageByGeometryWidgetUiBinder.class);
+
+ interface StartlineAdvantageByGeometryWidgetUiBinder extends UiBinder {
+ }
+
+ @UiField(provided = true)
+ DashboardWidgetHeaderAndNoDataMessage dashboardWidgetHeaderAndNoDataMessage;
+
+ @UiField(provided = true)
+ LiveAverageComponent advantageMaximumLiveAverage;
+
+ @UiField
+ HTMLPanel contentContainer;
+
+ private DashboardClientFactory dashboardClientFactory;
+ private GetStartlineAdvantageByGeometryAction getStartlineAdvantageByGeometryAction;
+ private static final Logger logger = Logger.getLogger(StartlineAdvantagesByWindWidget.class.getName());
+
+ public StartlineAdvantageByGeometryWidget(DashboardClientFactory dashboardClientFactory) {
+ StartlineAdvantageByGeometryWidgetRessources.INSTANCE.gss().ensureInjected();
+ String leaderboardNameParameterValue = DashboardURLParameters.LEADERBOARD_NAME.getValue();
+ if (leaderboardNameParameterValue != null) {
+ this.getStartlineAdvantageByGeometryAction = new GetStartlineAdvantageByGeometryAction(leaderboardNameParameterValue);
+ }
+ this.dashboardClientFactory = dashboardClientFactory;
+ dashboardWidgetHeaderAndNoDataMessage = new DashboardWidgetHeaderAndNoDataMessage();
+ advantageMaximumLiveAverage = new LiveAverageComponent(StringMessages.INSTANCE.metersUnit());
+ advantageMaximumLiveAverage.liveLabel.setInnerHTML(StringMessages.INSTANCE.dashboardLiveWind());
+ advantageMaximumLiveAverage.averageLabel.setInnerHTML("" + StringMessages.INSTANCE.dashboardAverageWind()
+ + "
" + StringMessages.INSTANCE.dashboardAverageWindMinutes(15) + "
");
+ initWidget(uiBinder.createAndBindUi(this));
+ hideDataDisplayContainer();
+ dashboardWidgetHeaderAndNoDataMessage.setHeaderText(StringMessages.INSTANCE
+ .dashboardStartlineAdvantageByGeometryHeader());
+ dashboardWidgetHeaderAndNoDataMessage.showNoDataMessageWithHeaderAndMessage(
+ StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByGeometryAvailableHeader(),
+ StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByGeometryAvailableMessage());
+ registerForDashboardFiveSecondsTimer(dashboardClientFactory);
+ }
+
+ private void showDataDisplayContainer() {
+ contentContainer.getElement().getStyle().setOpacity(1.0);
+ }
+
+ private void hideDataDisplayContainer() {
+ contentContainer.getElement().getStyle().setOpacity(0.0);
+ }
+
+ @Override
+ public void timeChanged(Date newTime, Date oldTime) {
+ if (getStartlineAdvantageByGeometryAction != null) {
+ dashboardClientFactory.getDispatch().execute(getStartlineAdvantageByGeometryAction,
+ new AsyncCallback() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+ logger.log(Level.INFO, "Failed to received startline advantage by geometry");
+ hideDataDisplayContainer();
+ dashboardWidgetHeaderAndNoDataMessage.showNoDataMessageWithHeaderAndMessage(
+ StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByGeometryAvailableHeader(),
+ StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByGeometryAvailableMessage());
+ }
+
+ @Override
+ public void onSuccess(StartLineAdvantageDTO result) {
+ if (result.startLineAdvantage != null) {
+ logger.log(Level.INFO,
+ "Updating UI with RibDashboardRaceInfoDTO.startLineAdvantageDTO");
+ advantageMaximumLiveAverage.setLiveValue(NumberFormat.getFormat("#0.0").format(
+ result.startLineAdvantage.doubleValue()));
+ advantageMaximumLiveAverage.setAverageValue(NumberFormat.getFormat("#0.0").format(
+ result.average.doubleValue()));
+ showDataDisplayContainer();
+ dashboardWidgetHeaderAndNoDataMessage.hideNoDataMessage();
+ } else {
+ logger.log(Level.INFO, "RibDashboardRaceInfoDTO.startLineAdvantageDTO is 0");
+ hideDataDisplayContainer();
+ dashboardWidgetHeaderAndNoDataMessage.showNoDataMessageWithHeaderAndMessage(
+ StringMessages.INSTANCE
+ .dashboardNoStartlineAdvantagesByGeometryAvailableHeader(),
+ StringMessages.INSTANCE
+ .dashboardNoStartlineAdvantagesByGeometryAvailableMessage());
+ }
+ }
+ });
+ }
+ }
+
+ @Override
+ public void registerForDashboardFiveSecondsTimer(DashboardClientFactory dashboardClientFactory) {
+ if (dashboardClientFactory != null) {
+ dashboardClientFactory.getDashboardFiveSecondsTimer().addTimeListener(this);
+ }
+ }
+
+ @Override
+ public void add(Widget w) {
+ throw new UnsupportedOperationException("The method add(Widget w) is not supported.");
+ }
+
+ @Override
+ public void clear() {
+ throw new UnsupportedOperationException("The method clear() is not supported.");
+ }
+
+ @Override
+ public Iterator iterator() {
+ return null;
+ }
+
+ @Override
+ public boolean remove(Widget w) {
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidget.ui.xml b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidget.ui.xml
new file mode 100644
index 00000000000..ae191af9880
--- /dev/null
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidget.ui.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartLineAdvantageByGeometryWidgetRessources.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidgetRessources.java
similarity index 51%
rename from java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartLineAdvantageByGeometryWidgetRessources.java
rename to java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidgetRessources.java
index ccbc0fe1578..f45bb80527e 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartLineAdvantageByGeometryWidgetRessources.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/course/StartlineAdvantageByGeometryWidgetRessources.java
@@ -5,25 +5,16 @@ import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
import com.google.gwt.resources.client.CssResource.Shared;
-public interface StartLineAdvantageByGeometryWidgetRessources extends ClientBundle {
+public interface StartlineAdvantageByGeometryWidgetRessources extends ClientBundle {
- public static final StartLineAdvantageByGeometryWidgetRessources INSTANCE = GWT.create(StartLineAdvantageByGeometryWidgetRessources.class);
+ public static final StartlineAdvantageByGeometryWidgetRessources INSTANCE = GWT.create(StartlineAdvantageByGeometryWidgetRessources.class);
- @Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "StartLineAdvantageByGeometryWidget.gss"})
+ @Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "StartlineAdvantageByGeometryWidget.gss"})
StartLineAdvantageByGeometryGss gss();
@Shared
public interface StartLineAdvantageByGeometryGss extends CssResource {
- public String startLineAdvantageComponent_liveAveragePanel();
-
- public String startLineAdvantageComponent_header();
-
- public String startLineAdvantageComponent_livePanel();
-
- public String startLineAdvantageComponent_averagePanel();
-
- public String startLineAdvantageComponent_middleLine();
-
- public String startLineAdvantageComponent_wrapper();
+ String start_line_advantage_by_geometry_widget();
+ String advantage_maximum_live_average();
}
}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.gss b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.gss
index cdeb1373791..4a26d8200e3 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.gss
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.gss
@@ -5,33 +5,14 @@
left: 0px;
right: 0px;
top: 0px;
- bottom: 0px;
-}
-
-.header_container {
- position: absolute;
- left: 0px;
- right: 0px;
- top: 0px;
- height: 35%;
-}
-
-.header {
- height: 100%;
- margin-top: 5pt;
- line-height: 15pt;
- vertical-align: middle;
- font-size: 13pt;
- font-family: DASHBOARD_FONT_FAMILY;
- width: 100%;
- text-align: center;
- overflow: visible;
- font-weight: bold;
+ height: 110px;
+ background-color: WHITE;
+ z-index: 2;
}
.live_container {
position: absolute;
- top: 35%;
+ top: DASHBOARD_SPACE_VERY_SMALL;
bottom: 30%;
right: 52%;
left: 0%;
@@ -39,7 +20,7 @@
.average_container {
position: absolute;
- top: 35%;
+ top: DASHBOARD_SPACE_VERY_SMALL;
bottom: 30%;
right: 0%;
left: 52%;
@@ -47,7 +28,7 @@
.middle_line {
position: absolute;
- top: 35%;
+ top: 13px;
height: 30pt;
width: 1px;
left: 50%;
@@ -57,12 +38,13 @@
.panel_value_number {
font-family: DASHBOARD_FONT_FAMILY;
- font-size: 26pt;
+ font-size: DASHBOARD_FONT_SIZE_VERY_LARGE;
+ height: DASHBOARD_FONT_SIZE_VERY_LARGE;
}
.panel_value_unit {
font-family: DASHBOARD_FONT_FAMILY;
- font-size: 15pt;
+ font-size: DASHBOARD_FONT_SIZE_MEDIUM;
}
.panel_value_unit_degrees {
@@ -74,7 +56,6 @@
.value_panel {
margin: 0px;
width: 100%;
- height: 90%;
text-align: center;
font-family: DASHBOARD_FONT_FAMILY;
font-weight: bolder;
@@ -85,23 +66,27 @@
width: 100%;
height: 100%;
text-align: center;
- font-size: 11pt;
- color: grey;
+ font-size: DASHBOARD_FONT_SIZE_MEDIUM;
+ color: LIGHT_TEXT_COLOR;
font-family: DASHBOARD_FONT_FAMILY;
}
.live_label_container {
position: absolute;
- bottom: 0px;
+ top: 56px;
left: 0px;
right: 50%;
- height: 35%;
+ height: 14px;
+ padding-left: DASHBOARD_SPACE_VERY_SMALL;
+ padding-right: DASHBOARD_SPACE_VERY_SMALL;
}
.average_label_container {
position: absolute;
- bottom: 0px;
- right: 0px;
+ top: 56px;
left: 50%;
- height: 35%;
+ right: 0px;
+ height: 14px;
+ padding-left: DASHBOARD_SPACE_VERY_SMALL;
+ padding-right: DASHBOARD_SPACE_VERY_SMALL;
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.java
index dd976dc9f0a..5ec96b8befc 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.java
@@ -11,7 +11,6 @@ import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Widget;
-import com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.course.StartLineAdvantageByGeometryWidget;
import com.sap.sailing.dashboards.gwt.client.widgets.windbot.WindBotWidget;
import com.sap.sailing.dashboards.gwt.client.widgets.windbot.charts.VerticalWindChartClickListener;
import com.sap.sailing.gwt.ui.client.StringMessages;
@@ -34,9 +33,6 @@ public class LiveAverageComponent extends Composite implements HasWidgets, Verti
@UiField
public HTMLPanel liveAveragePanel;
- @UiField
- public DivElement header;
-
@UiField
SpanElement liveNumber;
@@ -78,12 +74,11 @@ public class LiveAverageComponent extends Composite implements HasWidgets, Verti
* sets a special size
*
* */
- public LiveAverageComponent(String header, String unit) {
+ public LiveAverageComponent(String unit) {
LiveAverageComponentResources.INSTANCE.gss().ensureInjected();
stringConstants = StringMessages.INSTANCE;
initWidget(uiBinder.createAndBindUi(this));
liveAveragePanel.getElement().getStyle().setProperty("backgroundColor", "white");
- this.header.setInnerText(header);
this.liveUnit.setInnerText(unit);
this.averageUnit.setInnerText(unit);
// Lifts the degrees unit string "°". Otherwise it would be too small.
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.ui.xml b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.ui.xml
index 907458fd311..4780e7128cb 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.ui.xml
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponent.ui.xml
@@ -2,40 +2,29 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
+
-
-
+
-
-
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponentResources.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponentResources.java
index 2809a676b98..16f81f74f6b 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponentResources.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/util/LiveAverageComponentResources.java
@@ -17,8 +17,6 @@ public interface LiveAverageComponentResources extends ClientBundle {
interface LiveAverageComponentGss extends CssResource {
String live_average_component();
- String header();
- String header_container();
String live_container();
String average_container();
String middle_line();
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.gss b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.gss
index 3d15fb8ff12..0a0fe674631 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.gss
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.gss
@@ -1,21 +1,24 @@
@require 'theme';
-.start_line_advantages_by_wind_component{
+.start_line_advantages_by_wind_component {
position: absolute;
height: 100%;
width: 100%;
+ background-color: LIGHT_GREY;
+ border-radius: DASHBOARD_BORDER_RADIUS;
+ overflow: hidden;
}
-.advantage_maximum_live_average{
+.advantage_maximum_live_average {
position: absolute;
- height: 30%;
width: 100%;
- top: 4pt;
+ top: DASHBOARD_SPACE_MEDIUM;
+ height: auto;
}
-.advantages_on_line_chart_container{
- position: absolute;
- height: 70%;
- top: 30%;
+.advantages_on_line_chart_container {
+ position: absolute;
+ top: 145px;
width: 100%;
+ bottom: 0px;
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.java
index c54b0cc2482..2c9eb3aea66 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.java
@@ -6,18 +6,19 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.i18n.client.NumberFormat;
import com.google.gwt.resources.client.CssResource;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.dashboards.gwt.client.DashboardClientFactory;
import com.sap.sailing.dashboards.gwt.client.actions.GetStartlineAdvantagesByWindAction;
import com.sap.sailing.dashboards.gwt.client.widgets.PollsLiveDataEvery5Seconds;
+import com.sap.sailing.dashboards.gwt.client.widgets.header.DashboardWidgetHeaderAndNoDataMessage;
import com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.util.LiveAverageComponent;
import com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.wind.charts.StartlineAdvantagesOnLineChart;
import com.sap.sailing.dashboards.gwt.shared.DashboardURLParameters;
@@ -40,47 +41,63 @@ public class StartlineAdvantagesByWindWidget extends Composite implements HasWid
}
+ @UiField(provided = true)
+ DashboardWidgetHeaderAndNoDataMessage dashboardWidgetHeaderAndNoDataMessage;
+
@UiField(provided = true)
LiveAverageComponent advantageMaximumLiveAverage;
@UiField(provided = true)
StartlineAdvantagesOnLineChart startlineAdvantagesOnLineChart;
- public DashboardClientFactory dashboardClientFactory;
+ @UiField
+ HTMLPanel dataDisplayContainer;
+
+ private GetStartlineAdvantagesByWindAction getStartlineAdvantagesByWindAction;
+ private DashboardClientFactory dashboardClientFactory;
private static final Logger logger = Logger.getLogger(StartlineAdvantagesByWindWidget.class.getName());
public StartlineAdvantagesByWindWidget(DashboardClientFactory dashboardClientFactory) {
StartlineAdvantagesByWindWidgetResources.INSTANCE.gss().ensureInjected();
+ String leaderboardNameParameterValue = DashboardURLParameters.LEADERBOARD_NAME.getValue();
+ if (leaderboardNameParameterValue != null) {
+ getStartlineAdvantagesByWindAction = new GetStartlineAdvantagesByWindAction(leaderboardNameParameterValue);
+ }
this.dashboardClientFactory = dashboardClientFactory;
+ dashboardWidgetHeaderAndNoDataMessage = new DashboardWidgetHeaderAndNoDataMessage();
+ advantageMaximumLiveAverage = new LiveAverageComponent(StringMessages.INSTANCE.metersUnit());
startlineAdvantagesOnLineChart = new StartlineAdvantagesOnLineChart();
- advantageMaximumLiveAverage = new LiveAverageComponent(StringMessages.INSTANCE.dashboardStartlineAdvantagesByWind(), "m");
- advantageMaximumLiveAverage.header.getStyle().setFontSize(14, Unit.PT);
advantageMaximumLiveAverage.liveLabel.setInnerHTML("advantage max.");
advantageMaximumLiveAverage.averageLabel.setInnerHTML("advantage max. average "+StringMessages.INSTANCE.dashboardAverageWindMinutes(15));
initWidget(uiBinder.createAndBindUi(this));
+ hideDataDisplayContainer();
+ dashboardWidgetHeaderAndNoDataMessage.setHeaderText(StringMessages.INSTANCE.dashboardStartlineAdvantagesByWindHeader());
+ dashboardWidgetHeaderAndNoDataMessage.showNoDataMessageWithHeaderAndMessage(StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByWindAvailableHeader(), StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByWindAvailableMessage());
+ dataDisplayContainer.getElement().getStyle().setOpacity(0.0);
registerForDashboardFiveSecondsTimer(dashboardClientFactory);
}
private void loadData() {
logger.log(Level.INFO, "Executing GetStartlineAdvantagesAction");
- String leaderboardNameParameterValue = DashboardURLParameters.LEADERBOARD_NAME.getValue();
- if (leaderboardNameParameterValue != null) {
- dashboardClientFactory.getDispatch().execute(
- new GetStartlineAdvantagesByWindAction(leaderboardNameParameterValue),
+ if (getStartlineAdvantagesByWindAction != null) {
+ dashboardClientFactory.getDispatch().execute(getStartlineAdvantagesByWindAction,
new AsyncCallback() {
@Override
public void onSuccess(StartlineAdvantagesWithMaxAndAverageDTO result) {
logger.log(Level.INFO, "Received StartlineAdvantagesWithMaxAndAverageDTO");
if (result != null && result.maximum != null && result.average != null) {
+ dashboardWidgetHeaderAndNoDataMessage.hideNoDataMessage();
logger.log(Level.INFO, "Updating UI with StartlineAdvantagesWithMaxAndAverageDTO");
startlineAdvantagesOnLineChart.setStartlineAdvantagesAndConfidences(result.distanceToRCBoatToStartlineAdvantage, result.distanceToRCBoatToConfidence);
advantageMaximumLiveAverage.setLiveValue(NumberFormat.getFormat("#0.0").format(
result.maximum.doubleValue()));
advantageMaximumLiveAverage.setAverageValue(NumberFormat.getFormat("#0.0").format(
result.average.doubleValue()));
+ showDataDisplayContainer();
} else {
logger.log(Level.INFO, "StartlineAdvantagesWithMaxAndAverageDTO is null");
+ dashboardWidgetHeaderAndNoDataMessage.showNoDataMessageWithHeaderAndMessage(StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByWindAvailableHeader(), StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByWindAvailableMessage());
}
}
@@ -88,11 +105,20 @@ public class StartlineAdvantagesByWindWidget extends Composite implements HasWid
public void onFailure(Throwable caught) {
logger.log(Level.INFO, "Failed to received StartlineAdvantagesWithMaxAndAverageDTO, "
+ caught.getMessage());
+ dashboardWidgetHeaderAndNoDataMessage.showNoDataMessageWithHeaderAndMessage(StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByWindAvailableHeader(), StringMessages.INSTANCE.dashboardNoStartlineAdvantagesByWindAvailableMessage());
}
});
}
}
+ private void showDataDisplayContainer(){
+ dataDisplayContainer.getElement().getStyle().setOpacity(1.0);
+ }
+
+ private void hideDataDisplayContainer(){
+ dataDisplayContainer.getElement().getStyle().setOpacity(0.0);
+ }
+
@Override
public void timeChanged(Date newTime, Date oldTime) {
loadData();
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.ui.xml b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.ui.xml
index 4b8cd97fb6b..2a7f23688ce 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.ui.xml
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startlineadvantage/wind/StartlineAdvantagesByWindWidget.ui.xml
@@ -2,16 +2,21 @@
+ xmlns:chart="urn:import:com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.wind.charts"
+ xmlns:header="urn:import:com.sap.sailing.dashboards.gwt.client.widgets.header">
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.gss b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.gss
index 3443715463a..12939789ba7 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.gss
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.gss
@@ -1,23 +1,27 @@
@require 'theme';
-.wind_bot_component{
+.wind_bot_widget{
position: absolute;
height: 100%;
width: 100%;
+ background-color: LIGHT_GREY;
z-index: 5;
+ border-radius: DASHBOARD_BORDER_RADIUS;
+ overflow: hidden;
}
-.name_panel {
- height: 45pt;
- line-height: 45pt;
+.live_average_header {
+ position: absolute;
+ height: 60px;
+ top: DASHBOARD_SPACE_MEDIUM;
+ line-height: 60px;
vertical-align: middle;
- font-size: 14pt;
+ font-size: DASHBOARD_FONT_SIZE_LARGE;
font-family: DASHBOARD_FONT_FAMILY;
- width: 100%;
text-align: center;
font-weight: bold;
overflow: visible;
- background-color: white;
+ background-color: WHITE;
}
.live_average_container {
@@ -25,41 +29,34 @@
border: none;
border-radius: 0pt;
background-color: white;
- top: 45pt;
- bottom: 65%;
+ top: 90px;
}
.left {
- left: 0pt;
+ left: 0px;
right: 50%;
}
.right {
left: 50%;
- right: 0pt;
+ right: 0px;
}
.windchart_container {
position: absolute;
border: none;
- border-radius: 0pt;
+ border-radius: 0px;
background-color: white;
- top: 35%;
- bottom: 0pt;
+ top: 190px;
+ bottom: 0px;
+ padding-bottom: 10px;
}
.windchart{
- position: absolute;
- left: 0pt;
- right: 0pt;
- top: 0pt;
- bottom: 0pt;
-}
-
-.compass_container{
position: absolute;
- height: 45pt;
- width: 45pt;
- top: 5pt;
- right: 5pt;
-}
\ No newline at end of file
+ left: 0px;
+ right: 0px;
+ top: 0px;
+ bottom: 0px;
+ padding-bottom: 10px;
+}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.java
index 8e2b66b977e..6d79fe56bc4 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.java
@@ -7,15 +7,17 @@ import java.util.logging.Logger;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
+import com.google.gwt.dom.client.DivElement;
import com.google.gwt.i18n.client.NumberFormat;
-import com.google.gwt.resources.client.CssResource;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.dashboards.gwt.client.DashboardClientFactory;
import com.sap.sailing.dashboards.gwt.client.dataretriever.WindBotDataRetrieverListener;
+import com.sap.sailing.dashboards.gwt.client.widgets.header.DashboardWidgetHeaderAndNoDataMessage;
import com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.util.LiveAverageComponent;
import com.sap.sailing.dashboards.gwt.client.widgets.windbot.charts.VerticalWindChart;
import com.sap.sailing.dashboards.gwt.client.widgets.windbot.compass.LocationPointerCompass;
@@ -49,18 +51,18 @@ public class WindBotWidget extends Composite implements HasWidgets, WindBotDataR
interface WindBotWidgetUiBinder extends UiBinder {
}
-
- interface WindBotComponentStyle extends CssResource {
- }
@UiField
- public HTMLPanel windBotComponent;
-
- /**
- * The header of the widget displaying the name of the wind bot.
- * */
+ HTMLPanel contentContainer;
+
+ @UiField(provided = true)
+ DashboardWidgetHeaderAndNoDataMessage dashboardWidgetHeaderAndNoDataMessage;
+
@UiField
- public HTMLPanel windBotNamePanel;
+ DivElement totalWindSpeedHeader;
+
+ @UiField
+ DivElement totalWindDirectionHeader;
/**
* One of two {@link LiveAverageComponent}s that display in big font the live and the average value of the measured
@@ -97,27 +99,45 @@ public class WindBotWidget extends Composite implements HasWidgets, WindBotDataR
@UiField
public LocationPointerCompass locationPointerCompass;
+ public DashboardClientFactory dashboardClientFactory;
private String windBotId;
private StringMessages stringConstants;
- private final static String UNIT_WIND_DIRECTION = "°";
- public WindBotWidget(String windBotId) {
+ public WindBotWidget(DashboardClientFactory dashboardClientFactory) {
WindBotWidgetResources.INSTANCE.gss().ensureInjected();
- this.windBotId = windBotId;
+ this.dashboardClientFactory = dashboardClientFactory;
+ dashboardWidgetHeaderAndNoDataMessage = new DashboardWidgetHeaderAndNoDataMessage();
stringConstants = StringMessages.INSTANCE;
movingAverageSpeed = new MovingAverage(500);
movingAverageDirection = new MovingAverage(500);
- trueWindSpeedLiveAverageComponent = new LiveAverageComponent(stringConstants.dashboardTrueWindSpeed(), stringConstants.dashboardTrueWindSpeedUnit());
- trueWindDirectionLiveAverageComponent = new LiveAverageComponent(stringConstants.dashboardTrueWindDirection(), UNIT_WIND_DIRECTION);
+ trueWindSpeedLiveAverageComponent = new LiveAverageComponent(stringConstants.dashboardTrueWindSpeedUnit());
+ trueWindDirectionLiveAverageComponent = new LiveAverageComponent(stringConstants.degreesUnit());
trueWindSpeedVerticalWindChart = new VerticalWindChart("#008FFF", "#6ADBFF");
trueWindDirectionVerticalWindChart = new VerticalWindChart("#008FFF", "#6ADBFF");
initWidget(uiBinder.createAndBindUi(this));
- windBotNamePanel.getElement().setInnerText(stringConstants.dashboardWindBot()+" "+ windBotId);
+ hideContentContainer();
+ dashboardWidgetHeaderAndNoDataMessage.setHeaderText(stringConstants.dashboardWindBot());
+ dashboardWidgetHeaderAndNoDataMessage.showNoDataMessageWithHeaderAndMessage(stringConstants.dashboardNoWindBotAvailableHeader(), stringConstants.dashboardNoWindBotAvailableMessage());
+ totalWindSpeedHeader.setInnerHTML(stringConstants.dashboardTrueWindSpeed());
+ totalWindDirectionHeader.setInnerHTML(stringConstants.dashboardTrueWindDirection());
trueWindSpeedVerticalWindChart.addVerticalWindChartClickListener(trueWindSpeedLiveAverageComponent);
trueWindDirectionVerticalWindChart.addVerticalWindChartClickListener(trueWindDirectionLiveAverageComponent);
}
-
- public WindTrackInfoDTO getWindTrackInfoDTOFromAndWindBotID(WindInfoForRaceDTO windInfoForRaceDTO, String id) {
+
+ public void setWindBotId(String windBotId) {
+ this.windBotId = windBotId;
+ dashboardWidgetHeaderAndNoDataMessage.setHeaderText(stringConstants.dashboardWindBot() + " " + windBotId);
+ }
+
+ private void showContentContainer(){
+ contentContainer.getElement().getStyle().setOpacity(1.0);
+ }
+
+ private void hideContentContainer(){
+ contentContainer.getElement().getStyle().setOpacity(0.0);
+ }
+
+ private WindTrackInfoDTO getWindTrackInfoDTOFromAndWindBotID(WindInfoForRaceDTO windInfoForRaceDTO, String id) {
WindTrackInfoDTO windTrackInfo = null;
for (WindSource windSource : windInfoForRaceDTO.windTrackInfoByWindSource.keySet()) {
if (windSource.getType().equals(WindSourceType.EXPEDITION) && windSource.getId() != null) {
@@ -128,26 +148,6 @@ public class WindBotWidget extends Composite implements HasWidgets, WindBotDataR
return windTrackInfo;
}
- @Override
- public void add(Widget w) {
- throw new UnsupportedOperationException("The method add(Widget w) is not supported.");
- }
-
- @Override
- public void clear() {
- throw new UnsupportedOperationException("The method clear() is not supported.");
- }
-
- @Override
- public Iterator iterator() {
- return null;
- }
-
- @Override
- public boolean remove(Widget w) {
- return false;
- }
-
/**
* Updates the classes {@link LiveAverageComponent}s and {@link VerticalWindChart}s with data AND updates the
* {@link #locationPointerCompass} with a new wind bot position !!!
@@ -161,6 +161,7 @@ public class WindBotWidget extends Composite implements HasWidgets, WindBotDataR
logger.log(Level.INFO, "WindInfoForRaceDTO contains WindTrackInfoDTO for Windbot id " + windBotId);
if (windTrackInfoDTO.windFixes != null) {
if (windTrackInfoDTO.windFixes.size() > 0) {
+ dashboardWidgetHeaderAndNoDataMessage.hideNoDataMessage();
logger.log(Level.INFO, "Upating UI with Wind Fixes for WindBot id " + windBotId);
SplitScheduler.get().schedule(new ScheduledCommand() {
@@ -190,6 +191,7 @@ public class WindBotWidget extends Composite implements HasWidgets, WindBotDataR
updateLocationPointerCompass(windTrackInfoDTO);
}
});
+ showContentContainer();
} else {
logger.log(Level.INFO, "WindTrackInfoDTO.windFixes is empty");
}
@@ -220,8 +222,7 @@ public class WindBotWidget extends Composite implements HasWidgets, WindBotDataR
}
private void updateLocationPointerCompass(final WindTrackInfoDTO windTrackInfoDTO) {
- locationPointerCompass.windBotPositionChanged(windTrackInfoDTO.windFixes
- .get(windTrackInfoDTO.windFixes.size() - 1).position);
+ locationPointerCompass.windBotPositionChanged(windTrackInfoDTO.windFixes.get(windTrackInfoDTO.windFixes.size() - 1).position);
}
private void updateMovingAverages(List windFixes) {
@@ -230,4 +231,24 @@ public class WindBotWidget extends Composite implements HasWidgets, WindBotDataR
movingAverageDirection.add(windDTO.trueWindFromDeg);
}
}
+
+ @Override
+ public void add(Widget w) {
+ throw new UnsupportedOperationException("The method add(Widget w) is not supported.");
+ }
+
+ @Override
+ public void clear() {
+ throw new UnsupportedOperationException("The method clear() is not supported.");
+ }
+
+ @Override
+ public Iterator iterator() {
+ return null;
+ }
+
+ @Override
+ public boolean remove(Widget w) {
+ return false;
+ }
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.ui.xml b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.ui.xml
index 7a9d59ee719..be7b9f0b8ec 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.ui.xml
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.ui.xml
@@ -3,12 +3,17 @@
xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:client="urn:import:com.sap.sailing.dashboards.gwt.client"
xmlns:util="urn:import:com.sap.sailing.dashboards.gwt.client.widgets.startlineadvantage.util"
xmlns:windchart="urn:import:com.sap.sailing.dashboards.gwt.client.widgets.windbot.charts"
- xmlns:compass="urn:import:com.sap.sailing.dashboards.gwt.client.widgets.windbot.compass">
+ xmlns:compass="urn:import:com.sap.sailing.dashboards.gwt.client.widgets.windbot.compass"
+ xmlns:header="urn:import:com.sap.sailing.dashboards.gwt.client.widgets.header">
-
-
+
+
+
+
+
+
@@ -27,9 +32,6 @@
-
-
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidgetResources.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidgetResources.java
index c4e600796ba..fe2c852ec8a 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidgetResources.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidgetResources.java
@@ -16,13 +16,12 @@ public interface WindBotWidgetResources extends ClientBundle {
WindBotComponentGss gss();
public interface WindBotComponentGss extends CssResource {
- String wind_bot_component();
- String name_panel();
+ String wind_bot_widget();
+ String live_average_header();
String live_average_container();
String left();
String right();
String windchart_container();
String windchart();
- String compass_container();
}
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/charts/VerticalWindChart.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/charts/VerticalWindChart.java
index 01ea5d824aa..6fb1e99d8b3 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/charts/VerticalWindChart.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/charts/VerticalWindChart.java
@@ -37,6 +37,9 @@ import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FocusPanel;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.dashboards.gwt.client.theme.Colors;
+import com.sap.sailing.dashboards.gwt.client.theme.Fonts;
+import com.sap.sailing.dashboards.gwt.client.theme.Sizes;
import com.sap.sailing.dashboards.gwt.client.util.HighchartsUtil;
import com.sap.sailing.dashboards.gwt.shared.WindType;
import com.sap.sailing.gwt.ui.client.shared.charts.ChartPointRecalculator;
@@ -138,9 +141,8 @@ public class VerticalWindChart extends Composite implements HasWidgets {
.setType(Type.DATE_TIME)
.setReversed(false)
.setLabels(
- new XAxisLabels().setStyle(new Style().setFontFamily("Arial").setFontSize("12")
- .setColor("grey"))).setLineColor("grey").setTickWidth(0.5).setLineWidth(1)
- .setTickWidth(1).setTickColor("grey").setOffset(0).setMinPadding(20).setGridLineColor("white")
+ new XAxisLabels().setStyle(new Style().setFontFamily(Fonts.DASHBOARD_FONT_FAMILY).setFontSize(Sizes.DASHBOARD_FONT_SIZE_SMALL).setColor(Colors.LIGHT_TEXT_COLOR))).setLineColor(Colors.LIGHT_TEXT_COLOR).setTickWidth(0.5).setLineWidth(1)
+ .setTickWidth(1).setTickColor(Colors.LIGHT_TEXT_COLOR).setOffset(0).setMinPadding(20).setGridLineColor(Colors.LIGHT_GREY)
.setGridLineWidth(0)
.setDateTimeLabelFormats(new DateTimeLabelFormats().setMonth("%e. %b").setYear("%b"));
}
@@ -148,12 +150,12 @@ public class VerticalWindChart extends Composite implements HasWidgets {
private void setYAxisOptions() {
verticalWindChart
.getYAxis()
- .setLineColor("grey")
+ .setLineColor(Colors.LIGHT_TEXT_COLOR)
.setTickWidth(1)
- .setTickColor("grey")
+ .setTickColor(Colors.LIGHT_TEXT_COLOR)
.setAxisTitleText(null)
.setGridLineWidth(0)
- .setAlternateGridColor("#d4d4d4")
+ .setAlternateGridColor(Colors.LIGHT_GREY)
.setLineWidth(1)
.setEndOnTick(true)
.setStartOnTick(true)
@@ -163,7 +165,7 @@ public class VerticalWindChart extends Composite implements HasWidgets {
.setMaxPadding(0)
.setLabels(
new YAxisLabels().setStyle(
- new Style().setFontFamily("Arial").setFontSize("12").setColor("grey")).setFormatter(
+ new Style().setFontFamily(Fonts.DASHBOARD_FONT_FAMILY).setFontSize(Sizes.DASHBOARD_FONT_SIZE_SMALL).setColor(Colors.LIGHT_TEXT_COLOR)).setFormatter(
new AxisLabelsFormatter() {
@Override
public String format(AxisLabelsData axisLabelsData) {
@@ -276,13 +278,15 @@ public class VerticalWindChart extends Composite implements HasWidgets {
* */
@UiHandler("verticalWindChartClickArea")
public void verticalWindChartClickAreaClicked(ClickEvent e) {
- if (chartIntervallinMinutes == SMALL_DISPLAY_INTERVALL_IN_MINUTES) {
- chartIntervallinMinutes = LARGE_DISPLAY_INTERVALL_IN_MINUTES;
- } else {
- chartIntervallinMinutes = SMALL_DISPLAY_INTERVALL_IN_MINUTES;
+ if (lastPoint != null) {
+ if (chartIntervallinMinutes == SMALL_DISPLAY_INTERVALL_IN_MINUTES) {
+ chartIntervallinMinutes = LARGE_DISPLAY_INTERVALL_IN_MINUTES;
+ } else {
+ chartIntervallinMinutes = SMALL_DISPLAY_INTERVALL_IN_MINUTES;
+ }
+ adaptVerticalWindChartExtemes(lastPoint.getX().longValue());
+ notifyVerticalWindChartClickListeners(chartIntervallinMinutes);
}
- adaptVerticalWindChartExtemes(lastPoint.getX().longValue());
- notifyVerticalWindChartClickListeners(chartIntervallinMinutes);
}
@Override
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.gss b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.gss
index adbcad59e81..c75ec51b3cb 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.gss
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.gss
@@ -1,5 +1,18 @@
@require 'theme';
+.location_pointer_compass {
+ position: absolute;
+ width: 70px;
+ height: 85px;
+ background-color: LIGHT_GREY;
+ top: 0px;
+ right: 13px;
+ z-index: 5;
+ border-bottom-left-radius: DASHBOARD_BORDER_RADIUS;
+ border-bottom-right-radius: DASHBOARD_BORDER_RADIUS;
+ overflow:hidden;
+}
+
.compass{
height: 100%;
width: 100%;
@@ -8,13 +21,13 @@
.needle{
position: absolute;
- height: 100%;
- width: 100%;
- top: 0%;
- left: 0%;
+ top: 10px;
+ left: 10px;
+ width: 50px;
+ height: 50px;
}
-.angleToLocationLabel{
+.angle_to_location {
position: absolute;
height: 10pt;
width: 100%;
@@ -23,22 +36,22 @@
text-align: center;
vertical-align: middle;
font-family: DASHBOARD_FONT_FAMILY;
- font-size: 9pt;
+ font-size: DASHBOARD_FONT_SIZE_VERY_SMALL;
font-weight: bold;
color: white;
}
-.distanceToLocationLabel{
+.distance_to_location {
position: absolute;
- height: 15pt;
+ height: DASHBOARD_FONT_SIZE_SMALL;
width: 100%;
- bottom: -17pt;
+ top: 65px;
text-align: center;
vertical-align: middle;
font-family: DASHBOARD_FONT_FAMILY;
- line-height: 10pt;
+ line-height: DASHBOARD_FONT_SIZE_SMALL;
font-weight: bold;
- font-size: 9pt;
+ font-size: DASHBOARD_FONT_SIZE_SMALL;
color: black;
z-index: 10;
}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.java
index f92b6b3a1b9..a6a3a21c52f 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.java
@@ -1,38 +1,45 @@
package com.sap.sailing.dashboards.gwt.client.widgets.windbot.compass;
+import java.util.Iterator;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.DivElement;
import com.google.gwt.i18n.client.NumberFormat;
-import com.google.gwt.user.client.ui.AbsolutePanel;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.domain.common.Position;
/**
- * The class is an UI component that should be used to display the direction and the distance from the users device to a
- * certain pointed GPS location. The class needs an {@link LocationPointerCompassAngleDistance} instance and registers
- * as an listener to it. It furthermore notifies its {@link LocationPointerCompassAngleDistance} instance about wind bot
- * GPS location changes.
- *
* @author Alexander Ries (D062114)
*
*/
-public class LocationPointerCompass extends AbsolutePanel implements HasWidgets,
- LocationPointerCompassAngleDistanceListener {
+public class LocationPointerCompass extends Composite implements HasWidgets, LocationPointerCompassAngleDistanceListener {
- private double angleOffset;
+ private static LocationPointerCompasssUiBinder uiBinder = GWT.create(LocationPointerCompasssUiBinder.class);
+
+ interface LocationPointerCompasssUiBinder extends UiBinder {
+ }
- private Image compassNeedle;
+ @UiField
+ Image compassNeedle;
/**
* The Label shows the distance the users device is away from the location it points to.
* */
- private Label distanceToPointetLocationLabel;
+ @UiField
+ DivElement distanceToPointetLocation;
/**
* The Label shows the direction in degrees from north the users device is away from the location it points to.
* */
- private Label angleToPointetLocationLabel;
+ @UiField
+ DivElement angleToPointetLocation;
+ private double angleOffset;
/**
* The {@link LocationPointerCompassAngleDistance} notifies the class about updates about angle and distance
* changes.
@@ -41,57 +48,34 @@ public class LocationPointerCompass extends AbsolutePanel implements HasWidgets,
public LocationPointerCompass() {
LocationPointerCompassRessources.INSTANCE.gss().ensureInjected();
- this.getElement().addClassName(LocationPointerCompassRessources.INSTANCE.gss().compass());
- initCompassNeedle();
- initAngleToPointetLocationLabel();
- initDistanceToPointedLocationLabel();
+ initWidget(uiBinder.createAndBindUi(this));
+ compassNeedle.setResource(LocationPointerCompassRessources.INSTANCE.compass());
locationPointerCompassAngleDistance = new LocationPointerCompassAngleDistance();
locationPointerCompassAngleDistance.addListener(this);
- locationPointerCompassAngleDistance.triggerOrientationRead();
- }
-
- private void initCompassNeedle() {
- compassNeedle = new Image();
- compassNeedle.setResource(LocationPointerCompassRessources.INSTANCE.compass());
- compassNeedle.getElement().addClassName(LocationPointerCompassRessources.INSTANCE.gss().needle());
- LocationPointerCompass.this.add(compassNeedle);
- }
-
- private void initAngleToPointetLocationLabel() {
- angleToPointetLocationLabel = new Label();
- angleToPointetLocationLabel.getElement().addClassName(LocationPointerCompassRessources.INSTANCE.gss().angleToLocationLabel());
- this.add(angleToPointetLocationLabel);
- }
-
- private void initDistanceToPointedLocationLabel() {
- distanceToPointetLocationLabel = new Label();
- distanceToPointetLocationLabel.getElement().addClassName(LocationPointerCompassRessources.INSTANCE.gss().distanceToLocationLabel());
- distanceToPointetLocationLabel.setText("m");
- this.add(distanceToPointetLocationLabel);
}
private void updateNeedleAngle(double newDirection) {
// Adapt degrees to image angle
synchronized (this) {
- double newAngle = newDirection-angleOffset;
+ double newAngle = (newDirection-angleOffset)%360;
String winddirectionformatted = NumberFormat.getFormat("#0").format(newAngle);
compassNeedle.getElement().getStyle().setProperty("transform", "rotate(" + winddirectionformatted + "deg)");
compassNeedle.getElement().getStyle()
.setProperty("webkitTransform", "rotate(" + winddirectionformatted + "deg)");
String winddirectionFormattedForLabel = NumberFormat.getFormat("#0").format((newAngle < 0) ? 360+newAngle : newAngle);
- angleToPointetLocationLabel.setText(winddirectionFormattedForLabel+"°");
+ angleToPointetLocation.setInnerHTML(winddirectionFormattedForLabel+"°");
}
}
private void updateDistanceToPointedLocationLabel(double distance, double angle) {
String distanceFormatted = NumberFormat.getFormat("#0").format(distance);
- distanceToPointetLocationLabel.setText(distanceFormatted + " m");
+ distanceToPointetLocation.setInnerHTML(distanceFormatted + " m");
}
public void windBotPositionChanged(Position positionDTO) {
locationPointerCompassAngleDistance.windBotPositionChanged(positionDTO);
}
-
+
@Override
public void angleChanged(double angle) {
updateNeedleAngle(angle);
@@ -107,4 +91,24 @@ public class LocationPointerCompass extends AbsolutePanel implements HasWidgets,
public void setAngleOffset(double offset) {
angleOffset = offset;
}
+
+ @Override
+ public void add(Widget w) {
+ throw new UnsupportedOperationException("The method add(Widget w) is not supported.");
+ }
+
+ @Override
+ public void clear() {
+ throw new UnsupportedOperationException("The method clear() is not supported.");
+ }
+
+ @Override
+ public Iterator iterator() {
+ return null;
+ }
+
+ @Override
+ public boolean remove(Widget w) {
+ return false;
+ }
}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.ui.xml b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.ui.xml
new file mode 100644
index 00000000000..9b84f404930
--- /dev/null
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompass.ui.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompassAngleDistance.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompassAngleDistance.java
index 11d2d0020c7..9aa0f802e6f 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompassAngleDistance.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompassAngleDistance.java
@@ -55,18 +55,17 @@ public class LocationPointerCompassAngleDistance implements LocationListener, Co
Double phi2 = lat2 * degreesToRadiansFactor;
Double lam1 = lng1 * degreesToRadiansFactor;
Double lam2 = lng2 * degreesToRadiansFactor;
-
double angle = Math.atan2(Math.sin(lam2 - lam1) * Math.cos(phi2),
Math.cos(phi1) * Math.sin(phi2) - Math.sin(phi1) * Math.cos(phi2) * Math.cos(lam2 - lam1))
* 180 / Math.PI;
if (angle < 0) {
angle = 360 + angle;
}
- return angle;
+ return Math.abs(angle);
}
private float getDistanceBetweenGPSPoints(double lat1, double lng1, double lat2, double lng2) {
- double earthRadius = 6371000; // kilometers
+ double earthRadius = 6371000; //kilometers
double dLat = Math.toRadians(lat2 - lat1);
double dLng = Math.toRadians(lng2 - lng1);
double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.cos(Math.toRadians(lat1))
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompassRessources.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompassRessources.java
index b38b91e3b57..2b6ae32897f 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompassRessources.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/compass/LocationPointerCompassRessources.java
@@ -18,9 +18,10 @@ public interface LocationPointerCompassRessources extends ClientBundle {
@Shared
public interface LocationPointerCompassGSS extends CssResource {
+ public String location_pointer_compass();
public String compass();
public String needle();
- public String angleToLocationLabel();
- public String distanceToLocationLabel();
+ public String angle_to_location();
+ public String distance_to_location();
}
}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startanalysis/StartAnalysisCreationController.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startanalysis/StartAnalysisCreationController.java
index c424e122404..cf6dc65b73a 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startanalysis/StartAnalysisCreationController.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startanalysis/StartAnalysisCreationController.java
@@ -14,20 +14,20 @@ public final class StartAnalysisCreationController extends AbstractStartAnalysis
private static final Logger logger = Logger.getLogger(StartAnalysisCreationController.class.getName());
- private StartAnalysisCreationController(DashboardDispatchContext ctx) {
-
- }
-
public static StartAnalysisDTO checkStartAnalysisForCompetitorInTrackedRace(DashboardDispatchContext dashboardDispatchContext, Competitor competitor, TrackedRace trackedRace) {
StartAnalysisDTO result = null;
- if (competitor != null && trackedRace != null) {
- if (threeCompetitorsPassedSecondWayPoint(trackedRace) && raceProgressedFarEnough(competitor, trackedRace)) {
- logger.log(Level.INFO, "Creating startanalysis for race " + trackedRace.getRace().getName() + " and competitor: " + competitor.getName());
- result = StartAnalysisDTOFactory.createStartAnalysisForCompetitorAndTrackedRace(dashboardDispatchContext, competitor, trackedRace);
+ if(trackedRace != null) {
+ if (competitor != null) {
+ if (threeCompetitorsPassedSecondWayPoint(trackedRace) && raceProgressedFarEnough(competitor, trackedRace)) {
+ logger.log(Level.INFO, "Creating startanalysis for race " + trackedRace.getRace().getName() + " and competitor: " + competitor.getName());
+ result = StartAnalysisDTOFactory.createStartAnalysisForCompetitorAndTrackedRace(dashboardDispatchContext, competitor, trackedRace);
+ } else {
+ logger.log(Level.INFO, "Waiting to create startanalysis for race " + trackedRace.getRace().getName() + " and competitor: " + competitor.getName());
+ }
} else {
- logger.log(Level.INFO, "Waiting to create startanalysis for race " + trackedRace.getRace().getName() + " and competitor: " + competitor.getName());
+ result = StartAnalysisDTOFactory.createStartAnalysisForCompetitorAndTrackedRace(dashboardDispatchContext, competitor, trackedRace);
}
- }
+ }
return result;
}
}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startanalysis/StartAnalysisDTOFactory.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startanalysis/StartAnalysisDTOFactory.java
index a2de29ccd6d..13dbb033026 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startanalysis/StartAnalysisDTOFactory.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startanalysis/StartAnalysisDTOFactory.java
@@ -45,19 +45,22 @@ public final class StartAnalysisDTOFactory extends AbstractStartAnalysisCreation
List competitors = new ArrayList();
Waypoint secondWaypoint = trackedRace.getRace().getCourse().getFirstLeg().getTo();
List markPassingsInOrder = convertMarkpPassingsIteratorToList(trackedRace.getMarkPassingsInOrder(secondWaypoint).iterator());
- boolean isCompetitorOneOfFirstThree = false;
+ boolean isCompetitorNullOrOneOfFirstThreeCompetitors = false;
for (int i = 0; i < MINIMUM_MARKPASSIINGS_AT_FIRST_MARK; i++) {
competitors.add(createStartAnalysisCompetitorDTO(dashboardDispatchContext, trackedRace, i + 1, markPassingsInOrder.get(i).getCompetitor()));
- if (markPassingsInOrder.get(i).getCompetitor().equals(competitor)) {
- isCompetitorOneOfFirstThree = true;
+ if (competitor == null || markPassingsInOrder.get(i).getCompetitor().equals(competitor)) {
+ isCompetitorNullOrOneOfFirstThreeCompetitors = true;
}
}
- if (!isCompetitorOneOfFirstThree) {
+ if (competitor != null && !isCompetitorNullOrOneOfFirstThreeCompetitors) {
int rankOfCompetitorWhilePassingSecondWaypoint = getRankOfCompetitorWhilePassingSecondWaypoint(competitor, trackedRace);
competitors.add(createStartAnalysisCompetitorDTO(dashboardDispatchContext, trackedRace, rankOfCompetitorWhilePassingSecondWaypoint, competitor));
}
- startAnalysisDTO.competitor = dashboardDispatchContext.getRacingEventService().getBaseDomainFactory().getCompetitorStore().convertToCompetitorDTO(competitor);
+ if (competitor != null) {
+ startAnalysisDTO.competitor = dashboardDispatchContext.getRacingEventService().getBaseDomainFactory().getCompetitorStore().convertToCompetitorDTO(competitor);
+ logger.log(Level.INFO, "Created startanalysis for competitor"+competitor);
+ }
startAnalysisDTO.startAnalysisCompetitorDTOs = competitors;
final Boolean isGateStart = trackedRace.isGateStart();
if(isGateStart == Boolean.TRUE){
@@ -77,7 +80,7 @@ public final class StartAnalysisDTOFactory extends AbstractStartAnalysisCreation
startAnalysisDTO.tailLenghtInMilliseconds = ONE_MINUTE_INTERVALL_IN_MILLISECONDS;
}
startAnalysisDTO.regattaAndRaceIdentifier = trackedRace.getRaceIdentifier();
- logger.log(Level.INFO, "Created startanalysis for competitor " + competitor.getName() + " and "+ trackedRace.getRace().getName());
+ logger.log(Level.INFO, "Created startanalysis for "+ trackedRace.getRace().getName());
return startAnalysisDTO;
}
@@ -185,8 +188,7 @@ public final class StartAnalysisDTOFactory extends AbstractStartAnalysisCreation
}
}
- private static StartAnalysisCompetitorDTO createStartAnalysisCompetitorDTO(DashboardDispatchContext dashboardDispatchContext, TrackedRace trackedRace, int rank,
- Competitor competitor) {
+ private static StartAnalysisCompetitorDTO createStartAnalysisCompetitorDTO(DashboardDispatchContext dashboardDispatchContext, TrackedRace trackedRace, int rank, Competitor competitor) {
StartAnalysisCompetitorDTO startAnalysisCompetitorDTOsForRace = new StartAnalysisCompetitorDTO();
startAnalysisCompetitorDTOsForRace.competitorDTO = dashboardDispatchContext.getRacingEventService().getBaseDomainFactory().getCompetitorStore()
.convertToCompetitorDTO(competitor);
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/DefaultPolarWindAngleBoatSpeedFunction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/DefaultPolarWindAngleBoatSpeedFunction.java
index 7b16e26be3d..e2365db78ec 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/DefaultPolarWindAngleBoatSpeedFunction.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/DefaultPolarWindAngleBoatSpeedFunction.java
@@ -4,6 +4,9 @@ import org.apache.commons.math.ArgumentOutsideDomainException;
import org.apache.commons.math.analysis.interpolation.SplineInterpolator;
import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction;
+import com.sap.sailing.domain.base.SpeedWithConfidence;
+import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl;
+import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Speed;
import com.sap.sailing.domain.common.impl.KnotSpeedImpl;
@@ -27,11 +30,11 @@ public class DefaultPolarWindAngleBoatSpeedFunction {
windAngleBoatBearingSpeedFunction = splineInterpolator.interpolate(windAngleXValues, boatBearingYValues);
}
- public Speed getBoatSpeedForWindAngleAndSpeed(double angle, double speed) {
- Speed result = null;
+ public SpeedWithConfidence getBoatSpeedForWindAngleAndSpeed(Bearing angleToWind, Speed speed) {
+ SpeedWithConfidence result = null;
try {
- double boatSpeed = windAngleBoatBearingSpeedFunction.value(convert360AngleTo180RangeAngle(angle));
- result = new KnotSpeedImpl(boatSpeed);
+ KnotSpeedImpl boatSpeed = new KnotSpeedImpl(windAngleBoatBearingSpeedFunction.value(convert360AngleTo180RangeAngle(angleToWind.getDegrees())));
+ result = new SpeedWithConfidenceImpl(boatSpeed, 0.5 , null);
} catch (ArgumentOutsideDomainException e) {
e.printStackTrace();
}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantagesByWindCalculator.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantagesByWindCalculator.java
index 806bd4bbf3c..a04a9ed9e65 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantagesByWindCalculator.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantagesByWindCalculator.java
@@ -10,12 +10,16 @@ import com.sap.sailing.dashboards.gwt.server.util.actions.startlineadvantage.pre
import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchContext;
import com.sap.sailing.dashboards.gwt.shared.dto.StartLineAdvantageDTO;
import com.sap.sailing.dashboards.gwt.shared.dto.StartlineAdvantagesWithMaxAndAverageDTO;
+import com.sap.sailing.domain.base.DomainFactory;
+import com.sap.sailing.domain.base.SpeedWithConfidence;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.Speed;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
+import com.sap.sailing.domain.common.impl.KnotSpeedImpl;
import com.sap.sailing.domain.common.impl.MeterDistance;
+import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util.Pair;
@@ -24,34 +28,38 @@ import com.sap.sse.common.Util.Pair;
* @author Alexander Ries (D062114)
*
*/
-public class StartlineAdvantagesByWindCalculator extends AbstracPreCalculationDataRetriever {
+public class StartlineAdvantagesByWindCalculator extends AbstracPreCalculationDataRetriever {
private DashboardDispatchContext dashboardDispatchContext;
+ private DomainFactory domainFactory;
private DefaultPolarWindAngleBoatSpeedFunction defaultPolarSpeedWindAngleFunction;
-
- private final Logger logger = Logger.getLogger(StartlineAdvantagesByWindCalculator.class.getName());
-
- public StartlineAdvantagesByWindCalculator(DashboardDispatchContext dashboardDispatchContext){
+
+ private final Logger logger = Logger.getLogger(StartlineAdvantagesByWindCalculator.class.getName());
+
+ public StartlineAdvantagesByWindCalculator(DashboardDispatchContext dashboardDispatchContext, DomainFactory domainFactory) {
+ super(domainFactory);
this.dashboardDispatchContext = dashboardDispatchContext;
+ this.domainFactory = domainFactory;
this.defaultPolarSpeedWindAngleFunction = new DefaultPolarWindAngleBoatSpeedFunction();
}
-
- public StartlineAdvantagesWithMaxAndAverageDTO getStartLineAdvantagesAccrossLineFromTrackedRaceAtTimePoint(TrackedRace trackedRace,TimePoint timepoint) {
+
+ public StartlineAdvantagesWithMaxAndAverageDTO getStartLineAdvantagesAccrossLineFromTrackedRaceAtTimePoint(
+ TrackedRace trackedRace, TimePoint timepoint) {
StartlineAdvantagesWithMaxAndAverageDTO result = new StartlineAdvantagesWithMaxAndAverageDTO();
if (trackedRace != null) {
retrieveDataForCalculation(trackedRace, dashboardDispatchContext.getPolarDataService());
- if (wind != null) {
+ if (getWind() != null) {
Pair startlineAdvantagesAndConfidencesAsArray = null;
if (isStartlineCompletelyUnderneathLaylines()) {
logger.log(Level.INFO, "Startline is completely underneath laylines");
- Pair advantagesRange = new Pair(0.0, startlineLenghtInMeters);
+ Pair advantagesRange = new Pair(0.0, getStartlineLenghtInMeters());
List startlineAdvantages = calculateStartlineAdvantagesUnderneathLaylinesInRange(advantagesRange);
double maximum = getMaximumAdvantageOfStartlineAdvantageDTOs(startlineAdvantages);
result.maximum = maximum;
startlineAdvantagesAndConfidencesAsArray = convertStartLineAdvantageDTOListToPointAndConfidenceArrays(startlineAdvantages);
} else if (isStartlineCompletelyAboveLaylines()) {
logger.log(Level.INFO, "Startline is completely above laylines");
- Pair advantagesRange = new Pair(0.0, startlineLenghtInMeters);
+ Pair advantagesRange = new Pair(0.0, getStartlineLenghtInMeters());
List startlineAdvantages = calculatePolarBasedStartlineAdvantagesInRange(advantagesRange);
subtractMinimumOfAllStartlineAdvantages(startlineAdvantages);
double maximum = getMaximumAdvantageOfStartlineAdvantageDTOs(startlineAdvantages);
@@ -83,105 +91,112 @@ public class StartlineAdvantagesByWindCalculator extends AbstracPreCalculationD
}
return result;
}
-
- private boolean isBearingAboveAdvantageLines(Bearing bearing){
+
+ private boolean isBearingAboveAdvantageLines(Bearing bearing) {
boolean result = false;
- Bearing bearingOfRightLaylineInDeg = new DegreeBearingImpl(wind.getBearing().getDegrees() - meouvreAngle / 2);
- Bearing bearingOfLeftLaylineInDeg = new DegreeBearingImpl(wind.getBearing().getDegrees() + meouvreAngle / 2);
- if (bearing.getDegrees() < bearingOfRightLaylineInDeg.getDegrees() && bearing.getDegrees() > 0 ||
- bearing.getDegrees() > bearingOfLeftLaylineInDeg.getDegrees() && bearing.getDegrees() < 360) {
+ Bearing bearingOfRightLaylineInDeg = new DegreeBearingImpl(getWind().getBearing().getDegrees()
+ - getManeuverAngle() / 2);
+ Bearing bearingOfLeftLaylineInDeg = new DegreeBearingImpl(getWind().getBearing().getDegrees()
+ + getManeuverAngle() / 2);
+ if (bearing.getDegrees() < bearingOfRightLaylineInDeg.getDegrees() && bearing.getDegrees() > 0
+ || bearing.getDegrees() > bearingOfLeftLaylineInDeg.getDegrees() && bearing.getDegrees() < 360) {
result = true;
}
return result;
}
-
- private boolean isBearingUnderneathAdvantageLines(Bearing bearing){
+
+ private boolean isBearingUnderneathAdvantageLines(Bearing bearing) {
boolean result = false;
- Bearing bearingOfRightLaylineInDeg = new DegreeBearingImpl(wind.getBearing().getDegrees() - meouvreAngle / 2);
- Bearing bearingOfLeftLaylineInDeg = new DegreeBearingImpl(wind.getBearing().getDegrees() + meouvreAngle / 2);
- logger.log(Level.INFO, "Underneath bearingOfRightLaylineInDeg?"+bearingOfRightLaylineInDeg);
- logger.log(Level.INFO, "Underneath bearingOfLeftLaylineInDeg?"+bearingOfLeftLaylineInDeg);
- if (bearing.getDegrees() > bearingOfRightLaylineInDeg.getDegrees() && bearing.getDegrees() < bearingOfLeftLaylineInDeg.getDegrees()) {
+ Bearing bearingOfRightLaylineInDeg = new DegreeBearingImpl(getWind().getBearing().getDegrees()
+ - getManeuverAngle() / 2);
+ Bearing bearingOfLeftLaylineInDeg = new DegreeBearingImpl(getWind().getBearing().getDegrees()
+ + getManeuverAngle() / 2);
+ logger.log(Level.INFO, "Underneath bearingOfRightLaylineInDeg?" + bearingOfRightLaylineInDeg);
+ logger.log(Level.INFO, "Underneath bearingOfLeftLaylineInDeg?" + bearingOfLeftLaylineInDeg);
+ if (bearing.getDegrees() > bearingOfRightLaylineInDeg.getDegrees()
+ && bearing.getDegrees() < bearingOfLeftLaylineInDeg.getDegrees()) {
result = true;
}
return result;
}
-
+
private boolean isStartlineCompletelyAboveLaylines() {
boolean result = false;
- Bearing bearingRCBoatToFirstMark = new DegreeBearingImpl(
- startlineAndFirstMarkPositions.firstMarkPosition.getBearingGreatCircle(
- startlineAndFirstMarkPositions.startBoatPosition).getDegrees());
- Bearing bearingPinEndToFirstMark = new DegreeBearingImpl(
- startlineAndFirstMarkPositions.firstMarkPosition.getBearingGreatCircle(
- startlineAndFirstMarkPositions.pinEndPosition).getDegrees());
- if (isBearingAboveAdvantageLines(bearingRCBoatToFirstMark) && isBearingAboveAdvantageLines(bearingPinEndToFirstMark)) {
+ Bearing bearingRCBoatToFirstMark = new DegreeBearingImpl(getStartlineAndFirstMarkPositions().firstMarkPosition
+ .getBearingGreatCircle(getStartlineAndFirstMarkPositions().startBoatPosition).getDegrees());
+ Bearing bearingPinEndToFirstMark = new DegreeBearingImpl(getStartlineAndFirstMarkPositions().firstMarkPosition
+ .getBearingGreatCircle(getStartlineAndFirstMarkPositions().pinEndPosition).getDegrees());
+ if (isBearingAboveAdvantageLines(bearingRCBoatToFirstMark)
+ && isBearingAboveAdvantageLines(bearingPinEndToFirstMark)) {
result = true;
}
return result;
}
-
+
private boolean isStartlineCompletelyUnderneathLaylines() {
boolean result = false;
- Bearing bearingFirstMarkToRCBoat = new DegreeBearingImpl(
- startlineAndFirstMarkPositions.firstMarkPosition.getBearingGreatCircle(
- startlineAndFirstMarkPositions.startBoatPosition).getDegrees());
- Bearing bearingFirstMarkToPinEnd = new DegreeBearingImpl(
- startlineAndFirstMarkPositions.firstMarkPosition.getBearingGreatCircle(
- startlineAndFirstMarkPositions.pinEndPosition).getDegrees());
- logger.log(Level.INFO, "Underneath RC?"+bearingFirstMarkToRCBoat);
- logger.log(Level.INFO, "Underneath PIN?"+bearingFirstMarkToPinEnd);
- if (isBearingUnderneathAdvantageLines(bearingFirstMarkToRCBoat) && isBearingUnderneathAdvantageLines(bearingFirstMarkToPinEnd)) {
+ Bearing bearingFirstMarkToRCBoat = new DegreeBearingImpl(getStartlineAndFirstMarkPositions().firstMarkPosition
+ .getBearingGreatCircle(getStartlineAndFirstMarkPositions().startBoatPosition).getDegrees());
+ Bearing bearingFirstMarkToPinEnd = new DegreeBearingImpl(getStartlineAndFirstMarkPositions().firstMarkPosition
+ .getBearingGreatCircle(getStartlineAndFirstMarkPositions().pinEndPosition).getDegrees());
+ logger.log(Level.INFO, "Underneath RC?" + bearingFirstMarkToRCBoat);
+ logger.log(Level.INFO, "Underneath PIN?" + bearingFirstMarkToPinEnd);
+ if (isBearingUnderneathAdvantageLines(bearingFirstMarkToRCBoat)
+ && isBearingUnderneathAdvantageLines(bearingFirstMarkToPinEnd)) {
result = true;
}
return result;
}
-
- private Pair getStartAndEndPointOfPolarBasedStartlineAdvatagesInDistancesToRCBoat(Position rightIntersection, Position leftIntersection) {
+
+ private Pair getStartAndEndPointOfPolarBasedStartlineAdvatagesInDistancesToRCBoat(
+ Position rightIntersection, Position leftIntersection) {
Pair result = null;
- if(rightIntersection != null && leftIntersection == null) {
- double distanceFromIntersectionToRCBoatInMeters = rightIntersection.getDistance(startlineAndFirstMarkPositions.startBoatPosition).getMeters();
+ if (rightIntersection != null && leftIntersection == null) {
+ double distanceFromIntersectionToRCBoatInMeters = rightIntersection.getDistance(
+ getStartlineAndFirstMarkPositions().startBoatPosition).getMeters();
result = new Pair(0.0, distanceFromIntersectionToRCBoatInMeters);
- } else if(rightIntersection == null && leftIntersection != null) {
- double distanceFromIntersectionToRCBoatInMeters = leftIntersection.getDistance(startlineAndFirstMarkPositions.startBoatPosition).getMeters();
- result = new Pair(distanceFromIntersectionToRCBoatInMeters, startlineLenghtInMeters);
- } else if(rightIntersection != null && leftIntersection != null) {
- result = new Pair(0.0, startlineLenghtInMeters);
+ } else if (rightIntersection == null && leftIntersection != null) {
+ double distanceFromIntersectionToRCBoatInMeters = leftIntersection.getDistance(
+ getStartlineAndFirstMarkPositions().startBoatPosition).getMeters();
+ result = new Pair(distanceFromIntersectionToRCBoatInMeters, getStartlineLenghtInMeters());
+ } else if (rightIntersection != null && leftIntersection != null) {
+ result = new Pair(0.0, getStartlineLenghtInMeters());
}
return result;
}
-
- private Position getIntersectionOfRightLaylineAndStartline () {
+
+ private Position getIntersectionOfRightLaylineAndStartline() {
Position result = null;
- Bearing bearingOfRightLaylineInDeg = new DegreeBearingImpl(wind.getBearing().getDegrees() - meouvreAngle / 2);
+ Bearing bearingOfRightLaylineInDeg = new DegreeBearingImpl(getWind().getBearing().getDegrees()
+ - getManeuverAngle() / 2);
result = calculateIntersectionPointsOfStartlineAndLaylineWithBearing(bearingOfRightLaylineInDeg);
return result;
}
-
- private Position getIntersectionOfLeftLaylineAndStartline () {
+
+ private Position getIntersectionOfLeftLaylineAndStartline() {
Position result = null;
- Bearing bearingOfRightLaylineInDeg = new DegreeBearingImpl(wind.getBearing().getDegrees() + meouvreAngle / 2);
+ Bearing bearingOfRightLaylineInDeg = new DegreeBearingImpl(getWind().getBearing().getDegrees()
+ + getManeuverAngle() / 2);
result = calculateIntersectionPointsOfStartlineAndLaylineWithBearing(bearingOfRightLaylineInDeg);
return result;
}
-
+
private Position calculateIntersectionPointsOfStartlineAndLaylineWithBearing(Bearing bearing) {
Position result = null;
- Bearing bearingOfStartlineInRad = startlineAndFirstMarkPositions.startBoatPosition
- .getBearingGreatCircle(startlineAndFirstMarkPositions.pinEndPosition);
+ Bearing bearingOfStartlineInRad = getStartlineAndFirstMarkPositions().startBoatPosition
+ .getBearingGreatCircle(getStartlineAndFirstMarkPositions().pinEndPosition);
Bearing bearingOfStartlineInDeg = new DegreeBearingImpl(bearingOfStartlineInRad.getDegrees());
logger.log(Level.INFO, "bearingOfStartlineInDeg " + bearingOfStartlineInDeg);
logger.log(Level.INFO, "bearingOfLaylineInDeg " + bearing);
- Position intersectionPointLaylineStartline = startlineAndFirstMarkPositions.firstMarkPosition
- .getIntersection(bearing, startlineAndFirstMarkPositions.pinEndPosition,
- bearingOfStartlineInDeg);
+ Position intersectionPointLaylineStartline = getStartlineAndFirstMarkPositions().firstMarkPosition.getIntersection(
+ bearing, getStartlineAndFirstMarkPositions().pinEndPosition, bearingOfStartlineInDeg);
logger.log(Level.INFO, "rightIntersectionPointLaylineStartline " + intersectionPointLaylineStartline);
Bearing bearingIntersectionPointToFirstMark = new DegreeBearingImpl(
- startlineAndFirstMarkPositions.firstMarkPosition.getBearingGreatCircle(
+ getStartlineAndFirstMarkPositions().firstMarkPosition.getBearingGreatCircle(
intersectionPointLaylineStartline).getDegrees());
- if (bearingIntersectionPointToFirstMark.getDegrees() < bearing.getDegrees() + 1 &&
- bearingIntersectionPointToFirstMark.getDegrees() > bearing.getDegrees() - 1 &&
- isOnStartline(intersectionPointLaylineStartline)) {
+ if (bearingIntersectionPointToFirstMark.getDegrees() < bearing.getDegrees() + 1
+ && bearingIntersectionPointToFirstMark.getDegrees() > bearing.getDegrees() - 1
+ && isOnStartline(intersectionPointLaylineStartline)) {
result = intersectionPointLaylineStartline;
logger.log(Level.INFO, "Layline crosses startline");
}
@@ -192,17 +207,19 @@ public class StartlineAdvantagesByWindCalculator extends AbstracPreCalculationD
private boolean isOnStartline(Position position) {
boolean result = false;
- Distance distanceToStartline = position.getDistanceToLine(startlineAndFirstMarkPositions.startBoatPosition, startlineAndFirstMarkPositions.pinEndPosition);
+ Distance distanceToStartline = position.getDistanceToLine(getStartlineAndFirstMarkPositions().startBoatPosition,
+ getStartlineAndFirstMarkPositions().pinEndPosition);
if (distanceToStartline.getMeters() < 1) {
result = true;
}
return result;
}
- private List addClosingZeroPointToMixedAdvantages(List advantages, Pair rangePinEndStartlineAdvantage) {
+ private List addClosingZeroPointToMixedAdvantages(List advantages,
+ Pair rangePinEndStartlineAdvantage) {
StartLineAdvantageDTO startLineAdvantageDTO = new StartLineAdvantageDTO();
startLineAdvantageDTO.confidence = 1.0;
- if(rangePinEndStartlineAdvantage.getA() > 0) {
+ if (rangePinEndStartlineAdvantage.getA() > 0) {
startLineAdvantageDTO.distanceToRCBoatInMeters = rangePinEndStartlineAdvantage.getB();
startLineAdvantageDTO.startLineAdvantage = 0.0;
advantages.add(startLineAdvantageDTO);
@@ -213,40 +230,44 @@ public class StartlineAdvantagesByWindCalculator extends AbstracPreCalculationD
}
return advantages;
}
-
- private Pair getPinEndStartlineAdvantagesRangeFromPolarAdvantagesRange(Pair rangePolarBasedStartlineAdvatages) {
+
+ private Pair getPinEndStartlineAdvantagesRangeFromPolarAdvantagesRange(
+ Pair rangePolarBasedStartlineAdvatages) {
Pair result = null;
double pinEndStartlineAdvantagesStart;
double pinEndStartlineAdvantagesEnd;
- if(rangePolarBasedStartlineAdvatages.getA().doubleValue() == 0.0 && rangePolarBasedStartlineAdvatages.getB().doubleValue() != startlineLenghtInMeters) {
+ if (rangePolarBasedStartlineAdvatages.getA().doubleValue() == 0.0
+ && rangePolarBasedStartlineAdvatages.getB().doubleValue() != getStartlineLenghtInMeters()) {
pinEndStartlineAdvantagesStart = rangePolarBasedStartlineAdvatages.getB().doubleValue();
- pinEndStartlineAdvantagesEnd = startlineLenghtInMeters;
+ pinEndStartlineAdvantagesEnd = getStartlineLenghtInMeters();
result = new Pair(pinEndStartlineAdvantagesStart, pinEndStartlineAdvantagesEnd);
- } else if (rangePolarBasedStartlineAdvatages.getA().doubleValue() != 0.0 && rangePolarBasedStartlineAdvatages.getB().doubleValue() == startlineLenghtInMeters) {
+ } else if (rangePolarBasedStartlineAdvatages.getA().doubleValue() != 0.0
+ && rangePolarBasedStartlineAdvatages.getB().doubleValue() == getStartlineLenghtInMeters()) {
pinEndStartlineAdvantagesStart = 0.0;
pinEndStartlineAdvantagesEnd = rangePolarBasedStartlineAdvatages.getB().doubleValue();
result = new Pair(pinEndStartlineAdvantagesStart, pinEndStartlineAdvantagesEnd);
}
return result;
}
-
+
private List calculateStartlineAdvantagesUnderneathLaylinesInRange(
Pair rangePinEndStartlineAdvantage) {
List result = new ArrayList();
if (rangePinEndStartlineAdvantage != null) {
- logger.log(Level.INFO, "PinEnd startline advantages range " + rangePinEndStartlineAdvantage.getA() + " - "+ rangePinEndStartlineAdvantage.getB());
+ logger.log(Level.INFO, "PinEnd startline advantages range " + rangePinEndStartlineAdvantage.getA() + " - "
+ + rangePinEndStartlineAdvantage.getB());
StartLineAdvantageDTO rightEdgeAdvantage = new StartLineAdvantageDTO();
rightEdgeAdvantage.confidence = 1.0;
rightEdgeAdvantage.distanceToRCBoatInMeters = rangePinEndStartlineAdvantage.getA();
StartLineAdvantageDTO leftEdgeAdvantage = new StartLineAdvantageDTO();
leftEdgeAdvantage.confidence = 1.0;
leftEdgeAdvantage.distanceToRCBoatInMeters = rangePinEndStartlineAdvantage.getB();
- if (startlineAdvantageAtPinEndInMeters >= 0) {
- leftEdgeAdvantage.startLineAdvantage = startlineAdvantageAtPinEndInMeters;
+ if (getStartlineAdvantageAtPinEndInMeters() >= 0) {
+ leftEdgeAdvantage.startLineAdvantage = getStartlineAdvantageAtPinEndInMeters();
rightEdgeAdvantage.startLineAdvantage = 0.0;
} else {
leftEdgeAdvantage.startLineAdvantage = 0.0;
- rightEdgeAdvantage.startLineAdvantage = Math.abs(startlineAdvantageAtPinEndInMeters);
+ rightEdgeAdvantage.startLineAdvantage = Math.abs(getStartlineAdvantageAtPinEndInMeters());
}
result.add(rightEdgeAdvantage);
result.add(leftEdgeAdvantage);
@@ -255,46 +276,53 @@ public class StartlineAdvantagesByWindCalculator extends AbstracPreCalculationD
}
return result;
}
-
- private Pair convertStartLineAdvantageDTOListToPointAndConfidenceArrays(List startLineAdvantageDTOList) {
+
+ private Pair convertStartLineAdvantageDTOListToPointAndConfidenceArrays(
+ List startLineAdvantageDTOList) {
Pair result = null;
- if(startLineAdvantageDTOList != null && startLineAdvantageDTOList.size() > 0) {
+ if (startLineAdvantageDTOList != null && startLineAdvantageDTOList.size() > 0) {
Number[][] distanceToRCBoatToStartlineAdvantage = new Number[startLineAdvantageDTOList.size()][2];
Number[][] distanceToRCBoatToConfidence = new Number[startLineAdvantageDTOList.size()][2];
- for(int i = 0; i < startLineAdvantageDTOList.size(); i++) {
+ for (int i = 0; i < startLineAdvantageDTOList.size(); i++) {
StartLineAdvantageDTO startLineAdvantageDTO = startLineAdvantageDTOList.get(i);
distanceToRCBoatToStartlineAdvantage[i][0] = startLineAdvantageDTO.distanceToRCBoatInMeters;
distanceToRCBoatToStartlineAdvantage[i][1] = startLineAdvantageDTO.startLineAdvantage;
distanceToRCBoatToConfidence[i][0] = startLineAdvantageDTO.distanceToRCBoatInMeters;
distanceToRCBoatToConfidence[i][1] = startLineAdvantageDTO.confidence;
}
- result = new Pair(distanceToRCBoatToStartlineAdvantage, distanceToRCBoatToConfidence);
+ result = new Pair(distanceToRCBoatToStartlineAdvantage,
+ distanceToRCBoatToConfidence);
}
return result;
- }
-
- private List calculatePolarBasedStartlineAdvantagesInRange(Pair rangePinEndStartlineAdvantage) {
+ }
+
+ private List calculatePolarBasedStartlineAdvantagesInRange(
+ Pair rangePinEndStartlineAdvantage) {
List result = new ArrayList();
if (rangePinEndStartlineAdvantage != null) {
- logger.log(Level.INFO, "PolarBased startline advantages range " + rangePinEndStartlineAdvantage.getA() + " - "+ rangePinEndStartlineAdvantage.getB());
- Bearing bearingOfStartlineInRad = startlineAndFirstMarkPositions.startBoatPosition
- .getBearingGreatCircle(startlineAndFirstMarkPositions.pinEndPosition);
+ logger.log(Level.INFO, "PolarBased startline advantages range " + rangePinEndStartlineAdvantage.getA()
+ + " - " + rangePinEndStartlineAdvantage.getB());
+ Bearing bearingOfStartlineInRad = getStartlineAndFirstMarkPositions().startBoatPosition
+ .getBearingGreatCircle(getStartlineAndFirstMarkPositions().pinEndPosition);
Bearing bearingOfStartlineInDeg = new DegreeBearingImpl(bearingOfStartlineInRad.getDegrees());
- for(double i = rangePinEndStartlineAdvantage.getA().doubleValue(); i < rangePinEndStartlineAdvantage.getB().doubleValue()-1 ; i++) {
+ for (double i = rangePinEndStartlineAdvantage.getA().doubleValue(); i < rangePinEndStartlineAdvantage
+ .getB().doubleValue() - 1; i++) {
StartLineAdvantageDTO startlineAdvantage = new StartLineAdvantageDTO();
startlineAdvantage.confidence = 0.5;
startlineAdvantage.distanceToRCBoatInMeters = i;
- Position startingPosition = startlineAndFirstMarkPositions.startBoatPosition.translateRhumb(bearingOfStartlineInDeg, new MeterDistance(i));
- Distance startingPositionToFirstMarkDistance = startingPosition.getDistance(startlineAndFirstMarkPositions.firstMarkPosition);
- Bearing bearingOfFirstMarkToStartPositionPositionInRad = startlineAndFirstMarkPositions.firstMarkPosition
- .getBearingGreatCircle(startingPosition);
+ Position startingPosition = getStartlineAndFirstMarkPositions().startBoatPosition.translateRhumb(bearingOfStartlineInDeg, new MeterDistance(i));
+ Distance startingPositionToFirstMarkDistance = startingPosition.getDistance(getStartlineAndFirstMarkPositions().firstMarkPosition);
+ Bearing bearingOfFirstMarkToStartPositionPositionInRad = getStartlineAndFirstMarkPositions().firstMarkPosition.getBearingGreatCircle(startingPosition);
Bearing bearingOfFirstMarkToStartPositionPositionInDeg = new DegreeBearingImpl(bearingOfFirstMarkToStartPositionPositionInRad.getDegrees());
- double angleToWind = Math.abs(wind.getBearing().getDifferenceTo(bearingOfFirstMarkToStartPositionPositionInDeg).getDegrees());
- logger.log(Level.INFO, "angleToWind"+angleToWind);
- Speed speed = defaultPolarSpeedWindAngleFunction.getBoatSpeedForWindAngleAndSpeed(angleToWind, wind.getBeaufort());
- logger.log(Level.INFO, "Speed"+speed.getKnots());
- logger.log(Level.INFO, "startingPositionToFirstMarkDistance.getMeters()"+startingPositionToFirstMarkDistance.getMeters());
- startlineAdvantage.startLineAdvantage = Math.abs((startingPositionToFirstMarkDistance.getMeters()/speed.getMetersPerSecond())*speed.getMetersPerSecond());
+ DegreeBearingImpl angleToWind = new DegreeBearingImpl(Math.abs(getWind().getBearing().getDifferenceTo(bearingOfFirstMarkToStartPositionPositionInDeg).getDegrees()));
+ logger.log(Level.INFO, "angleToWind" + angleToWind);
+ SpeedWithConfidence speedWithConfidence = getBoatSpeedWithConfidenceForWindAngleAndStrength(angleToWind);
+ Speed speed = speedWithConfidence.getObject();
+ logger.log(Level.INFO, "Speed: " + speed.getKnots()+" Confidence: "+speedWithConfidence.getConfidence());
+ logger.log(Level.INFO, "startingPositionToFirstMarkDistance.getMeters()" + startingPositionToFirstMarkDistance.getMeters());
+ startlineAdvantage.startLineAdvantage = Math
+ .abs((startingPositionToFirstMarkDistance.getMeters() / speed.getMetersPerSecond())
+ * speed.getMetersPerSecond());
result.add(startlineAdvantage);
}
} else {
@@ -302,22 +330,23 @@ public class StartlineAdvantagesByWindCalculator extends AbstracPreCalculationD
}
return result;
}
-
- private List subtractAgainstMaximumOfAllStartlineAdvantages(List advantages, double maximum) {
- for(StartLineAdvantageDTO startLineAdvantageDTO : advantages) {
- startLineAdvantageDTO.startLineAdvantage = maximum-startLineAdvantageDTO.startLineAdvantage;
+
+ private List subtractAgainstMaximumOfAllStartlineAdvantages(
+ List advantages, double maximum) {
+ for (StartLineAdvantageDTO startLineAdvantageDTO : advantages) {
+ startLineAdvantageDTO.startLineAdvantage = maximum - startLineAdvantageDTO.startLineAdvantage;
}
return advantages;
}
-
+
private List subtractMinimumOfAllStartlineAdvantages(List advantages) {
double minimum = getMinimumAdvantageOfStartlineAdvantageDTOs(advantages);
- for(StartLineAdvantageDTO startLineAdvantageDTO : advantages) {
- startLineAdvantageDTO.startLineAdvantage = startLineAdvantageDTO.startLineAdvantage-minimum;
+ for (StartLineAdvantageDTO startLineAdvantageDTO : advantages) {
+ startLineAdvantageDTO.startLineAdvantage = startLineAdvantageDTO.startLineAdvantage - minimum;
}
return advantages;
}
-
+
private Double getMaximumAdvantageOfStartlineAdvantageDTOs(List advantages) {
Double result = null;
List sortedAdvantages = new ArrayList();
@@ -328,15 +357,27 @@ public class StartlineAdvantagesByWindCalculator extends AbstracPreCalculationD
}
return result;
}
-
+
private double getMinimumAdvantageOfStartlineAdvantageDTOs(List advantages) {
double result = 0;
List sortedAdvantages = new ArrayList();
sortedAdvantages.addAll(advantages);
- if(sortedAdvantages != null && sortedAdvantages.size() > 0) {
- Collections.sort(sortedAdvantages, StartLineAdvantageDTO.startlineAdvantageComparatorByAdvantageDesc);
- result = sortedAdvantages.get(sortedAdvantages.size()-1).startLineAdvantage;
+ if (sortedAdvantages != null && sortedAdvantages.size() > 0) {
+ Collections.sort(sortedAdvantages, StartLineAdvantageDTO.startlineAdvantageComparatorByAdvantageDesc);
+ result = sortedAdvantages.get(sortedAdvantages.size() - 1).startLineAdvantage;
}
return result;
}
+
+ private SpeedWithConfidence getBoatSpeedWithConfidenceForWindAngleAndStrength(Bearing angleToWind) {
+ SpeedWithConfidence result = null;
+ try {
+ result = dashboardDispatchContext.getPolarDataService().getSpeed(domainFactory.getOrCreateBoatClass("Extreme 40"), new KnotSpeedImpl(getWind().getBeaufort()), angleToWind);
+ } catch (NotEnoughDataHasBeenAddedException e) {
+ result = defaultPolarSpeedWindAngleFunction.getBoatSpeedForWindAngleAndSpeed(angleToWind, new KnotSpeedImpl(getWind().getBeaufort()));
+ e.printStackTrace();
+ }
+ return result;
+
+ }
}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/AbstracPreCalculationDataRetriever.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/AbstracPreCalculationDataRetriever.java
index 1cf1ab8d0e9..5a71f40268f 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/AbstracPreCalculationDataRetriever.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/AbstracPreCalculationDataRetriever.java
@@ -1,7 +1,6 @@
package com.sap.sailing.dashboards.gwt.server.util.actions.startlineadvantage.precalculation;
-import com.sap.sailing.domain.base.impl.BoatClassImpl;
-import com.sap.sailing.domain.common.BoatClassMasterdata;
+import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sailing.domain.common.ManeuverType;
import com.sap.sailing.domain.common.Wind;
import com.sap.sailing.domain.polars.PolarDataService;
@@ -15,17 +14,46 @@ public abstract class AbstracPreCalculationDataRetriever implements PreCalculati
PreCalculationStartlineAdvantageRetriever,
PreCalculationWindRetriever,
PreCalculationPolarDataRetriever {
- public StartlineAndFirstMarkPositions startlineAndFirstMarkPositions;
- public double startlineAdvantageAtPinEndInMeters;
- public double startlineLenghtInMeters;
- public Wind wind;
- public double meouvreAngle;
+ private StartlineAndFirstMarkPositions startlineAndFirstMarkPositions;
+ private double startlineAdvantageAtPinEndInMeters;
+ private double startlineLenghtInMeters;
+ private Wind wind;
+ private double maneuverAngle;
+ private final DomainFactory domainFactory;
+
+ public AbstracPreCalculationDataRetriever(DomainFactory domainFactory) {
+ super();
+ this.domainFactory = domainFactory;
+ }
+
protected void retrieveDataForCalculation(TrackedRace trackedRace, PolarDataService polarDataService) {
startlineAndFirstMarkPositions = retrieveMarkPositions(trackedRace);
startlineAdvantageAtPinEndInMeters = retrieveStartlineAdvantage(trackedRace);
startlineLenghtInMeters = retrieveStartlineLenght(trackedRace);
wind = retrieveWindAtPosition(startlineAndFirstMarkPositions.startBoatPosition, trackedRace);
- meouvreAngle = retrieveManouvreAngleAtWindSpeedAndBoatClass(new BoatClassImpl("Extreme40", BoatClassMasterdata.EXTREME_40), ManeuverType.TACK, wind, polarDataService);
+ maneuverAngle = retrieveManouvreAngleAtWindSpeedAndBoatClass(domainFactory.getOrCreateBoatClass("Extreme 40"), ManeuverType.TACK, wind, polarDataService);
}
+
+ protected StartlineAndFirstMarkPositions getStartlineAndFirstMarkPositions() {
+ return startlineAndFirstMarkPositions;
+ }
+
+ protected double getStartlineAdvantageAtPinEndInMeters() {
+ return startlineAdvantageAtPinEndInMeters;
+ }
+
+ protected double getStartlineLenghtInMeters() {
+ return startlineLenghtInMeters;
+ }
+
+ protected Wind getWind() {
+ return wind;
+ }
+
+ protected double getManeuverAngle() {
+ return maneuverAngle;
+ }
+
+
}
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/PreCalculationPolarDataRetriever.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/PreCalculationPolarDataRetriever.java
index c7068933782..9ab19d1fe1d 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/PreCalculationPolarDataRetriever.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/PreCalculationPolarDataRetriever.java
@@ -15,13 +15,11 @@ import com.sap.sailing.domain.polars.PolarDataService;
public interface PreCalculationPolarDataRetriever {
default double retrieveManouvreAngleAtWindSpeedAndBoatClass(BoatClass boatClass, ManeuverType maneuverType, Speed windSpeed, PolarDataService polarDataService) {
- double result = 0;
+ double result = DefaultPolarValues.getManouvreAngle(ManeuverType.TACK);
try {
if (boatClass != null && maneuverType != null && windSpeed != null) {
BearingWithConfidence bearingWithConfidence = polarDataService.getManeuverAngle(boatClass, maneuverType, windSpeed);
result = bearingWithConfidence.getObject().getDegrees();
- } else {
- result = DefaultPolarValues.getManouvreAngle(ManeuverType.TACK);
}
} catch (NotEnoughDataHasBeenAddedException | NullPointerException e) {
e.printStackTrace();
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAndCachesMovingAverageAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAndCachesMovingAverageAction.java
index 38db9e20d6f..90044d4fd6b 100644
--- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAndCachesMovingAverageAction.java
+++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAndCachesMovingAverageAction.java
@@ -20,11 +20,12 @@ public abstract class RequiresLiveRaceAndCachesMovingAverageAction
+
+
+
+
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/left.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/left.png
new file mode 100644
index 00000000000..383af6aeac2
Binary files /dev/null and b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/left.png differ
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/left_disabled.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/left_disabled.png
new file mode 100644
index 00000000000..ae93717cffd
Binary files /dev/null and b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/left_disabled.png differ
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/leftarrow.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/leftarrow.png
deleted file mode 100644
index de562344f94..00000000000
Binary files a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/leftarrow.png and /dev/null differ
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/leftarrow_disabled.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/leftarrow_disabled.png
deleted file mode 100644
index 9af5de2c43c..00000000000
Binary files a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/leftarrow_disabled.png and /dev/null differ
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/right.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/right.png
new file mode 100644
index 00000000000..7100d546a72
Binary files /dev/null and b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/right.png differ
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/right_disabled.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/right_disabled.png
new file mode 100644
index 00000000000..b7c2bfe146e
Binary files /dev/null and b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/right_disabled.png differ
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/rightarrow.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/rightarrow.png
deleted file mode 100644
index 7a560b168b2..00000000000
Binary files a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/rightarrow.png and /dev/null differ
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/rightarrow_disabled.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/rightarrow_disabled.png
deleted file mode 100644
index 38f2eaef9db..00000000000
Binary files a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/rightarrow_disabled.png and /dev/null differ
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/settings_disabled.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/settings_disabled.png
new file mode 100644
index 00000000000..559e4f252f6
Binary files /dev/null and b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/settings_disabled.png differ
diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/windarrow.png b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/windarrow.png
index 1d71881caa8..fc8859e921a 100644
Binary files a/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/windarrow.png and b/java/com.sap.sailing.dashboards.gwt/src/main/resources/com/sap/sailing/dashboards/gwt/client/images/windarrow.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
index ac81065b249..a1994551b29 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
@@ -176,6 +176,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, c
String secondsUnit();
String secondsPerNauticalMileUnit();
String metersUnit();
+ String degreesUnit();
@Override
String close();
String compareCompetitors();
@@ -1261,9 +1262,9 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, c
String valueDescending();
String sortBy();
- String dashboardWindBotLoadingText();
- String dashboardWindBotLoadingMessage();
- String dashboardWindBotNotAvailable();
+ String dashboardHeader();
+ String dashboardNoWindBotAvailableHeader();
+ String dashboardNoWindBotAvailableMessage();
String dashboardWindBot();
String dashboardTrueWindSpeed();
String dashboardTrueWindDirection();
@@ -1274,10 +1275,17 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, c
String dashboardAverageWindMinutes(int minutes);
String dashboardWindChartHint();
+ String dashboardSelectCompetitor();
+ String dashboardStartAnalysesHeader();
String dashboardNewStartAnalysisAvailable();
-
- String dashboardStartlineAdvantagesByWind();
- String dashboardStartlineAdvantageByGeometry();
+ String dashboardNoStartAnalysesAvailableHeader();
+ String dashboardNoStartAnalysesAvailableMessage();
+ String dashboardNoStartlineAdvantagesByWindAvailableHeader();
+ String dashboardNoStartlineAdvantagesByWindAvailableMessage();
+ String dashboardNoStartlineAdvantagesByGeometryAvailableHeader();
+ String dashboardNoStartlineAdvantagesByGeometryAvailableMessage();
+ String dashboardStartlineAdvantagesByWindHeader();
+ String dashboardStartlineAdvantageByGeometryHeader();
String dashboardRankAtFirstMark();
String dashboardTeam();
String dashboardDistanceToLineInM();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
index 47ad44120b7..316d07f3a69 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
@@ -179,6 +179,7 @@ in=in
secondsUnit=s
secondsPerNauticalMileUnit=s/NM
metersUnit=m
+degreesUnit=°
close=Close
compareCompetitors=Compare competitors
description=Description
@@ -1225,9 +1226,9 @@ groupName=Group Name
valueAscending=Value (Ascending)
valueDescending=Value (Descending)
sortBy=Sort by
-dashboardWindBotLoadingText=Waiting for wind bot data...
-dashboardWindBotLoadingMessage=Depending on your connection this operation might take some minutes to complete the first time. It can also take some time if there is no data available right now.
-dashboardWindBotNotAvailable=Wind bot not available.
+dashboardHeader=Dashboard
+dashboardNoWindBotAvailableHeader=Wind Bot is not available.
+dashboardNoWindBotAvailableMessage=To receive live wind data from wind measurement units, ensure that the wind bot is switched on and connected to the SAP Sailing Analytics.
dashboardWindBot=Wind Bot
dashboardTrueWindSpeed=TWS
dashboardTrueWindDirection=TWD
@@ -1237,9 +1238,17 @@ dashboardLiveWind=live
dashboardAverageWind=average
dashboardAverageWindMinutes=({0} minutes)
dashboardWindChartHint=Tap on chart to change interval
+dashboardSelectCompetitor=Select Competitor
+dashboardStartAnalysesHeader=Start Analyses
dashboardNewStartAnalysisAvailable=New start analysis available
-dashboardStartlineAdvantagesByWind=Startline advantage by wind
-dashboardStartlineAdvantageByGeometry=Startline advantage by geometry
+dashboardNoStartAnalysesAvailableHeader=No Start Analyses available.
+dashboardNoStartAnalysesAvailableMessage=There is a Start Analysis created from each race start. Please stand by till racing has been started.
+dashboardNoStartlineAdvantagesByWindAvailableHeader=No Startline Advantages available.
+dashboardNoStartlineAdvantagesByWindAvailableMessage=For calculating the startline advantage there needs to be a course set by the race commitee.
+dashboardNoStartlineAdvantagesByGeometryAvailableHeader=No Startline Advantage available.
+dashboardNoStartlineAdvantagesByGeometryAvailableMessage=For calculating the startline advantage there needs to be a course set by the race commitee.
+dashboardStartlineAdvantagesByWindHeader=Startline Advantages by Wind
+dashboardStartlineAdvantageByGeometryHeader=Startline Advantage by Geometry
dashboardRankAtFirstMark=Rank at first mark
dashboardTeam=Team
dashboardDistanceToLineInM=Distance to line in m
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
index 990df9608fd..e9bec87776f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
@@ -181,6 +181,7 @@ in=in
secondsUnit=s
secondsPerNauticalMileUnit=s/sm
metersUnit=m
+degreesUnit=°
close=Schließen
compareCompetitors=Teilnehmer vergleichen
description=Beschreibung
@@ -1212,9 +1213,9 @@ groupName=Gruppename
valueAscending=Wert (Aufsteigend)
valueDescending=Wert (Absteigend)
sortBy=Sortiert nach
-dashboardWindBotLoadingText=Lade Windmesser Daten ...
-dashboardWindBotLoadingMessage=Je nach Qualität Ihrer Verbindung kann dieser Vorgang ein paar Minuten dauern.
-dashboardWindBotNotAvailable=Keine Verbindung zu Windmesser.
+dashboardHeader=Dashboard
+dashboardNoWindBotAvailableHeader=Wind Bot nicht verfügbar.
+dashboardNoWindBotAvailableMessage=Um live Daten von Wind Messgeräten zu empfangen, muss der Wind Bot mit der SAP Sailing Analytics verknüpft sein.
dashboardWindBot=Windmesser
dashboardTrueWindSpeed=Wind Geschwindigkeit
dashboardTrueWindDirection=Wind Richtung
@@ -1224,9 +1225,17 @@ dashboardLiveWind=live
dashboardAverageWind=average
dashboardAverageWindMinutes=({0} minutes)
dashboardWindChartHint=Auf Chart drücken um Interval zu ändern
-dashboardNewStartAnalysisAvailable=Neue Startanalyse verfügbar
-dashboardStartlineAdvantagesByWind=Startlininien Vorteil nach Wind
-dashboardStartlineAdvantageByGeometry=Startlininien Vorteil nach Geometrie
+dashboardSelectCompetitor=Segler auswählen
+dashboardStartAnalysesHeader=Start Analysen
+dashboardNewStartAnalysisAvailable=Neue Start Analyse verfügbar.
+dashboardNoStartAnalysesAvailableHeader=Keine Start Analysen verfügbar.
+dashboardNoStartAnalysesAvailableMessage=Es wird eine Start Analyse für jeden Renn Start erstellt. Bitte warten bis die Rennen starten.
+dashboardNoStartlineAdvantagesByWindAvailableHeader=Kein Startlinien Vorteil verfügbar.
+dashboardNoStartlineAdvantagesByWindAvailableMessage=Um den Startlinien Vorteil zu berrechnen muss die Regattaleitung einen Kurs in im Race Manager gesetzt haben.
+dashboardNoStartlineAdvantagesByGeometryAvailableHeader=Keine Startlinien Vorteile verfügbar.
+dashboardNoStartlineAdvantagesByGeometryAvailableMessage=Um den Startlinien Vorteile zu berrechnen muss die Regattaleitung einen Kurs in im Race Manager gesetzt haben.
+dashboardStartlineAdvantagesByWindHeader=Startlinien Vorteile nach Wind
+dashboardStartlineAdvantageByGeometryHeader=Startlinien Vorteile nach Geometrie
dashboardRankAtFirstMark=Position an erster Bahnmarke
dashboardTeam=Team
dashboardDistanceToLineInM=Distanz zur Linie in m
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
index 3bd266c91ff..de43e303420 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
@@ -177,6 +177,7 @@ in=в
secondsUnit=с
secondsPerNauticalMileUnit=с/NM
metersUnit=м
+degreesUnit=°
close=Закрыть
compareCompetitors=Сравнить участников
description=Описание
@@ -1155,9 +1156,9 @@ groupName=Group Name
valueAscending=Value (Ascending)
valueDescending=Value (Descending)
sortBy=Sort by
-dashboardWindBotLoadingText=Loading wind bot data ...
-dashboardWindBotLoadingMessage=Depending on your connection this operation might take some minutes to complete the first time.
-dashboardWindBotNotAvailable=Wind bot not available.
+dashboardHeader=Dashboard
+dashboardNoWindBotAvailableHeader=Wind Bot not available.
+dashboardNoWindBotAvailableMessage=To receive live wind data from wind measurement units, ensure that the wind bot is switched on and connected to the SAP Sailing Analytics.
dashboardWindBot=Wind Bot
dashboardTrueWindSpeed=TWS
dashboardTrueWindDirection=TWD
@@ -1167,9 +1168,17 @@ dashboardLiveWind=live
dashboardAverageWind=average
dashboardAverageWindMinutes=({0} minutes)
dashboardWindChartHint=Tap on chart to change interval
+dashboardStartAnalysesHeader=Start Analyses
+dashboardSelectCompetitor=Select Competitor
dashboardNewStartAnalysisAvailable=New start analysis available
-dashboardStartlineAdvantagesByWind=Startline advantage by wind
-dashboardStartlineAdvantageByGeometry=Startline advantage by geometry
+dashboardNoStartAnalysesAvailableHeader=No Start Analyses available.
+dashboardNoStartAnalysesAvailableMessage=There is a Start Analysis created from each race start. Please stand by till racing has been started.
+dashboardNoStartlineAdvantagesByWindAvailableHeader=No Startline Advantages available.
+dashboardNoStartlineAdvantagesByWindAvailableMessage=For calculating the startline advantage there needs to be a course set by the race commitee.
+dashboardNoStartlineAdvantagesByGeometryAvailableHeader=No Startline Advantage available.
+dashboardNoStartlineAdvantagesByGeometryAvailableMessage=For calculating the startline advantage there needs to be a course set by the race commitee.
+dashboardStartlineAdvantagesByWindHeader=Startline Advantages by Wind
+dashboardStartlineAdvantageByGeometryHeader=Startline Advantage by Geometry
dashboardRankAtFirstMark=Rank at first mark
dashboardTeam=Team
dashboardDistanceToLineInM=Distance to line in m
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
index 798248333ef..72dd9f19f23 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
@@ -128,7 +128,9 @@ raceLogReloaded=Race log successfully reloaded from database
legend=Legend
courseDesignerMode=Course designer
configureLeaderboardUrlDescription=Configure a leaderboard and obtain the resulting URL from the link
+dashboardHeader=Dashboard
dashboardAverageWind=average
+dashboardSelectCompetitor=Select Competitor
welcomeToSailingAnalytics=Welcome to SAP Sailing Analytics
courseOverGroundTrueDegreesTooltip=实际航向角度
mediaSelectVideoCaption={0} Videos
@@ -160,7 +162,6 @@ explainReplicationServletPort=Servlet port number that is used to connect to reg
numberOfManeuvers=操作
successfullyAllowedCompetitorReset=Successfully allowed reload of competitor(s) {0}.
pleaseEnterAName=Please enter a name
-dashboardStartlineAdvantageByGeometry=Startline advantage by geometry
confidence=Confidence
from=从
start=起航
@@ -351,7 +352,10 @@ raceIsRunning=正在进行
starboardSide=右舷
polarSheetMinimumWindConfidence=Minimum wind confidence value
group=分组
+dashboardStartAnalysesHeader=Start Analyses
dashboardNewStartAnalysisAvailable=New start analysis available
+dashboardNoStartAnalysesAvailableHeader=No Start Analyses available.
+dashboardNoStartAnalysesAvailableMessage=There is a Start Analysis created from each race start. Please stand by till racing has been started.
actionAddWindData=Add wind data
competitorSearchFilter=Competitor Search Filter
dataCount=Data Size
@@ -861,6 +865,7 @@ selectAFilterCriteria=Select a filter criteria
errorWhileTryingToSetWindSourceForRace=Error while trying to set "wind starts upwind" flag
pleaseEnterASailNumber=Please enter a sail number
metersUnit=m
+degreesUnit=°
isPublic=Is public
speedOverGroundWhenPassingStartTooltip=参赛队越过起航线时的实际速度
successfullyUpdatedSailingServers=Successfully updated SailingServer instances
@@ -982,7 +987,6 @@ overallStandings=总排名
setClosingTimePoint=Set Timepoint that closes open time range
registeredCompetitors=Registered Competitors
timePointMustBeBeforeEndOfTracking=Time point must be before end of tracking.
-dashboardWindBotNotAvailable=Wind bot not available.
untracked=Untracked
scoringSchemeWinnerGetsEightAndInterpolation=High Point System, Winner 8 Points, Interpolated
export=Export
@@ -1095,7 +1099,8 @@ windwardDistanceToGoInMetersTooltip=迎/顺风航段时参赛队的位置离开
papaDisplayed=Start mode flag - four minutes till start
sheetNameTooltip=You can name your polar sheet using the text field.nA name will be generated using the boat classnif no name is provided.
competitorsFilter=参赛队过滤
-dashboardStartlineAdvantagesByWind=Startline advantage by wind
+dashboardStartlineAdvantagesByWindHeader=Startline Advantages by Wind
+dashboardStartlineAdvantageByGeometryHeader=Startline Advantage by Geometry
dashboardSecondsAbreviation=s
pleaseEnterNonEmptyDescription=Please enter a non-empty description
polarSheetChart=Polar Sheet
@@ -1252,8 +1257,12 @@ eventsCount[one]={0,number} event
competitorsCount={0,number} competitors
courseAreaName=Course area: {0}
competitorsCount[one]={0,number} competitor�
-dashboardWindBotLoadingText=Loading wind bot data ...
-dashboardWindBotLoadingMessage=Depending on your connection this operation might take some minutes to complete the first time.
+dashboardNoWindBotAvailableHeader=Wind Bot not available.
+dashboardNoWindBotAvailableMessage=To receive live wind data from wind measurement units, ensure that the wind bot is switched on and connected to the SAP Sailing Analytics.
+dashboardNoStartlineAdvantagesByWindAvailableHeader=No Startline Advantages available.
+dashboardNoStartlineAdvantagesByWindAvailableMessage=For calculating the startline advantage there needs to be a course set by the race commitee.
+dashboardNoStartlineAdvantagesByGeometryAvailableHeader=No Startline Advantage available.
+dashboardNoStartlineAdvantagesByGeometryAvailableMessage=For calculating the startline advantage there needs to be a course set by the race commitee.
currentOfTotalLegs=航段 {0,number}/{1,number}
clone=Clone
changed=Changed
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanel.java
index 40d5bcbc314..aa92c3f2602 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanel.java
@@ -23,22 +23,23 @@ public class CombinedWindPanel extends FlowPanel {
private Canvas canvas;
- private CombinedWindPanelStyle combinedWindPanelStyle;
+ private RaceMapStyle raceMapStyle;
private final CoordinateSystem coordinateSystem;
- public CombinedWindPanel(RaceMapImageManager theRaceMapResources, CombinedWindPanelStyle combinedWindPanelStyle,
+ public CombinedWindPanel(RaceMapImageManager theRaceMapResources, RaceMapStyle raceMapStyle,
StringMessages stringMessages, CoordinateSystem coordinateSystem) {
+ raceMapStyle.ensureInjected();
this.stringMessages = stringMessages;
this.coordinateSystem = coordinateSystem;
this.raceMapResources = theRaceMapResources;
- this.combinedWindPanelStyle = combinedWindPanelStyle;
- addStyleName(combinedWindPanelStyle.combinedWindPanel());
+ this.raceMapStyle = raceMapStyle;
+ addStyleName(raceMapStyle.raceMapIndicatorPanel());
transformer = raceMapResources.getCombinedWindIconTransformer();
canvas = transformer.getCanvas();
- canvas.addStyleName(this.combinedWindPanelStyle.combinedWindPanelCanvas());
+ canvas.addStyleName(this.raceMapStyle.raceMapIndicatorPanelCanvas());
add(canvas);
textLabel = new Label("");
- textLabel.addStyleName(this.combinedWindPanelStyle.combinedWindPanelTextLabel());
+ textLabel.addStyleName(this.raceMapStyle.raceMapIndicatorPanelTextLabel());
add(textLabel);
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanelStyle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanelStyle.java
deleted file mode 100644
index a1d84ffb09d..00000000000
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanelStyle.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.sap.sailing.gwt.ui.client.shared.racemap;
-
-import com.google.gwt.resources.client.CssResource;
-import com.google.gwt.resources.client.CssResource.Shared;
-
-@Shared
-public interface CombinedWindPanelStyle extends CssResource {
- public String combinedWindPanel();
- public String combinedWindPanelTextLabel();
- public String combinedWindPanelCanvas();
-}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanel.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.css
similarity index 73%
rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanel.css
rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.css
index 2a333cf891c..9c8056bcd53 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanel.css
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.css
@@ -1,6 +1,6 @@
@CHARSET "UTF-8";
-.combinedWindPanel {
+.raceMapIndicatorPanel {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-o-border-radius: 4px;
@@ -10,7 +10,7 @@
border: 1px solid #C9CACA;
}
-.combinedWindPanelTextLabel {
+.raceMapIndicatorPanelTextLabel {
height: 12px;
width: 55px;
vertical-align: middle;
@@ -18,8 +18,12 @@
text-align: center;
}
-.combinedWindPanelCanvas{
+.raceMapIndicatorPanelCanvas {
width: 55px;
margin-left: 6px;
cursor: pointer;
-}
\ No newline at end of file
+}
+
+.combinedWindPanel {}
+
+.trueNorthIndicator {}
\ No newline at end of file
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 c0efaa1bd7b..d8a3d76289a 100644
--- 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
@@ -409,7 +409,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
public RaceMap(SailingServiceAsync sailingService, AsyncActionsExecutor asyncActionsExecutor,
ErrorReporter errorReporter, Timer timer, CompetitorSelectionProvider competitorSelection, StringMessages stringMessages,
boolean showMapControls, boolean showViewStreamlets, boolean showViewStreamletColors, boolean showViewSimulation,
- RegattaAndRaceIdentifier raceIdentifier, CombinedWindPanelStyle combinedWindPanelStyle, boolean showHeaderPanel) {
+ RegattaAndRaceIdentifier raceIdentifier, RaceMapResources raceMapResources, boolean showHeaderPanel) {
this.setSize("100%", "100%");
this.showMapControls = showMapControls;
this.stringMessages = stringMessages;
@@ -419,7 +419,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
this.errorReporter = errorReporter;
this.timer = timer;
timer.addTimeListener(this);
- raceMapImageManager = new RaceMapImageManager();
+ raceMapImageManager = new RaceMapImageManager(raceMapResources);
markDTOs = new HashMap();
courseSidelines = new HashMap<>();
courseMiddleLines = new HashMap<>();
@@ -446,9 +446,9 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
panelForLeftHeaderLabels = new AbsolutePanel();
panelForRightHeaderLabels = new AbsolutePanel();
initializeData(showMapControls, showHeaderPanel);
- combinedWindPanel = new CombinedWindPanel(raceMapImageManager, combinedWindPanelStyle, stringMessages, coordinateSystem);
+ combinedWindPanel = new CombinedWindPanel(raceMapImageManager, raceMapResources.raceMapStyle(), stringMessages, coordinateSystem);
combinedWindPanel.setVisible(false);
- trueNorthIndicatorPanel = new TrueNorthIndicatorPanel(this, raceMapImageManager, combinedWindPanelStyle, stringMessages, coordinateSystem);
+ trueNorthIndicatorPanel = new TrueNorthIndicatorPanel(this, raceMapImageManager, raceMapResources.raceMapStyle(), stringMessages, coordinateSystem);
trueNorthIndicatorPanel.setVisible(true);
orientationChangeInProgress = false;
mapFirstZoomDone = false;
@@ -632,8 +632,9 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
if (showHeaderPanel) {
createHeaderPanel(map);
}
- createSettingsButton(map);
-
+ if (showMapControls) {
+ createSettingsButton(map);
+ }
// Data has been initialized
RaceMap.this.isMapInitialized = true;
RaceMap.this.redraw();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapImageManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapImageManager.java
index 4dffc1946d0..2ef5252955e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapImageManager.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapImageManager.java
@@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.google.gwt.core.client.GWT;
import com.google.gwt.maps.client.MapWidget;
import com.google.gwt.maps.client.base.Point;
import com.google.gwt.maps.client.base.Size;
@@ -39,9 +38,10 @@ public class RaceMapImageManager {
protected Map, Marker> maneuverIconsForTypeAndDirectionIndicatingColor;
- private static RaceMapResources resources = GWT.create(RaceMapResources.class);
-
- public RaceMapImageManager() {
+ private final RaceMapResources resources;
+
+ public RaceMapImageManager(RaceMapResources resources) {
+ this.resources = resources;
maneuverIconsForTypeAndDirectionIndicatingColor = new HashMap, Marker>();
trueNorthIndicatorIconTransformer = new ImageTransformer(resources.trueNorthIndicatorIcon());
combinedWindIconTransformer = new ImageTransformer(resources.combinedWindIcon());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapResources.java
index 689799cb81c..368ba925ee1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapResources.java
@@ -28,6 +28,6 @@ public interface RaceMapResources extends ClientBundle {
@Source("com/sap/sailing/gwt/ui/client/images/maneuver_green.png")
ImageResource maneuverMarkerGreen();
- @Source("CombinedWindPanel.css")
- CombinedWindPanelStyle combinedWindPanelStyle();
+ @Source("RaceMap.css")
+ RaceMapStyle raceMapStyle();
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapStyle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapStyle.java
new file mode 100644
index 00000000000..4a2179a296b
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapStyle.java
@@ -0,0 +1,21 @@
+package com.sap.sailing.gwt.ui.client.shared.racemap;
+
+import com.google.gwt.resources.client.CssResource;
+import com.google.gwt.resources.client.CssResource.Shared;
+
+/**
+ * Contains class names for styles that can get overwritten in the {@link RaceMap}.
+ * The {@link RaceMap} may require customized styles of elements when it is used in
+ * different contexts.
+ *
+ * @author Alexander Ries
+ *
+ */
+@Shared
+public interface RaceMapStyle extends CssResource {
+ public String raceMapIndicatorPanel();
+ public String raceMapIndicatorPanelTextLabel();
+ public String raceMapIndicatorPanelCanvas();
+ public String combinedWindPanel();
+ public String trueNorthIndicator();
+}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/TrueNorthIndicatorPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/TrueNorthIndicatorPanel.java
index 28da66d7f61..ef7cd8e80a3 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/TrueNorthIndicatorPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/TrueNorthIndicatorPanel.java
@@ -26,19 +26,20 @@ public class TrueNorthIndicatorPanel extends FlowPanel {
private Canvas canvas;
- private CombinedWindPanelStyle combinedWindPanelStyle;
+ private RaceMapStyle raceMapStyle;
private final CoordinateSystem coordinateSystem;
- public TrueNorthIndicatorPanel(final RaceMap map, RaceMapImageManager theRaceMapResources, CombinedWindPanelStyle combinedWindPanelStyle,
+ public TrueNorthIndicatorPanel(final RaceMap map, RaceMapImageManager theRaceMapResources, RaceMapStyle raceMapStyle,
final StringMessages stringMessages, CoordinateSystem coordinateSystem) {
this.stringMessages = stringMessages;
this.coordinateSystem = coordinateSystem;
this.raceMapResources = theRaceMapResources;
- this.combinedWindPanelStyle = combinedWindPanelStyle;
- addStyleName(combinedWindPanelStyle.combinedWindPanel());
+ this.raceMapStyle = raceMapStyle;
+ addStyleName(raceMapStyle.raceMapIndicatorPanel());
+ addStyleName(raceMapStyle.trueNorthIndicator());
transformer = raceMapResources.getTrueNorthIndicatorIconTransformer();
canvas = transformer.getCanvas();
- canvas.addStyleName(this.combinedWindPanelStyle.combinedWindPanelCanvas());
+ canvas.addStyleName(this.raceMapStyle.raceMapIndicatorPanelCanvas());
add(canvas);
canvas.addClickHandler(new ClickHandler() {
@Override
@@ -58,7 +59,7 @@ public class TrueNorthIndicatorPanel extends FlowPanel {
}
});
textLabel = new Label("");
- textLabel.addStyleName(this.combinedWindPanelStyle.combinedWindPanelTextLabel());
+ textLabel.addStyleName(this.raceMapStyle.raceMapIndicatorPanelTextLabel());
add(textLabel);
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
index 127cb23ee23..f1a0b2eb29c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
@@ -155,7 +155,7 @@ public class EmbeddedMapAndWindChartEntryPoint extends AbstractSailingEntryPoint
final TimePanelSettings timePanelSettings = timePanel.getSettings();
timePanelSettings.setRefreshInterval(refreshInterval);
timePanel.updateSettings(timePanelSettings);
- raceMapResources.combinedWindPanelStyle().ensureInjected();
+ raceMapResources.raceMapStyle().ensureInjected();
final CompetitorColorProvider colorProvider = new CompetitorColorProviderImpl(selectedRaceIdentifier, competitorBoats);
final CompetitorSelectionProvider competitorSelection;
if (showCompetitors) {
@@ -165,7 +165,7 @@ public class EmbeddedMapAndWindChartEntryPoint extends AbstractSailingEntryPoint
}
final RaceMap raceMap = new RaceMap(sailingService, asyncActionsExecutor, /* errorReporter */ EmbeddedMapAndWindChartEntryPoint.this, timer,
competitorSelection, getStringMessages(), showMapControls, showViewStreamlets, showViewStreamletColors,
- showViewSimulation, selectedRaceIdentifier, raceMapResources.combinedWindPanelStyle(), /* showHeaderPanel */ false) {
+ showViewSimulation, selectedRaceIdentifier, raceMapResources, /* showHeaderPanel */ false) {
@Override
protected void showAdditionalControls(MapWidget map) {
backToLivePlayButton.removeFromParent();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
index 05eea8e29be..567de85eb3e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
@@ -170,10 +170,10 @@ public class RaceBoardPanel extends SimplePanel implements LeaderboardUpdateList
final CompetitorColorProvider colorProvider = new CompetitorColorProviderImpl(selectedRaceIdentifier, competitorsAndTheirBoats);
competitorSelectionProvider = new CompetitorSelectionModel(/* hasMultiSelection */ true, colorProvider);
- raceMapResources.combinedWindPanelStyle().ensureInjected();
+ raceMapResources.raceMapStyle().ensureInjected();
raceMap = new RaceMap(sailingService, asyncActionsExecutor, errorReporter, timer,
competitorSelectionProvider, stringMessages, showMapControls, getConfiguration().isShowViewStreamlets(), getConfiguration().isShowViewStreamletColors(), getConfiguration().isShowViewSimulation(),
- selectedRaceIdentifier, raceMapResources.combinedWindPanelStyle(), /* showHeaderPanel */ true) {
+ selectedRaceIdentifier, raceMapResources, /* showHeaderPanel */ true) {
private static final String INDENT_SMALL_CONTROL_STYLE = "indentsmall";
private static final String INDENT_BIG_CONTROL_STYLE = "indentbig";
@Override
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch b/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch
index 70d5da234a1..64d68838215 100644
--- a/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch
@@ -1,38 +1,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch
index fb49b67aa62..eb1a2722b78 100644
--- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch
@@ -1,38 +1,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
index f423d629372..a08607085cc 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
@@ -1,37 +1,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
index a1b211da85d..3d3b3b72ea9 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
index 5fb70d15c55..95f214db6ad 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch
index 7327c33673a..ce754832c84 100644
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch
index 3e59695678f..140ffe940f7 100644
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
index 4c27b93091f..ad8671fb860 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
index 09a44db1439..4187f309ac1 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
@@ -1,31 +1,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
index a855c7db089..0b5043c7561 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
@@ -1,37 +1,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (Proxy).launch b/java/com.sap.sailing.server/SailingServer (Proxy).launch
index c74298fb3be..21dfc841aea 100755
--- a/java/com.sap.sailing.server/SailingServer (Proxy).launch
+++ b/java/com.sap.sailing.server/SailingServer (Proxy).launch
@@ -1,39 +1,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch b/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
index b19398528bb..e30859d3dbe 100755
--- a/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
+++ b/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch b/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
index 57628771165..90b6f42c0f2 100755
--- a/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
+++ b/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
@@ -1,31 +1,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch b/java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
index d9d2b3a236c..c8d7494d4d5 100755
--- a/java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
+++ b/java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
@@ -1,30 +1,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch b/java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
index 4e8e768c965..c577be0479c 100755
--- a/java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
+++ b/java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
@@ -1,33 +1,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
index 380af12c155..bf414899be1 100644
--- a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
@@ -9,9 +9,13 @@ Require-Bundle: com.google.gwt.osgi;bundle-version="2.7.0",
com.sap.sse.common,
com.sap.sse.filestorage
Bundle-ActivationPolicy: lazy
-Import-Package: javax.servlet;version="2.6.0",
- javax.servlet.http;version="2.6.0",
+Import-Package: com.google.gwt.core.ext,
+ com.google.gwt.core.ext.linker,
+ com.google.gwt.core.ext.linker.impl,
+ javax.servlet;version="2.6.0",
javax.servlet.descriptor;version="2.6.0",
+ javax.servlet.http;version="2.6.0",
+ org.apache.commons.io,
org.json.simple,
org.json.simple.parser,
org.osgi.framework,
@@ -31,6 +35,7 @@ Export-Package: com.google.gwt.user.client.rpc.core.java.util,
com.sap.sse.gwt.client.dialog,
com.sap.sse.gwt.client.event,
com.sap.sse.gwt.client.filestorage,
+ com.sap.sse.gwt.client.linker,
com.sap.sse.gwt.client.media,
com.sap.sse.gwt.client.mutationobserver,
com.sap.sse.gwt.client.mvp,
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/linker/ManifestLinker.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/linker/ManifestLinker.java
new file mode 100644
index 00000000000..2e26ee6790c
--- /dev/null
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/linker/ManifestLinker.java
@@ -0,0 +1,135 @@
+package com.sap.sse.gwt.client.linker;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+
+import org.apache.commons.io.IOUtils;
+
+import com.google.gwt.core.ext.LinkerContext;
+import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.linker.AbstractLinker;
+import com.google.gwt.core.ext.linker.Artifact;
+import com.google.gwt.core.ext.linker.ArtifactSet;
+import com.google.gwt.core.ext.linker.EmittedArtifact;
+import com.google.gwt.core.ext.linker.LinkerOrder;
+import com.google.gwt.core.ext.linker.impl.SelectionInformation;
+
+/**
+ * This class creates an application manifest file for HTML 5 Offline Application Caching in the
+ * output folder of your client side gwt compilation results.
+ * Follow those steps to use HTML 5 Offline Application Caching in your bundle:
+ *
+ * - Add {@code manifest="YOURMODULENAME/appcache.manifest"} to the {@code } tag in your base html file.
+ * - Subclass {@link ManifestLinker} and override the method {@link #staticCachedFiles()}.
+ * - Define a mime type mapping for the
manifest extension in your web.xml file.
+ *
+ * {@code
+ * manifest
+ * text/cache-manifest
+ *
+ * }
+ *
+ * - Define the subclassed linker in your gwt.xml file and add the linker.
+ *
+ * {@code
+ *
+ * }
+ * - Make sure to import the those packages into your MANIFEST.MF file.
+ * com.google.gwt.core.ext
+ * com.google.gwt.core.ext.linker
+ * com.google.gwt.core.ext.linker.impl
+ *
+ *
+ * @author Alexander Ries
+ *
+ */
+@LinkerOrder(LinkerOrder.Order.POST)
+public class ManifestLinker extends AbstractLinker {
+
+ private static final String MANIFEST = "appcache.manifest";
+ private static final String MANIFESTTEMPLATE = "cache.manifest.template";
+
+ @Override
+ public String getDescription() {
+ return ManifestLinker.class.getName();
+ }
+
+ @Override
+ public ArtifactSet link(TreeLogger logger, LinkerContext context, ArtifactSet artifacts, boolean onePermutation) throws UnableToCompleteException {
+ ArtifactSet result = new ArtifactSet(artifacts);
+ if (onePermutation) {
+ return result;
+ }
+ if (result.find(SelectionInformation.class).isEmpty()) {
+ logger.log(TreeLogger.INFO, "Warning: Clobbering " + MANIFEST + " to allow debugging. " + "Recompile before deploying your app!");
+ artifacts = null;
+ } else {
+ result.add(emitLandingPageCacheManifest(context, logger, artifacts));
+ }
+ return result;
+ }
+
+ private Artifact emitLandingPageCacheManifest(LinkerContext context, TreeLogger logger, ArtifactSet artifacts) throws UnableToCompleteException {
+ StringBuilder publicSourcesSb = new StringBuilder();
+ StringBuilder staticResoucesSb = new StringBuilder();
+ if (artifacts != null) {
+ for (@SuppressWarnings("rawtypes")
+ Artifact artifact : artifacts) {
+ if (artifact instanceof EmittedArtifact) {
+ EmittedArtifact ea = (EmittedArtifact) artifact;
+ String pathName = ea.getPartialPath();
+ if (pathName.endsWith("symbolMap") ||
+ pathName.endsWith(".xml.gz") ||
+ pathName.endsWith("rpc.log") ||
+ pathName.endsWith("gwt.rpc") ||
+ pathName.endsWith("manifest.txt") ||
+ pathName.startsWith("rpcPolicyManifest")) {
+ } else {
+ publicSourcesSb.append(pathName + "\n");
+ }
+ }
+ }
+ String[] cacheExtraFiles = getCacheExtraFiles();
+ for (int i = 0; i < cacheExtraFiles.length; i++) {
+ staticResoucesSb.append(cacheExtraFiles[i]);
+ staticResoucesSb.append("\n");
+ }
+ }
+ String cacheManifestString = createCache(logger, context, publicSourcesSb, staticResoucesSb);
+ return emitString(logger, cacheManifestString, MANIFEST);
+ }
+
+ protected String createCache(TreeLogger logger, LinkerContext context, StringBuilder publicSourcesSb, StringBuilder staticResoucesSb) throws UnableToCompleteException {
+ try {
+ String manifest = IOUtils.toString(getClass().getResourceAsStream(appCacheManifestTemplate()));
+ manifest = manifest.replace("$UNIQUEID$", (new Date()).getTime() + "." + Math.random()).toString();
+ manifest = manifest.replace("$STATICAPPFILES$", staticResoucesSb.toString());
+ manifest = manifest.replace("$GENAPPFILES$", publicSourcesSb.toString());
+ return manifest;
+ } catch (IOException e) {
+ //logger.log(TreeLogger.ERROR, "Could not read cache manifest template.", e);
+ throw new UnableToCompleteException();
+ }
+ }
+
+ private String[] getCacheExtraFiles() {
+ String[] cacheExtraFiles = staticCachedFiles();
+ return cacheExtraFiles == null ? new String[0] : Arrays.copyOf(cacheExtraFiles, cacheExtraFiles.length);
+ }
+
+ /**
+ * Override this method to provide static files for caching.
+ * Include at least your root HTML and CSS file.
+ * Also include all files referenced in your root HTML file.
+ * See {@link DashboardManifestLinker} as an example.
+ * */
+ protected String[] staticCachedFiles() {
+ return null;
+ }
+
+ protected String appCacheManifestTemplate() {
+ return MANIFESTTEMPLATE;
+ }
+}
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
index 65310a6b18d..be64553c1f8 100755
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
@@ -1,5 +1,11 @@
package com.sap.sailing.racecommittee.app.ui.activities;
+import java.io.FileNotFoundException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.UUID;
+
import android.animation.Animator;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
@@ -58,12 +64,6 @@ import com.sap.sailing.racecommittee.app.ui.fragments.lists.selection.PositionSe
import com.sap.sailing.racecommittee.app.utils.StringHelper;
import com.sap.sailing.racecommittee.app.utils.autoupdate.AutoUpdater;
-import java.io.FileNotFoundException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.UUID;
-
public class LoginActivity extends BaseActivity
implements EventSelectedListenerHost, CourseAreaSelectedListenerHost, PositionSelectedListenerHost, DialogListenerHost.DialogResultListener {
@@ -421,6 +421,7 @@ public class LoginActivity extends BaseActivity
getLoaderManager().restartLoader(0, null, configurationLoader).forceLoad();
} else {
dismissProgressSpinner();
+ slideUpBackdropDelayed();
}
}
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MoreFlagsFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MoreFlagsFragment.java
index 4d258d37dd5..1a443453f72 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MoreFlagsFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MoreFlagsFragment.java
@@ -251,7 +251,7 @@ public class MoreFlagsFragment extends BaseFragment implements MoreFlagItemClick
}
if (result.hasError()) {
- Toast.makeText(getActivity(), result.getMessageId(), Toast.LENGTH_LONG).show();
+ Toast.makeText(getActivity(), result.getMessage(getActivity()), Toast.LENGTH_LONG).show();
}
}
}