Changeset 26290 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions

Timestamp:

2011-07-10T08:55:51+02:00 (14 years ago)

Author:

zverik

Message:

implemented most TODO requests, fixed some bugs

Location:

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions

Files:

• CreateMultipolygonAction.java (modified) (4 diffs)
• DuplicateChosenRelationAction.java (added)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java

@@ -44 +44 @@
         else if( property.equals("boundaryways") ) return true;
         else if( property.equals("tags") ) return true;
+        else if( property.equals("alltags") ) return false;
         else if( property.equals("single") ) return true;
         throw new IllegalArgumentException(property);
@@ -74 +75 @@
                 rel.addMember(new RelationMember("inner", w));
         List<Command> list = removeTagsFromInnerWays(rel);
+        if( !list.isEmpty() && isBoundary ) {
+            Main.main.undoRedo.add(new SequenceCommand(tr("Move tags from ways to relation"), list));
+            list = new ArrayList<Command>();
+        }
         if( isBoundary ) {
             if( !askForAdminLevelAndName(rel) )
@@ -231 +236 @@
 
         // filter out empty key conflicts - we need second iteration
+        boolean isBoundary = getPref("boundary");
+        if( isBoundary || !getPref("alltags") )
         for( RelationMember m: relation.getMembers() )
             if( m.hasRole() && m.getRole().equals("outer") && m.isWay() )
@@ -246 +253 @@
             values.remove("natural");
 
-        boolean isBoundary = getPref("boundary");
         String name = values.get("name");
-        String adminLevel = values.get("admin_level");
         if( isBoundary ) {
             Set<String> keySet = new TreeSet<String>(values.keySet());