Changeset 71 in josm for src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.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/data/osm/visitor/BoundingXYVisitor.java (moved) (moved from src/org/openstreetmap/josm/data/osm/visitor/BoundingVisitor.java ) (3 diffs)

src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.osm.visitor;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.Node;
@@ -7 +9 @@
 
 /**
- * Calculates the total bounding rectangle of a serie of OsmPrimitives.
+ * Calculates the total bounding rectangle of a serie of OsmPrimitives, using the EastNorth values
+ * as reference.
  * @author imi
  */
-public class BoundingVisitor implements Visitor {
+public class BoundingXYVisitor implements Visitor {
 
-        /**
-         * The bounding rectangle of all primitives visited so far.
-         */
-        public Bounds bounds;
-
-        /**
-         * Calculate regarding lat/lon or x/y?
-         */
-        public static enum Type {LATLON, XY}
-        private Type type;
-
-
-        public BoundingVisitor(Type type) {
-                this.type = type;
-        }
-        
+        public EastNorth min, max;
 
         public void visit(Node n) {
-                if (bounds == null)
-                        bounds = new Bounds(n.coor.clone(), n.coor.clone());
-                else {
-                        if (type == Type.LATLON) {
-                                bounds.min.lat = Math.min(bounds.min.lat, n.coor.lat);
-                                bounds.min.lon = Math.min(bounds.min.lon, n.coor.lon);
-                                bounds.max.lat = Math.max(bounds.max.lat, n.coor.lat);
-                                bounds.max.lon = Math.max(bounds.max.lon, n.coor.lon);
-                        } else {
-                                bounds.min.x = Math.min(bounds.min.x, n.coor.x);
-                                bounds.min.y = Math.min(bounds.min.y, n.coor.y);
-                                bounds.max.x = Math.max(bounds.max.x, n.coor.x);
-                                bounds.max.y = Math.max(bounds.max.y, n.coor.y);
-                        }
-                }
+                visit(n.eastNorth);
         }
 
@@ -58 +32 @@
                         visit(ls);
         }
+
+        public void visit(EastNorth eastNorth) {
+                if (eastNorth != null) {
+                        if (min == null)
+                                min = eastNorth;
+                        else if (eastNorth.east() < min.east() || eastNorth.north() < min.north())
+                                min = new EastNorth(Math.min(min.east(), eastNorth.east()), Math.min(min.north(), eastNorth.north()));
+                        
+                        if (max == null)
+                                max = eastNorth;
+                        else if (eastNorth.east() > max.east() || eastNorth.north() > max.north())
+                                max = new EastNorth(Math.max(max.east(), eastNorth.east()), Math.max(max.north(), eastNorth.north()));
+                }
+        }
+
+        /**
+         * @return The bounding box or <code>null</code> if no coordinates have passed
+         */
+        public Bounds getBounds() {
+                if (min == null || max == null)
+                        return null;
+                return new Bounds(Main.pref.getProjection().eastNorth2latlon(min), Main.pref.getProjection().eastNorth2latlon(max));
+        }
 }
-