Changeset 16864 in josm for trunk/src/org

Timestamp:

2020-08-10T23:19:05+02:00 (4 years ago)

Author:

simon04

Message:

fix #15441 - Separate GpxRouteLayer

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadGpsTask.java (modified) (3 diffs)
• data/gpx/GpxData.java (modified) (3 diffs)
• gui/io/importexport/GpxImporter.java (modified) (8 diffs)
• gui/layer/GpxRouteLayer.java (added)
• gui/layer/gpx/GpxDrawHelper.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.io.importexport.GpxImporter.GpxImporterData;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.GpxRouteLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -144 +145 @@
             addOrMergeLayer(gpxLayer, findGpxMergeLayer());
             addOrMergeLayer(layers.getMarkerLayer(), findMarkerMergeLayer(gpxLayer));
+            addOrMergeLayer(layers.getGpxRouteLayer(), findGpxRouteMergeLayer(gpxLayer));
 
             layers.getPostLayerTask().run();
@@ -190 +192 @@
         }
 
+        private GpxRouteLayer findGpxRouteMergeLayer(GpxLayer fromLayer) {
+            return MainApplication.getLayerManager().getLayersOfType(GpxRouteLayer.class).stream()
+                    .filter(l -> fromLayer != null && l.fromLayer == fromLayer)
+                    .findFirst().orElse(null);
+        }
+
         @Override
         protected void cancel() {

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

@@ -905 +905 @@
         private int idxTracks;
         private Iterator<IGpxTrackSegment> itTrackSegments;
-        private final Iterator<GpxRoute> itRoutes;
 
         private Line next;
@@ -921 +920 @@
             itTracks = data.tracks.iterator();
             idxTracks = -1;
-            itRoutes = data.routes.iterator();
             this.trackVisibility = trackVisibility;
             next = getNext();
@@ -961 +959 @@
                     itTracks = null;
                 }
-            }
-            if (itRoutes.hasNext()) {
-                return new Line(itRoutes.next());
             }
             return null;

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.GpxRouteLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -41 +42 @@
         private final GpxLayer gpxLayer;
         /**
+         * The imported GPX route layer. May be null if no marker.
+         */
+        private final GpxRouteLayer gpxRouteLayer;
+        /**
          * The imported marker layer. May be null if no marker.
          */
@@ -55 +60 @@
          * @param postLayerTask The task to run after GPX and/or marker layer has been added to MapView.
          */
-        public GpxImporterData(GpxLayer gpxLayer, MarkerLayer markerLayer, Runnable postLayerTask) {
+        public GpxImporterData(GpxLayer gpxLayer, GpxRouteLayer gpxRouteLayer, MarkerLayer markerLayer, Runnable postLayerTask) {
             this.gpxLayer = gpxLayer;
+            this.gpxRouteLayer = gpxRouteLayer;
             this.markerLayer = markerLayer;
             this.postLayerTask = postLayerTask;
@@ -67 +73 @@
         public GpxLayer getGpxLayer() {
             return gpxLayer;
+        }
+
+        /**
+         * Returns the imported GPX route layer. May be null if no GPX data.
+         * @return the imported GPX route layer. May be null if no GPX data.
+         */
+        public GpxRouteLayer getGpxRouteLayer() {
+            return gpxRouteLayer;
         }
 
@@ -128 +142 @@
                 MainApplication.getLayerManager().addLayer(data.markerLayer);
             }
+            if (data.gpxRouteLayer != null) {
+                MainApplication.getLayerManager().addLayer(data.gpxRouteLayer);
+            }
             if (data.gpxLayer != null) {
                 MainApplication.getLayerManager().addLayer(data.gpxLayer);
@@ -147 +164 @@
             final String gpxLayerName, String markerLayerName) {
         MarkerLayer markerLayer = null;
+        GpxRouteLayer gpxRouteLayer = null;
         GpxLayer gpxLayer = new GpxLayer(data, gpxLayerName, data.storageFile != null);
         if (Config.getPref().getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
@@ -155 +173 @@
                 gpxLayer.setLinkedMarkerLayer(markerLayer);
             }
+        }
+        if (Config.getPref().getBoolean("gpx.makeautoroutes", true)) {
+            gpxRouteLayer = new GpxRouteLayer(tr("Routes from {0}", gpxLayerName), gpxLayer);
         }
 
@@ -182 +203 @@
             }
         };
-        return new GpxImporterData(gpxLayer, markerLayer, postLayerTask);
+        return new GpxImporterData(gpxLayer, gpxRouteLayer, markerLayer, postLayerTask);
     }
 

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

@@ -370 +370 @@
 
         ensureTrackVisibilityLength();
-        for (Line segment : data.getLinesIterable(layer.trackVisibility)) {
+        for (Line segment : getLinesIterable(layer.trackVisibility)) {
 
             for (WayPoint pt : segment) {
@@ -396 +396 @@
     }
 
+    protected Iterable<Line> getLinesIterable(final boolean[] trackVisibility) {
+        return data.getLinesIterable(trackVisibility);
+    }
+
     /** ensures the trackVisibility array has the correct length without losing data.
      * TODO: Make this nicer by syncing the trackVisibility automatically.
@@ -508 +512 @@
             if (colored == ColorMode.VELOCITY) {
                 final List<Double> velocities = new ArrayList<>();
-                for (Line segment : data.getLinesIterable(null)) {
+                for (Line segment : getLinesIterable(null)) {
                     if (!forceLines) {
                         oldWp = null;
@@ -533 +537 @@
                 }
             } else if (colored == ColorMode.HDOP) {
-                for (Line segment : data.getLinesIterable(null)) {
+                for (Line segment : getLinesIterable(null)) {
                     for (WayPoint trkPnt : segment) {
                         Object val = trkPnt.get(GpxConstants.PT_HDOP);
@@ -573 +577 @@
 
         // Now the colors for all the points will be assigned
-        for (Line segment : data.getLinesIterable(null)) {
+        for (Line segment : getLinesIterable(null)) {
             if (!forceLines) { // don't draw lines between segments, unless forced to
                 oldWp = null;