Changeset 11289 in josm for trunk

Timestamp:

2016-11-21T23:05:39+01:00 (8 years ago)

Author:

wiktorn

Message:

Use explicit ImageryTypes when adding layers

Closes: #14017

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/imagery

Files:

• AddTMSLayerPanel.java (modified) (1 diff)
• AddWMSLayerPanel.java (modified) (2 diffs)
• AddWMTSLayerPanel.java (modified) (1 diff)

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

@@ -78 +78 @@
     @Override
     public ImageryInfo getImageryInfo() {
-        return new ImageryInfo(getImageryName(), getTmsUrl());
+        ImageryInfo ret = new ImageryInfo(getImageryName(), getTmsUrl());
+        ret.setImageryType(ImageryType.TMS);
+        return ret;
+
     }
 

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

@@ -19 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -155 +156 @@
             info = wms.toImageryInfo(getImageryName(), tree.getSelectedLayers());
             info.setUrl(getWmsUrl());
+            info.setImageryType(ImageryType.WMS);
         }
         return info;

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

@@ -36 +36 @@
     protected ImageryInfo getImageryInfo() {
         ImageryInfo ret = new ImageryInfo(getImageryName(), "wmts:" + sanitize(getImageryRawUrl(), ImageryType.WMTS));
+        ret.setImageryType(ImageryType.WMTS);
         try {
             new WMTSTileSource(ret); // check if constructor throws an error