Changeset 11559 in josm for trunk/src/org

Timestamp:

2017-02-14T00:21:56+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14361 - WMTS: download only supported image formats

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• TMSCachedTileLoaderJob.java (modified) (2 diffs)
• WMTSTileSource.java (modified) (6 diffs)

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

@@ -110 +110 @@
         if (url == null) {
             synchronized (this) {
-                if (url == null)
-                    url = new URL(tile.getUrl());
+                if (url == null) {
+                    String sUrl = tile.getUrl();
+                    if (!"".equals(sUrl)) {
+                        url = new URL(sUrl);
+                    }
+                }
             }
         }
@@ -151 +155 @@
         try {
             super.submit(this, force);
-        } catch (IOException e) {
+        } catch (IOException | IllegalArgumentException e) {
             // if we fail to submit the job, mark tile as loaded and set error message
             Main.warn(e, false);

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

@@ -11 +11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -17 +18 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -27 +29 @@
 import java.util.stream.Collectors;
 
+import javax.imageio.ImageIO;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -148 +151 @@
 
         Layer(Layer l) {
-            if (l != null) {
-                format = l.format;
-                name = l.name;
-                baseUrl = l.baseUrl;
-                style = l.style;
-                tileMatrixSet = new TileMatrixSet(l.tileMatrixSet);
-            }
+            Objects.requireNonNull(l);
+            format = l.format;
+            name = l.name;
+            baseUrl = l.baseUrl;
+            style = l.style;
+            tileMatrixSet = new TileMatrixSet(l.tileMatrixSet);
         }
 
@@ -384 +386 @@
         Layer layer = new Layer();
         Stack<QName> tagStack = new Stack<>();
+        List<String> supportedMimeTypes = Arrays.asList(ImageIO.getReaderMIMETypes());
 
         for (int event = reader.getEventType();
@@ -392 +395 @@
                 if (tagStack.size() == 2) {
                     if (QN_FORMAT.equals(reader.getName())) {
-                        layer.format = reader.getElementText();
+                        String format = reader.getElementText();
+                        if (supportedMimeTypes.contains(format)) {
+                            layer.format = format;
+                        }
                     } else if (GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER.equals(reader.getName())) {
                         layer.name = reader.getElementText();