Changeset 942 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer

Timestamp:

2008-09-10T00:40:33+02:00 (16 years ago)

Author:

framm

Message:

• filename checking for audio markers in GPX. Fixes #973.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.GpxLink;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -75 +76 @@
                 this.fromLayer = fromLayer;
                 double firstTime = -1.0;
+                String lastLinkedFile = "";
 
                 for (WayPoint wpt : indata.waypoints) {
                         /* calculate time differences in waypoints */
                         double time = wpt.time;
-                        if (firstTime < 0)
+                        if (firstTime < 0) {
                                 firstTime = time;
+                                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
+                                        lastLinkedFile = oneLink.uri;
+                                        break;
+                                }
+                        }
+                        for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
+                                if (!oneLink.uri.equals(lastLinkedFile))firstTime = time;
+                                lastLinkedFile = oneLink.uri;
+                                break;
+                        }
             Marker m = Marker.createMarker(wpt, indata.storageFile, this, time, time - firstTime);
             if (m != null)