Changeset 2477 in josm for trunk/src/org

Timestamp:

2009-11-19T10:00:15+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3921: Autojump to downloaded area

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AutoScaleAction.java (modified) (4 diffs)
• downloadtasks/DownloadOsmTask.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -15 +15 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -69 +69 @@
         }else if (mode.equals("download")) {
             putValue("help", ht("/Action/ZoomToDownload"));
-        }                       
+        }
     }
 
@@ -151 +151 @@
             if (Main.pref.hasKey("osm-download.bounds")) {
                 try {
-                    String bounds[] = Main.pref.get("osm-download.bounds").split(";");
-                    double minlat = Double.parseDouble(bounds[0]);
-                    double minlon = Double.parseDouble(bounds[1]);
-                    double maxlat = Double.parseDouble(bounds[2]);
-                    double maxlon = Double.parseDouble(bounds[3]);
-
-                    v.visit(Main.proj.latlon2eastNorth(new LatLon(minlat, minlon)));
-                    v.visit(Main.proj.latlon2eastNorth(new LatLon(maxlat, maxlon)));
-                }
-                catch (Exception e) {
+                    v.visit(new Bounds(Main.pref.get("osm-download.bounds"), ";"));
+                } catch (Exception e) {
                     e.printStackTrace();
                 }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -31 +32 @@
     private static final Logger logger = Logger.getLogger(DownloadOsmTask.class.getName());
 
-    private static Bounds currentBounds;
+    private Bounds currentBounds;
     private DataSet downloadedData;
     private DownloadTask downloadTask;
@@ -157 +158 @@
                 }
                 target.mergeFrom(dataSet);
+                BoundingXYVisitor v = new BoundingXYVisitor();
+                v.visit(currentBounds);
+                Main.map.mapView.recalculateCenterScale(v);
                 target.onPostDownloadFromServer();
             }