Changeset 12594 in josm for trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.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/ImagerySessionImporter.java (modified) (2 diffs)

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

@@ -18 +18 @@
 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.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -45 +47 @@
             AbstractTileSourceLayer<?> tsLayer = (AbstractTileSourceLayer<?>) layer;
             tsLayer.getDisplaySettings().loadFrom(attributes);
-            NodeList nodes = elem.getChildNodes();
-            for (int i = 0; i < nodes.getLength(); ++i) {
-                Node node = nodes.item(i);
-                if (node.getNodeType() == Node.ELEMENT_NODE && "offset".equals(node.getLocalName())) {
-                    Map<String, String> offsetAttributes = readProperties((Element) node);
-                    OffsetBookmark offset = OffsetBookmark.fromPropertiesMap(offsetAttributes);
-                    tsLayer.getDisplaySettings().setOffsetBookmark(offset);
-                    break;
-                }
+            Element offsetEl = getFirstElementByTagName(elem, "offset");
+            if (offsetEl != null) {
+                Map<String, String> offsetAttributes = readProperties(offsetEl);
+                OffsetBookmark offset = OffsetBookmark.fromPropertiesMap(offsetAttributes);
+                tsLayer.getDisplaySettings().setOffsetBookmark(offset);
+            }
+        }
+        Element filtersEl = getFirstElementByTagName(elem, "filters");
+        if (filtersEl != null) {
+            ImageryFilterSettings filterSettings = layer.getFilterSettings();
+            if (filterSettings != null) {
+                Map<String, String> filtersProps = readProperties(filtersEl);
+                filterSettings.getProcessors().stream()
+                        .flatMap(Utils.castToStream(SessionAwareReadApply.class))
+                        .forEach(proc -> proc.applyFromPropertiesMap(filtersProps));
             }
         }
         return layer;
+    }
+
+    private static Element getFirstElementByTagName(Element el, String name) {
+        NodeList nl = el.getElementsByTagName(name);
+        if (nl.getLength() == 0)
+            return null;
+        return (Element) nl.item(0);
     }