Changeset 2942 in josm for trunk/src/org

Timestamp:

2010-02-05T20:52:53+01:00 (15 years ago)

Author:

mjulius

Message:

fixes #4441 - error downloading/sync
when updating data round bounding boxes to LatLon.MAX_SERVER_PRECISION and really eliminate empty download areas before downloading

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
@@ -51 +51 @@
             return;
 
-        int bboxCount = 0;
         List<Area> areas = new ArrayList<Area>();
         for(DataSource ds : getEditLayer().data.dataSources) {
-            areas.add(new Area(ds.bounds.asRect()));
+            areas.add(new Area(ds.bounds.getRoundedToOsmPrecision().asRect()));
         }
 
@@ -73 +72 @@
         }
 
+        List<Area> areasToDownload = new ArrayList<Area>();
         for(Area a : areas) {
             if(a.isEmpty()) {
                 continue;
             }
-            bboxCount++;
+            areasToDownload.add(a);
         }
 
-        if(bboxCount == 0) {
+        if(areasToDownload.isEmpty()) {
             // no bounds defined in the dataset? we update all primitives in the data set
             // using a series of multi fetch requests
@@ -89 +89 @@
             //
             final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
-            final Future<?> future = new DownloadOsmTaskList().download(false /* no new layer */, areas, monitor);
+            final Future<?> future = new DownloadOsmTaskList().download(false /* no new layer */, areasToDownload, monitor);
             Main.worker.submit(
                     new Runnable() {

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

@@ -241 +241 @@
     }
 
+    /**
+     * Returns a clone of this Bounds, 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
+        );
+    }
 }