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

Timestamp:

2011-03-04T21:36:49+01:00 (14 years ago)

Author:

stoecker

Message:

fix multipolygon validator tests

File:

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

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

@@ -148 +148 @@
 
                 AreaElemStyle area = null;
+                boolean areaStyle = false;
                 for (ElemStyle s : styles.generateStyles(r, SCALE, null, false).a) {
                     if (s instanceof AreaElemStyle) {
                         area = (AreaElemStyle) s;
+                        areaStyle = true;
                         break;
                     }
@@ -156 +158 @@
                 // If area style was not found for relation then use style of ways
                 if (area == null) {
-                    errors.add( new TestError(this, Severity.OTHER, tr("No style in multipolygon relation"),
-                            NO_STYLE_POLYGON, r));
                     for (Way w : polygon.getOuterWays()) {
 
-                        for (ElemStyle s : styles.generateStyles(r, SCALE, null, true).a) {
+                        for (ElemStyle s : styles.generateStyles(w, SCALE, null, true).a) {
                             if (s instanceof AreaElemStyle) {
                                 area = (AreaElemStyle) s;
@@ -170 +170 @@
                         }
                     }
+                    if(area == null)
+                        errors.add(new TestError(this, Severity.OTHER, tr("No style for multipolygon"), NO_STYLE, r));
+                    else
+                        errors.add( new TestError(this, Severity.OTHER, tr("No style in multipolygon relation"),
+                            NO_STYLE_POLYGON, r));
                 }
 
@@ -190 +195 @@
                         }
                     }
-                    for (Way wOuter : polygon.getOuterWays()) {
-                        AreaElemStyle areaOuter = null;
-                        for (ElemStyle s : styles.generateStyles(wOuter, SCALE, null, false).a) {
-                            if (s instanceof AreaElemStyle) {
-                                areaOuter = (AreaElemStyle) s;
-                                break;
-                            }
-                        }
-                        if (areaOuter != null && !area.equals(areaOuter)) {
-                            List<OsmPrimitive> l = new ArrayList<OsmPrimitive>();
-                            l.add(r);
-                            l.add(wOuter);
-                            errors.add(new TestError(this, Severity.WARNING, tr("Style for outer way mismatches"),
-                            OUTER_STYLE_MISMATCH, l, Collections.singletonList(wOuter)));
-                        }
-                    }
-                }
-                else {
-                    errors.add(new TestError(this, Severity.OTHER, tr("No style for multipolygon"), NO_STYLE, r));
+                    if(!areaStyle) {
+                        for (Way wOuter : polygon.getOuterWays()) {
+                            AreaElemStyle areaOuter = null;
+                            for (ElemStyle s : styles.generateStyles(wOuter, SCALE, null, false).a) {
+                                if (s instanceof AreaElemStyle) {
+                                    areaOuter = (AreaElemStyle) s;
+                                    break;
+                                }
+                            }
+                            if (areaOuter != null && !area.equals(areaOuter)) {
+                                List<OsmPrimitive> l = new ArrayList<OsmPrimitive>();
+                                l.add(r);
+                                l.add(wOuter);
+                                errors.add(new TestError(this, Severity.WARNING, tr("Style for outer way mismatches"),
+                                OUTER_STYLE_MISMATCH, l, Collections.singletonList(wOuter)));
+                            }
+                        }
+                    }
                 }
             }