Changeset 71 in josm for src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2006-03-25T16:21:09+01:00 (20 years ago)

Author:

imi

Message:

• refactored GpsPoint to be immutable and added LatLon and NorthEast
• refactored Bounding Box calculations
• various other renames

Location:

src/org/openstreetmap/josm/actions/mapmode

Files:

• AddLineSegmentAction.java (modified) (1 diff)
• AddNodeAction.java (modified) (2 diffs)
• DeleteAction.java (modified) (1 diff)
• MoveAction.java (modified) (2 diffs)
• SelectionAction.java (modified) (1 diff)
• ZoomAction.java (modified) (2 diffs)

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

@@ -162 +162 @@
                 g.setColor(Color.BLACK);
                 g.setXORMode(Color.WHITE);
-                Point firstDrawn = mv.getScreenPoint(first.coor);
-                Point secondDrawn = mv.getScreenPoint(second.coor);
+                Point firstDrawn = mv.getPoint(first.eastNorth);
+                Point secondDrawn = mv.getPoint(second.eastNorth);
                 g.drawLine(firstDrawn.x, firstDrawn.y, secondDrawn.x, secondDrawn.y);
                 hintDrawn = !hintDrawn;

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

@@ -23 +23 @@
 public class AddNodeAction extends MapMode {
 
-        /**
-         * Create an AddNodeAction. Mnemonic is 'a'
-         * @param mapFrame
-         */
         public AddNodeAction(MapFrame mapFrame) {
                 super("Add nodes", "addnode", "Add nodes to the map.", "N", KeyEvent.VK_N, mapFrame);
@@ -50 +46 @@
         public void mouseClicked(MouseEvent e) {
                 if (e.getButton() == MouseEvent.BUTTON1) {
-                        Node node = new Node(mv.getPoint(e.getX(), e.getY(), true));
+                        Node node = new Node(mv.getLatLon(e.getX(), e.getY()));
                         if (node.coor.isOutSideWorld()) {
                                 JOptionPane.showMessageDialog(Main.main, "Can not add a node outside of the world.");

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

@@ -94 +94 @@
          * Delete the primitives and everything they references.
          * 
-         * If a node is deleted, the node and all line segments, waies and areas
+         * If a node is deleted, the node and all line segments, ways and areas
          * the node is part of are deleted as well.
          * 
-         * If a line segment is deleted, all waies the line segment is part of 
+         * If a line segment is deleted, all ways the line segment is part of 
          * are deleted as well. No nodes are deleted.
          * 

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

@@ -12 +12 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
-import org.openstreetmap.josm.data.GeoPoint;
+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.visitor.AllNodesVisitor;
 import org.openstreetmap.josm.gui.MapFrame;
 
@@ -79 +80 @@
                 }
 
-                GeoPoint mouseGeo = mv.getPoint(e.getX(), e.getY(), false);
-                GeoPoint mouseStartGeo = mv.getPoint(mousePos.x, mousePos.y, false);
-                double dx = mouseGeo.x - mouseStartGeo.x;
-                double dy = mouseGeo.y - mouseStartGeo.y;
+                EastNorth mouseGeo = mv.getEastNorth(e.getX(), e.getY());
+                EastNorth mouseStartGeo = mv.getEastNorth(mousePos.x, mousePos.y);
+                double dx = mouseGeo.east() - mouseStartGeo.east();
+                double dy = mouseGeo.north() - mouseStartGeo.north();
                 if (dx == 0 && dy == 0)
                         return;
 
                 Collection<OsmPrimitive> selection = Main.main.ds.getSelected();
-                Collection<Node> affectedNodes = MoveCommand.getAffectedNodes(selection);
+                Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
                 
                 // check if any coordinate would be outside the world

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

@@ -27 +27 @@
  * If Alt key was hold, select all objects that are touched by the 
  * selection rectangle. If the Alt key was not hold, select only those objects 
- * completly within (e.g. for waies mean: only if all nodes of the way are 
+ * completly within (e.g. for ways mean: only if all nodes of the way are 
  * within).  
  *

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

@@ -4 +4 @@
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.data.GeoPoint;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -52 +52 @@
                 if (r.width >= 3 && r.height >= 3) {
                         double scale = mv.getScale() * r.getWidth()/mv.getWidth();
-                        GeoPoint newCenter = mv.getPoint(r.x+r.width/2, r.y+r.height/2, false);
+                        EastNorth newCenter = mv.getEastNorth(r.x+r.width/2, r.y+r.height/2);
                         mv.zoomTo(newCenter, scale);
                 }