imporved handling of cmds #23

JOSM · Jul 14, 2017 · c875c92 · c875c92
1 parent c91b3b9
commit c875c92
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/org/openstreetmap/josm/plugins/areaselector/AreaSelectorAction.java b/src/org/openstreetmap/josm/plugins/areaselector/AreaSelectorAction.java
@@ -213,23 +213,21 @@ public void createArea() {
  Collection<Command> cmds = new LinkedList<>();
  List<Node> nodes = way.getNodes();
  for (int i = 0; i < nodes.size() - 1; i++) {
-
  cmds.add(new AddCommand(nodes.get(i)));
  }
  cmds.add(new AddCommand(way));
-
- Command c = new SequenceCommand(/* I18n: Name of command */ tr("create building"), cmds);
- Main.main.undoRedo.add(c);
- Main.getLayerManager().getEditDataSet().setSelected(way);
+ Main.main.undoRedo.add(new SequenceCommand(/* I18n: Name of command */ tr("create building"), cmds));
 
  if (replaceBuildings && existingWay != null){
  if (way.getBBox().bounds(existingWay.getBBox().getCenter())){
  log.info("existing way is inside of new building: "+existingWay.toString() + " is in " + way.toString());
- Main.main.undoRedo.add(replaceWay(existingWay, way));
+ Main.main.undoRedo.add(new SequenceCommand(tr("replace building"), replaceWay(existingWay, way)));
  way = existingWay;
  }
  }
 
+ Main.getLayerManager().getEditDataSet().setSelected(way);
+
  if (mergeNodes) {
  mergeNodes(way);
  }
@@ -282,30 +280,31 @@ public OsmPrimitive fetchAddress(OsmPrimitive selectedObject) {
  * @param newWay new way
  * @return replaced way
  */
- public Command replaceWay(Way existingWay, Way newWay){
+ public List<Command> replaceWay(Way existingWay, Way newWay){
  if (existingWay == null || newWay == null){
  return null;
  }
  ArrayList<Command> cmds = new ArrayList<>();
 
  cmds.add(new RemoveNodesCommand(existingWay, existingWay.getNodes()));
 
+ int i = 1;
  for (Node existingNode : existingWay.getNodes()){
- if (existingNode.getParentWays().size() == 1){
+ if (i < existingWay.getNodesCount() && existingNode.getParentWays().size() == 1 && !existingNode.isDeleted() && !existingNode.isNew()){
+ // log.info("delete node "+existingNode.toString());
  cmds.add(new DeleteCommand(existingNode));
  }
- }
- if(existingWay.getNodesCount() > 2 && existingWay.getRealNodesCount() > 1){
- // do not try to delete the first node again, as it will be twice in the way
- cmds.remove(cmds.size()-1);
+ i++;
  }
 
  for (Node newNode : newWay.getNodes()){
  existingWay.addNode(newNode);
  }
- cmds.add(new DeleteCommand(newWay));
+ if(newWay.isNew() && !newWay.isDeleted()){
+ cmds.add(new DeleteCommand(newWay));
+ }
 
- return new SequenceCommand(tr("replace bauilding"), cmds);
+ return cmds;
  }
 
  public Way createWayFromPolygon(MapView mapView, Polygon polygon) {