Changeset 16674 in josm for trunk

Timestamp:

2020-06-17T22:16:45+02:00 (4 years ago)

Author:

simon04

Message:

fix #19406 - InspectPrimitiveDialog: display length and area

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

@@ -10 +10 @@
 import java.util.stream.Stream;
 
+import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.ILatLon;
@@ -25 +26 @@
 import org.openstreetmap.josm.data.osm.OsmData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
@@ -175 +178 @@
             add(tr("Centroid: "), toStringCSV(false,
                     ProjectionRegistry.getProjection().eastNorth2latlon(Geometry.getCentroid(((IWay<?>) o).getNodes()))));
+            if (o instanceof Way) {
+                double dist = ((Way) o).getLength();
+                String distText = SystemOfMeasurement.getSystemOfMeasurement().getDistText(dist);
+                add(tr("Length: {0}", distText));
+            }
+            if (o instanceof Way && ((Way) o).concernsArea() && ((Way) o).isClosed()) {
+                double area = Geometry.closedWayArea((Way) o);
+                String areaText = SystemOfMeasurement.getSystemOfMeasurement().getAreaText(area);
+                add(tr("Area: {0}", areaText));
+            }
             addWayNodes((IWay<?>) o);
         } else if (o instanceof IRelation) {
             addBbox(o);
+            if (o instanceof Relation && ((Relation) o).concernsArea()) {
+                double area = Geometry.multipolygonArea(((Relation) o));
+                String areaText = SystemOfMeasurement.getSystemOfMeasurement().getAreaText(area);
+                add(tr("Area: {0}", areaText));
+            }
             addRelationMembers((IRelation<?>) o);
         }