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

Timestamp:

2008-10-05T16:39:49+02:00 (16 years ago)

Author:

stoecker

Message:

close bug #1461 - initial zoom to download area

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -104 +105 @@
                                 removeComponentListener(this);
 
-                                new AutoScaleAction("data").actionPerformed(null);
+                                if (!zoomToEditLayerBoundingBox())
+                                        new AutoScaleAction("data").actionPerformed(null);
 
                                 new MapMover(MapView.this, Main.contentPane);
@@ -404 +406 @@
                         firePropertyChange("scale", oldScale, scale);
         }
+
+        /**
+         * Tries to zoom to the download boundingbox[es] of the current edit layer
+         * (aka {@link OsmDataLayer}). If the edit layer has multiple download bounding
+         * boxes it zooms to a large virtual bounding box containing all smaller ones.
+         * This implementation can be used for resolving ticket #1461.
+         *
+         * @return <code>true</code> if a zoom operation has been performed
+         * @author Jan Peter Stotz
+         */
+        public boolean zoomToEditLayerBoundingBox() {
+                // workaround for #1461 (zoom to download bounding box instead of all data)
+                // In case we already have an existing data layer ...
+                Collection<DataSource> dataSources = Main.main.editLayer().data.dataSources;
+                // ... with bounding box[es] of data loaded from OSM or a file...
+                BoundingXYVisitor bbox = new BoundingXYVisitor();
+                for (DataSource ds : dataSources) {
+                        if (ds.bounds != null) {
+                                bbox.visit(Main.proj.latlon2eastNorth(ds.bounds.max));
+                                bbox.visit(Main.proj.latlon2eastNorth(ds.bounds.min));
+                        }
+                        if (bbox.max != null && bbox.min != null && !bbox.max.equals(bbox.min)) {
+                                // ... we zoom to it's bounding box
+                                recalculateCenterScale(bbox);
+                                return true;
+                        }
+                }
+                return false;
+        }
         
         public boolean addTemporaryLayer(MapViewPaintable mvp) {