Merge remote-tracking branch 'server/master'

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java

@@ -65,8 +65,8 @@ public class ManeuverAnalysisIDMChampionsFinalTest extends AbstractManeuverDetec
         TimePoint epoch = new MillisecondsTimePoint(0l);
         TimePoint now = MillisecondsTimePoint.now();
         Map<String, Position> markPositions = new HashMap<String, Position>();
-        markPositions.put("G2 Start-Finish (1)", new DegreePosition(53.96003300000019, 10.878697000000084));
-        markPositions.put("G2 Start-Finish (2)", new DegreePosition(53.9674420000693, 10.894410000058738));
+        markPositions.put("G2 Start", new DegreePosition(53.96003300000019, 10.878697000000084));
+        markPositions.put("Finish", new DegreePosition(53.9674420000693, 10.894410000058738));
         markPositions.put("G2 Mark4 (2)", new DegreePosition(53.96002200000019, 10.878875000000063));
         markPositions.put("G2 Mark4 (1)", new DegreePosition(53.9599880000002, 10.878665000000069));
         markPositions.put("G2 Mark1", new DegreePosition(53.96355800000006, 10.885751999999806));

java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MetadataParserImpl.java

@@ -145,10 +145,30 @@ public class MetadataParserImpl implements MetadataParser {
             String pattern2 = controlPointMetadata.get("P2.Pattern");
             String mark1UUID = controlPointMetadata.get("P1.UUID");
             String mark2UUID = controlPointMetadata.get("P2.UUID");
-            final String name1 = controlPointName + " (1)";
+            String name1 = controlPointMetadata.get("P1.Name");
+            if (name1 == null) {
+                // as this is a gate and TracTrac is providing a dashed name
+                // we can extract it here
+                String[] markNames = controlPointName.split("-");
+                if (markNames.length == 2) {
+                    name1 = markNames[0];
+                } else {
+                    name1 = controlPointName + " (1)";
+                }
+            }
+            String name2 = controlPointMetadata.get("P2.Name");
+            if (name2 == null) {
+                // as this is a gate and TracTrac is providing a dashed name
+                // we can extract it here
+                String[] markNames = controlPointName.split("-");
+                if (markNames.length == 2) {
+                    name2 = markNames[1];
+                } else {
+                    name2 = controlPointName + " (2)";
+                }
+            }
             final Serializable id1 = mark1UUID == null ? name1 : UUID.fromString(mark1UUID);
             ControlPointMetaData mark1Metadata = new ControlPointMetaDataImpl(name1, type1, color1, shape1, pattern1, id1);
-            final String name2 = controlPointName + " (2)";
             final Serializable id2 = mark2UUID == null ? name2 : UUID.fromString(mark2UUID);
             ControlPointMetaData mark2Metadata = new ControlPointMetaDataImpl(name2, type2, color2, shape2, pattern2, id2);
             result = Arrays.asList(new ControlPointMetaData[] { mark1Metadata, mark2Metadata });

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/WindJsonDeserializer.java

@@ -27,10 +27,16 @@ public class WindJsonDeserializer implements JsonDeserializer<Wind> {
         Position position = positionDeserializer.deserialize(positionJsonObject);
         
         Number timeStamp = (Number) object.get(WindJsonSerializer.FIELD_TIMEPOINT);
-        Number bearing = (Number) object.get(WindJsonSerializer.FIELD_BEARING);
+        Number direction = (Number) object.get(WindJsonSerializer.FIELD_DIRECTION);
         Number speedInKnots = (Number) object.get(WindJsonSerializer.FIELD_SPEED_IN_KNOTS);
         
-        Bearing degreeBearing = new DegreeBearingImpl(bearing.doubleValue());
+        Bearing degreeBearing = null;
+        if (direction.doubleValue() >= 180) {
+            degreeBearing = new DegreeBearingImpl(direction.doubleValue()-180);
+        } else {
+            degreeBearing = new DegreeBearingImpl(direction.doubleValue()+180);
+        }
+        
         SpeedWithBearing speedBearing = new KnotSpeedWithBearingImpl(speedInKnots.doubleValue(), degreeBearing);
         Wind wind = new WindImpl(position, new MillisecondsTimePoint(timeStamp.longValue()), speedBearing);
 

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/WindJsonSerializer.java

@@ -10,7 +10,7 @@ public class WindJsonSerializer implements JsonSerializer<Wind> {
     public static final String FIELD_POSITION = "position";
     public static final String FIELD_TIMEPOINT = "timepoint";
     public static final String FIELD_SPEED_IN_KNOTS = "speedinknots";
-    public static final String FIELD_BEARING = "bearing";
+    public static final String FIELD_DIRECTION = "direction";
 
     private final JsonSerializer<Position> positionSerializer;
 
@@ -25,7 +25,7 @@ public class WindJsonSerializer implements JsonSerializer<Wind> {
         result.put(FIELD_POSITION, positionSerializer.serialize(wind.getPosition()));
         result.put(FIELD_TIMEPOINT, wind.getTimePoint().asMillis());
         result.put(FIELD_SPEED_IN_KNOTS, wind.getKnots());
-        result.put(FIELD_BEARING, wind.getBearing().getDegrees());
+        result.put(FIELD_DIRECTION, wind.getBearing().getDegrees());
 
         return result;
     }