Index: applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinNodeWayAction.java =================================================================== --- applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinNodeWayAction.java (revision 5449) +++ (revision ) @@ -1,90 +1,0 @@ -package UtilsPlugin; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; - -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.WaySegment; -import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.gui.MapFrame; -import org.openstreetmap.josm.plugins.Plugin; -import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.command.Command; -import org.openstreetmap.josm.command.AddCommand; -import org.openstreetmap.josm.command.DeleteCommand; -import org.openstreetmap.josm.command.ChangeCommand; -import org.openstreetmap.josm.command.SequenceCommand; -import org.openstreetmap.josm.data.osm.OsmPrimitive; - -import javax.swing.AbstractAction; - -class JoinNodeWayAction extends JosmAction { - public JoinNodeWayAction() { - super(tr("Join node to way"), "joinnodeway", - tr("Join a node into the nearest way segments"), KeyEvent.VK_J, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true); - } - - public void actionPerformed(ActionEvent e) { - Collection sel = Main.ds.getSelected(); - if (sel.size() != 1 || !(sel.iterator().next() instanceof Node)) return; - Node node = (Node) sel.iterator().next(); - - List wss = Main.map.mapView.getNearestWaySegments( - Main.map.mapView.getPoint(node.eastNorth)); - HashMap> insertPoints = new HashMap>(); - for (WaySegment ws : wss) { - List is; - if (insertPoints.containsKey(ws.way)) { - is = insertPoints.get(ws.way); - } else { - is = new ArrayList(); - insertPoints.put(ws.way, is); - } - - if (ws.way.nodes.get(ws.lowerIndex) != node - && ws.way.nodes.get(ws.lowerIndex+1) != node) { - is.add(ws.lowerIndex); - } - } - - Collection cmds = new LinkedList(); - for (Map.Entry> insertPoint : insertPoints.entrySet()) { - Way w = insertPoint.getKey(); - Way wnew = new Way(w); - List is = insertPoint.getValue(); - pruneSuccsAndReverse(is); - for (int i : is) wnew.nodes.add(i+1, node); - cmds.add(new ChangeCommand(w, wnew)); - } - - Main.main.undoRedo.add(new SequenceCommand(tr("Join Node and Line"), cmds)); - Main.map.repaint(); - } - - private static void pruneSuccsAndReverse(List is) { - //if (is.size() < 2) return; - - HashSet is2 = new HashSet(); - for (int i : is) { - if (!is2.contains(i - 1) && !is2.contains(i + 1)) { - is2.add(i); - } - } - is.clear(); - is.addAll(is2); - Collections.sort(is); - Collections.reverse(is); - } -} Index: applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/MergeNodesAction.java =================================================================== --- applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/MergeNodesAction.java (revision 5449) +++ (revision ) @@ -1,128 +1,0 @@ -package UtilsPlugin; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Collection; -import java.util.Collections; - -import java.awt.event.ActionEvent; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor; -import org.openstreetmap.josm.data.coor.EastNorth; -import org.openstreetmap.josm.gui.MapFrame; -import org.openstreetmap.josm.plugins.Plugin; -import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.command.Command; -import org.openstreetmap.josm.command.AddCommand; -import org.openstreetmap.josm.command.DeleteCommand; -import org.openstreetmap.josm.command.ChangeCommand; -import org.openstreetmap.josm.command.SequenceCommand; - -import javax.swing.AbstractAction; -import javax.swing.JOptionPane; - -class MergeNodesAction extends JosmAction { - public MergeNodesAction() { - super(tr("Merge nodes"), "mergenodes", - tr("Merge nodes"), 0, 0, true); - } - - public void actionPerformed(ActionEvent e) { - Collection sel = Main.ds.getSelected(); - HashSet nodes = new HashSet(); - - for (OsmPrimitive osm : sel) - if (osm instanceof Node) - nodes.add((Node)osm); - if (nodes.size() < 2) { - JOptionPane.showMessageDialog(Main.parent, - tr("Must select at least two nodes.")); - return; - } - - // Find the node with the lowest ID. - // We're gonna keep our 3-digit node ids. - Node target = null; - for (Node n : nodes) { - if (target == null || target.id == 0 || n.id < target.id) { - target = n; - } - } - - Collection cmds = new LinkedList(); - - Node newTarget = new Node(target); - - // Don't place the merged node on one of the former nodes. - // Place it right there in the middle. - double x = 0, y = 0; - for (Node n : nodes) { - x += n.eastNorth.east(); - y += n.eastNorth.north(); - } - newTarget.eastNorth = new EastNorth( - x / nodes.size(), y / nodes.size()); - - cmds.add(new ChangeCommand(target, newTarget)); - - HashSet delNodes = new HashSet(nodes); - delNodes.remove(target); - cmds.add(new DeleteCommand(delNodes)); - - for (Way w : Main.ds.ways) { - if (w.deleted || w.incomplete) continue; - - boolean affected = false; - for (Node n : nodes) { - if (w.nodes.contains(n)) { - affected = true; - break; - } - } - if (!affected) continue; - - // Replace the old nodes with the merged one - Way wnew = new Way(w); - for (int i = 0; i < wnew.nodes.size(); i++) { - if (nodes.contains(wnew.nodes.get(i))) { - wnew.nodes.set(i, target); - } - } - - // Remove duplicates - Node lastN = null; - for (int i = wnew.nodes.size() - 1; i >= 0; i--) { - Node n = wnew.nodes.get(i); - if (lastN == n) wnew.nodes.remove(i); - lastN = n; - } - - if (wnew.nodes.size() < 2) { - CollectBackReferencesVisitor backRefV = - new CollectBackReferencesVisitor(Main.ds, false); - backRefV.visit(w); - if (!backRefV.data.isEmpty()) { - JOptionPane.showMessageDialog(Main.parent, - tr("Cannot merge nodes: " + - "Would have to delete a way that is still used.")); - return; - } - - cmds.add(new DeleteCommand(Collections.singleton(w))); - } else { - cmds.add(new ChangeCommand(w, wnew)); - } - } - - Main.main.undoRedo.add(new SequenceCommand(tr("Merge Nodes"), cmds)); - Main.ds.setSelected(newTarget); - Main.map.repaint(); - } -} Index: applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/UtilsPlugin.java =================================================================== --- applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/UtilsPlugin.java (revision 5449) +++ applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/UtilsPlugin.java (revision 5452) @@ -21,5 +21,4 @@ public class UtilsPlugin extends Plugin { - JMenuItem JoinNodeWay; JMenuItem SimplifyWay; @@ -27,9 +26,4 @@ JosmAction action; - action = new JoinNodeWayAction(); - JoinNodeWay = Main.main.menu.toolsMenu.add(action); - JoinNodeWay.setAccelerator(action.shortCut); - JoinNodeWay.setEnabled(false); - action = new SimplifyWayAction(); SimplifyWay = Main.main.menu.toolsMenu.add(action); @@ -41,5 +35,4 @@ public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { if (oldFrame == null && newFrame != null) { - JoinNodeWay.setEnabled(true); SimplifyWay.setEnabled(true); }