mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
Merge branch 'master' into bug5239
This commit is contained in:
commit
46753a3b68
16 files changed
+131
-40
No files matched your search
+3
@@ -68,6 +68,8 @@ public enum BoatClassMasterdata {
|
||||
J70 ("J/70", true, 6.93, 2.25, BoatHullType.MONOHULL, true, "J70", "J-70"),
|
||||
J80 ("J/80", true, 8.0, 2.51, BoatHullType.MONOHULL, true, "J80", "J-80"),
|
||||
J88 ("J/88", true, 8.9, 1.89, BoatHullType.MONOHULL, true, "J88", "J-88"),
|
||||
J92 ("J/92", true, 9.14, 3.05, BoatHullType.MONOHULL, true, "J92", "J-92"),
|
||||
J92S ("J/92S", true, 9.14, 3.05, BoatHullType.MONOHULL, true, "J92S", "J-92S"),
|
||||
J105 ("J/105", true, 10.52, 3.35, BoatHullType.MONOHULL, true, "J105", "J-105"),
|
||||
J111 ("J/111", true, 11.1, 3.29, BoatHullType.MONOHULL, true, "J111", "J-111"),
|
||||
JK_20 ("20qm Jollenkreuzer", true, 7.75, 2.50, BoatHullType.MONOHULL, true, "JK 20", "JK20", "20er"),
|
||||
@@ -136,6 +138,7 @@ public enum BoatClassMasterdata {
|
||||
VX_ONE ("VX ONE", true, 5.79, 2.19, BoatHullType.MONOHULL, true, "VX-ONE"),
|
||||
WAYFARER ("Wayfarer", true, 4.82, 1.85, BoatHullType.MONOHULL, false),
|
||||
WETA ("Weta", true, 4.4, 3.5, BoatHullType.TRIMARAN, true, "Weta Trimaran"),
|
||||
X_332 ("X-332", true, 10.06, 3.30, BoatHullType.MONOHULL, true, "X332"),
|
||||
X_99 ("X-99", true, 9.96, 2.95, BoatHullType.MONOHULL, true, "X99"),
|
||||
|
||||
// multi-class "boat classes"; to be replaced at some later point in time by something like a RegattaClass
|
||||
|
||||
+3
@@ -82,6 +82,8 @@ public class BoatClassImageResolver {
|
||||
boatClassIconsMap.put(BoatClassMasterdata.J70.getDisplayName(), imageResources.J70Icon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.J80.getDisplayName(), imageResources.J80Icon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.J88.getDisplayName(), imageResources.J88Icon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.J92.getDisplayName(), imageResources.J92Icon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.J92S.getDisplayName(), imageResources.J92SIcon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.J105.getDisplayName(), imageResources.J105Icon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.J111.getDisplayName(), imageResources.J111Icon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.JK_20.getDisplayName(), imageResources.JK20Icon());
|
||||
@@ -148,6 +150,7 @@ public class BoatClassImageResolver {
|
||||
boatClassIconsMap.put(BoatClassMasterdata.VX_ONE.getDisplayName(), imageResources.VXOneIcon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.WAYFARER.getDisplayName(), imageResources.WayfarerIcon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.WETA.getDisplayName(), imageResources.WetaIcon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.X_332.getDisplayName(), imageResources.X332Icon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.X_99.getDisplayName(), imageResources.X99Icon());
|
||||
boatClassIconsMap.put(BoatClassMasterdata.RUNNING.getDisplayName(), imageResources.RunningIcon());
|
||||
}
|
||||
|
||||
+16
-4
@@ -216,6 +216,14 @@ public interface BoatClassImageResources extends ClientBundle {
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource J88Icon();
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/J92.png")
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource J92Icon();
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/J92S.png")
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource J92SIcon();
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/J105.png")
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource J105Icon();
|
||||
@@ -380,10 +388,6 @@ public interface BoatClassImageResources extends ClientBundle {
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource TornadoIcon();
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/X_99.png")
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource X99Icon();
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/DYAS.png")
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource DyasIcon();
|
||||
@@ -532,4 +536,12 @@ public interface BoatClassImageResources extends ClientBundle {
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource VariantaIcon();
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/X_99.png")
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource X99Icon();
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/X_332.png")
|
||||
@ImageOptions(preventInlining = true)
|
||||
ImageResource X332Icon();
|
||||
|
||||
}
|
||||
+6
@@ -4,6 +4,12 @@
|
||||
<div id="mainContent">
|
||||
<h4 class="articleHeadline">What's New - SAP Sailing Race Manager</h4>
|
||||
<div class="innerContent">
|
||||
<h5 class="articleSubheadline">August 2020</h5>
|
||||
<ul class="bulletList">
|
||||
<li>A problem with loading ORC PCS implied wind source settings for races has been fixed.
|
||||
This problem could have caused the race manager app to fail to load the race logs from
|
||||
the server if only one of them had an "implied wind source" setting of "None".</li>
|
||||
</ul>
|
||||
<h5 class="articleSubheadline">May 2020</h5>
|
||||
<ul class="bulletList">
|
||||
<li>Leaderboards and regattas can now be configured to take place on more than one course area.
|
||||
|
||||
+4
-3
@@ -42,12 +42,13 @@ public class BoatClassVectorGraphicsResolver {
|
||||
BoatClassMasterdata.NACRA_17_FOIL, BoatClassMasterdata.F_16, BoatClassMasterdata.F_18,
|
||||
BoatClassMasterdata.HOBIE_WILD_CAT, BoatClassMasterdata.HOBIE_16, BoatClassMasterdata.HOBIE_TIGER,
|
||||
BoatClassMasterdata.A_CAT, BoatClassMasterdata.TORNADO, BoatClassMasterdata.FLYING_PHANTOM);
|
||||
BoatClassVectorGraphics keelBoatWithGennaker = new KeelBoatWithGennakerVectorGraphics(BoatClassMasterdata.FIRST_CLASS_7_5,BoatClassMasterdata.J70,
|
||||
BoatClassMasterdata.B_ONE, BoatClassMasterdata.J80, BoatClassMasterdata.LASER_SB3, BoatClassMasterdata.LONGTZE,
|
||||
BoatClassVectorGraphics keelBoatWithGennaker = new KeelBoatWithGennakerVectorGraphics(BoatClassMasterdata.FIRST_CLASS_7_5,
|
||||
BoatClassMasterdata.J70, BoatClassMasterdata.J80, BoatClassMasterdata.J92, BoatClassMasterdata.J92S,
|
||||
BoatClassMasterdata.B_ONE, BoatClassMasterdata.LASER_SB3, BoatClassMasterdata.LONGTZE,
|
||||
BoatClassMasterdata.RS_FEVA, BoatClassMasterdata.RS_TERA, BoatClassMasterdata.RS100, BoatClassMasterdata.TP52,
|
||||
BoatClassMasterdata.CLUB_SWAN_50, BoatClassMasterdata.BAVARIA_CRUISER_41S, BoatClassMasterdata.BAVARIA_CRUISER_45,
|
||||
BoatClassMasterdata.BAVARIA_CRUISER_46, BoatClassMasterdata.SPAEKHUGGER, BoatClassMasterdata.SCAN_KAP_99,
|
||||
BoatClassMasterdata.BB10M, BoatClassMasterdata.WAYFARER);
|
||||
BoatClassMasterdata.BB10M, BoatClassMasterdata.WAYFARER, BoatClassMasterdata.X_332);
|
||||
BoatClassVectorGraphics dinghyWithSpinnaker = new DinghyWithSpinnakerVectorGraphics(BoatClassMasterdata._420,
|
||||
BoatClassMasterdata._470, BoatClassMasterdata._5O5, BoatClassMasterdata.CADET, BoatClassMasterdata.FLYING_DUTCHMAN,
|
||||
BoatClassMasterdata.FOLKBOAT, BoatClassMasterdata.DYAS, BoatClassMasterdata.DRAGON_INT,
|
||||
|
||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
-1
@@ -38,7 +38,6 @@ public abstract class BaseRaceLogEventDeserializer implements JsonDeserializer<R
|
||||
Number createdAt = (Number) object.get(BaseRaceLogEventSerializer.FIELD_CREATED_AT);
|
||||
Number timeStamp = (Number) object.get(BaseRaceLogEventSerializer.FIELD_TIMESTAMP);
|
||||
Number passId = (Number) object.get(BaseRaceLogEventSerializer.FIELD_PASS_ID);
|
||||
|
||||
JSONArray jsonCompetitors = Helpers.getNestedArraySafe(object, BaseRaceLogEventSerializer.FIELD_COMPETITORS);
|
||||
List<Competitor> competitors = new ArrayList<>();
|
||||
for (Object competitorObject : jsonCompetitors) {
|
||||
|
||||
+5
-2
@@ -24,9 +24,12 @@ public class ImpliedWindSourceDeserializer implements JsonDeserializer<ImpliedWi
|
||||
|
||||
@Override
|
||||
public ImpliedWindSource deserialize(JSONObject object) throws JsonDeserializationException {
|
||||
final String type = object.get(ImpliedWindSourceSerializer.ORC_IMPLIED_WIND_SOURCE_TYPE).toString();
|
||||
final Object typeObject = object.get(ImpliedWindSourceSerializer.ORC_IMPLIED_WIND_SOURCE_TYPE);
|
||||
final String type = typeObject == null ? null : typeObject.toString();
|
||||
final ImpliedWindSource impliedWindSource;
|
||||
if (type.equals(FixedSpeedImpliedWind.class.getSimpleName())) {
|
||||
if (type == null) {
|
||||
impliedWindSource = null;
|
||||
} else if (type.equals(FixedSpeedImpliedWind.class.getSimpleName())) {
|
||||
final Number impliedWindSpeedInKnotsAsNumber = (Number) object.get(ImpliedWindSourceSerializer.ORC_FIXED_IMPLIED_WIND_SPEED_IN_KNOTS);
|
||||
final Speed impliedWindSpeed = impliedWindSpeedInKnotsAsNumber == null ? null : new KnotSpeedImpl(impliedWindSpeedInKnotsAsNumber.doubleValue());
|
||||
impliedWindSource = new FixedSpeedImpliedWindSourceImpl(impliedWindSpeed);
|
||||
|
||||
+1
-5
@@ -33,11 +33,7 @@ public class RaceLogORCImpliedWindSourceEventDeserializer extends BaseRaceLogEve
|
||||
throws JsonDeserializationException {
|
||||
final ImpliedWindSource impliedWindSource = new ImpliedWindSourceDeserializer().deserialize((JSONObject) object.get(RaceLogORCImpliedWindSourceEventSerializer.ORC_IMPLIED_WIND_SOURCE));
|
||||
final RaceLogEvent result;
|
||||
if (impliedWindSource == null) {
|
||||
result = null;
|
||||
} else {
|
||||
result = new RaceLogORCImpliedWindSourceEventImpl(createdAt, timePoint, author, id, passId, impliedWindSource);
|
||||
}
|
||||
result = new RaceLogORCImpliedWindSourceEventImpl(createdAt, timePoint, author, id, passId, impliedWindSource);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
+27
-23
@@ -19,29 +19,33 @@ public class ImpliedWindSourceSerializer implements JsonSerializer<ImpliedWindSo
|
||||
@Override
|
||||
public JSONObject serialize(ImpliedWindSource impliedWindSource) {
|
||||
final JSONObject result = new JSONObject();
|
||||
impliedWindSource.accept(new ImpliedWindSourceVisitor<Void>() {
|
||||
@Override
|
||||
public Void visit(FixedSpeedImpliedWind impliedWindSource) {
|
||||
result.put(ORC_IMPLIED_WIND_SOURCE_TYPE, FixedSpeedImpliedWind.class.getSimpleName());
|
||||
result.put(ORC_FIXED_IMPLIED_WIND_SPEED_IN_KNOTS, impliedWindSource.getFixedImpliedWindSpeed() == null ? null : impliedWindSource.getFixedImpliedWindSpeed().getKnots());
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Void visit(OtherRaceAsImpliedWindSource impliedWindSource) {
|
||||
result.put(ORC_IMPLIED_WIND_SOURCE_TYPE, OtherRaceAsImpliedWindSource.class.getSimpleName());
|
||||
result.put(ORC_OTHER_RACE_REGATTA_LIKE_NAME, impliedWindSource.getLeaderboardAndRaceColumnAndFleetOfDefiningRace().getA());
|
||||
result.put(ORC_OTHER_RACE_RACE_COLUMN_NAME, impliedWindSource.getLeaderboardAndRaceColumnAndFleetOfDefiningRace().getB());
|
||||
result.put(ORC_OTHER_RACE_FLEET_NAME, impliedWindSource.getLeaderboardAndRaceColumnAndFleetOfDefiningRace().getC());
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Void visit(OwnMaxImpliedWind impliedWindSource) {
|
||||
result.put(ORC_IMPLIED_WIND_SOURCE_TYPE, OwnMaxImpliedWind.class.getSimpleName());
|
||||
return null;
|
||||
}
|
||||
});
|
||||
if (impliedWindSource == null) {
|
||||
result.put(ORC_IMPLIED_WIND_SOURCE_TYPE, null);
|
||||
} else {
|
||||
impliedWindSource.accept(new ImpliedWindSourceVisitor<Void>() {
|
||||
@Override
|
||||
public Void visit(FixedSpeedImpliedWind impliedWindSource) {
|
||||
result.put(ORC_IMPLIED_WIND_SOURCE_TYPE, FixedSpeedImpliedWind.class.getSimpleName());
|
||||
result.put(ORC_FIXED_IMPLIED_WIND_SPEED_IN_KNOTS, impliedWindSource.getFixedImpliedWindSpeed() == null ? null : impliedWindSource.getFixedImpliedWindSpeed().getKnots());
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Void visit(OtherRaceAsImpliedWindSource impliedWindSource) {
|
||||
result.put(ORC_IMPLIED_WIND_SOURCE_TYPE, OtherRaceAsImpliedWindSource.class.getSimpleName());
|
||||
result.put(ORC_OTHER_RACE_REGATTA_LIKE_NAME, impliedWindSource.getLeaderboardAndRaceColumnAndFleetOfDefiningRace().getA());
|
||||
result.put(ORC_OTHER_RACE_RACE_COLUMN_NAME, impliedWindSource.getLeaderboardAndRaceColumnAndFleetOfDefiningRace().getB());
|
||||
result.put(ORC_OTHER_RACE_FLEET_NAME, impliedWindSource.getLeaderboardAndRaceColumnAndFleetOfDefiningRace().getC());
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Void visit(OwnMaxImpliedWind impliedWindSource) {
|
||||
result.put(ORC_IMPLIED_WIND_SOURCE_TYPE, OwnMaxImpliedWind.class.getSimpleName());
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
package com.sap.sailing.server.gateway.serialization.test.racelog;
|
||||
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import org.json.simple.JSONObject;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.orc.RaceLogORCImpliedWindSourceEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
|
||||
import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogORCImpliedWindSourceEventDeserializer;
|
||||
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
|
||||
import com.sap.sailing.server.gateway.serialization.racelog.impl.ImpliedWindSourceSerializer;
|
||||
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogORCImpliedWindSourceEventSerializer;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
public class ORCSetImpliedWindSourceEventSerializerTest extends AbstractEventSerializerTest<RaceLogORCImpliedWindSourceEvent> {
|
||||
|
||||
private final long expectedStartTimeTimestamp = 2013;
|
||||
|
||||
@Override
|
||||
protected RaceLogORCImpliedWindSourceEvent createMockEvent() {
|
||||
TimePoint startTime = mock(TimePoint.class);
|
||||
when(startTime.asMillis()).thenReturn(expectedStartTimeTimestamp);
|
||||
RaceLogORCImpliedWindSourceEvent event = mock(RaceLogORCImpliedWindSourceEvent.class);
|
||||
when(event.getImpliedWindSource()).thenReturn(null);
|
||||
return event;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JsonSerializer<RaceLogEvent> createSerializer(JsonSerializer<Competitor> competitorSerializer) {
|
||||
return new RaceLogORCImpliedWindSourceEventSerializer(competitorSerializer);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNullImpliedWindSourceAttribute() {
|
||||
final JSONObject json = serializer.serialize(event);
|
||||
assertNull(((JSONObject) json.get(RaceLogORCImpliedWindSourceEventSerializer.ORC_IMPLIED_WIND_SOURCE))
|
||||
.get(ImpliedWindSourceSerializer.ORC_IMPLIED_WIND_SOURCE_TYPE));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNullImpliedWindSourceDeserialization() throws JsonDeserializationException {
|
||||
final JSONObject json = serializer.serialize(event);
|
||||
final RaceLogEvent result = new RaceLogORCImpliedWindSourceEventDeserializer(null).deserialize(json);
|
||||
assertNull(((RaceLogORCImpliedWindSourceEvent) result).getImpliedWindSource());
|
||||
}
|
||||
}
|
||||
+8
@@ -10,6 +10,7 @@ import org.junit.Test;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
|
||||
import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
|
||||
import com.sap.sailing.domain.abstractlog.orc.impl.RaceLogORCImpliedWindSourceEventImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFinishPositioningConfirmedEventImpl;
|
||||
@@ -149,6 +150,13 @@ public class RaceLogEventSerializerTest {
|
||||
serializer.serialize(event);
|
||||
verify(raceStatusSerializer).serialize(event);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNullImpliedWindSourceSerializer() {
|
||||
RaceLogEvent event = new RaceLogORCImpliedWindSourceEventImpl(null, null, author, null, 0, null);
|
||||
serializer.serialize(event);
|
||||
verify(orcSetImpliedWindEventSerializer).serialize(event);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testChoosesPassChangedSerializer() {
|
||||
|
||||
-2
@@ -9,7 +9,6 @@ import com.sap.sailing.server.gateway.serialization.JsonSerializer;
|
||||
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogPassChangeEventSerializer;
|
||||
|
||||
public class RaceLogPassChangeEventSerializerTest extends AbstractEventSerializerTest<RaceLogPassChangeEvent> {
|
||||
|
||||
@Override
|
||||
protected RaceLogPassChangeEvent createMockEvent() {
|
||||
RaceLogPassChangeEvent event = mock(RaceLogPassChangeEvent.class);
|
||||
@@ -20,5 +19,4 @@ public class RaceLogPassChangeEventSerializerTest extends AbstractEventSerialize
|
||||
protected JsonSerializer<RaceLogEvent> createSerializer(JsonSerializer<Competitor> competitorSerializer) {
|
||||
return new RaceLogPassChangeEventSerializer(competitorSerializer);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -23,6 +23,13 @@
|
||||
<div class="mainContent">
|
||||
<h2 class="releaseHeadline">Release Notes - Administration Console</h2>
|
||||
<div class="innerContent">
|
||||
<h2 class="articleSubheadline">August 2020</h2>
|
||||
<ul class="bulletList">
|
||||
<li>Fixed a problem with "None" implied wind source selection for ORC PCS races.
|
||||
It caused a serialization error of the race log, e.g., when requested by the
|
||||
Race Manager App.</li>
|
||||
<li>Added boat classes X-332, J/92, and J/92S.</li>
|
||||
</ul>
|
||||
<h2 class="articleSubheadline">July 2020</h2>
|
||||
<ul class="bulletList">
|
||||
<li>Fixed a problem with cross-track error calculations in case no track can be found for a competitor</li>
|
||||
|
||||
Reference in new issue
Block a user