Changeset 14451 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-11-25T17:51:39+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16963 - do not draw lines for GPX unordered tracks

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxData.java (modified) (5 diffs)
• data/gpx/Line.java (added)
• gui/layer/gpx/GpxDrawHelper.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -840 +840 @@
      * over all routes
      */
-    public Iterable<Collection<WayPoint>> getLinesIterable(final boolean... trackVisibility) {
+    public Iterable<Line> getLinesIterable(final boolean... trackVisibility) {
         return () -> new LinesIterator(this, trackVisibility);
     }
@@ -863 +863 @@
      * Iterates over all track segments and then over all routes.
      */
-    public static class LinesIterator implements Iterator<Collection<WayPoint>> {
+    public static class LinesIterator implements Iterator<Line> {
 
         private Iterator<GpxTrack> itTracks;
@@ -870 +870 @@
         private final Iterator<GpxRoute> itRoutes;
 
-        private Collection<WayPoint> next;
+        private Line next;
         private final boolean[] trackVisibility;
+        private Map<String, Object> trackAttributes;
 
         /**
@@ -893 +894 @@
 
         @Override
-        public Collection<WayPoint> next() {
+        public Line next() {
             if (!hasNext()) {
                 throw new NoSuchElementException();
             }
-            Collection<WayPoint> current = next;
+            Line current = next;
             next = getNext();
             return current;
         }
 
-        private Collection<WayPoint> getNext() {
+        private Line getNext() {
             if (itTracks != null) {
                 if (itTrackSegments != null && itTrackSegments.hasNext()) {
-                    return itTrackSegments.next().getWayPoints();
+                    return new Line(itTrackSegments.next(), trackAttributes);
                 } else {
                     while (itTracks.hasNext()) {
                         GpxTrack nxtTrack = itTracks.next();
+                        trackAttributes = nxtTrack.getAttributes();
                         idxTracks++;
                         if (trackVisibility != null && !trackVisibility[idxTracks])
@@ -914 +916 @@
                         itTrackSegments = nxtTrack.getSegments().iterator();
                         if (itTrackSegments.hasNext()) {
-                            return itTrackSegments.next().getWayPoints();
+                            return new Line(itTrackSegments.next(), trackAttributes);
                         }
                     }
                     // if we get here, all the Tracks are finished; Continue with Routes
+                    trackAttributes = null;
                     itTracks = null;
                 }
             }
             if (itRoutes.hasNext()) {
-                return itRoutes.next().routePoints;
+                return new Line(itRoutes.next());
             }
             return null;

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -24 +24 @@
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -42 +41 @@
 import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeEvent;
 import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener;
+import org.openstreetmap.josm.data.gpx.Line;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
@@ -365 +365 @@
 
         ensureTrackVisibilityLength();
-        for (Collection<WayPoint> segment : data.getLinesIterable(layer.trackVisibility)) {
+        for (Line segment : data.getLinesIterable(layer.trackVisibility)) {
 
             for (WayPoint pt : segment) {
@@ -501 +501 @@
             if (colored == ColorMode.VELOCITY) {
                 final List<Double> velocities = new ArrayList<>();
-                for (Collection<WayPoint> segment : data.getLinesIterable(null)) {
+                for (Line segment : data.getLinesIterable(null)) {
                     if (!forceLines) {
                         oldWp = null;
@@ -526 +526 @@
                 }
             } else if (colored == ColorMode.HDOP) {
-                for (Collection<WayPoint> segment : data.getLinesIterable(null)) {
+                for (Line segment : data.getLinesIterable(null)) {
                     for (WayPoint trkPnt : segment) {
                         Object val = trkPnt.get(GpxConstants.PT_HDOP);
@@ -565 +565 @@
 
         // Now the colors for all the points will be assigned
-        for (Collection<WayPoint> segment : data.getLinesIterable(null)) {
+        for (Line segment : data.getLinesIterable(null)) {
             if (!forceLines) { // don't draw lines between segments, unless forced to
                 oldWp = null;
@@ -609 +609 @@
                     default: // Do nothing
                     }
-                    if (!noDraw && (maxLineLength == -1 || dist <= maxLineLength)) {
+                    if (!noDraw && !segment.isUnordered() && (maxLineLength == -1 || dist <= maxLineLength)) {
                         trkPnt.drawLine = true;
                         double bearing = oldWp.getCoor().bearing(trkPnt.getCoor());