eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-25 05:23:51 +00:00
Code Activity

fixed wrong merge conflict

Browse Source
This commit is contained in:
Peter Siegmund committed 2014-11-19 08:57:45 +01:00
1 parent fc5cabb080
commit 5d39835862
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer implements
double accuracy = Double.parseDouble(object.get(ACCURACY).toString());
double altitude = Double.parseDouble(object.get(ALTITUDE).toString());
String provider = object.get(PROVIDER).toString();
GPSFixMoving fix = GPSFixMovingImpl.create(lonDeg, latDeg, timeMillis, speedKnots, bearingDeg);
GPSFixMoving fix = GPSFixMovingImpl.create(lonDeg, latDeg, timeMillis, speedKnots, bearingDeg, accuracy, altitude, provider);
fixes.add(fix);
}