Changeset 15496 in josm for trunk/src/org/openstreetmap/josm/data/gpx/Line.java

Timestamp:

2019-11-02T15:11:34+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16796 - Rework of GPX track colors / layer preferences (patch by Bjoeni)

File:

• trunk/src/org/openstreetmap/josm/data/gpx/Line.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/Line.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.gpx;
 
+import java.awt.Color;
 import java.util.Collection;
 import java.util.Iterator;
@@ -14 +15 @@
     private final Collection<WayPoint> waypoints;
     private final boolean unordered;
+    private final Color color;
 
     /**
@@ -19 +21 @@
      * @param waypoints collection of waypoints
      * @param attributes track/route attributes
+     * @param color color of the track
+     * @since 15496
      */
-    public Line(Collection<WayPoint> waypoints, Map<String, Object> attributes) {
+    public Line(Collection<WayPoint> waypoints, Map<String, Object> attributes, Color color) {
+        this.color = color;
         this.waypoints = Objects.requireNonNull(waypoints);
         unordered = attributes.isEmpty() && waypoints.stream().allMatch(x -> x.get(GpxConstants.PT_TIME) == null);
@@ -29 +34 @@
      * @param trackSegment track segment
      * @param trackAttributes track attributes
+     * @param color color of the track
+     * @since 15496
      */
-    public Line(GpxTrackSegment trackSegment, Map<String, Object> trackAttributes) {
-        this(trackSegment.getWayPoints(), trackAttributes);
+    public Line(IGpxTrackSegment trackSegment, Map<String, Object> trackAttributes, Color color) {
+        this(trackSegment.getWayPoints(), trackAttributes, color);
     }
 
@@ -39 +46 @@
      */
     public Line(GpxRoute route) {
-        this(route.routePoints, route.attr);
+        this(route.routePoints, route.attr, null);
     }
 
@@ -48 +55 @@
     public boolean isUnordered() {
         return unordered;
+    }
+
+    /**
+     * Returns the track/route color
+     * @return the color
+     * @since 15496
+     */
+    public Color getColor() {
+        return color;
     }