Changeset 7565 in josm for trunk

Timestamp:

2014-09-20T14:24:31+02:00 (10 years ago)

Author:

stoecker

Message:

see #10529 - fix one validator test case for multipolygon

Location:

trunk

Files:

• data_nodist/multipolygon.osm (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (1 diff)

trunk/data_nodist/multipolygon.osm

@@ -242 +242 @@
   <node id='-237' action='modify' visible='true' lat='83.72291011287005' lon='-177.88230504962021'>
     <tag k='place' v='city' />
-    <tag k='name' v='02 : Basic test with tagged inner and outer ways and no area tagging inside relation (very old style)' />
+    <tag k='name' v='02 : Basic test with tagged inner and outer ways and no area tagging inside relation (very old style - no longer supported)' />
   </node>
   <node id='-238' action='modify' visible='true' lat='83.34037740211511' lon='-166.97194405693813' />
@@ -3009 +3009 @@
     <member type='way' ref='-951' role='inner' />
     <member type='way' ref='-966' role='outer' />
-    <tag k='name' v='Example 2 (02)' />
+    <tag k='name' v='Example 2 (04)' />
     <tag k='type' v='multipolygon' />
   </relation>

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

@@ -239 +239 @@
                         }
                     }
-                    if(!areaStyle) {
-                        for (Way wOuter : polygon.getOuterWays()) {
-                            AreaElemStyle areaOuter = ElemStyles.getAreaElemStyle(wOuter, false);
-                            if (areaOuter != null && !area.equals(areaOuter)) {
-                                List<OsmPrimitive> l = new ArrayList<>();
-                                l.add(r);
-                                l.add(wOuter);
-                                addError(r, new TestError(this, Severity.WARNING, tr("Style for outer way mismatches"),
-                                OUTER_STYLE_MISMATCH, l, Collections.singletonList(wOuter)));
-                            }
+                    for (Way wOuter : polygon.getOuterWays()) {
+                        AreaElemStyle areaOuter = ElemStyles.getAreaElemStyle(wOuter, false);
+                        if (areaOuter != null && !area.equals(areaOuter)) {
+                            List<OsmPrimitive> l = new ArrayList<>();
+                            l.add(r);
+                            l.add(wOuter);
+                            addError(r, new TestError(this, Severity.WARNING, !areaStyle ? tr("Style for outer way mismatches")
+                            : tr("Style for outer way mismatches polygon"),
+                            OUTER_STYLE_MISMATCH, l, Collections.singletonList(wOuter)));
                         }
                     }