Changeset 13388 in josm for trunk/src/org

Timestamp:

2018-02-07T00:16:59+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15880 - robustness to unsupported projections

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (2 diffs)
• data/imagery/WMTSTileSource.java (modified) (3 diffs)

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

@@ -40 +40 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.bugreport.ReportedException;
 
 /**
@@ -136 +137 @@
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled()) return;
+        ImageryLayer layer = null;
         try {
             final ImageryInfo infoToAdd = convertImagery(info);
             if (infoToAdd != null) {
-                getLayerManager().addLayer(ImageryLayer.create(infoToAdd));
+                layer = ImageryLayer.create(infoToAdd);
+                getLayerManager().addLayer(layer);
                 AlignImageryPanel.addNagPanelIfNeeded(infoToAdd);
             }
-        } catch (IllegalArgumentException ex) {
+        } catch (IllegalArgumentException | ReportedException ex) {
             if (ex.getMessage() == null || ex.getMessage().isEmpty() || GraphicsEnvironment.isHeadless()) {
                 throw ex;
             } else {
-                JOptionPane.showMessageDialog(Main.parent,
-                        ex.getMessage(), tr("Error"),
-                        JOptionPane.ERROR_MESSAGE);
+                Logging.error(ex);
+                JOptionPane.showMessageDialog(Main.parent, ex.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);
+                if (layer != null) {
+                    getLayerManager().removeLayer(layer);
+                }
             }
         }

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -147 +147 @@
             identifier = builder.identifier;
         }
+
+        @Override
+        public String toString() {
+            return "TileMatrixSet [crs=" + crs + ", identifier=" + identifier + ']';
+        }
     }
 
@@ -188 +193 @@
         public String getUserTitle() {
             return title != null ? title : identifier;
+        }
+
+        @Override
+        public String toString() {
+            return "Layer [identifier=" + identifier + ", title=" + title + ", tileMatrixSet="
+                    + tileMatrixSet + ", baseUrl=" + baseUrl + ", style=" + style + ']';
         }
     }
@@ -683 +694 @@
                 }
                 if (this.currentLayer == null)
-                    return;
+                    throw new IllegalArgumentException(
+                            layers.stream().map(l -> l.tileMatrixSet).collect(Collectors.toList()).toString());
             } // else: keep currentLayer and tileProjection as is
         }