Changeset 35212 in osm for applications/editors/josm

Timestamp:

2019-11-02T15:30:55+01:00 (5 years ago)

Author:

donvip

Message:

update to JOSM 15496

Location:

applications/editors/josm/plugins/ElevationProfile

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/elevation/gpx/GpxIterator.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxVisitor.java (modified) (3 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="[josm_elevationprofile]"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14456"/>
+    <property name="plugin.main.version" value="15496"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java

@@ -8 +8 @@
 import org.openstreetmap.josm.data.gpx.GpxRoute;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.IWithAttributes;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -160 +160 @@
 
     @Override
-    public void beginTrackSegment(GpxTrack track, GpxTrackSegment segment) {
+    public void beginTrackSegment(GpxTrack track, IGpxTrackSegment segment) {
         // Nothing to do here for now
     }
 
     @Override
-    public void endTrackSegment(GpxTrack track, GpxTrackSegment segment) {
+    public void endTrackSegment(GpxTrack track, IGpxTrackSegment segment) {
         // Nothing to do here for now
     }
 
     @Override
-    public void visitTrackPoint(WayPoint wp, GpxTrack track,
-            GpxTrackSegment segment) {
-
+    public void visitTrackPoint(WayPoint wp, GpxTrack track, IGpxTrackSegment segment) {
         processWayPoint(wp);
     }

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GpxIterator.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.gpx.GpxRoute;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 
@@ -78 +78 @@
         if (visitor == null) return;
 
-        Collection<GpxTrackSegment> segments = trk.getSegments();
+        Collection<IGpxTrackSegment> segments = trk.getSegments();
 
         if (segments != null) {
             visitor.beginTrack(trk);
             // visit all segments
-            for (GpxTrackSegment segment : segments) {
+            for (IGpxTrackSegment segment : segments) {
                 Collection<WayPoint> waypts = segment.getWayPoints();
                 // no visitor here...

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxVisitor.java

@@ -4 +4 @@
 import org.openstreetmap.josm.data.gpx.GpxRoute;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 
@@ -46 +46 @@
      * Starts a segment within a GPX track.
      */
-    void beginTrackSegment(GpxTrack track, GpxTrackSegment segment);
+    void beginTrackSegment(GpxTrack track, IGpxTrackSegment segment);
 
     /**
      * Ends a segment within a GPX track.
      */
-    void endTrackSegment(GpxTrack track, GpxTrackSegment segment);
+    void endTrackSegment(GpxTrack track, IGpxTrackSegment segment);
 
     /**
@@ -67 +67 @@
      * @param segment the track segment
      */
-    void visitTrackPoint(WayPoint wp, GpxTrack track, GpxTrackSegment segment);
+    void visitTrackPoint(WayPoint wp, GpxTrack track, IGpxTrackSegment segment);
 
     /**