Changeset 35215 in osm for applications/editors/josm/plugins/infomode/src

Timestamp:

2019-11-02T15:35:24+01:00 (5 years ago)

Author:

donvip

Message:

update to JOSM 15496

Location:

applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode

Files:

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

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

@@ -27 +27 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 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;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
@@ -222 +222 @@
             for (GpxTrack track : gpxL.data.tracks) {
                 boolean f = true;
-                sg: for (GpxTrackSegment seg : track.getSegments()) {
+                sg: for (IGpxTrackSegment seg : track.getSegments()) {
                     for (WayPoint S : seg.getWayPoints()) {
                         if (S.hasDate()) {
@@ -244 +244 @@
             double maxD = mv.getDist100Pixel()/3;
             for (GpxTrack track : gpxL.data.tracks) {
-                for (GpxTrackSegment seg : track.getSegments()) {
+                for (IGpxTrackSegment seg : track.getSegments()) {
                     oldWp = null; // next segment will have new previous point
                     for (WayPoint S : seg.getWayPoints()) {
@@ -268 +268 @@
                     Stroke oldStroke = g.getStroke();
                     g.setStroke(new BasicStroke(10));
-                    for (GpxTrackSegment seg : trk.getSegments()) {
-                    Point oldP = null, curP = null; // next segment will have new previous point
+                    for (IGpxTrackSegment seg : trk.getSegments()) {
+                        Point oldP = null, curP = null; // next segment will have new previous point
                         for (WayPoint S : seg.getWayPoints()) {
                             curP = mv.getPoint(S.getEastNorth(ProjectionRegistry.getProjection()));

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 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;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -76 +76 @@
 
             double tm = -1;
-            for (GpxTrackSegment seg : trk.getSegments()) {
+            for (IGpxTrackSegment seg : trk.getSegments()) {
                     for (WayPoint S : seg.getWayPoints()) {
                         if (S.getTime() > tm) {
@@ -86 +86 @@
             for (GpxTrack track : tracks) {
                 boolean f = true;
-                sg: for (GpxTrackSegment seg : track.getSegments()) {
+                sg: for (IGpxTrackSegment seg : track.getSegments()) {
                     for (WayPoint S : seg.getWayPoints()) {
                         if (S.getTime() > tm) {