Changeset 9952 in josm

Timestamp:

2016-03-07T23:29:30+01:00 (8 years ago)

Author:

simon04

Message:

see #11516 - Compute multipolygon area, include in MapCSS, JOSM search

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Geometry.java (modified) (2 diffs)
• test/data/multipolygon.osm (added)
• test/unit/org/openstreetmap/josm/tools/GeometryTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -1386 +1386 @@
         @Override
         protected Long getNumber(OsmPrimitive osm) {
-            if (!(osm instanceof Way && ((Way) osm).isClosed()))
-                return null;
-            Way way = (Way) osm;
-            return (long) Geometry.closedWayArea(way);
+            final Double area = Geometry.computeArea(osm);
+            return area == null ? null : area.longValue();
         }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -652 +652 @@
                 }
                 if (extent != null) {
-                    if (!usePartialFill(pd.getAreaAndPerimeter(), extent, extentThreshold)) {
+                    if (!usePartialFill(pd.getAreaAndPerimeter(null), extent, extentThreshold)) {
                         extent = null;
                     } else if (!pd.isClosed()) {

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData.Intersection;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.AreaAndPerimeter;
@@ -375 +376 @@
         }
 
-        public AreaAndPerimeter getAreaAndPerimeter() {
-            AreaAndPerimeter ap = Geometry.getAreaAndPerimeter(nodes);
+        /**
+         * Calculate area and perimeter length in the given projection.
+         *
+         * @param projection the projection to use for the calculation, {@code null} defaults to {@link Main#getProjection()}
+         * @return area and perimeter
+         */
+        public AreaAndPerimeter getAreaAndPerimeter(Projection projection) {
+            AreaAndPerimeter ap = Geometry.getAreaAndPerimeter(nodes, projection);
             double area = ap.getArea();
             double perimeter = ap.getPerimeter();
             for (PolyData inner : inners) {
-                AreaAndPerimeter apInner = inner.getAreaAndPerimeter();
+                AreaAndPerimeter apInner = inner.getAreaAndPerimeter(projection);
                 area -= apInner.getArea();
                 perimeter += apInner.getPerimeter();

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -531 +531 @@
 
         /**
-         * Returns the area of a closed way in square meters or {@code null}.
-         * @param env the environment
-         * @return the area of a closed way in square meters or {@code null}
-         * @see Geometry#closedWayArea(Way)
+         * Returns the area of a closed way or multipolygon in square meters or {@code null}.
+         * @param env the environment
+         * @return the area of a closed way or multipolygon in square meters or {@code null}
+         * @see Geometry#computeArea(OsmPrimitive)
          */
         public static Float areasize(final Environment env) {
-            if (env.osm instanceof Way && ((Way) env.osm).isClosed()) {
-                return (float) Geometry.closedWayArea((Way) env.osm);
-            } else {
-                return null;
-            }
+            final Double area = Geometry.computeArea(env.osm);
+            return area == null ? null : area.floatValue();
         }
 

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

@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.NodePositionComparator;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
@@ -638 +641 @@
     public static double closedWayArea(Way way) {
         return getAreaAndPerimeter(way.getNodes(), Projections.getProjectionByCode("EPSG:54008")).getArea();
+    }
+
+    /**
+     * Returns area of a multipolygon in square meters.
+     *
+     * @param multipolygon the multipolygon to measure
+     * @return area of the multipolygon.
+     */
+    public static double multipolygonArea(Relation multipolygon) {
+        double area = 0.0;
+        final Multipolygon mp = Main.map == null || Main.map.mapView == null
+                ? new Multipolygon(multipolygon)
+                : MultipolygonCache.getInstance().get(Main.map.mapView, multipolygon);
+        for (Multipolygon.PolyData pd : mp.getCombinedPolygons()) {
+            area += pd.getAreaAndPerimeter(Projections.getProjectionByCode("EPSG:54008")).getArea();
+        }
+        return area;
+    }
+
+    /**
+     * Computes the area of a closed way and multipolygon in square meters, or {@code null} for other primitives
+     *
+     * @param osm the primitive to measure
+     * @return area of the primitive, or {@code null}
+     */
+    public static Double computeArea(OsmPrimitive osm) {
+        if (osm instanceof Way && ((Way) osm).isClosed()) {
+            return closedWayArea((Way) osm);
+        } else if (osm instanceof Relation && ((Relation) osm).isMultipolygon() && !((Relation) osm).hasIncompleteMembers()) {
+            return multipolygonArea((Relation) osm);
+        } else {
+            return null;
+        }
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.io.OsmReader;
@@ -72 +73 @@
             Way closedWay = (Way) Utils.filter(ds.allPrimitives(), SearchCompiler.compile("landuse=forest")).iterator().next();
             Assert.assertEquals(5760015.7353515625, Geometry.closedWayArea(closedWay), 1e-3);
+            Assert.assertEquals(5760015.7353515625, Geometry.computeArea(closedWay), 1e-3);
+        }
+    }
+
+    /**
+     * Test of {@link Geometry#multipolygonArea(Relation)}} method.
+     *
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testMultipolygonArea() throws Exception {
+        try (FileInputStream in = new FileInputStream(TestUtils.getTestDataRoot() + "multipolygon.osm")) {
+            DataSet ds = OsmReader.parseDataSet(in, null);
+            final Relation r = ds.getRelations().iterator().next();
+            Assert.assertEquals(4401735.20703125, Geometry.multipolygonArea(r), 1e-3);
+            Assert.assertEquals(4401735.20703125, Geometry.computeArea(r), 1e-3);
         }
     }