Changeset 3289 in josm

Timestamp:

Jun 1, 2010 9:09:39 AM (3 years ago)

Author:

stoecker

Message:

added role support to presets

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (modified) (3 diffs)

trunk/data/defaultpresets.xml

@@ -48 +48 @@
   value_off: the value to set when unchecked (default is 'no')
 
+role: type to specify possible roles in relations
+  key: the role name used in relation
+  text: fixed label to display
+  requisite: "optional" or "required" (default is optional)
+  count: how often can the role occur (if not given unlimited number is assumed)
+  type: the data types - way,node,relation,closedway (separated by comma)
+
 For external files the <annotations> should have following elements:
 - author           the author of the preset
@@ -3179 +3186 @@
     </group> <!-- Landuse -->
   </group>
-<!-- FIXME: element role not yet supported! -->
     <group name="Relations" icon="presets/relations.png">
         <item name="Multipolygon" icon="presets/empty.png" type="relation">
@@ -3193 +3199 @@
                 <role key="outer" text="outer segment" requisite="required" type="way" />
                 <role key="inner" text="inner segment" requisite="optional" type="way" />
+            </roles>
+        </item>
+        <item name="Boundary" icon="presets/empty.png" type="relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
+            <label text="Edit Boundary" />
+            <key key="type" value="boundary" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <optional>
+                <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" default="" delete_if_empty="true" />
+                <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" default="" delete_if_empty="true" />
+            </optional>
+            <roles>
+                <role key="outer" text="outer segment" requisite="required" type="way" />
+                <role key="inner" text="inner segment" requisite="optional" type="way" />
+                <role key="subarea" text="Sub area" requisite="optional" type="relation" />
+                <role key="admin_centre" text="Administration centre" requisite="optional" type="node" />
             </roles>
         </item>

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -310 +310 @@
                 }
         );
+        tfRole.setText(Main.pref.get("relation.editor.generic.lastrole", ""));
         p3.add(tfRole);
         SetRoleAction setRoleAction = new SetRoleAction();
@@ -1167 +1168 @@
 
         public void run() {
+            Main.pref.put("relation.editor.generic.lastrole", tfRole.getText());
             if (getRelation() == null) {
                 applyNewRelation();

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -486 +486 @@
     }
 
+    public static class Role {
+        public List<String> types;
+        public String key;
+        public String text;
+        public String text_context;
+        public String locale_text;
+
+        public boolean required=false;
+        public long count = 0;
+
+        public void setType(String types) throws SAXException {
+            this.types = TaggingPreset.getType(types);
+        }
+
+        public void setRequisite(String str) throws SAXException {
+            if("required".equals(str))
+                required = true;
+            else if(!"optional".equals(str))
+                throw new SAXException(tr("Unknown requisite: {0}", str));
+        }
+
+        /* return either argument, the highest possible value or the lowest
+           allowed value */
+        public long getValidCount(long c)
+        {
+            if(count > 0 && !required)
+                return c != 0 ? count : 0;
+            else if(count > 0)
+                return count;
+            else if(!required)
+                return c != 0  ? c : 0;
+            else
+                return c != 0  ? c : 1;
+        }
+        public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+            String cstring;
+            if(count > 0 && !required)
+                cstring = "0,"+String.valueOf(count);
+            else if(count > 0)
+                cstring = String.valueOf(count);
+            else if(!required)
+                cstring = "0-...";
+            else
+                cstring = "1-...";
+            if(locale_text == null) {
+                if (text != null) {
+                    if(text_context != null) {
+                        locale_text = trc(text_context, text);
+                    } else {
+                        locale_text = tr(text);
+                    }
+                }
+            }
+            p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0));
+            p.add(new JLabel(key), GBC.std().insets(0,0,10,0));
+            p.add(new JLabel(cstring), types == null ? GBC.eol() : GBC.std().insets(0,0,10,0));
+            if(types != null){
+                JPanel pp = new JPanel();
+                for(String t : types)
+                    pp.add(new JLabel(ImageProvider.get("Mf_" + t)));
+                p.add(pp, GBC.eol());
+            }
+            return true;
+        }
+    }
+
+    public static class Roles extends Item {
+        public List<Role> roles = new LinkedList<Role>();
+        @Override public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+            p.add(new JLabel(" "), GBC.eol()); // space
+            if(roles.size() > 0)
+            {
+                JPanel proles = new JPanel(new GridBagLayout());
+                proles.add(new JLabel(tr("Available roles")), GBC.std().insets(0,0,10,0));
+                proles.add(new JLabel(tr("role")), GBC.std().insets(0,0,10,0));
+                proles.add(new JLabel(tr("count")), GBC.std().insets(0,0,10,0));
+                proles.add(new JLabel(tr("elements")), GBC.eol());
+                for (Role i : roles)
+                    i.addToPanel(proles, sel);
+                p.add(proles, GBC.eol());
+            }
+            return false;
+        }
+        @Override public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {}
+    }
+
     public static class Optional extends Item {
         // TODO: Draw a box around optional stuff
@@ -581 +667 @@
      */
     private static Collection<String> allowedtypes = Arrays.asList(new String[]
-                                                                              {marktr("way"), marktr("node"), marktr("relation"), marktr("closedway")});
-    public void setType(String types) throws SAXException {
-        this.types = Arrays.asList(types.split(","));
-        for (String type : this.types) {
+    {marktr("way"), marktr("node"), marktr("relation"), marktr("closedway")});
+
+    static public List<String> getType(String types) throws SAXException {
+        List<String> t = Arrays.asList(types.split(","));
+        for (String type : t) {
             if(!allowedtypes.contains(type))
                 throw new SAXException(tr("Unknown type: {0}", type));
         }
+        return t;
+    }
+
+    public void setType(String types) throws SAXException {
+        this.types = getType(types);
     }
 
@@ -598 +690 @@
         parser.map("link", Link.class);
         parser.mapOnStart("optional", Optional.class);
+        parser.mapOnStart("roles", Roles.class);
+        parser.map("role", Role.class);
         parser.map("check", Check.class);
         parser.map("combo", Combo.class);
@@ -605 +699 @@
         LinkedList<TaggingPreset> all = new LinkedList<TaggingPreset>();
         TaggingPresetMenu lastmenu = null;
+        Roles lastrole = null;
         parser.start(in);
         while(parser.hasNext()) {
@@ -621 +716 @@
 
                 }
+                lastrole = null;
             } else if (o instanceof TaggingPresetSeparator) {
                 TaggingPresetSeparator tp = (TaggingPresetSeparator) o;
                 tp.group = lastmenu;
                 all.add(tp);
+                lastrole = null;
             } else if (o instanceof TaggingPreset) {
                 TaggingPreset tp = (TaggingPreset) o;
@@ -631 +728 @@
                 all.add(tp);
                 Main.toolbar.register(tp);
+                lastrole = null;
             } else {
-                if(all.size() != 0)
-                    all.getLast().data.add((Item)o);
+                if(all.size() != 0) {
+                    if(o instanceof Roles) {
+                        all.getLast().data.add((Item)o);
+                        lastrole = (Roles) o;
+                    }
+                    else if(o instanceof Role) {
+                        if(lastrole == null)
+                            throw new SAXException(tr("Preset role element without parent"));
+                        lastrole.roles.add((Role) o);
+                    }
+                    else {
+                        all.getLast().data.add((Item)o);
+                        lastrole = null;
+                    }
+                }
                 else
                     throw new SAXException(tr("Preset sub element without parent"));

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -75 +75 @@
      * use getRoleCache() accessor
      */
-    protected  Set<String> roleCache;
+    protected Set<String> roleCache;
+    /**
+     * the same as roleCache but for the preset roles
+     * can be accessed directly
+     */
+    protected static Set<String> presetRoleCache = new HashSet<String>();
 
     public AutoCompletionManager(DataSet ds) {
@@ -179 +184 @@
                         presetTagCache.put(tt.key, tt.default_);
                     }
+                } else if (item instanceof TaggingPreset.Roles) {
+                    TaggingPreset.Roles r = (TaggingPreset.Roles) item;
+                    for (TaggingPreset.Role i : r.roles) {
+                        if (i.key != null)
+                            presetRoleCache.add(i.key);
+                    }
                 }
             }
@@ -228 +239 @@
      */
     public void populateWithMemberRoles(AutoCompletionList list) {
+        list.add(presetRoleCache, AutoCompletionItemPritority.IS_IN_STANDARD);
         list.add(getRoleCache(), AutoCompletionItemPritority.IS_IN_DATASET);
     }