Changeset 1725 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-07-03T23:15:39+02:00 (17 years ago)

Author:

stoecker

Message:

some cleanups

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NavigatableComponent.java (modified) (8 diffs)
• SelectionManager.java (modified) (3 diffs)
• dialogs/ConflictDialog.java (modified) (1 diff)
• layer/GeoImageLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -149 +150 @@
     }
 
+    public Point getPoint(LatLon latlon) {
+        if(latlon == null)
+            return new Point();
+        else if(latlon instanceof CachedLatLon)
+            return getPoint(((CachedLatLon)latlon).getEastNorth());
+        else
+            return getPoint(getProjection().latlon2eastNorth(latlon));
+    }
+    public Point getPoint(Node n) {
+        return getPoint(n.getEastNorth());
+    }
+
     /**
      * Zoom to the given coordinate.
@@ -179 +192 @@
     }
 
+    public void zoomTo(LatLon newCenter) {
+        if(newCenter instanceof CachedLatLon)
+            zoomTo(((CachedLatLon)newCenter).getEastNorth(), scale);
+        else
+            zoomTo(getProjection().latlon2eastNorth(newCenter), scale);
+    }
+
     public void zoomToFactor(double x, double y, double factor) {
         double newScale = scale*factor;
@@ -228 +248 @@
             if (n.deleted || n.incomplete)
                 continue;
-            Point sp = getPoint(n.getEastNorth());
+            Point sp = getPoint(n);
             double dist = p.distanceSq(sp);
             if (dist < minDistanceSq) {
@@ -263 +283 @@
                 }
 
-                Point A = getPoint(lastN.getEastNorth());
-                Point B = getPoint(n.getEastNorth());
+                Point A = getPoint(lastN);
+                Point B = getPoint(n);
                 double c = A.distanceSq(B);
                 double a = p.distanceSq(B);
@@ -372 +392 @@
                     continue;
                 }
-                Point A = getPoint(lastN.getEastNorth());
-                Point B = getPoint(n.getEastNorth());
+                Point A = getPoint(lastN);
+                Point B = getPoint(n);
                 double c = A.distanceSq(B);
                 double a = p.distanceSq(B);
@@ -387 +407 @@
         for (Node n : getData().nodes) {
             if (!n.deleted && !n.incomplete
-                    && getPoint(n.getEastNorth()).distanceSq(p) < snapDistance) {
+                    && getPoint(n).distanceSq(p) < snapDistance) {
                 nearest.add(n);
             }
@@ -406 +426 @@
         for (Node n : getData().nodes) {
             if (!n.deleted && !n.incomplete
-                    && getPoint(n.getEastNorth()).distanceSq(p) < snapDistance) {
+                    && getPoint(n).distanceSq(p) < snapDistance) {
                 nearest.add(n);
             }

trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -280 +280 @@
             // nodes
             for (Node n : nc.getData().nodes) {
-                if (!n.deleted && !n.incomplete && r.contains(nc.getPoint(n.getEastNorth())))
+                if (!n.deleted && !n.incomplete && r.contains(nc.getPoint(n)))
                     selection.add(n);
             }
@@ -290 +290 @@
                 if (alt) {
                     for (Node n : w.nodes) {
-                        if (!n.incomplete && r.contains(nc.getPoint(n.getEastNorth()))) {
+                        if (!n.incomplete && r.contains(nc.getPoint(n))) {
                             selection.add(w);
                             break;
@@ -298 +298 @@
                     boolean allIn = true;
                     for (Node n : w.nodes) {
-                        if (!n.incomplete && !r.contains(nc.getPoint(n.getEastNorth()))) {
+                        if (!n.incomplete && !r.contains(nc.getPoint(n))) {
                             allIn = false;
                             break;

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -190 +190 @@
         Visitor conflictPainter = new AbstractVisitor(){
             public void visit(Node n) {
-                Point p = nc.getPoint(n.getEastNorth());
+                Point p = nc.getPoint(n);
                 g.drawRect(p.x-1, p.y-1, 2, 2);
             }
             public void visit(Node n1, Node n2) {
-                Point p1 = nc.getPoint(n1.getEastNorth());
-                Point p2 = nc.getPoint(n2.getEastNorth());
+                Point p1 = nc.getPoint(n1);
+                Point p2 = nc.getPoint(n2);
                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
             }

trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -404 +404 @@
                     if (e.pos == null)
                         continue;
-                    Point p = Main.map.mapView.getPoint(e.pos.getEastNorth());
+                    Point p = Main.map.mapView.getPoint(e.pos);
                     Rectangle r = new Rectangle(p.x-ICON_SIZE/2, p.y-ICON_SIZE/2, ICON_SIZE, ICON_SIZE);
                     if (r.contains(ev.getPoint())) {
@@ -536 +536 @@
 
             if (centerToggle.getModel().isSelected())
-                Main.map.mapView.zoomTo(currentImageEntry.pos.getEastNorth());
+                Main.map.mapView.zoomTo(currentImageEntry.pos);
 
             dlg.setTitle(currentImageEntry.image +
@@ -612 +612 @@
                 }
 
-                Point p = mv.getPoint(e.pos.getEastNorth());
+                Point p = mv.getPoint(e.pos);
                 Rectangle r = new Rectangle(p.x-ICON_SIZE / 2, p.y-ICON_SIZE / 2, ICON_SIZE, ICON_SIZE);
                 if (r.contains(mousePosition)) {
@@ -624 +624 @@
             ImageEntry e = data.get(i);
             if (e.pos != null) {
-                Point p = mv.getPoint(e.pos.getEastNorth());
+                Point p = mv.getPoint(e.pos);
                 Rectangle r = new Rectangle(p.x-ICON_SIZE / 2, p.y-ICON_SIZE / 2, ICON_SIZE, ICON_SIZE);
                 g.drawImage(e.getIcon(), r.x, r.y, null);