Changeset 1226 in josm for trunk/src/org

Timestamp:

2009-01-09T21:36:04+01:00 (15 years ago)

Author:

stoecker

Message:

fixed bug #1963, fix by markb _ ordern _ com

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) (4 diffs)

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

@@ -5 +5 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -61 +62 @@
 
     /**
-     * Enlarges the calculated bounding box by 0.0001 degrees.
+     * Enlarges the calculated bounding box by 0.002 degrees.
      * If the bounding box has not been set (<code>min</code> or <code>max</code>
      * equal <code>null</code>) this method does not do anything.
@@ -68 +69 @@
      */
     public void enlargeBoundingBox() {
-        enlargeBoundingBox(0.0001);
+        enlargeBoundingBox(0.002);
     }
 
@@ -81 +82 @@
         if (min == null || max == null)
             return;
-        EastNorth en = new EastNorth(enlargeDegree, enlargeDegree);
-        min = new EastNorth(min.east() - en.east(), min.north() - en.north());
-        max = new EastNorth(max.east() + en.east(), max.north() + en.north());
+        LatLon minLatlon = Main.proj.eastNorth2latlon(min);
+        min = Main.proj.latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree));
+        LatLon maxLatlon = Main.proj.eastNorth2latlon(max);
+        max = Main.proj.latlon2eastNorth(new LatLon(maxLatlon.lat() + enlargeDegree, maxLatlon.lon() + enlargeDegree));
     }
 }