Changeset 71 in josm for src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

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

Author:

imi

Message:

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

File:

• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (12 diffs)

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.GeoPoint;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.Node;
@@ -32 +33 @@
          * Center n/e coordinate of the desired screen center.
          */
-        protected GeoPoint center;
+        protected EastNorth center;
 
         /**
@@ -46 +47 @@
          *              change the center by accessing the return value. Use zoomTo instead.
          */
-        public GeoPoint getCenter() {
-                return center.clone();
-        }
-
-        /**
-         * Get geographic coordinates from a specific pixel coordination
-         * on the screen.
-         * 
-         * If you don't need it, provide false at third parameter to speed
-         * up the calculation.
-         *  
+        public EastNorth getCenter() {
+                return center;
+        }
+
+        /**
          * @param x X-Pixelposition to get coordinate from
          * @param y Y-Pixelposition to get coordinate from
-         * @param latlon If set, the return value will also have the 
-         *                               latitude/longitude filled.
-         * 
-         * @return The geographic coordinate, filled with x/y (northing/easting)
-         *              settings and, if requested with latitude/longitude.
-         */
-        public GeoPoint getPoint(int x, int y, boolean latlon) {
-                GeoPoint p = new GeoPoint();
-                p.x = center.x + (x - getWidth()/2.0)*scale;
-                p.y = center.y - (y - getHeight()/2.0)*scale;
-                if (latlon)
-                        getProjection().xy2latlon(p);
-                return p;
-        }
-
-        /**
-         * Return the point on the screen where this GeoPoint would be.
+         * 
+         * @return Geographic coordinates from a specific pixel coordination
+         *              on the screen.
+         */
+        public EastNorth getEastNorth(int x, int y) {
+                return new EastNorth(
+                                center.east() + (x - getWidth()/2.0)*scale,
+                                center.north() - (y - getHeight()/2.0)*scale);
+        }
+
+        /**
+         * @param x X-Pixelposition to get coordinate from
+         * @param y Y-Pixelposition to get coordinate from
+         * 
+         * @return Geographic unprojected coordinates from a specific pixel coordination
+         *              on the screen.
+         */
+        public LatLon getLatLon(int x, int y) {
+                EastNorth eastNorth = new EastNorth(
+                                center.east() + (x - getWidth()/2.0)*scale,
+                                center.north() - (y - getHeight()/2.0)*scale);
+                return Main.pref.getProjection().eastNorth2latlon(eastNorth);
+        }
+
+        /**
+         * Return the point on the screen where this Coordinate would be.
          * @param point The point, where this geopoint would be drawn.
          * @return The point on screen where "point" would be drawn, relative
          *              to the own top/left.
          */
-        public Point getScreenPoint(GeoPoint point) {
-                GeoPoint p;
-                if (!Double.isNaN(point.x) && !Double.isNaN(point.y))
-                        p = point;
-                else {
-                        if (Double.isNaN(point.lat) || Double.isNaN(point.lon))
-                                throw new IllegalArgumentException("point: Either lat/lon or x/y must be set.");
-                        p = point.clone();
-                        getProjection().latlon2xy(p);
-                }
-                double x = (p.x-center.x)/scale + getWidth()/2;
-                double y = (center.y-p.y)/scale + getHeight()/2;
+        public Point getPoint(EastNorth p) {
+                double x = (p.east()-center.east())/scale + getWidth()/2;
+                double y = (center.north()-p.north())/scale + getHeight()/2;
                 return new Point((int)x,(int)y);
         }
@@ -101 +96 @@
          * @param scale The scale to use.
          */
-        public void zoomTo(GeoPoint newCenter, double scale) {
-                center = newCenter.clone();
-                getProjection().xy2latlon(center);
+        public void zoomTo(EastNorth newCenter, double scale) {
+                center = newCenter;
+                getProjection().eastNorth2latlon(center);
                 this.scale = scale;
                 repaint();
@@ -127 +122 @@
          * 
          * @param p                              The point on screen.
-         * @param lsInsteadWay Whether the line segment (true) or only the whole
+         * @param segmentInsteadWay Whether the line segment (true) or only the whole
          *                                               way should be returned.
          * @return      The primitive, that is nearest to the point p.
          */
-        public OsmPrimitive getNearest(Point p, boolean lsInsteadWay) {
+        public OsmPrimitive getNearest(Point p, boolean segmentInsteadWay) {
                 double minDistanceSq = Double.MAX_VALUE;
                 OsmPrimitive minPrimitive = null;
@@ -139 +134 @@
                         if (n.isDeleted())
                                 continue;
-                        Point sp = getScreenPoint(n.coor);
+                        Point sp = getPoint(n.eastNorth);
                         double dist = p.distanceSq(sp);
                         if (minDistanceSq > dist && dist < 100) {
@@ -151 +146 @@
                 // for whole ways, try the ways first
                 minDistanceSq = Double.MAX_VALUE;
-                if (!lsInsteadWay) {
-                        for (Way w : Main.main.ds.waies) {
+                if (!segmentInsteadWay) {
+                        for (Way w : Main.main.ds.ways) {
                                 if (w.isDeleted())
                                         continue;
@@ -158 +153 @@
                                         if (ls.isDeleted() || ls.incomplete)
                                                 continue;
-                                        Point A = getScreenPoint(ls.from.coor);
-                                        Point B = getScreenPoint(ls.to.coor);
+                                        Point A = getPoint(ls.from.eastNorth);
+                                        Point B = getPoint(ls.to.eastNorth);
                                         double c = A.distanceSq(B);
                                         double a = p.distanceSq(B);
@@ -179 +174 @@
                         if (ls.isDeleted() || ls.incomplete)
                                 continue;
-                        Point A = getScreenPoint(ls.from.coor);
-                        Point B = getScreenPoint(ls.to.coor);
+                        Point A = getPoint(ls.from.eastNorth);
+                        Point B = getPoint(ls.to.eastNorth);
                         double c = A.distanceSq(B);
                         double a = p.distanceSq(B);
@@ -201 +196 @@
          * If its a node, return all line segments and
          * streets the node is part of, as well as all nodes
-         * (with their line segments and waies) with the same
+         * (with their line segments and ways) with the same
          * location.
          * 
-         * If its a line segment, return all waies this segment 
+         * If its a line segment, return all ways this segment 
          * belongs to as well as all line segments that are between
-         * the same nodes (in both direction) with all their waies.
+         * the same nodes (in both direction) with all their ways.
          * 
          * @return A collection of all items or <code>null</code>
@@ -221 +216 @@
                         Node node = (Node)osm;
                         for (Node n : Main.main.ds.nodes)
-                                if (!n.isDeleted() && n.coor.equalsLatLon(node.coor))
+                                if (!n.isDeleted() && n.coor.equals(node.coor))
                                         c.add(n);
                         for (LineSegment ls : Main.main.ds.lineSegments)
@@ -235 +230 @@
                 }
                 if (osm instanceof Node || osm instanceof LineSegment) {
-                        for (Way t : Main.main.ds.waies) {
+                        for (Way t : Main.main.ds.ways) {
                                 if (t.isDeleted())
                                         continue;