Changeset 6575 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-12-31T12:05:47+01:00 (11 years ago)

Author:

simon04

Message:

fix #7196 - Validator: add multipolygon role check

This is done by creating a new multipolygon using the logics from
"Create multipolygon" and see if the roles match.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateMultipolygonAction.java (modified) (2 diffs)
• data/osm/Relation.java (modified) (1 diff)
• data/validation/tests/MultipolygonTest.java (modified) (3 diffs)

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

@@ -36 +36 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -147 +146 @@
             // add ways of existing relation to include them in polygon analysis
             selectedWays = new HashSet<Way>(selectedWays);
-            selectedWays.addAll(Utils.filteredCollection(selectedMultipolygonRelation.getMemberPrimitives(), Way.class));
+            selectedWays.addAll(selectedMultipolygonRelation.getMemberPrimitives(Way.class));
         }
 

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

@@ -397 +397 @@
     }
 
+    public <T extends OsmPrimitive> Collection<T> getMemberPrimitives(Class<T> tClass) {
+        return Utils.filteredCollection(getMemberPrimitives(), tClass);
+    }
+
     public List<OsmPrimitive> getMemberPrimitivesList() {
         return Utils.transform(getMembers(), new Utils.Function<RelationMember, OsmPrimitive>() {

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -15 +15 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.CreateMultipolygonAction;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -28 +29 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -176 +179 @@
             }
 
-            for (RelationMember rm : r.getMembers()) {
-                if (!rm.getMember().isUsable())
-                    return; // Rest of checks is only for complete multipolygons
+            if (r.hasIncompleteMembers()) {
+                return; // Rest of checks is only for complete multipolygons
+            }
+
+            // Create new multipolygon using the logics from CreateMultipolygonAction and see if roles match.
+            final Pair<Relation, Relation> newMP = CreateMultipolygonAction.createMultipolygonRelation(
+                    r.getMemberPrimitives(Way.class), Collections.singleton(new Relation()));
+            if (newMP != null) {
+                for (RelationMember member : r.getMembers()) {
+                    final Collection<RelationMember> memberInNewMP = newMP.b.getMembersFor(Collections.singleton(member.getMember()));
+                    if (memberInNewMP != null && !memberInNewMP.isEmpty()) {
+                        final String roleInNewMP = memberInNewMP.iterator().next().getRole();
+                        if (!member.getRole().equals(roleInNewMP)) {
+                            addError(r, new TestError(this, Severity.WARNING, tr("Role for ''{0}'' should be ''{1}''",
+                                    member.getMember().getDisplayName(DefaultNameFormatter.getInstance()), roleInNewMP),
+                                    WRONG_MEMBER_ROLE, Collections.singleton(r), Collections.singleton(member.getMember())));
+                        }
+                    }
+                }
+
             }