Changeset 15244 in josm for trunk

Timestamp:

2019-07-12T20:03:56+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17886 - remove check for old-style multipolygons (removed from OSM database in May 2017)

Location:

trunk

Files:

• data_nodist/multipolygon.osm (modified) (3 diffs)
• src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (4 diffs)

trunk/data_nodist/multipolygon.osm

@@ -3913 +3913 @@
     <member type='way' ref='-41659' role='outer' />
     <member type='way' ref='-41651' role='outer' />
-    <tag k='josm_error_codes' v='1606,1611,1617' />
+    <tag k='josm_error_codes' v='1606,1617' />
     <tag k='name' v='07/04 - Mixed Geometry' />
     <tag k='type' v='multipolygon' />
@@ -4021 +4021 @@
     <member type='way' ref='-41737' role='' />
     <member type='relation' ref='-42089' role='' />
-    <tag k='josm_error_codes' v='1601,1602,1611' />
+    <tag k='josm_error_codes' v='1601,1602' />
     <tag k='name' v='06/05 - wrong roles' />
     <tag k='type' v='multipolygon' />
@@ -4143 +4143 @@
     <member type='way' ref='-41777' role='outer' />
     <tag k='comment' v='For this test the display style depends on the order of ways and is unpredictable' />
-    <tag k='josm_error_codes' v='1607,1611' />
+    <tag k='josm_error_codes' v='1607' />
     <tag k='name' v='06/04 - Mismatching way styles' />
     <tag k='type' v='multipolygon' />

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.geom.Area;
@@ -63 +62 @@
     /** No area style for multipolygon */
     public static final int NO_STYLE = 1610;
-    /** Multipolygon relation should be tagged with area tags and not the outer way(s) */
-    public static final int NO_STYLE_POLYGON = 1611;
+    // no longer used: Multipolygon relation should be tagged with area tags and not the outer way(s) NO_STYLE_POLYGON = 1611;
     /** Area style on outer way */
     public static final int OUTER_STYLE = 1613;
@@ -112 +110 @@
     /**
      * Various style-related checks:<ul>
-     * <li>{@link #NO_STYLE_POLYGON}: Multipolygon relation should be tagged with area tags and not the outer way</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}: Style for outer way mismatches</li>
@@ -136 +133 @@
                     errors.add(TestError.builder(this, Severity.OTHER, NO_STYLE)
                             .message(tr("No area style for multipolygon"))
-                            .primitives(r)
-                            .build());
-                } else {
-                    /* old style multipolygon - solve: copy tags from outer way to multipolygon */
-                    errors.add(TestError.builder(this, Severity.ERROR, NO_STYLE_POLYGON)
-                            .message(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()))
                             .primitives(r)
                             .build());