From 3c52efadd6f456477c521740d0311295f9c4b9b9 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 26 Dec 2019 11:37:48 +0100 Subject: [PATCH] Removed unused Waypoint.TripStatistics. --- .../opentracks/MarkerDetailActivity.java | 9 +++------ .../content/ContentProviderUtils.java | 19 ------------------- .../opentracks/content/data/Waypoint.java | 18 +----------------- .../io/file/exporter/FileTrackExporter.java | 4 +--- .../importer/AbstractFileTrackImporter.java | 5 +---- .../services/TrackRecordingService.java | 2 +- 6 files changed, 7 insertions(+), 50 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java index 599146128..df3f0fcac 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java @@ -71,12 +71,9 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark if (cursor != null && cursor.moveToFirst()) { for (int i = 0; i < cursor.getCount(); i++) { Waypoint currentMarker = contentProviderUtils.createWaypoint(cursor); - - if (!currentMarker.isTripStatistics()) { - markerIds.add(currentMarker.getId()); - if (currentMarker.getId() == markerId) { - markerIndex = markerIds.size() - 1; - } + markerIds.add(currentMarker.getId()); + if (currentMarker.getId() == markerId) { + markerIndex = markerIds.size() - 1; } cursor.moveToNext(); diff --git a/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java index 3ffc105f7..a9b43c43e 100644 --- a/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java +++ b/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java @@ -518,9 +518,6 @@ public class ContentProviderUtils { tripStatistics.setMaxGrade(cursor.getFloat(maxGradeIndex)); hasTripStatistics = true; } - if (hasTripStatistics) { - waypoint.setTripStatistics(tripStatistics); - } if (!cursor.isNull(photoUrlIndex)) { waypoint.setPhotoUrl(cursor.getString(photoUrlIndex)); @@ -742,22 +739,6 @@ public class ContentProviderUtils { } } - TripStatistics tripStatistics = waypoint.getTripStatistics(); - if (tripStatistics != null) { - values.put(WaypointsColumns.STARTTIME, tripStatistics.getStartTime()); - values.put(WaypointsColumns.TOTALDISTANCE, tripStatistics.getTotalDistance()); - values.put(WaypointsColumns.TOTALTIME, tripStatistics.getTotalTime()); - values.put(WaypointsColumns.MOVINGTIME, tripStatistics.getMovingTime()); - values.put(WaypointsColumns.AVGSPEED, tripStatistics.getAverageSpeed()); - values.put(WaypointsColumns.AVGMOVINGSPEED, tripStatistics.getAverageMovingSpeed()); - values.put(WaypointsColumns.MAXSPEED, tripStatistics.getMaxSpeed()); - values.put(WaypointsColumns.MINELEVATION, tripStatistics.getMinElevation()); - values.put(WaypointsColumns.MAXELEVATION, tripStatistics.getMaxElevation()); - values.put(WaypointsColumns.ELEVATIONGAIN, tripStatistics.getTotalElevationGain()); - values.put(WaypointsColumns.MINGRADE, tripStatistics.getMinGrade()); - values.put(WaypointsColumns.MAXGRADE, tripStatistics.getMaxGrade()); - } - values.put(WaypointsColumns.PHOTOURL, waypoint.getPhotoUrl()); return values; } diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Waypoint.java b/src/main/java/de/dennisguse/opentracks/content/data/Waypoint.java index 02437ceda..3787786b4 100644 --- a/src/main/java/de/dennisguse/opentracks/content/data/Waypoint.java +++ b/src/main/java/de/dennisguse/opentracks/content/data/Waypoint.java @@ -19,8 +19,6 @@ package de.dennisguse.opentracks.content.data; import android.location.Location; import android.net.Uri; -import de.dennisguse.opentracks.stats.TripStatistics; - /** * A waypoint. * @@ -38,13 +36,12 @@ public final class Waypoint { private double length = 0.0; private long duration = 0; private Location location = null; - private TripStatistics tripStatistics = null; private String photoUrl = ""; public Waypoint() { } - public Waypoint(String name, String description, String category, String icon, long trackId, double length, long duration, Location location, TripStatistics tripStatistics, String photoUrl) { + public Waypoint(String name, String description, String category, String icon, long trackId, double length, long duration, Location location, String photoUrl) { this.name = name; this.description = description; this.category = category; @@ -53,7 +50,6 @@ public final class Waypoint { this.length = length; this.duration = duration; this.location = location; - this.tripStatistics = tripStatistics; this.photoUrl = photoUrl; } @@ -129,18 +125,6 @@ public final class Waypoint { this.location = location; } - public boolean isTripStatistics() { - return tripStatistics != null; - } - - public TripStatistics getTripStatistics() { - return tripStatistics; - } - - public void setTripStatistics(TripStatistics tripStatistics) { - this.tripStatistics = tripStatistics; - } - public String getPhotoUrl() { return photoUrl; } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java index 1d23dcaab..313467bad 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java @@ -108,9 +108,7 @@ public class FileTrackExporter implements TrackExporter { hasWaypoints = true; } Waypoint waypoint = contentProviderUtils.createWaypoint(cursor); - if (!waypoint.isTripStatistics()) { - trackWriter.writeWaypoint(waypoint); - } + trackWriter.writeWaypoint(waypoint); cursor.moveToNext(); } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java index 5a4c439b9..1a4db5a23 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java @@ -44,7 +44,6 @@ import de.dennisguse.opentracks.content.LocationIterator; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.content.data.Waypoint; import de.dennisguse.opentracks.services.TrackRecordingService; -import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.stats.TripStatisticsUpdater; import de.dennisguse.opentracks.util.FileUtils; import de.dennisguse.opentracks.util.LocationUtils; @@ -200,15 +199,13 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track // Valid location if (location.getLatitude() == waypoint.getLocation().getLatitude() && location.getLongitude() == waypoint.getLocation().getLongitude()) { - - TripStatistics tripStatistics = null; String waypointDescription = waypoint.getDescription(); String icon = context.getString(R.string.marker_waypoint_icon_url); double length = trackTripStatisticstrackUpdater.getTripStatistics().getTotalDistance(); long duration = trackTripStatisticstrackUpdater.getTripStatistics().getTotalTime(); // Insert waypoint - Waypoint newWaypoint = new Waypoint(waypoint.getName(), waypointDescription, waypoint.getCategory(), icon, track.getId(), length, duration, location, tripStatistics, waypoint.getPhotoUrl()); + Waypoint newWaypoint = new Waypoint(waypoint.getName(), waypointDescription, waypoint.getCategory(), icon, track.getId(), length, duration, location, waypoint.getPhotoUrl()); contentProviderUtils.insertWaypoint(newWaypoint); } diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index ab072b546..d2dabc63d 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/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, location, null, photoUrl); + Waypoint waypoint = new Waypoint(name, description, category, icon, recordingTrackId, length, duration, location, photoUrl); Uri uri = contentProviderUtils.insertWaypoint(waypoint); return Long.parseLong(uri.getLastPathSegment()); }