Changeset 7175 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2014-05-24T14:04:15+02:00 (10 years ago)

Author:

bastiK

Message:

add imagery url panel: by default request the transparent version of layer

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (3 diffs)

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

@@ -104 +104 @@
     public String buildGetMapUrl(Collection<LayerDetails> selectedLayers, String format) {
         return buildRootUrl()
-                + "FORMAT=" + format + "&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS="
+                + "FORMAT=" + format + (imageFormatHasTransparency(format) ? "&TRANSPARENT=TRUE" : "")
+                + "&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS="
                 + Utils.join(",", Utils.transform(selectedLayers, new Utils.Function<LayerDetails, String>() {
             @Override
@@ -153 +154 @@
         }
         String incomingData = ba.toString();
+        Main.debug("Server response to Capabilities request:");
+        Main.debug(incomingData);
 
         try {
@@ -221 +224 @@
                 || format.startsWith("image/bmp") && ImageIO.getImageReadersBySuffix("bmp").hasNext();
     }
+    
+    static boolean imageFormatHasTransparency(final String format) {
+        return format.startsWith("image/png") || format.startsWith("image/gif") 
+                || format.startsWith("image/svg") || format.startsWith("image/tiff");
+    }
 
     public ImageryInfo toImageryInfo(String name, Collection<LayerDetails> selectedLayers) {