Changeset 7438 in josm for trunk/src

Timestamp:

2014-08-23T21:26:31+02:00 (10 years ago)

Author:

bastiK

Message:

fixed #10410 - session: imagery layer settings not stored

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/WMSLayer.java (modified) (1 diff)
• io/session/ImagerySessionExporter.java (modified) (2 diffs)
• io/session/ImagerySessionImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -239 +239 @@
         return autoDownloadEnabled;
     }
+    
+    public void setAutoDownload(boolean val) {
+        autoDownloadEnabled = val;
+    }
+    
+    public boolean isAutoResolution() {
+        return autoResolutionEnabled;
+    }
+    
+    public void setAutoResolution(boolean val) {
+        autoResolutionEnabled = val;
+    }
 
     public void downloadAreaToCache(PrecacheTask precacheTask, List<LatLon> points, double bufferX, double bufferY) {

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -78 +79 @@
         layerElem.setAttribute("version", "0.1");
         ImageryPreferenceEntry e = new ImageryPreferenceEntry(layer.getInfo());
-        Map<String,String> data = Preferences.serializeStruct(e, ImageryPreferenceEntry.class);
+        Map<String,String> data = new LinkedHashMap<>(Preferences.serializeStruct(e, ImageryPreferenceEntry.class));
+        if (layer instanceof WMSLayer) {
+            WMSLayer wms = (WMSLayer) layer;
+            data.put("automatic-downloading", Boolean.toString(wms.hasAutoDownload()));
+            data.put("automatically-change-resolution", Boolean.toString(wms.isAutoResolution()));
+        }
         for (Map.Entry<String,String> entry : data.entrySet()) {
             Element attrElem = support.createElement(entry.getKey());

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.IllegalDataException;
@@ -44 +45 @@
         ImageryPreferenceEntry prefEntry = Preferences.deserializeStruct(attributes, ImageryPreferenceEntry.class);
         ImageryInfo i = new ImageryInfo(prefEntry);
-        return ImageryLayer.create(i);
+        ImageryLayer layer = ImageryLayer.create(i);
+        if (layer instanceof WMSLayer) {
+            WMSLayer wms = (WMSLayer) layer;
+            String autoDownload = attributes.get("automatic-downloading");
+            if (autoDownload != null) {
+                wms.setAutoDownload(Boolean.parseBoolean(autoDownload));
+            }
+            String autoResolution = attributes.get("automatically-change-resolution");
+            if (autoResolution != null) {
+                wms.setAutoResolution(Boolean.parseBoolean(autoResolution));
+            }
+        }
+        return layer;
     }
 }