Changeset 5614 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

Timestamp:

2012-12-06T22:54:00+01:00 (11 years ago)

Author:

simon04

Message:

see #8255 - suggest roles when adding objects to a relation

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (10 diffs)

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

@@ -67 +67 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
+import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
@@ -76 +77 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.UrlLabel;
 import org.openstreetmap.josm.tools.Utils;
@@ -1094 +1096 @@
         public String text_context;
         public String locale_text;
+        public Match memberExpression;
 
         public boolean required = false;
@@ -1107 +1110 @@
             } else if(!"optional".equals(str))
                 throw new SAXException(tr("Unknown requisite: {0}", str));
+        }
+
+        public void setMember_expression(String member_expression) throws SAXException {
+            try {
+                this.memberExpression = SearchCompiler.compile(member_expression, true, true);
+            } catch (SearchCompiler.ParseError ex) {
+                throw new SAXException(tr("Illegal member expression: {0}", ex.getMessage()), ex);
+            }
         }
 
@@ -1158 +1169 @@
     public static class Roles extends Item {
 
-        public List<Role> roles = new LinkedList<Role>();
+        public final List<Role> roles = new LinkedList<Role>();
 
         @Override
@@ -1241 +1252 @@
     public EnumSet<PresetType> types;
     public List<Item> data = new LinkedList<Item>();
+    public Roles roles;
     public TemplateEntry nameTemplate;
     public Match nameTemplateFilter;
@@ -1428 +1440 @@
                     if (o instanceof Roles) {
                         all.getLast().data.add((Item) o);
+                        if (all.getLast().roles != null) {
+                            throw new SAXException(tr("Roles cannot appear more than once"));
+                        }
+                        all.getLast().roles = (Roles) o;
                         lastrole = (Roles) o;
                     } else if (o instanceof Role) {
@@ -1572 +1588 @@
     }
 
+    public String suggestRoleForOsmPrimitive(OsmPrimitive osm) {
+        if (roles == null) {
+            return null;
+        }
+        for (Role i : roles.roles) {
+            if (i.memberExpression != null && i.memberExpression.match(osm)) {
+                return i.key;
+            }
+        }
+        return null;
+    }
+
     public void actionPerformed(ActionEvent e) {
         if (Main.main == null) return;
@@ -1590 +1618 @@
                 r.put(t.getKey(), t.getValue());
             }
-            for(OsmPrimitive osm : Main.main.getCurrentDataSet().getSelected()) {
-                RelationMember rm = new RelationMember("", osm);
+            for (OsmPrimitive osm : Main.main.getCurrentDataSet().getSelected()) {
+                String role = suggestRoleForOsmPrimitive(osm);
+                RelationMember rm = new RelationMember(role == null ? "" : role, osm);
                 r.addMember(rm);
                 members.add(rm);
@@ -1773 +1802 @@
         return atLeastOnePositiveMatch;
     }
+
+    public static Collection<TaggingPreset> getMatchingPresets(final Collection<PresetType> t, final Map<String, String> tags, final boolean onlyShowable) {
+        return Utils.filter(TaggingPresetPreference.taggingPresets, new Predicate<TaggingPreset>() {
+            @Override
+            public boolean evaluate(TaggingPreset object) {
+                return object.matches(t, tags, onlyShowable);
+            }
+        });
+    }
 }