Changeset 35221 in osm for applications/editors/josm/plugins/infomode/src/org

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/infomode/src/org/openstreetmap/josm/plugins/infomode

Files:

• InfoMode.java (modified) (3 diffs)
• InfoPanel.java (modified) (5 diffs)

applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -219 +219 @@
         if (l instanceof GpxLayer && pos != null) {
             GpxLayer gpxL = (GpxLayer) l;
-            Set<GpxTrack> toRemove = new HashSet<>();
-            for (GpxTrack track : gpxL.data.tracks) {
+            Set<IGpxTrack> toRemove = new HashSet<>();
+            for (IGpxTrack track : gpxL.data.tracks) {
                 boolean f = true;
                 sg: for (IGpxTrackSegment seg : track.getSegments()) {
@@ -241 +241 @@
             double minDist = 1e9, d;
             WayPoint wp = null, oldWp = null, prevWp = null;
-            GpxTrack trk = null;
+            IGpxTrack trk = null;
             double maxD = mv.getDist100Pixel()/3;
-            for (GpxTrack track : gpxL.data.tracks) {
+            for (IGpxTrack track : gpxL.data.tracks) {
                 for (IGpxTrackSegment seg : track.getSegments()) {
                     oldWp = null; // next segment will have new previous point

applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java

@@ -20 +20 @@
 
 import org.openstreetmap.josm.data.SystemOfMeasurement;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -31 +31 @@
 class InfoPanel extends JPanel {
 
-    private Collection<GpxTrack> tracks;
-    private GpxTrack trk;
+    private Collection<IGpxTrack> tracks;
+    private IGpxTrack trk;
 
     private JLabel label1 = new JLabel();
@@ -73 +73 @@
             public void actionPerformed(ActionEvent e) {
             if (tracks == null) return;
-            Set<GpxTrack> toRemove = new HashSet<>();
+            Set<IGpxTrack> toRemove = new HashSet<>();
 
             double tm = -1;
@@ -84 +84 @@
                 }
 
-            for (GpxTrack track : tracks) {
+            for (IGpxTrack track : tracks) {
                 boolean f = true;
                 sg: for (IGpxTrackSegment seg : track.getSegments()) {
@@ -102 +102 @@
     }
 
-    void setData(WayPoint wp, GpxTrack trk, double vel, Collection<GpxTrack> tracks) {
+    void setData(WayPoint wp, IGpxTrack trk, double vel, Collection<IGpxTrack> tracks) {
         this.tracks = tracks;
         this.trk = trk;