Changeset 17163 in josm for trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java
- Timestamp:
- 2020-10-11T14:24:00+02:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java
r16781 r17163 351 351 352 352 // Figure out the order of relation members (if any). 353 Analysis analysis = analyseSplit(way, wayToKeep, newWays , indexOfWayToKeep);353 Analysis analysis = analyseSplit(way, wayToKeep, newWays); 354 354 355 355 // If there are relations that cannot be split properly without downloading more members, … … 406 406 // If missing relation members were downloaded, perform the analysis again to find the relation 407 407 // member order for all relations. 408 analysis = analyseSplit(way, wayToKeep, newWays , indexOfWayToKeep);408 analysis = analyseSplit(way, wayToKeep, newWays); 409 409 return Optional.of(splitBasedOnAnalyses(way, newWays, newSelection, analysis, indexOfWayToKeep)); 410 410 case GO_AHEAD_WITHOUT_DOWNLOADS: … … 421 421 static Analysis analyseSplit(Way way, 422 422 Way wayToKeep, 423 List<Way> newWays, 424 int indexOfWayToKeep) { 423 List<Way> newWays) { 425 424 Collection<Command> commandList = new ArrayList<>(); 426 425 Collection<String> nowarnroles = Config.getPref().getList("way.split.roles.nowarn", … … 430 429 final Way changedWay = new Way(way); 431 430 changedWay.setNodes(wayToKeep.getNodes()); 432 commandList.add(new ChangeCommand(way, changedWay)); 433 431 commandList.add(new ChangeNodesCommand(way, changedWay.getNodes())); 434 432 for (Way wayToAdd : newWays) { 435 433 commandList.add(new AddCommand(way.getDataSet(), wayToAdd)); … … 559 557 } 560 558 } 561 559 changedWay.setNodes(null); // see #19885 562 560 return new Analysis(relationAnalyses, commandList, warnings, numberOfRelations); 563 561 }
Note:
See TracChangeset
for help on using the changeset viewer.