Changeset 13420 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

Timestamp:

2018-02-12T23:19:49+01:00 (6 years ago)

Author:

bastiK

Message:

fixed #11607 - RangeViolatedError: the new range must be within a single subrange

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.DividedScale.RangeViolatedError;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
@@ -90 +92 @@
             preferenceCache.clear();
             backgroundColorCache = null;
+            MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class).forEach(
+                    dl -> dl.data.clearMappaintCache());
         });
     }
@@ -139 +143 @@
      */
     public Pair<StyleElementList, Range> getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) {
-        if (osm.mappaintStyle == null || osm.getMappaintCacheIdx() != cacheIdx || scale <= 0) {
+        if (!osm.isCachedStyleUpToDate() || scale <= 0) {
             osm.mappaintStyle = StyleCache.EMPTY_STYLECACHE;
         } else {
@@ -195 +199 @@
                     + ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b + ')', e);
         }
-        osm.setMappaintCacheIdx(cacheIdx);
+        osm.declareCachedStyleUpToDate();
         return p;
     }