Index: applications/editors/josm/plugins/utilsplugin/data/Join Areas Tests.osm
===================================================================
--- applications/editors/josm/plugins/utilsplugin/data/Join Areas Tests.osm (revision 14340)
+++ applications/editors/josm/plugins/utilsplugin/data/Join Areas Tests.osm (revision 14356)
@@ -2,4 +2,5 @@
+
@@ -231,11 +232,87 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -246,21 +323,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -279,74 +374,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -359,187 +385,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -556,30 +415,113 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -600,42 +542,95 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -644,67 +639,129 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java (revision 14340)
+++ applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java (revision 14356)
@@ -1,4 +1,5 @@
package UtilsPlugin;
+import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
@@ -214,5 +215,5 @@
ArrayList nodes = addIntersections(a, b);
if(nodes.size() == 0) return hadChanges;
- commitCommands("Added node on all intersections");
+ commitCommands(marktr("Added node on all intersections"));
// Remove ways from all relations so ways can be combined/split quietly
@@ -238,16 +239,16 @@
if(innerWays != null && innerWays.size() > 0)
cmds.add(DeleteCommand.delete(innerWays, true));
- commitCommands("Delete Ways that are not part of an inner multipolygon");
+ commitCommands(marktr("Delete Ways that are not part of an inner multipolygon"));
// We can attach our new multipolygon relation and pretend it has always been there
addOwnMultigonRelation(newInnerWays, outerWay, relations);
fixRelations(relations, outerWay);
- commitCommands("Fix relations");
+ commitCommands(marktr("Fix relations"));
stripTags(newInnerWays);
makeCommitsOneAction(
- a.equals(b)
- ? "Joined self-overlapping area " + a.getName()
- : "Joined overlapping areas " + a.getName() + " and " + b.getName()
+ same
+ ? marktr("Joined self-overlapping area")
+ : marktr("Joined overlapping areas")
);
@@ -328,5 +329,5 @@
cmds.add(new ChangeCommand(a, ax));
cmds.add(new ChangeCommand(b, bx));
- commitCommands("Fix tag conflicts");
+ commitCommands(marktr("Fix tag conflicts"));
return false;
}
@@ -477,5 +478,5 @@
}
- commitCommands("Removed Element from Relations");
+ commitCommands(marktr("Removed Element from Relations"));
return result;
}
@@ -542,5 +543,5 @@
for(Node n: multigonNodes) {
if(!((Way)w).nodes.contains(n) && poly.contains(latlonToXY(n.coor.lat()), latlonToXY(n.coor.lon()))) {
- innerWays.addAll(getWaysByNode(multigonWays, n));
+ getWaysByNode(innerWays, multigonWays, n);
}
}
@@ -557,15 +558,13 @@
/**
* Finds all ways that contain the given node.
- * @param Collection A collection of OsmPrimitives, but only ways will be honored
+ * @param Collection A list to which matching ways will be added
+ * @param Collection A list of ways to check
* @param Node The node the ways should be checked against
- * @return Collection A list of ways that contain the given node
- */
- private Collection getWaysByNode(Collection w, Node n) {
- Collection deletedWays = new ArrayList();
+ */
+ private void getWaysByNode(Collection innerWays, Collection w, Node n) {
for(Way way : w) {
if(!((Way)way).nodes.contains(n)) continue;
- if(!deletedWays.contains(way)) deletedWays.add(way); // Will need this later for multigons
- }
- return deletedWays;
+ if(!innerWays.contains(way)) innerWays.add(way); // Will need this later for multigons
+ }
}
@@ -588,6 +587,22 @@
}
- commitCommands("Join Areas: Remove Short Ways");
- return joinWays(join);
+ commitCommands(marktr("Join Areas: Remove Short Ways"));
+ return closeWay(joinWays(join));
+ }
+
+ /**
+ * Ensures a way is closed. If it isn't, last and first node are connected.
+ * @param Way the way to ensure it's closed
+ * @return Way The joined way.
+ */
+ private Way closeWay(Way w) {
+ if(w.isClosed())
+ return w;
+ Main.ds.setSelected(w);
+ Way wnew = new Way(w);
+ wnew.addNode(wnew.firstNode());
+ cmds.add(new ChangeCommand(w, wnew));
+ commitCommands(marktr("Closed Way"));
+ return (Way)(Main.ds.getSelectedWays().toArray())[0];
}
@@ -599,5 +614,4 @@
private Way joinWays(ArrayList ways) {
if(ways.size() < 2) return ways.get(0);
- //Main.ds.setSelected(ways);
// This will turn ways so all of them point in the same direction and CombineAction won't bug
@@ -618,4 +632,7 @@
}
Main.ds.setSelected(ways);
+ // TODO: It might be possible that a confirmation dialog is presented even after reversing (for
+ // "strange" ways). If the user cancels this, makeCommitsOneAction will wrongly consume a previous
+ // action. Make CombineWayAction either silent or expose its combining capabilities.
new CombineWayAction().actionPerformed(null);
cmdsCount++;
@@ -641,5 +658,5 @@
// inner multigon part will have at least two ways, so we can use this to find which ways do
// belong to the multigon.
- Collection possibleWays = new ArrayList();
+ ArrayList possibleWays = new ArrayList();
wayIterator: for(Way w : uninterestingWays) {
boolean hasInnerNodes = false;
@@ -648,7 +665,11 @@
if(!hasInnerNodes && innerNodes.contains(n)) hasInnerNodes = true;
}
- if(!hasInnerNodes && w.nodes.size() >= 2) continue;
+ if(!hasInnerNodes || w.nodes.size() < 2) continue;
possibleWays.add(w);
}
+
+ // This removes unnecessary ways that might have been added.
+ removeAlmostAlikeWays(possibleWays);
+ removePartlyUnconnectedWays(possibleWays);
// Join all ways that have one start/ending node in common
@@ -685,4 +706,50 @@
} while(joined != null);
return newInnerWays;
+ }
+
+ /**
+ * Removes almost alike ways (= ways that are on top of each other for all nodes)
+ * @param ArrayList the ways to remove almost-duplicates from
+ */
+ private void removeAlmostAlikeWays(ArrayList ways) {
+ Collection removables = new ArrayList();
+ outer: for(int i=0; i < ways.size(); i++) {
+ Way a = ways.get(i);
+ for(int j=i+1; j < ways.size(); j++) {
+ Way b = ways.get(j);
+ List revNodes = new ArrayList(b.nodes);
+ Collections.reverse(revNodes);
+ if(a.nodes.equals(b.nodes) || a.nodes.equals(revNodes)) {
+ removables.add(a);
+ continue outer;
+ }
+ }
+ }
+ ways.removeAll(removables);
+ }
+
+ /**
+ * Removes ways from the given list whose starting or ending node doesn't
+ * connect to other ways from the same list (it's like removing spikes).
+ * @param ArrayList The list of ways to remove "spikes" from
+ */
+ private void removePartlyUnconnectedWays(ArrayList ways) {
+ List removables = new ArrayList();
+ for(Way a : ways) {
+ if(a.isClosed()) continue;
+ boolean connectedStart = false;
+ boolean connectedEnd = false;
+ for(Way b : ways) {
+ if(a.equals(b))
+ continue;
+ if(b.isFirstLastNode(a.firstNode()))
+ connectedStart = true;
+ if(b.isFirstLastNode(a.lastNode()))
+ connectedEnd = true;
+ }
+ if(!connectedStart || !connectedEnd)
+ removables.add(a);
+ }
+ ways.removeAll(removables);
}
@@ -803,5 +870,5 @@
private void stripTags(Collection ways) {
for(Way w: ways) stripTags(w);
- commitCommands("Remove tags from inner ways");
+ commitCommands(marktr("Remove tags from inner ways"));
}
@@ -825,11 +892,12 @@
UndoRedoHandler ur = Main.main.undoRedo;
cmds.clear();
- for(int i = ur.commands.size() - cmdsCount; i < ur.commands.size(); i++)
+ int i = Math.max(ur.commands.size() - cmdsCount, 0);
+ for(; i < ur.commands.size(); i++)
cmds.add(ur.commands.get(i));
- for(int i = 0; i < cmdsCount; i++)
+ for(i = 0; i < cmds.size(); i++)
ur.undo();
- commitCommands(message == null ? "Join Areas Function" : message);
+ commitCommands(message == null ? marktr("Join Areas Function") : message);
cmdsCount = 0;
}