Ticket #20663: 20663.patch

nodist/data/multipolygon.osm

@@ -4190 +4190 @@
   <relation id='-42115' action='modify'>
     <member type='way' ref='-41755' role='inner' />
     <member type='way' ref='-41791' role='outer' />
-    <tag k='josm_error_codes' v='1607' />
-    <tag k='name' v='06/03 - Mismatching way styles' />
+    <tag k='josm_error_codes' v='1613' />
+    <tag k='name' v='06/03 - Area style on outer way' />
     <tag k='natural' v='water' />
     <tag k='type' v='multipolygon' />
   </relation>

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

@@ -56 +56 @@
     public static final int INNER_WAY_OUTSIDE = 1605;
     /** Intersection between multipolygon ways */
     public static final int CROSSING_WAYS = 1606;
-    /** Style for outer way mismatches / With the currently used mappaint style(s) the style for outer way mismatches the area style */
-    public static final int OUTER_STYLE_MISMATCH = 1607;
+    // 1607 is no longer used: With the currently used mappaint style(s) the style for outer way mismatches the area style
     /** With the currently used mappaint style the style for inner way equals the multipolygon style */
     public static final int INNER_STYLE_MISMATCH = 1608;
-    // no longer used: Area style way is not closed NOT_CLOSED = 1609
+    // 1609 is no longer used: Area style way is not closed
     /** No area style for multipolygon */
     public static final int NO_STYLE = 1610;
-    // no longer used: Multipolygon relation should be tagged with area tags and not the outer way(s) NO_STYLE_POLYGON = 1611;
+    // 1611 is no longer used: Multipolygon relation should be tagged with area tags and not the outer way(s)
     /** Area style on outer way */
     public static final int OUTER_STYLE = 1613;
     /** Multipolygon member repeated (same primitive, same role */
@@ -125 +124 @@
      * Various style-related checks:<ul>
      * <li>{@link #NO_STYLE}: No area style for multipolygon</li>
      * <li>{@link #INNER_STYLE_MISMATCH}: With the currently used mappaint style the style for inner way equals the multipolygon style</li>
-     * <li>{@link #OUTER_STYLE_MISMATCH}: With the currently used mappaint style the style for outer way mismatches the area style</li>
      * <li>{@link #OUTER_STYLE}: Area style on outer way</li>
      * </ul>
      * @param r relation
@@ -154 +152 @@
                         continue;
                     AreaElement areaOuter = ElemStyles.getAreaElemStyle(wOuter, false);
                     if (areaOuter != null) {
-                        if (!area.equals(areaOuter)) {
-                            errors.add(TestError.builder(this, Severity.OTHER, OUTER_STYLE_MISMATCH)
-                                    .message(tr("With the currently used mappaint style the style for outer way mismatches the area style"))
-                                    .primitives(Arrays.asList(r, wOuter))
-                                    .highlight(wOuter)
-                                    .build());
-                        } else { /* style on outer way of multipolygon, but equal to polygon */
-                            errors.add(TestError.builder(this, Severity.WARNING, OUTER_STYLE)
-                                    .message(tr("Area style on outer way"))
-                                    .primitives(Arrays.asList(r, wOuter))
-                                    .highlight(wOuter)
-                                    .build());
-                        }
+                        errors.add(TestError.builder(this, Severity.WARNING, OUTER_STYLE)
+                                .message(tr("Area style on outer way"))
+                                .primitives(Arrays.asList(r, wOuter))
+                                .highlight(wOuter)
+                                .build());
                     }
                 }
             }