Changeset 3844 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2011-02-02T16:56:07+01:00 (13 years ago)

Author:

stoecker

Message:

see #5899 - support different display of closed ways and areas

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -1216 +1216 @@
 
         for (Relation r : CombineWayAction.getParentRelations(selectedWays)) {
-            if (r.isDeleted() ||
-                    r.get("type") == null ||
-                    !r.get("type").equalsIgnoreCase("multipolygon")) {
+            if (r.isDeleted() || !r.isMultipolygon()) {
                 continue;
             }
@@ -1390 +1388 @@
 
         for (RelationRole r : rels) {
-            if (r.rel.get("type") != null &&
-                    r.rel.get("type").equalsIgnoreCase("multipolygon") &&
-                    r.role.equalsIgnoreCase("outer")
-            ) {
+            if (r.rel.isMultipolygon() && r.role.equalsIgnoreCase("outer")) {
                 multiouters.add(r);
                 continue;