Removed unused Waypoint.startId and Waypoint.stopId.

src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java

@@ -453,12 +453,6 @@ public class ContentProviderUtils {
         if (!cursor.isNull(durationIndex)) {
             waypoint.setDuration(cursor.getLong(durationIndex));
         }
-        if (!cursor.isNull(startIdIndex)) {
-            waypoint.setStartId(cursor.getLong(startIdIndex));
-        }
-        if (!cursor.isNull(stopIdIndex)) {
-            waypoint.setStopId(cursor.getLong(stopIdIndex));
-        }
 
         Location location = new Location("");
         if (!cursor.isNull(longitudeIndex) && !cursor.isNull(latitudeIndex)) {
@@ -728,8 +722,6 @@ public class ContentProviderUtils {
         values.put(WaypointsColumns.TRACKID, waypoint.getTrackId());
         values.put(WaypointsColumns.LENGTH, waypoint.getLength());
         values.put(WaypointsColumns.DURATION, waypoint.getDuration());
-        values.put(WaypointsColumns.STARTID, waypoint.getStartId());
-        values.put(WaypointsColumns.STOPID, waypoint.getStopId());
 
         Location location = waypoint.getLocation();
         if (location != null) {

src/main/java/de/dennisguse/opentracks/content/data/Waypoint.java

@@ -37,8 +37,6 @@ public final class Waypoint {
     private long trackId = -1L;
     private double length = 0.0;
     private long duration = 0;
-    private long startId = -1L;
-    private long stopId = -1L;
     private Location location = null;
     private TripStatistics tripStatistics = null;
     private String photoUrl = "";
@@ -46,7 +44,7 @@ public final class Waypoint {
     public Waypoint() {
     }
 
-    public Waypoint(String name, String description, String category, String icon, long trackId, double length, long duration, long startId, long stopId, Location location, TripStatistics tripStatistics, String photoUrl) {
+    public Waypoint(String name, String description, String category, String icon, long trackId, double length, long duration, Location location, TripStatistics tripStatistics, String photoUrl) {
         this.name = name;
         this.description = description;
         this.category = category;
@@ -54,8 +52,6 @@ public final class Waypoint {
         this.trackId = trackId;
         this.length = length;
         this.duration = duration;
-        this.startId = startId;
-        this.stopId = stopId;
         this.location = location;
         this.tripStatistics = tripStatistics;
         this.photoUrl = photoUrl;
@@ -125,22 +121,6 @@ public final class Waypoint {
         this.duration = duration;
     }
 
-    public long getStartId() {
-        return startId;
-    }
-
-    public void setStartId(long startId) {
-        this.startId = startId;
-    }
-
-    public long getStopId() {
-        return stopId;
-    }
-
-    public void setStopId(long stopId) {
-        this.stopId = stopId;
-    }
-
     public Location getLocation() {
         return location;
     }

src/main/java/de/dennisguse/opentracks/content/data/WaypointsColumns.java

@@ -40,13 +40,16 @@ public interface WaypointsColumns extends BaseColumns {
     String CATEGORY = "category"; // waypoint category
     String ICON = "icon"; // waypoint icon
     String TRACKID = "trackid"; // track id
-    @Deprecated //Unused
+    @Deprecated
-            String TYPE = "type"; // type
+    String TYPE = "type"; // type // TODO UNUSED
+
     String LENGTH = "length"; // length of the track (without smoothing)
     String DURATION = "duration"; // total duration of the track (not from last waypoint)
     String STARTTIME = "starttime"; // start time of the trip statistics
-    String STARTID = "startid"; // start track point id
+    @Deprecated
-    String STOPID = "stopid"; // stop track point id
+    String STARTID = "startid"; // start track point id // TODO UNUSED
+    @Deprecated
+    String STOPID = "stopid"; // stop track point id // TODO UNUSED
 
     String LONGITUDE = "longitude"; // longitude
     String LATITUDE = "latitude"; // latitude

src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java

@@ -208,7 +208,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
                         long duration = trackTripStatisticstrackUpdater.getTripStatistics().getTotalTime();
 
                         // Insert waypoint
-                        Waypoint newWaypoint = new Waypoint(waypoint.getName(), waypointDescription, waypoint.getCategory(), icon, track.getId(), length, duration, -1L, -1L, location, tripStatistics, waypoint.getPhotoUrl());
+                        Waypoint newWaypoint = new Waypoint(waypoint.getName(), waypointDescription, waypoint.getCategory(), icon, track.getId(), length, duration, location, tripStatistics, waypoint.getPhotoUrl());
                         contentProviderUtils.insertWaypoint(newWaypoint);
                     }
 

src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java

@@ -322,7 +322,7 @@ public class TrackRecordingService extends Service {
         long duration = stats.getTotalTime();
 
         // Insert waypoint
-        Waypoint waypoint = new Waypoint(name, description, category, icon, recordingTrackId, length, duration, -1L, -1L, location, null, photoUrl);
+        Waypoint waypoint = new Waypoint(name, description, category, icon, recordingTrackId, length, duration, location, null, photoUrl);
         Uri uri = contentProviderUtils.insertWaypoint(waypoint);
         return Long.parseLong(uri.getLastPathSegment());
     }