Merge branch 'master' into bug3932

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/regatta/tracking/analyzing/impl/BaseRegattaLogDeviceMappingFinder.java

@@ -65,7 +65,7 @@ public abstract class BaseRegattaLogDeviceMappingFinder<ItemT extends WithID>
                 if (!endOfFirstHalf.before(from)) {
                     log.add(createDeviceMappingEvent(item, event.getAuthor(), from, endOfFirstHalf, event.getDevice()));
                 }
-                if (!to.before(startOfSecondHalf)) {
+                if (to == null || !to.before(startOfSecondHalf)) {
                     log.add(createDeviceMappingEvent(item, event.getAuthor(), startOfSecondHalf, to,
                             event.getDevice()));
                 }

java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/FlatGPSFixJsonSerializer.java

@@ -17,8 +17,12 @@ public class FlatGPSFixJsonSerializer implements JsonSerializer<GPSFix> {
         result.put(FIELD_LON_DEG, object.getPosition().getLngDeg());
         result.put(FIELD_LAT_DEG, object.getPosition().getLatDeg());
         result.put(FIELD_TIME_MILLIS, object.getTimePoint().asMillis());
-        // TODO the default accuracy is 1.0; when fixes ever have an accuracy, report it here
-        result.put(FIELD_ACCURACY, 1.0);
+        // TODO Insert Accuracy if someday available from the server
+        // Buoy Pinger app will interpret no accuracy in JSON message as MarkPingInfo.NOT_SET_BY_USER (-1) and store that in DB
+        // For the user these values are displayed as R.string.unknown ("n/a");
+        // (CheckinManager in Buoy Pinger can accept messages with and without accuracy)
+        
+        // result.put(FIELD_ACCURACY, XXXXXXXXX);
         return result;
     }
 }