Changeset 15244 in josm


Ignore:
Timestamp:
2019-07-12T20:03:56+02:00 (4 days ago)
Author:
Don-vip
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data_nodist/multipolygon.osm

    r14437 r15244  
    39133913    <member type='way' ref='-41659' role='outer' />
    39143914    <member type='way' ref='-41651' role='outer' />
    3915     <tag k='josm_error_codes' v='1606,1611,1617' />
     3915    <tag k='josm_error_codes' v='1606,1617' />
    39163916    <tag k='name' v='07/04 - Mixed Geometry' />
    39173917    <tag k='type' v='multipolygon' />
     
    40214021    <member type='way' ref='-41737' role='' />
    40224022    <member type='relation' ref='-42089' role='' />
    4023     <tag k='josm_error_codes' v='1601,1602,1611' />
     4023    <tag k='josm_error_codes' v='1601,1602' />
    40244024    <tag k='name' v='06/05 - wrong roles' />
    40254025    <tag k='type' v='multipolygon' />
     
    41434143    <member type='way' ref='-41777' role='outer' />
    41444144    <tag k='comment' v='For this test the display style depends on the order of ways and is unpredictable' />
    4145     <tag k='josm_error_codes' v='1607,1611' />
     4145    <tag k='josm_error_codes' v='1607' />
    41464146    <tag k='name' v='06/04 - Mismatching way styles' />
    41474147    <tag k='type' v='multipolygon' />
  • trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

    r15183 r15244  
    44import static org.openstreetmap.josm.tools.I18n.marktr;
    55import static org.openstreetmap.josm.tools.I18n.tr;
    6 import static org.openstreetmap.josm.tools.I18n.trn;
    76
    87import java.awt.geom.Area;
     
    6362    /** No area style for multipolygon */
    6463    public static final int NO_STYLE = 1610;
    65     /** Multipolygon relation should be tagged with area tags and not the outer way(s) */
    66     public static final int NO_STYLE_POLYGON = 1611;
     64    // no longer used: Multipolygon relation should be tagged with area tags and not the outer way(s) NO_STYLE_POLYGON = 1611;
    6765    /** Area style on outer way */
    6866    public static final int OUTER_STYLE = 1613;
     
    112110    /**
    113111     * Various style-related checks:<ul>
    114      * <li>{@link #NO_STYLE_POLYGON}: Multipolygon relation should be tagged with area tags and not the outer way</li>
    115112     * <li>{@link #INNER_STYLE_MISMATCH}: With the currently used mappaint style the style for inner way equals the multipolygon style</li>
    116113     * <li>{@link #OUTER_STYLE_MISMATCH}: Style for outer way mismatches</li>
     
    136133                    errors.add(TestError.builder(this, Severity.OTHER, NO_STYLE)
    137134                            .message(tr("No area style for multipolygon"))
    138                             .primitives(r)
    139                             .build());
    140                 } else {
    141                     /* old style multipolygon - solve: copy tags from outer way to multipolygon */
    142                     errors.add(TestError.builder(this, Severity.ERROR, NO_STYLE_POLYGON)
    143                             .message(trn("Multipolygon relation should be tagged with area tags and not the outer way",
    144                                     "Multipolygon relation should be tagged with area tags and not the outer ways",
    145                                     polygon.getOuterWays().size()))
    146135                            .primitives(r)
    147136                            .build());
Note: See TracChangeset for help on using the changeset viewer.