Changeset 16847 in josm for trunk

Timestamp:

2020-08-04T22:19:41+02:00 (4 years ago)

Author:

simon04

Message:

fix #10488 - GpxLayer: jump to previous/next segment

File:

• trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -13 +13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
@@ -34 +36 @@
 import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener;
 import org.openstreetmap.josm.data.gpx.IGpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.io.importexport.GpxImporter;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToMarkerLayer;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToNextMarker;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToPreviousMarker;
 import org.openstreetmap.josm.gui.layer.gpx.ChooseTrackVisibilityAction;
 import org.openstreetmap.josm.gui.layer.gpx.ConvertFromGpxLayerAction;
@@ -60 +67 @@
  * A layer that displays data from a Gpx file / the OSM gpx downloads.
  */
-public class GpxLayer extends AbstractModifiableLayer implements ExpertModeChangeListener {
+public class GpxLayer extends AbstractModifiableLayer implements ExpertModeChangeListener, JumpToMarkerLayer {
 
     /** GPX data */
@@ -83 +90 @@
      */
     private MarkerLayer linkedMarkerLayer;
+
+    /**
+     * Current segment for {@link JumpToMarkerLayer}.
+     */
+    private IGpxTrackSegment currentSegment = null;
 
     /**
@@ -239 +251 @@
     @Override
     public Action[] getMenuEntries() {
+        JumpToNextMarker jumpToNext = new JumpToNextMarker(this);
+        jumpToNext.putValue(Action.NAME, tr("Jump to next segment"));
+        JumpToPreviousMarker jumpToPrevious = new JumpToPreviousMarker(this);
+        jumpToPrevious.putValue(Action.NAME, tr("Jump to previous segment"));
         List<Action> entries = new ArrayList<>(Arrays.asList(
                 LayerListDialog.getInstance().createShowHideLayerAction(),
@@ -251 +267 @@
                 new ImportAudioAction(this),
                 new MarkersFromNamedPointsAction(this),
+                jumpToNext,
+                jumpToPrevious,
                 new ConvertFromGpxLayerAction(this),
                 new DownloadAlongTrackAction(data),
@@ -555 +573 @@
         return data;
     }
+
+    /**
+     * Jump (move the viewport) to the next track segment.
+     */
+    @Override
+    public void jumpToNextMarker() {
+        List<IGpxTrackSegment> segments = data.getTrackSegmentsStream().collect(Collectors.toList());
+        jumpToNext(segments);
+    }
+
+    /**
+     * Jump (move the viewport) to the previous track segment.
+     */
+    @Override
+    public void jumpToPreviousMarker() {
+        List<IGpxTrackSegment> segments = data.getTrackSegmentsStream().collect(Collectors.toList());
+        Collections.reverse(segments);
+        jumpToNext(segments);
+    }
+
+    private void jumpToNext(List<IGpxTrackSegment> segments) {
+        if (segments.isEmpty()) {
+            return;
+        } else if (currentSegment == null) {
+            currentSegment = segments.get(0);
+            MainApplication.getMap().mapView.zoomTo(currentSegment.getBounds());
+        } else {
+            try {
+                int index = segments.indexOf(currentSegment);
+                currentSegment = segments.listIterator(index + 1).next();
+                MainApplication.getMap().mapView.zoomTo(currentSegment.getBounds());
+            } catch (IndexOutOfBoundsException | NoSuchElementException ignore) {
+                Logging.trace(ignore);
+            }
+        }
+    }
 }