TrackPoint has Location as delegate instead of inheritance.

This commit is contained in:
Dennis Guse
2020-03-29 12:30:16 +02:00
parent 901cffee97
commit 194379295d
25 changed files with 288 additions and 184 deletions
@@ -18,6 +18,7 @@ package de.dennisguse.opentracks.io.file.importer;
import android.content.ContentUris;
import android.content.Context;
import android.location.Location;
import android.location.LocationManager;
import android.net.Uri;
@@ -84,12 +85,12 @@ public abstract class AbstractTestFileTrackImporter {
public ContentProviderUtils contentProviderUtils;
TrackPoint createTrackPoint(int index, long time) {
TrackPoint trackPoint = new TrackPoint(LocationManager.GPS_PROVIDER);
Location trackPoint = new Location(LocationManager.GPS_PROVIDER);
trackPoint.setLatitude(TRACK_LATITUDE + index);
trackPoint.setLongitude(TRACK_LONGITUDE + index);
trackPoint.setAltitude(TRACK_ELEVATION + index);
trackPoint.setTime(time);
return trackPoint;
return new TrackPoint(trackPoint);
}
/**
@@ -67,7 +67,7 @@ public class ExportImportTest {
waypoint.setIcon("the waypoing icon" + i);
waypoint.setPhotoUrl("the photo url" + i);
waypoint.setTrackId(trackId);
waypoint.setLocation(track.getTrackPoints().get(i));
waypoint.setLocation(track.getTrackPoints().get(i).getLocation());
contentProviderUtils.insertWaypoint(waypoint);
waypoints.add(waypoint);