Changeset 9574 in josm for trunk/src/org

Timestamp:

2016-01-23T03:47:29+01:00 (9 years ago)

Author:

Don-vip

Message:

see #12412 - add a new preset type "multipolygon". TODO: make a better icon

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/RelationChecker.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetItem.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetType.java (modified) (2 diffs)

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

@@ -185 +185 @@
                 return r.types.contains(TaggingPresetType.WAY);
             case MULTIPOLYGON:
+                return r.types.contains(TaggingPresetType.MULTIPOLYGON);
             case RELATION:
                 return r.types.contains(TaggingPresetType.RELATION);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java

@@ -88 +88 @@
             try {
                 TaggingPresetType presetType = TaggingPresetType.fromString(type);
-                result.add(presetType);
+                if (presetType != null) {
+                    result.add(presetType);
+                }
             } catch (IllegalArgumentException e) {
                 throw new SAXException(tr("Unknown type: {0}", type), e);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetType.java

@@ -17 +17 @@
     RELATION(/* ICON */ "Mf_relation", "relation"),
     /** Closed way */
-    CLOSEDWAY(/* ICON */ "Mf_closedway", "closedway");
+    CLOSEDWAY(/* ICON */ "Mf_closedway", "closedway"),
+    /** Multipolygon */
+    MULTIPOLYGON(/* ICON */ "multipoly_create", "multipolygon"); // FIXME find a better multipolygon icon
     private final String iconName;
     private final String name;
@@ -57 +59 @@
      */
     public static TaggingPresetType forPrimitiveType(OsmPrimitiveType type) {
-        if (type == OsmPrimitiveType.NODE) return NODE;
-        if (type == OsmPrimitiveType.WAY) return WAY;
-        if (type == OsmPrimitiveType.CLOSEDWAY) return CLOSEDWAY;
-        if (type == OsmPrimitiveType.RELATION || type == OsmPrimitiveType.MULTIPOLYGON)
-                return RELATION;
+        if (type == OsmPrimitiveType.NODE)
+            return NODE;
+        if (type == OsmPrimitiveType.WAY)
+            return WAY;
+        if (type == OsmPrimitiveType.CLOSEDWAY)
+            return CLOSEDWAY;
+        if (type == OsmPrimitiveType.MULTIPOLYGON)
+            return TaggingPresetType.MULTIPOLYGON;
+        if (type == OsmPrimitiveType.RELATION)
+            return RELATION;
         throw new IllegalArgumentException("Unexpected primitive type: " + type);
     }