Changeset 11774 in josm for trunk/src/org/openstreetmap/josm/gui/layer/LayerManager.java

Timestamp:

2017-03-25T17:33:06+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #13922 - zoom only once when downloading several data types

File:

• trunk/src/org/openstreetmap/josm/gui/layer/LayerManager.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/LayerManager.java

@@ -71 +71 @@
         }
 
+        /**
+         * Returns the {@code LayerManager} at the origin of this event.
+         * @return the {@code LayerManager} at the origin of this event
+         */
         public LayerManager getSource() {
             return source;
@@ -82 +86 @@
     public static class LayerAddEvent extends LayerManagerEvent {
         private final Layer addedLayer;
-
-        LayerAddEvent(LayerManager source, Layer addedLayer) {
+        private final boolean requiresZoom;
+
+        LayerAddEvent(LayerManager source, Layer addedLayer, boolean requiresZoom) {
             super(source);
             this.addedLayer = addedLayer;
+            this.requiresZoom = requiresZoom;
         }
 
@@ -94 +100 @@
         public Layer getAddedLayer() {
             return addedLayer;
+        }
+
+        /**
+         * Determines if an initial zoom is required.
+         * @return {@code true} if a zoom is required when this layer is added
+         * @since 11774
+         */
+        public final boolean isZoomRequired() {
+            return requiresZoom;
         }
 
@@ -182 +197 @@
 
     /**
+     * Add a layer. The layer will be added at a given position and the mapview zoomed at its projection bounds.
+     * @param layer The layer to add
+     */
+    public void addLayer(final Layer layer) {
+        addLayer(layer, true);
+    }
+
+    /**
      * Add a layer. The layer will be added at a given position.
      * @param layer The layer to add
-     */
-    public void addLayer(final Layer layer) {
+     * @param initialZoom whether if the mapview must be zoomed at layer projection bounds
+     */
+    public void addLayer(final Layer layer, final boolean initialZoom) {
         // we force this on to the EDT Thread to make events fire from there.
         // The synchronization lock needs to be held by the EDT.
-        GuiHelper.runInEDTAndWaitWithException(() -> realAddLayer(layer));
-    }
-
-    protected synchronized void realAddLayer(Layer layer) {
+        GuiHelper.runInEDTAndWaitWithException(() -> realAddLayer(layer, initialZoom));
+    }
+
+    protected synchronized void realAddLayer(Layer layer, boolean initialZoom) {
         if (containsLayer(layer)) {
             throw new IllegalArgumentException("Cannot add a layer twice: " + layer);
@@ -199 +223 @@
         checkPosition(position);
         insertLayerAt(layer, position);
-        fireLayerAdded(layer);
+        fireLayerAdded(layer, initialZoom);
         if (Main.map != null) {
             layer.hookUpMapView(); // needs to be after fireLayerAdded
@@ -366 +390 @@
         if (fireAdd) {
             for (Layer l : getLayers()) {
-                listener.layerAdded(new LayerAddEvent(this, l));
+                listener.layerAdded(new LayerAddEvent(this, l, true));
             }
         }
@@ -399 +423 @@
     }
 
-    private void fireLayerAdded(Layer layer) {
+    private void fireLayerAdded(Layer layer, boolean initialZoom) {
         GuiHelper.assertCallFromEdt();
-        LayerAddEvent e = new LayerAddEvent(this, layer);
+        LayerAddEvent e = new LayerAddEvent(this, layer, initialZoom);
         for (LayerChangeListener l : layerChangeListeners) {
             try {