- Timestamp:
- 2020-02-18T15:02:41+01:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
r15875 r15883 480 480 public void actionPerformed(ActionEvent e) { 481 481 join(getLayerManager().getEditDataSet().getSelectedWays()); 482 clearFields(); 483 } 484 485 private void clearFields() { 486 ds = null; 487 cmdsCount = 0; 488 cmds.clear(); 489 addedRelations.clear(); 482 490 } 483 491 … … 488 496 */ 489 497 public void join(Collection<Way> ways) { 490 cmdsCount = 0; 491 addedRelations.clear(); 498 clearFields(); 492 499 493 500 if (ways.isEmpty()) { … … 675 682 List<WayInPolygon> preparedWays = new ArrayList<>(); 676 683 684 // maps oldest way referring to start of each part 685 Map<Node, Way> oldestWayMap = new HashMap<>(); 686 677 687 for (Way way : outerStartingWays) { 678 688 List<Way> splitWays = splitWayOnNodes(way, nodes); 689 690 // see #9599 691 if (!way.isNew() && splitWays.size() > 1) { 692 for (Way part : splitWays) { 693 Node n = part.firstNode(); 694 Way old = oldestWayMap.get(n); 695 if (old == null || old.getUniqueId() > way.getUniqueId()) { 696 oldestWayMap.put(n, way); 697 } 698 } 699 } 700 679 701 preparedWays.addAll(markWayInsideSide(splitWays, false)); 680 702 } … … 721 743 722 744 commitCommands(marktr("Delete relations")); 745 746 // see #9599: result should contain original way(s) where possible 747 if (discardedWays.stream().anyMatch(w -> !w.isNew())) { 748 for (int i = 0; i < polygons.size(); i++) { 749 Multipolygon mp = polygons.get(i); 750 for (int k = 0; k < mp.getInnerWays().size(); k++) { 751 Way inner = mp.getInnerWays().get(k); 752 Way older = keepOlder(inner, oldestWayMap, discardedWays); 753 if (inner != older) { 754 mp.getInnerWays().set(k, older); 755 } 756 } 757 Way older = keepOlder(mp.outerWay, oldestWayMap, discardedWays); 758 if (older != mp.outerWay) { 759 Multipolygon mpNew = new Multipolygon(older); 760 mpNew.innerWays.addAll(mp.getInnerWays()); 761 polygons.set(i, mpNew); 762 } 763 } 764 commitCommands(marktr("Keep older versions")); 765 } 723 766 724 767 // Delete the discarded inner ways … … 740 783 741 784 return new JoinAreasResult(true, polygons); 785 } 786 787 /** 788 * Create copy of given way using an older id so that we don't create a new way instead of a modified old one. 789 * @param way the way to check 790 * @param oldestWayMap nodes from old ways 791 * @param discardedWays collection of ways which will be deleted (modified) 792 * @return a copy of the way with an older id or the way itself 793 */ 794 private Way keepOlder(Way way, Map<Node, Way> oldestWayMap, List<Way> discardedWays) { 795 Way oldest = null; 796 for (Node n : way.getNodes()) { 797 Way orig = oldestWayMap .get(n); 798 if (orig != null && (oldest == null || oldest.getUniqueId() > orig.getUniqueId()) 799 && discardedWays.contains(orig)) { 800 oldest = orig; 801 } 802 } 803 if (oldest != null) { 804 discardedWays.remove(oldest); 805 discardedWays.add(way); 806 Way copy = new Way(oldest); 807 copy.setNodes(way.getNodes()); 808 cmds.add(new ChangeCommand(oldest, copy)); 809 return copy; 810 } 811 return way; 742 812 } 743 813 … … 1056 1126 * @param way way to split 1057 1127 * @param nodes split points 1058 * @return list of split ways (or original way sif no splitting is done).1128 * @return list of split ways (or original way if no splitting is done). 1059 1129 */ 1060 1130 private List<Way> splitWayOnNodes(Way way, Set<Node> nodes) { … … 1373 1443 //TODO: ReverseWay and Combine way are really slow and we use them a lot here. This slows down large joins. 1374 1444 List<Way> actionWays = new ArrayList<>(ways.size()); 1375 1445 int oldestPos = 0; 1446 Way oldest = ways.get(0).way; 1376 1447 for (WayInPolygon way : ways) { 1377 1448 actionWays.add(way.way); 1449 if (oldest.isNew() || !way.way.isNew() && oldest.getUniqueId() > way.way.getUniqueId()) { 1450 oldest = way.way; 1451 oldestPos = actionWays.size() - 1; 1452 } 1378 1453 1379 1454 if (!way.insideToTheRight) { … … 1383 1458 } 1384 1459 } 1460 1461 // see #9599: Help CombineWayAction to use the oldest way 1462 Collections.rotate(actionWays, actionWays.size() - oldestPos); 1385 1463 1386 1464 Pair<Way, Command> result = CombineWayAction.combineWaysWorker(actionWays);
Note:
See TracChangeset
for help on using the changeset viewer.