Changeset 5624 in josm for trunk/src/org

Timestamp:

2012-12-19T14:21:31+01:00 (12 years ago)

Author:

Don-vip

Message:

see #8255 - Use 'type' attribute when specified to filter role candidates (for example, this prevents highway=crossing or highway=street_lampnodes to be added as street members to an associatedStreet relation)

File:

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

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

@@ -54 +54 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -121 +122 @@
         }
 
-        public static PresetType forPrimitiveType(org.openstreetmap.josm.data.osm.OsmPrimitiveType type) {
+        public static PresetType forPrimitiveType(OsmPrimitiveType type) {
             switch (type) {
             case NODE:
@@ -1589 +1590 @@
 
     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;
+        if (roles != null && osm != null) {
+            for (Role i : roles.roles) {
+                if (i.memberExpression != null && i.memberExpression.match(osm) 
+                        && (i.types == null || i.types.isEmpty() || i.types.contains(PresetType.forPrimitive(osm)) )) {
+                    return i.key;
+                }
             }
         }