Changeset 35221 in osm for applications/editors/josm/plugins/livegps

Timestamp:

2019-11-03T22:22:25+01:00 (5 years ago)

Author:

donvip

Message:

see #josm16796 - update to JOSM 15502 - use IGpxTrack in GpxData (patch by Bjoeni)

Location:

applications/editors/josm/plugins/livegps

Files:

• build.xml (modified) (1 diff)
• src/livegps/AppendableGpxTrackSegment.java (modified) (2 diffs)
• src/livegps/LiveGpsLayer.java (modified) (2 diffs)
• src/livegps/SingleSegmentGpxTrack.java (modified) (2 diffs)

applications/editors/josm/plugins/livegps/build.xml

@@ -2 +2 @@
 <project name="livegps" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="15502"/>
         
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/livegps/src/livegps/AppendableGpxTrackSegment.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.gpx.WithAttributes;
 import org.openstreetmap.josm.tools.CopyList;
 
@@ -13 +14 @@
  *
  */
-public class AppendableGpxTrackSegment implements GpxTrackSegment {
+public class AppendableGpxTrackSegment extends WithAttributes implements IGpxTrackSegment {
 
     private WayPoint[] wayPoints = new WayPoint[16];

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -51 +51 @@
         attr.put("desc", "josm live gps");
 
-        GpxTrack trackBeingWritten = new SingleSegmentGpxTrack(trackSegment, attr);
+        IGpxTrack trackBeingWritten = new SingleSegmentGpxTrack(trackSegment, attr);
         data.tracks.add(trackBeingWritten);
 

applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WithAttributes;
 
-public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
+public class SingleSegmentGpxTrack extends WithAttributes implements IGpxTrack {
 
-    private final GpxTrackSegment trackSegment;
+    private final IGpxTrackSegment trackSegment;
 
-    public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
+    public SingleSegmentGpxTrack(IGpxTrackSegment trackSegment, Map<String, Object> attributes) {
         this.attr = Collections.unmodifiableMap(attributes);
         this.trackSegment = trackSegment;
@@ -31 +31 @@
 
     @Override
-    public Collection<GpxTrackSegment> getSegments() {
+    public Collection<IGpxTrackSegment> getSegments() {
         return Collections.singleton(trackSegment);
     }