Changeset 1601 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-05-19T18:45:54+02:00 (15 years ago)

Author:

stoecker

Message:

fix #2547 - patch by Henrik Niehaus - Audio/picture markers no longer working

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/markerlayer/Marker.java (modified) (2 diffs)
• gui/layer/markerlayer/MarkerLayer.java (modified) (2 diffs)
• io/GpxWriter.java (modified) (1 diff)

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxLink;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -82 +83 @@
                 // collection of GpxLink objects...
                 try {
-                    for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
+                    for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) {
                         uri = oneLink.uri;
                         break;

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

@@ -80 +80 @@
             /* calculate time differences in waypoints */
             double time = wpt.time;
-            boolean wpt_has_link = wpt.attr.containsKey("link");
+            boolean wpt_has_link = wpt.attr.containsKey(GpxData.META_LINKS);
             if (firstTime < 0 && wpt_has_link) {
                 firstTime = time;
-                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
+                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) {
                     lastLinkedFile = oneLink.uri;
                     break;
@@ -89 +89 @@
             }
             if (wpt_has_link) {
-                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get("link")) {
+                for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) {
                     if (!oneLink.uri.equals(lastLinkedFile))firstTime = time;
                     lastLinkedFile = oneLink.uri;

trunk/src/org/openstreetmap/josm/io/GpxWriter.java

@@ -63 +63 @@
         for (Map.Entry<String, Object> ent : attr.entrySet()) {
             String k = ent.getKey();
-            if (k.equals("link")) {
+            if (k.equals(GpxData.META_LINKS)) {
                 for (GpxLink link : (Collection<GpxLink>) ent.getValue()) {
                     gpxLink(link);