Changeset 2943 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-02-05T22:30:40+01:00 (14 years ago)

Author:

mjulius

Message:

generally round Bounds to LatLon.MAX_SERVER_PRECISION

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UpdateDataAction.java (modified) (1 diff)
• data/Bounds.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

@@ -53 +53 @@
         List<Area> areas = new ArrayList<Area>();
         for(DataSource ds : getEditLayer().data.dataSources) {
-            areas.add(new Area(ds.bounds.getRoundedToOsmPrecision().asRect()));
+            areas.add(new Area(ds.bounds.asRect()));
         }
 

trunk/src/org/openstreetmap/josm/data/Bounds.java

@@ -13 +13 @@
 /**
  * This is a simple data class for "rectangular" areas of the world, given in
- * lat/lon min/max values.
+ * lat/lon min/max values.  The values are rounded to LatLon.OSM_SERVER_PRECISION
  *
  * @author imi
@@ -43 +43 @@
 
     public Bounds(double minlat, double minlon, double maxlat, double maxlon) {
-        this.minLat = minlat;
-        this.minLon = minlon;
-        this.maxLat = maxlat;
-        this.maxLon = maxlon;
+        this.minLat = roundToOsmPrecision(minlat);
+        this.minLon = roundToOsmPrecision(minlon);
+        this.maxLat = roundToOsmPrecision(maxlat);
+        this.maxLon = roundToOsmPrecision(maxlon);
     }
 
@@ -53 +53 @@
         if (coords.length != 4)
             throw new IllegalArgumentException(MessageFormat.format("Expected array of length 4, got {0}", coords.length));
-        this.minLat = coords[0];
-        this.minLon = coords[1];
-        this.maxLat = coords[2];
-        this.maxLon = coords[3];
+        this.minLat = roundToOsmPrecision(coords[0]);
+        this.minLon = roundToOsmPrecision(coords[1]);
+        this.maxLat = roundToOsmPrecision(coords[2]);
+        this.maxLon = roundToOsmPrecision(coords[3]);
     }
 
@@ -81 +81 @@
             throw new IllegalArgumentException(tr("Illegal latitude value ''{0}''", values[3]));
 
-        this.minLat = values[0];
-        this.minLon = values[1];
-        this.maxLat = values[2];
-        this.maxLon = values[3];
+        this.minLat = roundToOsmPrecision(values[0]);
+        this.minLon = roundToOsmPrecision(values[1]);
+        this.maxLat = roundToOsmPrecision(values[2]);
+        this.maxLon = roundToOsmPrecision(values[3]);
     }
 
@@ -114 +114 @@
             throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0.0 exptected, got {1}", "lonExtent", lonExtent));
 
-        this.minLat = center.lat() - latExtent / 2;
-        this.minLon = center.lon() - lonExtent / 2;
-        this.maxLat = center.lat() + latExtent / 2;
-        this.maxLon = center.lon() + lonExtent / 2;
+        this.minLat = roundToOsmPrecision(center.lat() - latExtent / 2);
+        this.minLon = roundToOsmPrecision(center.lon() - lonExtent / 2);
+        this.maxLat = roundToOsmPrecision(center.lat() + latExtent / 2);
+        this.maxLon = roundToOsmPrecision(center.lon() + lonExtent / 2);
     }
 
@@ -145 +145 @@
     public void extend(LatLon ll) {
         if (ll.lat() < minLat) {
-            minLat = ll.lat();
+            minLat = roundToOsmPrecision(ll.lat());
         }
         if (ll.lon() < minLon) {
-            minLon = ll.lon();
+            minLon = roundToOsmPrecision(ll.lon());
         }
         if (ll.lat() > maxLat) {
-            maxLat = ll.lat();
+            maxLat = roundToOsmPrecision(ll.lat());
         }
         if (ll.lon() > maxLon) {
-            maxLon = ll.lon();
+            maxLon = roundToOsmPrecision(ll.lon());
         }
     }
@@ -172 +172 @@
         return true;
     }
-    
+
     /**
      * The two bounds intersect? Compared to java Shape.intersects, if does not use
@@ -178 +178 @@
      */
     public boolean intersects(Bounds b) {
-            return b.getMax().lat() >= minLat &&
-                    b.getMax().lon() >= minLon &&
-                    b.getMin().lat() <= maxLat &&
-                    b.getMin().lon() <= maxLon;
-    }
-    
+        return b.getMax().lat() >= minLat &&
+        b.getMax().lon() >= minLon &&
+        b.getMin().lat() <= maxLat &&
+        b.getMin().lon() <= maxLon;
+    }
+
 
     /**
@@ -242 +242 @@
 
     /**
-     * Returns a clone of this Bounds, rounded to OSM precisions, i.e. to
+     * Returns the value rounded to OSM precisions, i.e. to
      * LatLon.MAX_SERVER_PRECISION
      *
-     * @return a clone of this Bounds
-     */
-    public Bounds getRoundedToOsmPrecision() {
-        return new Bounds(
-                Math.round(minLat / LatLon.MAX_SERVER_PRECISION) * LatLon.MAX_SERVER_PRECISION,
-                Math.round(minLon / LatLon.MAX_SERVER_PRECISION) * LatLon.MAX_SERVER_PRECISION,
-                Math.round(maxLat / LatLon.MAX_SERVER_PRECISION) * LatLon.MAX_SERVER_PRECISION,
-                Math.round(maxLon / LatLon.MAX_SERVER_PRECISION) * LatLon.MAX_SERVER_PRECISION
-        );
+     * @return rounded value
+     */
+    private double roundToOsmPrecision(double value) {
+        return Math.round(value / LatLon.MAX_SERVER_PRECISION) * LatLon.MAX_SERVER_PRECISION;
     }
 }