Changeset 6930 in josm

Timestamp:

2014-03-24T20:27:00+01:00 (11 years ago)

Author:

simon04

Message:

Add WMS: filter unsupported image formats, preselect jpeg or png

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• gui/preferences/imagery/AddWMSLayerPanel.java (modified) (1 diff)
• io/imagery/WMSImagery.java (modified) (6 diffs)

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

@@ -103 +103 @@
             tree.updateTree(wms);
             final JComboBox formats = new JComboBox(wms.getFormats().toArray());
+            formats.setSelectedItem(wms.getPreferredFormats());
             formats.setToolTipText(tr("Select image format for WMS layer"));
 

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -78 +78 @@
                     tree.updateTree(wms);
                     formats.setModel(new DefaultComboBoxModel(wms.getFormats().toArray()));
+                    formats.setSelectedItem(wms.getPreferredFormats());
                 } catch (MalformedURLException ex) {
                     JOptionPane.showMessageDialog(getParent(), tr("Invalid service URL."),

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -17 +18 @@
 import java.util.regex.Pattern;
 
+import javax.imageio.ImageIO;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -26 +28 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Document;
@@ -63 +66 @@
 
     public List<String> getFormats() {
-        return formats;
+        return Collections.unmodifiableList(formats);
+    }
+
+    public String getPreferredFormats() {
+        return formats.contains("image/jpeg") ? "image/jpeg"
+                : formats.contains("image/png") ? "image/png"
+                : formats.isEmpty() ? null
+                : formats.get(0);
     }
 
@@ -165 +175 @@
             child = getChild(child, "GetMap");
 
-            formats = new ArrayList<String>(Utils.transform(getChildren(child, "Format"), new Utils.Function<Element, String>() {
-                @Override
-                public String apply(Element x) {
-                    return x.getTextContent();
-                }
-            }));
+            formats = new ArrayList<String>(Utils.filter(Utils.transform(getChildren(child, "Format"),
+                    new Utils.Function<Element, String>() {
+                        @Override
+                        public String apply(Element x) {
+                            return x.getTextContent();
+                        }
+                    }
+                    ), new Predicate<String>() {
+                        @Override
+                        public boolean evaluate(String format) {
+                            boolean isFormatSupported = isImageFormatSupported(format);
+                            if (!isFormatSupported) {
+                                Main.info("Skipping unsupported image format {0}", format);
+                            }
+                            return isFormatSupported;
+                        }
+                    }
+            ));
 
             child = getChild(child, "DCPType");
@@ -191 +213 @@
         }
 
+    }
+
+    static boolean isImageFormatSupported(final String format) {
+        return ImageIO.getImageReadersByMIMEType(format).hasNext()
+                || (format.startsWith("image/tiff") || format.startsWith("image/geotiff")) && ImageIO.getImageReadersBySuffix("tiff").hasNext() // handles image/tiff image/tiff8 image/geotiff image/geotiff8
+                || format.startsWith("image/png") && ImageIO.getImageReadersBySuffix("png").hasNext()
+                || format.startsWith("image/svg") && ImageIO.getImageReadersBySuffix("svg").hasNext()
+                || format.startsWith("image/bmp") && ImageIO.getImageReadersBySuffix("bmp").hasNext();
     }