Changeset 26888 in osm for applications/editors/josm/plugins/reltoolbox

Timestamp:

2011-10-14T23:36:20+02:00 (13 years ago)

Author:

zverik

Message:

It's alive! ALIVE!

Location:

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

Files:

• SplittingMultipolygons.java (modified) (1 diff)
• TheRing.java (modified) (5 diffs)

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

@@ -341 +341 @@
             otherRing.putSourceWayFirst();
         
+        Map<Relation, Relation> relationCache = new HashMap<Relation, Relation>();
         for( TheRing otherRing : otherWays )
-            commands.addAll(otherRing.getCommands(false));
-        commands.addAll(theRing.getCommands());
+            commands.addAll(otherRing.getCommands(false, relationCache));
+        commands.addAll(theRing.getCommands(relationCache));
+        TheRing.updateCommandsWithRelations(commands, relationCache);
         resultingCommands.add(new SequenceCommand(tr("Complete multipolygon for way {0}",
                 DefaultNameFormatter.getInstance().format(ring)), commands));

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

@@ -66 +66 @@
         redistributeSegments(rings);
         List<Relation> relations = new ArrayList<Relation>();
+        Map<Relation, Relation> relationCache = new HashMap<Relation, Relation>();
         for( TheRing r : rings ) {
-            commands.addAll(r.getCommands());
+            commands.addAll(r.getCommands(relationCache));
             relations.add(r.getRelation());
         }
+        updateCommandsWithRelations(commands, relationCache);
         return relations;
     }
@@ -277 +279 @@
     
     public List<Command> getCommands() {
-        return getCommands(true);
+        return getCommands(true, null);
+    }
+    
+    public List<Command> getCommands( Map<Relation, Relation> relationChangeMap ) {
+        return getCommands(true, relationChangeMap);
     }
     
@@ -284 +290 @@
      * The first way is copied from the source one, ChangeCommand is issued in this case.
      */
-    public List<Command> getCommands( boolean createMultipolygon ) {
+    public List<Command> getCommands( boolean createMultipolygon, Map<Relation, Relation> relationChangeMap ) {
         Way sourceCopy = new Way(source);
         if( createMultipolygon ) {
@@ -303 +309 @@
         for( OsmPrimitive p : source.getReferrers() ) {
             if( p instanceof Relation ) {
-                Relation rel = new Relation((Relation)p);
-                relationCommands.add(new ChangeCommand((Relation)p, rel));
+                Relation rel = null;
+                if( relationChangeMap != null ) {
+                    if( relationChangeMap.containsKey((Relation)p) )
+                        rel = relationChangeMap.get((Relation)p);
+                    else {
+                        rel = new Relation((Relation)p);
+                        relationChangeMap.put((Relation)p, rel);
+                    }
+                } else {                    
+                    rel = new Relation((Relation)p);
+                    relationCommands.add(new ChangeCommand((Relation)p, rel));
+                }
                 for( int i = 0; i < rel.getMembersCount(); i++ )
                     if( rel.getMember(i).getMember().equals(source) )
@@ -342 +358 @@
             commands.add(new AddCommand(relation));
         return commands;
+    }
+    
+    public static void updateCommandsWithRelations( List<Command> commands, Map<Relation, Relation> relationCache ) {
+        for( Relation src : relationCache.keySet() )
+            commands.add(new ChangeCommand(src, relationCache.get(src)));
     }