Changeset 99 in josm for src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java

Timestamp:

2006-04-27T01:29:55+02:00 (20 years ago)

Author:

imi

Message:

• added GeoImage feature (showing images on a tracklog)
• added zoom slider
• added Escape cancels selection rectangle
• added "Save password" option to Auth-dialog
• fixed that redo/undo buttons were not enabled
• fixed hotkeys beeing inaccessible when no data is loaded

File:

• src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (modified) (6 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -64 +63 @@
         @Override public void enterMode() {
                 super.enterMode();
-                Command c = null;
                 way = makeWay();
-                if (way != null) {
-                        c = new AddCommand(way);
-                        Main.ds.setSelected(way);
-                        Main.main.editLayer().add(c);
-                } else
-                        Main.ds.clearSelection();
+                Main.ds.setSelected(way);
                 Main.map.mapView.addMouseListener(this);
         }
@@ -147 +140 @@
                 }
 
+                Way wayToAdd = null;
+                boolean reordered = false;
                 if (numberOfSelectedWays > 0) {
                         String ways = "way" + (numberOfSelectedWays==1?" has":"s have");
@@ -155 +150 @@
                                         if (osm instanceof Way)
                                                 segmentSet.addAll(((Way)osm).segments);
+                        } else if (numberOfSelectedWays == 1) {
+                                answer = JOptionPane.showConfirmDialog(Main.parent, "Do you want to add all other selected segments to the one selected way?", "Add segments to way?", JOptionPane.YES_NO_OPTION);
+                                if (answer == JOptionPane.YES_OPTION) {
+                                        for (OsmPrimitive osm : selection) {
+                                                if (osm instanceof Way) {
+                                                        wayToAdd = (Way)osm;
+                                                        answer = JOptionPane.showConfirmDialog(Main.parent, "Reorder all line segments?", "Reorder?", JOptionPane.YES_NO_CANCEL_OPTION);
+                                                        if (answer == JOptionPane.CANCEL_OPTION)
+                                                                return wayToAdd;
+                                                        if (answer == JOptionPane.YES_OPTION) {
+                                                                segmentSet.addAll(wayToAdd.segments);
+                                                                reordered = true;
+                                                        } else
+                                                                segmentSet.removeAll(wayToAdd.segments);
+                                                        break;
+                                                }
+                                        }
+                                }
                         }
                 }
@@ -193 +206 @@
                 }
 
+                if (wayToAdd != null) {
+                        Way w = new Way(wayToAdd);
+                        if (reordered)
+                                w.segments.clear();
+                        w.segments.addAll(sortedSegments);
+                        Main.main.editLayer().add(new ChangeCommand(wayToAdd, w));
+                        return wayToAdd;
+                }
+
                 if (JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(Main.parent, "Create a new way out of "+sortedSegments.size()+" segments?", "Create new way", JOptionPane.YES_NO_OPTION))
                         return null;
@@ -198 +220 @@
                 Way w = new Way();
                 w.segments.addAll(sortedSegments);
+
+                if (way != null)
+                        Main.main.editLayer().add(new AddCommand(way));
                 return w;
         }