Index: applications/editors/josm/plugins/dumbutils/README =================================================================== --- applications/editors/josm/plugins/dumbutils/README (revision 25871) +++ applications/editors/josm/plugins/dumbutils/README (revision 25873) @@ -4,4 +4,7 @@ * Copy tags from previous selected object * Replace geometry for existing way +* Remember and paste source tag +* Align nodes in a way +* Paste relations from objects in the paste buffer As for icons, sorry: this is quick&dirty plugin, and I'm no artist. Index: applications/editors/josm/plugins/dumbutils/src/dumbutils/AlignWayNodesAction.java =================================================================== --- applications/editors/josm/plugins/dumbutils/src/dumbutils/AlignWayNodesAction.java (revision 25871) +++ applications/editors/josm/plugins/dumbutils/src/dumbutils/AlignWayNodesAction.java (revision 25873) @@ -1,19 +1,11 @@ package dumbutils; -import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.data.osm.RelationData; -import org.openstreetmap.josm.data.osm.PrimitiveData; -import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.*; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.*; import java.util.*; -import java.awt.event.KeyEvent; -import org.openstreetmap.josm.tools.Shortcut; import java.awt.event.ActionEvent; +import javax.swing.JOptionPane; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import static org.openstreetmap.josm.tools.I18n.tr; @@ -25,4 +17,5 @@ class AlignWayNodesAction extends JosmAction { private static final String TITLE = "Align way nodes"; + private static final double MOVE_THRESHOLD = 1e-9; public AlignWayNodesAction() { @@ -33,21 +26,82 @@ Collection selection = getCurrentDataSet().getSelected(); Set selectedNodes = filterNodes(selection); + int selectedNodesCount = selectedNodes.size(); Set ways = findCommonWays(selectedNodes); - if( ways == null || ways.size() != 1 ) + if( ways == null || ways.size() != 1 || selectedNodesCount == 0 ) return; Way way = ways.iterator().next(); + if( way.getNodesCount() < (way.isClosed() ? 4 : 3) ) { + JOptionPane.showMessageDialog(Main.parent, tr("The way with selected nodes can not be straightened."), tr(TITLE), JOptionPane.ERROR_MESSAGE); + return; + } // Prepare a list of nodes to align + int firstNodePos = findFirstNode(way, selectedNodes); + int lastNodePos = way.isClosed() ? firstNodePos : way.getNodesCount(); List nodes = new ArrayList(); - for( int i = 0; i < way.getNodesCount(); i++ ) { + int i = firstNodePos; + boolean iterated = false; + while( !iterated || i != lastNodePos ) { Node node = way.getNode(i); if( selectedNodes.contains(node) ) { nodes.add(node); selectedNodes.remove(node); - } - // todo: 1 node - add adjacent; 2 nodes - add all between them + if( selectedNodesCount == 1 ) { + nodes.add(0, way.getNode( i > 0 ? i - 1 : way.isClosed() ? way.getNodesCount() - 2 : i + 2 )); + nodes.add(way.getNode( i + 1 < way.getNodesCount() ? i + 1 : way.isClosed() ? 1 : i - 2 )); + } + if( selectedNodes.isEmpty() ) + break; + } else if( selectedNodesCount == 2 && selectedNodes.size() == 1 ) + nodes.add(node); + i++; + if( i >= way.getNodesCount() && way.isClosed() ) + i = 0; + iterated = true; } + if( nodes.size() < 3 ) { + JOptionPane.showMessageDialog(Main.parent, "Internal error: number of nodes is " + nodes.size(), + tr(TITLE), JOptionPane.ERROR_MESSAGE); + return; + } + + // Now, we have an ordered list of nodes, of which idx 0 and N-1 serve as guides + // and 1..N-2 should be aligned with them List commands = new ArrayList(); + double ax = nodes.get(0).getEastNorth().east(); + double ay = nodes.get(0).getEastNorth().north(); + double bx = nodes.get(nodes.size() - 1).getEastNorth().east(); + double by = nodes.get(nodes.size() - 1).getEastNorth().north(); + + for( i = 1; i + 1 < nodes.size(); i++ ) { + Node n = nodes.get(i); + + // Algorithm is copied from org.openstreetmap.josm.actions.AlignInLineAction + double nx = n.getEastNorth().east(); + double ny = n.getEastNorth().north(); + + if( ax == bx ) { + // Special case if AB is vertical... + nx = ax; + } else if( ay == by ) { + // ...or horizontal + ny = ay; + } else { + // Otherwise calculate position by solving y=mx+c (simplified) + double m1 = (by - ay) / (bx - ax); + double c1 = ay - (ax * m1); + double m2 = (-1) / m1; + double c2 = ny - (nx * m2); + + nx = (c2 - c1) / (m1 - m2); + ny = (m1 * nx) + c1; + } + + // Add the command to move the node to its new position. + if( Math.abs(nx - n.getEastNorth().east()) > MOVE_THRESHOLD && Math.abs(ny - n.getEastNorth().north()) > MOVE_THRESHOLD ) + commands.add(new MoveCommand(n, nx - n.getEastNorth().east(), ny - n.getEastNorth().north())); + } + if( !commands.isEmpty() ) Main.main.undoRedo.add(new SequenceCommand(tr(TITLE), commands)); @@ -64,6 +118,7 @@ @Override protected void updateEnabledState( Collection selection ) { - Set ways = findCommonWays(filterNodes(selection)); - setEnabled(ways != null && ways.size() == 1); + Set nodes = filterNodes(selection); + Set ways = findCommonWays(nodes); + setEnabled(ways != null && ways.size() == 1 && !nodes.isEmpty()); } @@ -92,3 +147,39 @@ return result; } + + /** + * Find the largest empty span between nodes and returns the index of the node right after it. + */ + private int findFirstNode( Way way, Set nodes ) { + int pos = 0; + while( pos < way.getNodesCount() && !nodes.contains(way.getNode(pos)) ) + pos++; + if( pos >= way.getNodesCount() ) + return 0; + if( !way.isClosed() || nodes.size() <= 1 ) + return pos; + + // now, way is closed + boolean fullCircle = false; + int maxLength = 0; + int lastPos = 0; + while( !fullCircle ) { + int length = 0; + boolean skippedFirst = false; + while( !(skippedFirst && nodes.contains(way.getNode(pos))) ) { + skippedFirst = true; + length++; + pos++; + if( pos >= way.getNodesCount() ) { + pos = 0; + fullCircle = true; + } + } + if( length > maxLength ) { + maxLength = length; + lastPos = pos; + } + } + return lastPos; + } } Index: applications/editors/josm/plugins/dumbutils/src/dumbutils/DumbUtilsPlugin.java =================================================================== --- applications/editors/josm/plugins/dumbutils/src/dumbutils/DumbUtilsPlugin.java (revision 25871) +++ applications/editors/josm/plugins/dumbutils/src/dumbutils/DumbUtilsPlugin.java (revision 25873) @@ -23,5 +23,5 @@ sourceTag = MainMenu.add(Main.main.menu.toolsMenu, new TagSourceAction()); pasteRelations = MainMenu.add(Main.main.menu.toolsMenu, new PasteRelationsAction()); -// alignWayNodes = MainMenu.add(Main.main.menu.toolsMenu, new AlignWayNodesAction()); + alignWayNodes = MainMenu.add(Main.main.menu.toolsMenu, new AlignWayNodesAction()); } @@ -33,5 +33,5 @@ sourceTag.setEnabled(enabled); pasteRelations.setEnabled(enabled); -// alignWayNodes.setEnabled(enabled); + alignWayNodes.setEnabled(enabled); } }