Changeset 11779 in josm for trunk/src/org/openstreetmap/josm/tools/Geometry.java

Timestamp:

2017-03-25T23:34:39+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14572 - Don't index MultipolygonCache by NavigatableComponent

File:

• trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -533 +533 @@
         final Multipolygon mp = Main.map == null || Main.map.mapView == null
                 ? new Multipolygon(multipolygon)
-                : MultipolygonCache.getInstance().get(Main.map.mapView, multipolygon);
+                : MultipolygonCache.getInstance().get(multipolygon);
         Path2D path = new Path2D.Double();
         path.setWindingRule(Path2D.WIND_EVEN_ODD);
@@ -673 +673 @@
         final Multipolygon mp = Main.map == null || Main.map.mapView == null
                 ? new Multipolygon(multipolygon)
-                : MultipolygonCache.getInstance().get(Main.map.mapView, multipolygon);
+                : MultipolygonCache.getInstance().get(multipolygon);
         for (Multipolygon.PolyData pd : mp.getCombinedPolygons()) {
             area += pd.getAreaAndPerimeter(Projections.getProjectionByCode("EPSG:54008")).getArea();