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

Timestamp:

2025-01-24T14:05:46+01:00 (3 months ago)

Author:

taylor.smock

Message:

Fix #24097: Zoom to imagery layer

This fixes two issues:

1. Adds implementation for visitBoundingBox used by the Zoom to layer action
2. Uses addLayer(Layer, boolean) to avoid zooming to the bounds of the layer on layer add

Also, clean up some deprecation warnings.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (4 diffs)

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

@@ -169 +169 @@
             if (infoToAdd != null) {
                 layer = ImageryLayer.create(infoToAdd);
-                getLayerManager().addLayer(layer);
+                getLayerManager().addLayer(layer, false);
                 AlignImageryPanel.addNagPanelIfNeeded(infoToAdd);
             }

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

@@ -27 +27 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -292 +293 @@
 
         try {
-            if ("file".equalsIgnoreCase(new URL(tileSource.getBaseUrl()).getProtocol())) {
+            if ("file".equalsIgnoreCase(new URI(tileSource.getBaseUrl()).toURL().getProtocol())) {
                 tileLoader = new OsmTileLoader(this);
             }
-        } catch (MalformedURLException e) {
+        } catch (URISyntaxException | MalformedURLException e) {
             // ignore, assume that this is not a file
             Logging.log(Logging.LEVEL_DEBUG, e);
@@ -515 +516 @@
         if (tile != null) {
             try {
-                new Notification(HttpClient.create(new URL(tile.getUrl() + '/' + request))
+                new Notification(HttpClient.create(new URI(tile.getUrl() + '/' + request).toURL())
                         .connect().fetchContent()).setIcon(JOptionPane.INFORMATION_MESSAGE).show();
-            } catch (IOException ex) {
+            } catch (URISyntaxException | IOException ex) {
                 Logging.error(ex);
             }
@@ -1874 +1875 @@
     @Override
     public void visitBoundingBox(BoundingXYVisitor v) {
+        if (this.getInfo() != null) {
+            v.visit(this.getInfo().getBounds());
+        }
     }