Changeset 7583 in josm

Timestamp:

2014-09-24T17:58:41+02:00 (10 years ago)

Author:

stoecker

Message:

fix #10255 - don't issue style warnings for boundaries

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (2 diffs)

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

@@ -207 +207 @@
             List<List<Node>> innerWays = joinWays(polygon.getInnerWays()); // Side effect - sets nonClosedWays
             List<List<Node>> outerWays = joinWays(polygon.getOuterWays());
-            if (styles != null) {
-
+            if (styles != null && !"boundary".equals(r.get("type"))) {
                 AreaElemStyle area = ElemStyles.getAreaElemStyle(r, false);
                 boolean areaStyle = area != null;
@@ -219 +218 @@
                         }
                     }
-                    if (!"boundary".equals(r.get("type"))) {
-                        if (area == null) {
-                            addError(r, new TestError(this, Severity.OTHER, tr("No area style for multipolygon"), NO_STYLE, r));
-                        } else {
-                            /* old style multipolygon - solve: copy tags from outer way to multipolygon */
-                            addError(r, new TestError(this, Severity.WARNING, 
-                                    trn("Multipolygon relation should be tagged with area tags and not the outer way",
-                                            "Multipolygon relation should be tagged with area tags and not the outer ways", polygon.getOuterWays().size()),
-                                NO_STYLE_POLYGON, r));
-                        }
+                    if (area == null) {
+                        addError(r, new TestError(this, Severity.OTHER, tr("No area style for multipolygon"), NO_STYLE, r));
+                    } else {
+                        /* old style multipolygon - solve: copy tags from outer way to multipolygon */
+                        addError(r, new TestError(this, Severity.WARNING, 
+                                trn("Multipolygon relation should be tagged with area tags and not the outer way",
+                                        "Multipolygon relation should be tagged with area tags and not the outer ways", polygon.getOuterWays().size()),
+                           NO_STYLE_POLYGON, r));
                     }
                 }