Changeset 9716 in josm for trunk/src

Timestamp:

2016-02-02T23:01:02+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12467, see #12412 - presets no longer fit correct for boundary relations (regression from r9574)

File:

• trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -420 +420 @@
     @Override
     public OsmPrimitiveType getDisplayType() {
-        return isMultipolygon() ? OsmPrimitiveType.MULTIPOLYGON
-        : OsmPrimitiveType.RELATION;
-    }
-
+        return isMultipolygon() && !isBoundary() ? OsmPrimitiveType.MULTIPOLYGON : OsmPrimitiveType.RELATION;
+    }
+
+    /**
+     * Determines if this relation is a boundary.
+     * @return {@code true} if a boundary relation
+     */
+    public boolean isBoundary() {
+        return "boundary".equals(get("type"));
+    }
+
+    /**
+     * Determines if this relation behaves as a multipolygon.
+     * @return {@code true} if it's a real mutlipolygon or a boundary relation
+     */
     public boolean isMultipolygon() {
-        return "multipolygon".equals(get("type")) || "boundary".equals(get("type"));
+        return "multipolygon".equals(get("type")) || isBoundary();
     }