Changeset 6913 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-03-19T13:25:23+01:00 (10 years ago)

Author:

akks

Message:

see #9832: move tags from ways to the multipolygons created by Shift-J

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CreateMultipolygonAction.java (modified) (1 diff)
• JoinAreasAction.java (modified) (4 diffs)

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

@@ -324 +324 @@
      * @return a list of commands to execute
      */
-    private static List<Command> removeTagsFromWaysIfNeeded( Relation relation ) {
+    public static List<Command> removeTagsFromWaysIfNeeded( Relation relation ) {
         Map<String, String> values = new HashMap<String, String>(relation.getKeys());
 

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

@@ -52 +52 @@
 public class JoinAreasAction extends JosmAction {
     // This will be used to commit commands and unite them into one large command sequence at the end
-    private LinkedList<Command> cmds = new LinkedList<Command>();
+    private final LinkedList<Command> cmds = new LinkedList<Command>();
     private int cmdsCount = 0;
+    private final LinkedList<Relation> addedRelations = new LinkedList<Relation>();
 
     /**
@@ -316 +317 @@
     public void actionPerformed(ActionEvent e) {
         LinkedList<Way> ways = new LinkedList<Way>(Main.main.getCurrentDataSet().getSelectedWays());
-
+        addedRelations.clear();
+        
         if (ways.isEmpty()) {
             new Notification(
@@ -373 +375 @@
 
             if (result.hasChanges) {
-
+                // move tags from ways to newly created relations
+                // TODO: do we need to also move tags for the modified relations?
+                for (Relation r: addedRelations) {
+                    cmds.addAll(CreateMultipolygonAction.removeTagsFromWaysIfNeeded(r));
+                }
+                commitCommands(tr("Move tags from ways to relations"));
+                
                 List<Way> allWays = new ArrayList<Way>();
                 for (Multipolygon pol : result.polygons) {
@@ -1307 +1315 @@
         }
         cmds.add(new AddCommand(newRel));
+        addedRelations.add(newRel);
 
         // We don't add outer to the relation because it will be handed to fixRelations()