diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/Mark.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkInfo.java similarity index 67% rename from mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/Mark.java rename to mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkInfo.java index 6f4f5df86de..559cb1cad5a 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/Mark.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkInfo.java @@ -1,25 +1,19 @@ package com.sap.sailing.android.buoy.positioning.app.valueobjects; -public class Mark { +public class MarkInfo { - private int id; + private int markId; private String name; private String type; private String className; - - public Mark(int id, String name, String type, String className){ - setId(id); - setName(name); - setType(type); - setClassName(className); - } + private String checkinDigest; public int getId() { - return id; + return markId; } public void setId(int id) { - this.id = id; + this.markId = id; } public String getName() { @@ -45,5 +39,13 @@ public class Mark { public void setClassName(String className) { this.className = className; } + + public String getCheckinDigest() { + return checkinDigest; + } + + public void setCheckinDigest(String checkinDigest) { + this.checkinDigest = checkinDigest; + } } diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkPing.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkPing.java deleted file mode 100644 index 790a45c3902..00000000000 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkPing.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.sap.sailing.android.buoy.positioning.app.valueobjects; - -public class MarkPing { - private String type; - private String longitude; - private String lattitude; - private int unixType; - - public MarkPing(String type, String longitude, String lattitude, int unixType){ - setType(type); - setLongitude(longitude); - setLattitude(lattitude); - setUnixType(unixType); - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getLattitude() { - return lattitude; - } - - public void setLattitude(String lattitude) { - this.lattitude = lattitude; - } - - public int getUnixType() { - return unixType; - } - - public void setUnixType(int unixType) { - this.unixType = unixType; - } -} diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkPingInfo.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkPingInfo.java new file mode 100644 index 00000000000..7327afb0f35 --- /dev/null +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkPingInfo.java @@ -0,0 +1,49 @@ +package com.sap.sailing.android.buoy.positioning.app.valueobjects; + +public class MarkPingInfo { + private int markId; + private String longitude; + private String lattitude; + private double accuracy; + private int timestamp; + + public int getMarkId() { + return markId; + } + + public void setMarkId(int markId) { + this.markId = markId; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLattitude() { + return lattitude; + } + + public void setLattitude(String lattitude) { + this.lattitude = lattitude; + } + + public double getAccuracy() { + return accuracy; + } + + public void setAccuracy(double accuracy) { + this.accuracy = accuracy; + } + + public int getTimestamp() { + return timestamp; + } + + public void setTimestamp(int timestamp) { + this.timestamp = timestamp; + } +}