Changeset 15228 in josm for trunk/src/org

Timestamp:

2019-07-07T22:13:12+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17801 - use selected image format when building WMS URL

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -185 +185 @@
             if (wms != null && wms.buildRootUrl() != null) {
                 // TODO: ask user about transparency
-                info = wms.toImageryInfo(getImageryName(), tree.getSelectedLayers(), (List<String>) null, true);
+                info = wms.toImageryInfo(
+                        getImageryName(), tree.getSelectedLayers(), (List<String>) null, (String) formats.getSelectedItem(), true);
             } else {
                 info = new ImageryInfo(getImageryName(), getWmsUrl());

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

@@ -311 +311 @@
      */
     public String buildGetMapUrl(List<LayerDetails> selectedLayers, List<String> selectedStyles, boolean transparent) {
+        return buildGetMapUrl(selectedLayers, selectedStyles, getPreferredFormat(), transparent);
+    }
+
+    /**
+     * @param selectedLayers selected layers as subset of the tree returned by {@link #getLayers()}
+     * @param selectedStyles selected styles for all selectedLayers
+     * @param format format of the response - one of {@link #getFormats()}
+     * @param transparent whether returned images should contain transparent pixels (if supported by format)
+     * @return URL template for GetMap service
+     * @see #buildGetMapUrl(List, boolean)
+     * @since 15228
+     */
+    public String buildGetMapUrl(List<LayerDetails> selectedLayers, List<String> selectedStyles, String format, boolean transparent) {
         return buildGetMapUrl(
                 selectedLayers.stream().map(LayerDetails::getName).collect(Collectors.toList()),
                 selectedStyles,
-                getPreferredFormat(),
+                format,
                 transparent);
     }
@@ -662 +675 @@
      * @param selectedLayers layers which are to be used by this imagery layer
      * @param selectedStyles styles that should be used for selectedLayers
+     * @param format format of the response - one of {@link #getFormats()}
      * @param transparent if layer should be transparent
      * @return ImageryInfo object
-     */
-    public ImageryInfo toImageryInfo(String name, List<LayerDetails> selectedLayers, List<String> selectedStyles, boolean transparent) {
-        ImageryInfo i = new ImageryInfo(name, buildGetMapUrl(selectedLayers, selectedStyles, transparent));
+     * @since 15228
+     */
+    public ImageryInfo toImageryInfo(
+            String name, List<LayerDetails> selectedLayers, List<String> selectedStyles, String format, boolean transparent) {
+        ImageryInfo i = new ImageryInfo(name, buildGetMapUrl(selectedLayers, selectedStyles, format, transparent));
         if (selectedLayers != null && !selectedLayers.isEmpty()) {
             i.setServerProjections(getServerProjections(selectedLayers));