Changeset 9952 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

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

Author:

simon04

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)

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();
         }