Changeset 17659 in josm

Timestamp:

2021-03-24T23:04:28+01:00 (4 years ago)

Author:

simon04

Message:

fix #20233 - Session: export/import layer color

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/session/SessionReader.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/session/SessionWriter.java (modified) (2 diffs)
• test/data/sessions/gpx_markers.jos (modified) (1 diff)
• test/data/sessions/gpx_markers.joz (modified) ( previous)
• test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Color;
 import java.awt.GraphicsEnvironment;
 import java.io.BufferedInputStream;
@@ -46 +47 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
@@ -618 +620 @@
                 }
             }
+            String colorString = el.getAttribute("color");
+            if (colorString != null) {
+                try {
+                    Color color = ColorHelper.html2color(colorString);
+                    layer.setColor(color);
+                } catch (RuntimeException ex) {
+                    Logging.warn("Cannot parse color " + colorString);
+                }
+            }
             layer.setName(names.get(entry.getKey()));
             layers.add(layer);

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

@@ -44 +44 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
+import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
@@ -239 +240 @@
             if (!Utils.equalsEpsilon(layer.getOpacity(), 1.0)) {
                 el.setAttribute("opacity", Double.toString(layer.getOpacity()));
+            }
+            if (layer.getColor() != null) {
+                el.setAttribute("color", ColorHelper.color2html(layer.getColor()));
             }
             Set<Layer> deps = dependencies.get(layer);

trunk/test/data/sessions/gpx_markers.jos

@@ -16 +16 @@
             <file>layers/01/data.gpx</file>
         </layer>
-        <layer index="2" name="Marker layer name" type="markers" version="0.1" visible="true">
+        <layer color="#34567812" index="2" name="Marker layer name" opacity="0.5" type="markers" version="0.1" visible="true">
             <file>layers/02/data.gpx</file>
         </layer>

trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java

@@ -6 +6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.awt.Color;
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -119 +120 @@
         assertEquals(gpx.getName(), "GPX layer name");
         assertEquals(marker.getName(), "Marker layer name");
+        assertEquals(1.0, gpx.getOpacity());
+        assertEquals(0.5, marker.getOpacity());
+        assertEquals(new Color(0x204060), gpx.getColor());
+        assertEquals(new Color(0x12345678, true), marker.getColor());
     }
 

trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io.session;
 
+import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
@@ -154 +155 @@
 
     private MarkerLayer createMarkerLayer(GpxLayer gpx) {
-        return new MarkerLayer(gpx.data, "Marker layer name", gpx.getAssociatedFile(), gpx);
+        MarkerLayer layer = new MarkerLayer(gpx.data, "Marker layer name", gpx.getAssociatedFile(), gpx);
+        layer.setOpacity(0.5);
+        layer.setColor(new Color(0x12345678, true));
+        return layer;
     }