Changeset 12594 in josm for trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java

Timestamp:

2017-08-12T11:24:39+02:00 (7 years ago)

Author:

bastiK

Message:

fixed #15139 - raster-image filter settings are Not Stored when saving session (color Saturation, Brightness, Sharpness)

File:

• trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.awt.GridBagLayout;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -20 +21 @@
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.gui.layer.WMTSLayer;
+import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
 import org.openstreetmap.josm.io.session.SessionWriter.ExportSupport;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 
@@ -95 +98 @@
             }
         }
+        ImageryFilterSettings filters = layer.getFilterSettings();
+        if (filters != null) {
+            Map<String, String> filterProps = new HashMap<>();
+            filters.getProcessors().stream()
+                    .flatMap(Utils.castToStream(SessionAwareReadApply.class))
+                    .forEach(proc -> filterProps.putAll(proc.toPropertiesMap()));
+            if (!filterProps.isEmpty()) {
+                Element filterEl = support.createElement("filters");
+                layerElem.appendChild(filterEl);
+                addAttributes(filterEl, filterProps, support);
+            }
+        }
         return layerElem;
     }