Changeset 12742 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-09-05T20:41:09+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove useless dependence of Geometry on GUI now that MultipolygonCache does not need anymore a MapView

File:

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

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

@@ -35 +35 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MapFrame;
 
 /**
@@ -553 +551 @@
      */
     public static Area getAreaLatLon(Relation multipolygon) {
-        MapFrame map = MainApplication.getMap();
-        final Multipolygon mp = map == null || map.mapView == null
-                ? new Multipolygon(multipolygon)
-                : MultipolygonCache.getInstance().get(multipolygon);
+        final Multipolygon mp = MultipolygonCache.getInstance().get(multipolygon);
         Path2D path = new Path2D.Double();
         path.setWindingRule(Path2D.WIND_EVEN_ODD);
@@ -694 +689 @@
     public static double multipolygonArea(Relation multipolygon) {
         double area = 0.0;
-        MapFrame map = MainApplication.getMap();
-        final Multipolygon mp = map == null || map.mapView == null
-                ? new Multipolygon(multipolygon)
-                : MultipolygonCache.getInstance().get(multipolygon);
+        final Multipolygon mp = MultipolygonCache.getInstance().get(multipolygon);
         for (Multipolygon.PolyData pd : mp.getCombinedPolygons()) {
             area += pd.getAreaAndPerimeter(Projections.getProjectionByCode("EPSG:54008")).getArea();