Changeset 2521 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2009-11-27T21:46:49+01:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
r2512 r2521 23 23 24 24 import org.openstreetmap.josm.Main; 25 import org.openstreetmap.josm.actions.SplitWayAction; 25 26 import org.openstreetmap.josm.data.osm.BackreferencedDataSet; 26 27 import org.openstreetmap.josm.data.osm.Node; … … 253 254 protected static Collection<Node> computeNodesToDelete(BackreferencedDataSet backreferences, OsmDataLayer layer, Collection<OsmPrimitive> primitivesToDelete) { 254 255 Collection<Node> nodesToDelete = new HashSet<Node>(); 255 //CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data, false);256 256 for (Way way : OsmPrimitive.getFilteredList(primitivesToDelete, Way.class)) { 257 257 for (Node n : way.getNodes()) { … … 259 259 continue; 260 260 } 261 //v.initialize();262 //n.visit(v);263 261 Collection<OsmPrimitive> referringPrimitives = backreferences.getParents(n); 264 262 referringPrimitives.removeAll(primitivesToDelete); … … 385 383 public static Command deleteWaySegment(OsmDataLayer layer, WaySegment ws) { 386 384 if (ws.way.getNodesCount() < 3) 387 return new DeleteCommand(layer, Collections.singleton(ws.way));385 return delete(layer, Collections.singleton(ws.way)); 388 386 389 387 if (ws.way.firstNode() == ws.way.lastNode()) { … … 416 414 return new ChangeCommand(ws.way, wnew); 417 415 } else { 418 Collection<Command> cmds = new LinkedList<Command>(); 419 420 wnew.setNodes(n1); 421 cmds.add(new ChangeCommand(ws.way, wnew)); 422 423 Way wnew2 = new Way(); 424 wnew2.setKeys(wnew.getKeys()); 425 wnew2.setNodes(n2); 426 cmds.add(new AddCommand(wnew2)); 427 428 // FIXME: relation memberships are not handled 429 430 return new SequenceCommand(tr("Split way segment"), cmds); 416 List<List<Node>> chunks = new ArrayList<List<Node>>(2); 417 chunks.add(n1); 418 chunks.add(n2); 419 return SplitWayAction.splitWay(ws.way, chunks).getCommand(); 431 420 } 432 421 }
Note:
See TracChangeset
for help on using the changeset viewer.