Changeset 14748 in josm for trunk

Timestamp:

2019-01-28T10:05:18+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17263: GpxLayer sometimes shows "ghost lines"

File:

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

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

@@ -350 +350 @@
     @Override
     public void paint(MapViewGraphics graphics) {
-        List<WayPoint> visibleSegments = listVisibleSegments(graphics.getClipBounds().getLatLonBoundsBox());
+        Bounds clipBounds = graphics.getClipBounds().getLatLonBoundsBox();
+        List<WayPoint> visibleSegments = listVisibleSegments(clipBounds);
         if (!visibleSegments.isEmpty()) {
             readPreferences(layer.getName());
-            drawAll(graphics.getDefaultGraphics(), graphics.getMapView(), visibleSegments);
+            drawAll(graphics.getDefaultGraphics(), graphics.getMapView(), visibleSegments, clipBounds);
             if (graphics.getMapView().getLayerManager().getActiveLayer() == layer) {
                 drawColorBar(graphics.getDefaultGraphics(), graphics.getMapView());
@@ -411 +412 @@
      * @param mv              the meta data to current displayed area
      * @param visibleSegments segments visible in the current scope of mv
-     */
-    public void drawAll(Graphics2D g, MapView mv, List<WayPoint> visibleSegments) {
+     * @param clipBounds      the clipping rectangle for the current view
+     * @since 14748 : new parameter clipBounds
+     */
+
+    public void drawAll(Graphics2D g, MapView mv, List<WayPoint> visibleSegments, Bounds clipBounds) {
 
         final long timeStart = System.currentTimeMillis();
@@ -421 +425 @@
         if (!computeCacheInSync) { // don't compute if the cache is good
             calculateColors();
+            // update the WaiPoint.drawline attributes
+            visibleSegments.clear();
+            visibleSegments.addAll(listVisibleSegments(clipBounds));
         }