Changeset 170 in josm for src/org

Timestamp:

2006-11-28T20:30:37+01:00 (18 years ago)

Author:

imi

Message:

• added new mapmode "Add node and connect"

File:

• src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (modified) (4 diffs)

src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
@@ -38 +39 @@
 public class AddNodeAction extends MapMode {
 
-        enum Mode {node, nodesegment}
+        enum Mode {node, nodesegment, autonode}
         private final Mode mode;
 
@@ -47 +48 @@
                         actions.add(new AddNodeAction(mf,tr("Add node"), Mode.node, tr("Add a new node to the map")));
                         actions.add(new AddNodeAction(mf, tr("Add node into segment"), Mode.nodesegment,tr( "Add a node into an existing segment")));
+                        actions.add(new AddNodeAction(mf, tr("Add node and connect"), Mode.autonode,tr( "Add a node and connect it to the selected (previous added) node")));
                         setCurrent(0);
                 }
@@ -132 +134 @@
                         }
 
-                        c = new SequenceCommand(tr("Add Node into Segment"), cmds);
+                        c = new SequenceCommand(tr("Add node into segment"), cmds);
                 }
+
+                if (mode == Mode.autonode) {
+                        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+                        if (selection.size() == 1 && selection.iterator().next() instanceof Node) {
+                                Node n1 = (Node)selection.iterator().next();
+                                Collection<Command> cmds = new LinkedList<Command>();
+                                Segment s = new Segment(n1, n);
+                                cmds.add(c);                            
+                                cmds.add(new AddCommand(s));                    
+
+                                Way way = getWayForNode(n1);
+                                if (way != null) {
+                                        Way newWay = new Way(way);
+                                        if (way.segments.get(0).from == n1)
+                                                newWay.segments.add(0, s);
+                                        else
+                                                newWay.segments.add(s);
+                                        cmds.add(new ChangeCommand(way, newWay));
+                                }
+
+                                c = new SequenceCommand(tr("Add node and connect"), cmds);
+                        }       
+                }               
+        
                 Main.main.editLayer().add(c);
                 Main.ds.setSelected(n);
                 Main.map.mapView.repaint();
         }
+        
+        /**
+         * @return If the node is part of exactly one way, return this. 
+         *      <code>null</code> otherwise.
+         */
+        private Way getWayForNode(Node n) {
+                Way way = null;
+                for (Way w : Main.ds.ways) {
+                        for (Segment s : w.segments) {
+                                if (s.from == n || s.to == n) {
+                                        if (way != null)
+                                                return null;
+                                        if (s.from == s.to)
+                                                return null;
+                                        way = w;
+                                }
+                        }
+                }
+                return way;
+        }
 }