Changeset 12157 in josm for trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

Timestamp:

2017-05-15T14:41:08+02:00 (7 years ago)

Author:

michael2402

Message:

See #13124: Refresh the heat map on every invalidation (visible tacks changed, ...)

File:

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

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

@@ -10 +10 @@
 import java.text.DateFormat;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 
 import javax.swing.Action;
@@ -20 +17 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.SaveActionBase;
@@ -28 +24 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.preferences.ColorProperty;
@@ -66 +61 @@
     public boolean[] trackVisibility = new boolean[0];
 
-    private final GpxDrawHelper drawHelper;
-
     /**
      * Constructs a new {@code GpxLayer} without name.
@@ -95 +88 @@
         data = d;
         data.addWeakChangeListener(e -> this.invalidate());
-        drawHelper = new GpxDrawHelper(data);
-        SystemOfMeasurement.addSoMChangeListener(drawHelper);
-        ensureTrackVisibilityLength();
+        trackVisibility = new boolean[data.getTracks().size()];
+        Arrays.fill(trackVisibility, true);
         setName(name);
         isLocalFile = isLocal;
@@ -280 +272 @@
             throw new IllegalArgumentException("not a GpxLayer: " + from);
         data.mergeFrom(((GpxLayer) from).data);
-        drawHelper.dataChanged();
-    }
-
-    @Override
-    public void paint(Graphics2D g, MapView mv, Bounds box) {
-        List<WayPoint> visibleSegments = listVisibleSegments(box);
-        if (!visibleSegments.isEmpty()) {
-            drawHelper.readPreferences(getName());
-            drawHelper.drawAll(g, mv, visibleSegments);
-            if (Main.getLayerManager().getActiveLayer() == this) {
-                drawHelper.drawColorBar(g, mv);
-            }
-        }
-    }
-
-    private List<WayPoint> listVisibleSegments(Bounds box) {
-        WayPoint last = null;
-        LinkedList<WayPoint> visibleSegments = new LinkedList<>();
-
-        ensureTrackVisibilityLength();
-        for (Collection<WayPoint> segment : data.getLinesIterable(trackVisibility)) {
-
-            for (WayPoint pt : segment) {
-                Bounds b = new Bounds(pt.getCoor());
-                if (pt.drawLine && last != null) {
-                    b.extend(last.getCoor());
-                }
-                if (b.intersects(box)) {
-                    if (last != null && (visibleSegments.isEmpty()
-                            || visibleSegments.getLast() != last)) {
-                        if (last.drawLine) {
-                            WayPoint l = new WayPoint(last);
-                            l.drawLine = false;
-                            visibleSegments.add(l);
-                        } else {
-                            visibleSegments.add(last);
-                        }
-                    }
-                    visibleSegments.add(pt);
-                }
-                last = pt;
-            }
-        }
-        return visibleSegments;
+        invalidate();
     }
 
@@ -339 +288 @@
     public void setAssociatedFile(File file) {
         data.storageFile = file;
-    }
-
-    /** ensures the trackVisibility array has the correct length without losing data.
-     * additional entries are initialized to true;
-     */
-    private void ensureTrackVisibilityLength() {
-        final int l = data.getTracks().size();
-        if (l == trackVisibility.length)
-            return;
-        final int m = Math.min(l, trackVisibility.length);
-        trackVisibility = Arrays.copyOf(trackVisibility, l);
-        for (int i = m; i < l; i++) {
-            trackVisibility[i] = true;
-        }
-        invalidate();
     }
 
@@ -383 +317 @@
 
     @Override
-    public synchronized void destroy() {
-        super.destroy();
-        SystemOfMeasurement.removeSoMChangeListener(drawHelper);
+    public void paint(Graphics2D g, MapView mv, Bounds bbox) {
+        // unused - we use a painter so this is not called.
+    }
+
+    @Override
+    protected LayerPainter createMapViewPainter(MapViewEvent event) {
+        return new GpxDrawHelper(this);
     }
 }