Changeset 7570 in josm for trunk/src/org

Timestamp:

2014-09-20T21:19:54+02:00 (10 years ago)

Author:

bastiK

Message:

see #10529 - remove duplicate test (same as NO_STYLE_POLYGON)

File:

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

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.geom.GeneralPath;
@@ -54 +55 @@
     protected static final int NO_STYLE = 1610;
     protected static final int NO_STYLE_POLYGON = 1611;
-    protected static final int STYLE_ON_WAY = 1612;
     protected static final int OUTER_STYLE = 1613;
 
@@ -221 +221 @@
                     if (!"boundary".equals(r.get("type"))) {
                         if (area == null) {
-                            addError(r, new TestError(this, Severity.OTHER, tr("No style for multipolygon"), NO_STYLE, r));
+                            addError(r, new TestError(this, Severity.OTHER, tr("No area style for multipolygon"), NO_STYLE, r));
                         } else {
-                            addError(r, new TestError(this, Severity.OTHER, tr("No style in multipolygon relation"),
+                            /* old style multipolygon - solve: copy tags from outer way to multipolygon */
+                            addError(r, new TestError(this, Severity.OTHER, 
+                                    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));
                         }
@@ -257 +260 @@
                         }
                     }
-                    if(!areaStyle) { /* old style multipolygon - solve: copy tags from outer way to multipolygon */
-                        addError(r, new TestError(this, Severity.WARNING, tr("Style is on way and not on multipolygon"), STYLE_ON_WAY, r));
-                    }
                 }
             }