Changeset 12134 in josm for trunk/src/org/openstreetmap/josm/gui/layer/imagery

Timestamp:

2017-05-13T12:58:12+02:00 (7 years ago)

Author:

bastiK

Message:

see #14773 - improve session export/import for imagery layer offset data

File:

• trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

@@ -248 +248 @@
     /**
      * Stores the current settings object to the given hashmap.
+     * The offset data is not stored and needs to be handled separately.
      * @param data The map to store the settings to.
      * @see #loadFrom(Map)
+     * @see OffsetBookmark#toPropertiesMap()
      */
     public void storeTo(Map<String, String> data) {
@@ -255 +257 @@
         data.put(AUTO_ZOOM, Boolean.toString(autoZoom));
         data.put(SHOW_ERRORS, Boolean.toString(showErrors));
-        data.put("dx", String.valueOf(getDx()));
-        data.put("dy", String.valueOf(getDy()));
     }
 
     /**
      * Load the settings from the given data instance.
+     * The offset data is not loaded and needs to be handled separately.
      * @param data The data
      * @see #storeTo(Map)
+     * @see OffsetBookmark#fromPropertiesMap(java.util.Map)
      */
     public void loadFrom(Map<String, String> data) {
@@ -279 +281 @@
             if (doShowErrors != null) {
                 setShowErrors(Boolean.parseBoolean(doShowErrors));
-            }
-
-            String dx = data.get("dx");
-            String dy = data.get("dy");
-            if (dx != null && dy != null) {
-                setDisplacement(new EastNorth(Double.parseDouble(dx), Double.parseDouble(dy)));
             }
         } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {