Changeset 7901 in josm


Ignore:
Timestamp:
2014-12-28T14:27:49+01:00 (5 years ago)
Author:
Don-vip
Message:

fix #10892 - update multipolygon preset + javadoc update

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7887 r7901  
    77167716            </optional>
    77177717            <roles>
    7718                 <role key="outer" text="outer segment" requisite="required" type="way" />
    7719                 <role key="inner" text="inner segment" requisite="optional" type="way" />
     7718                <role key="outer" text="outer segment" requisite="required" type="way,closedway" />
     7719                <role key="inner" text="inner segment" requisite="optional" type="way,closedway" />
    77207720            </roles>
    77217721        </item> <!-- Multipolygon -->
     
    77377737            </optional>
    77387738            <roles>
    7739                 <role key="outer" text="outer segment" requisite="required" type="way" />
    7740                 <role key="inner" text="inner segment" requisite="optional" type="way" />
     7739                <role key="outer" text="outer segment" requisite="required" type="way,closedway" />
     7740                <role key="inner" text="inner segment" requisite="optional" type="way,closedway" />
    77417741                <role key="subarea" text="Sub area" requisite="optional" type="relation" />
    77427742                <role key="admin_centre" text="Administration centre" requisite="optional" type="node" count="1" />
  • trunk/src/org/openstreetmap/josm/tools/I18n.java

    r7898 r7901  
    4040
    4141    /**
    42      * Enumeration of possible plural modes.
     42     * Enumeration of possible plural modes. It allows us to identify and implement logical conditions of
     43     * plural forms defined on <a href="https://help.launchpad.net/Translations/PluralForms">Launchpad</a>.
    4344     * See <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html">CLDR</a>
    44      * for a complete list.
     45     * for another complete list.
    4546     * @see #pluralEval
    4647     */
  • trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy

    r7884 r7901  
    4646        assert errors.size() == 1
    4747        assert errors.get(0).getMessage() == "Relation is empty"
     48    }
     49
     50    void testNormal() {
     51        def r = createRelation("type=multipolygon")
     52        r.addMember(new RelationMember("outer", new Way()))
     53        r.addMember(new RelationMember("inner", new Way()))
     54        assert testRelation(r).isEmpty()
    4855    }
    4956
Note: See TracChangeset for help on using the changeset viewer.