Changeset 1601 in josm
- Timestamp:
- 2009-05-19T18:45:54+02:00 (16 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
r1169 r1601 17 17 import org.openstreetmap.josm.data.coor.EastNorth; 18 18 import org.openstreetmap.josm.data.coor.LatLon; 19 import org.openstreetmap.josm.data.gpx.GpxData; 19 20 import org.openstreetmap.josm.data.gpx.GpxLink; 20 21 import org.openstreetmap.josm.data.gpx.WayPoint; … … 82 83 // collection of GpxLink objects... 83 84 try { 84 for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get( "link")) {85 for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) { 85 86 uri = oneLink.uri; 86 87 break; -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r1221 r1601 80 80 /* calculate time differences in waypoints */ 81 81 double time = wpt.time; 82 boolean wpt_has_link = wpt.attr.containsKey( "link");82 boolean wpt_has_link = wpt.attr.containsKey(GpxData.META_LINKS); 83 83 if (firstTime < 0 && wpt_has_link) { 84 84 firstTime = time; 85 for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get( "link")) {85 for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) { 86 86 lastLinkedFile = oneLink.uri; 87 87 break; … … 89 89 } 90 90 if (wpt_has_link) { 91 for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get( "link")) {91 for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) { 92 92 if (!oneLink.uri.equals(lastLinkedFile))firstTime = time; 93 93 lastLinkedFile = oneLink.uri; -
trunk/src/org/openstreetmap/josm/io/GpxWriter.java
r1574 r1601 63 63 for (Map.Entry<String, Object> ent : attr.entrySet()) { 64 64 String k = ent.getKey(); 65 if (k.equals( "link")) {65 if (k.equals(GpxData.META_LINKS)) { 66 66 for (GpxLink link : (Collection<GpxLink>) ent.getValue()) { 67 67 gpxLink(link);
Note:
See TracChangeset
for help on using the changeset viewer.