Changeset 6765 in josm for trunk/src/org

Timestamp:

2014-01-28T19:36:46+01:00 (10 years ago)

Author:

simon04

Message:

fix #9623 - Create multipolygon: do not move fence_type tag to relation

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -316 +316 @@
     }
 
-    public static final List<String> DEFAULT_LINEAR_TAGS = Arrays.asList(new String[] {"barrier", "source"});
+    public static final List<String> DEFAULT_LINEAR_TAGS = Arrays.asList("barrier", "fence_type", "source");
 
     /**
@@ -325 +325 @@
      */
     private static List<Command> removeTagsFromWaysIfNeeded( Relation relation ) {
-        Map<String, String> values = new HashMap<String, String>();
-
-        if( relation.hasKeys() ) {
-            for( String key : relation.keySet() ) {
-                values.put(key, relation.get(key));
-            }
-        }
+        Map<String, String> values = new HashMap<String, String>(relation.getKeys());
 
         List<Way> innerWays = new ArrayList<Way>();
@@ -372 +366 @@
             values.remove(linearTag);
 
-        if( values.containsKey("natural") && values.get("natural").equals("coastline") )
+        if ("coastline".equals(values.get("natural")))
             values.remove("natural");
 
@@ -386 +380 @@
 
             for (Way way : innerWays) {
-                if (way.hasKey(key) && (value.equals(way.get(key)))) {
+                if (value.equals(way.get(key))) {
                     affectedWays.add(way);
                 }