Changeset 11470 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-01-16T22:34:15+01:00 (7 years ago)

Author:

bastiK

Message:

see #13124 - better cache invalidation

Fixes a problem when zoomed out, so all gpx data is in the center of the mapview.
Then moving the map did not update the gpx layer.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapViewState.java (modified) (1 diff)
• layer/gpx/GpxDrawHelper.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -381 +381 @@
         }
         return Main.getProjection().latlon2eastNorth(b.getCenter());
+    }
+
+    /**
+     * Check if this MapViewState equals another one, disregarding the position
+     * of the JOSM window on screen.
+     * @param other the other MapViewState
+     * @return true if the other MapViewState has the same size, scale, position and projection,
+     * false otherwise
+     */
+    public boolean equalsInWindow(MapViewState other) {
+        return other != null &&
+                this.viewWidth == other.viewWidth &&
+                this.viewHeight == other.viewHeight &&
+                this.scale == other.scale &&
+                Objects.equals(this.topLeft, other.topLeft) &&
+                Objects.equals(this.projecting, other.projecting);
     }
 

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

@@ -39 +39 @@
 import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapViewState;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.ColorScale;
@@ -139 +140 @@
     // some cached values
     Rectangle heatMapCacheScreenBounds = new Rectangle();
-    int heatMapCacheVisibleSegments;
-    double heatMapCacheZoomScale;
+    MapViewState heatMapMapViewState;
     int heatMapCacheLineWith;
 
@@ -538 +538 @@
 
             // force redraw of image
-            heatMapCacheVisibleSegments = 0;
+            heatMapMapViewState = null;
         }
 
@@ -1088 +1088 @@
         // get bounds of screen image and projection, zoom and adjust input parameters
         final Rectangle screenBounds = new Rectangle(mv.getWidth(), mv.getHeight());
-        final double zoomScale = mv.getScale();
+        final MapViewState mapViewState = mv.getState();
+        final double zoomScale = mapViewState.getScale();
 
         // adjust global settings ( zero = default line width )
@@ -1117 +1118 @@
 
         // recalculation of image needed
-        final boolean imageRecalc = heatMapCacheVisibleSegments != visibleSegments.size() ||
-                                    heatMapCacheZoomScale != zoomScale ||
+        final boolean imageRecalc = !mapViewState.equalsInWindow(heatMapMapViewState) ||
                                     heatMapCacheLineWith != globalLineWidth;
 
@@ -1141 +1141 @@
 
             // remember draw parameters
-            heatMapCacheVisibleSegments = visibleSegments.size();
-            heatMapCacheZoomScale = zoomScale;
+            heatMapMapViewState = mapViewState;
             heatMapCacheLineWith = globalLineWidth;
         }