Changeset 12156 in josm for trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java

Timestamp:

2017-05-15T14:14:40+02:00 (7 years ago)

Author:

michael2402

Message:

See #14120: Don't make gpx tracks depend on the isChanged method, use a listener based approach instead.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java (modified) (2 diffs)

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

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
-import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -30 +27 @@
     public void actionPerformed(ActionEvent e) {
         GpxData namedTrackPoints = new GpxData();
-        for (GpxTrack track : layer.data.tracks) {
-            for (GpxTrackSegment seg : track.getSegments()) {
-                for (WayPoint point : seg.getWayPoints()) {
-                    if (point.attr.containsKey("name") || point.attr.containsKey("desc")) {
-                        namedTrackPoints.waypoints.add(point);
-                    }
-                }
-            }
-        }
+        layer.data.getTrackPoints()
+            .filter(point -> point.attr.containsKey("name") || point.attr.containsKey("desc"))
+            .forEach(namedTrackPoints.waypoints::add);
         MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", layer.getName()), layer.getAssociatedFile(), layer);
         if (!ml.data.isEmpty()) {