Changeset 7901 in josm for trunk

Timestamp:

2014-12-28T14:27:49+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #10892 - update multipolygon preset + javadoc update

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/I18n.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -7716 +7716 @@
             </optional>
             <roles>
-                <role key="outer" text="outer segment" requisite="required" type="way" />
-                <role key="inner" text="inner segment" requisite="optional" type="way" />
+                <role key="outer" text="outer segment" requisite="required" type="way,closedway" />
+                <role key="inner" text="inner segment" requisite="optional" type="way,closedway" />
             </roles>
         </item> <!-- Multipolygon -->
@@ -7737 +7737 @@
             </optional>
             <roles>
-                <role key="outer" text="outer segment" requisite="required" type="way" />
-                <role key="inner" text="inner segment" requisite="optional" type="way" />
+                <role key="outer" text="outer segment" requisite="required" type="way,closedway" />
+                <role key="inner" text="inner segment" requisite="optional" type="way,closedway" />
                 <role key="subarea" text="Sub area" requisite="optional" type="relation" />
                 <role key="admin_centre" text="Administration centre" requisite="optional" type="node" count="1" />

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -40 +40 @@
 
     /**
-     * Enumeration of possible plural modes.
+     * Enumeration of possible plural modes. It allows us to identify and implement logical conditions of
+     * plural forms defined on <a href="https://help.launchpad.net/Translations/PluralForms">Launchpad</a>.
      * See <a href="http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html">CLDR</a>
-     * for a complete list.
+     * for another complete list.
      * @see #pluralEval
      */

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy

@@ -46 +46 @@
         assert errors.size() == 1
         assert errors.get(0).getMessage() == "Relation is empty"
+    }
+
+    void testNormal() {
+        def r = createRelation("type=multipolygon")
+        r.addMember(new RelationMember("outer", new Way()))
+        r.addMember(new RelationMember("inner", new Way()))
+        assert testRelation(r).isEmpty()
     }