Changeset 8526 in josm for trunk/src/org/openstreetmap/josm/io/session
- Timestamp:
- 2015-06-24T20:57:43+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io/session
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
r8510 r8526 17 17 import org.openstreetmap.josm.data.Preferences; 18 18 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry; 19 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer; 19 20 import org.openstreetmap.josm.gui.layer.ImageryLayer; 20 21 import org.openstreetmap.josm.gui.layer.Layer; … … 81 82 ImageryPreferenceEntry e = new ImageryPreferenceEntry(layer.getInfo()); 82 83 Map<String, String> data = new LinkedHashMap<>(Preferences.serializeStruct(e, ImageryPreferenceEntry.class)); 83 if (layer instanceof WMSLayer) { 84 WMSLayer wms = (WMSLayer) layer; 85 data.put("automatic-downloading", Boolean.toString(wms.hasAutoDownload())); 86 data.put("automatically-change-resolution", Boolean.toString(wms.isAutoResolution())); 84 if (layer instanceof AbstractTileSourceLayer) { 85 AbstractTileSourceLayer tsLayer = (AbstractTileSourceLayer) layer; 86 data.put("automatic-downloading", Boolean.toString(tsLayer.autoLoad)); 87 data.put("automatically-change-resolution", Boolean.toString(tsLayer.autoZoom)); 88 data.put("show-errors", Boolean.toString(tsLayer.showErrors)); 87 89 } 88 90 for (Map.Entry<String, String> entry : data.entrySet()) { -
trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
r8510 r8526 11 11 import org.openstreetmap.josm.data.imagery.ImageryInfo; 12 12 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry; 13 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer; 13 14 import org.openstreetmap.josm.gui.layer.ImageryLayer; 14 15 import org.openstreetmap.josm.gui.layer.Layer; 15 import org.openstreetmap.josm.gui.layer.WMSLayer;16 16 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 17 17 import org.openstreetmap.josm.io.IllegalDataException; … … 46 46 ImageryInfo i = new ImageryInfo(prefEntry); 47 47 ImageryLayer layer = ImageryLayer.create(i); 48 if (layer instanceof WMSLayer) { 49 WMSLayer wms = (WMSLayer) layer; 50 String autoDownload = attributes.get("automatic-downloading"); 51 if (autoDownload != null) { 52 wms.setAutoDownload(Boolean.parseBoolean(autoDownload)); 48 if (layer instanceof AbstractTileSourceLayer) { 49 AbstractTileSourceLayer tsLayer = (AbstractTileSourceLayer) layer; 50 if (attributes.containsKey("automatic-downloading")) { 51 tsLayer.autoLoad = new Boolean(attributes.get("automatic-downloading")).booleanValue(); 53 52 } 54 String autoResolution = attributes.get("automatically-change-resolution"); 55 if (autoResolution != null) { 56 wms.setAutoResolution(Boolean.parseBoolean(autoResolution)); 53 54 if (attributes.containsKey("automatically-change-resolution")) { 55 tsLayer.autoZoom = new Boolean(attributes.get("automatically-change-resolution")).booleanValue(); 56 } 57 58 if (attributes.containsKey("show-errors")) { 59 tsLayer.showErrors = new Boolean(attributes.get("show-errors")).booleanValue(); 57 60 } 58 61 }
Note:
See TracChangeset
for help on using the changeset viewer.