Changeset 7518 in josm for trunk/src/org/openstreetmap/josm/gui/layer/gpx

Timestamp:

2014-09-10T02:29:55+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10489 - Add additional attributes to GPX Export for nodes + GPX code improvements

Location:

trunk/src/org/openstreetmap/josm/gui/layer/gpx

Files:

• ChooseTrackVisibilityAction.java (modified) (2 diffs)
• ConvertToDataLayerAction.java (modified) (3 diffs)
• GpxDrawHelper.java (modified) (4 diffs)
• ImportAudioAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -32 +32 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -111 +112 @@
         for (GpxTrack trk : layer.data.tracks) {
             Map<String, Object> attr = trk.getAttributes();
-            String name = (String) (attr.containsKey("name") ? attr.get("name") : "");
-            String desc = (String) (attr.containsKey("desc") ? attr.get("desc") : "");
+            String name = (String) (attr.containsKey(GpxConstants.GPX_NAME) ? attr.get(GpxConstants.GPX_NAME) : "");
+            String desc = (String) (attr.containsKey(GpxConstants.GPX_DESC) ? attr.get(GpxConstants.GPX_DESC) : "");
             String time = GpxLayer.getTimespanForTrack(trk);
             TrackLength length = new TrackLength(trk.length());

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
@@ -53 +54 @@
                 for (WayPoint p : segment.getWayPoints()) {
                     Node n = new Node(p.getCoor());
-                    String timestr = p.getString("time");
+                    String timestr = p.getString(GpxConstants.PT_TIME);
                     if (timestr != null) {
                         n.setTimestamp(DateUtils.fromString(timestr));
@@ -68 +69 @@
         Main.main.removeLayer(layer);
     }
-
 }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -17 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -253 +254 @@
                 for (Collection<WayPoint> segment : data.getLinesIterable(null)) {
                     for (WayPoint trkPnt : segment) {
-                        Object val = trkPnt.attr.get("hdop");
+                        Object val = trkPnt.get(GpxConstants.PT_HDOP);
                         if (val != null) {
                             double hdop = ((Float) val).doubleValue();
@@ -304 +305 @@
 
                 if (colored == ColorMode.HDOP) {
-                    Float hdop = (Float) trkPnt.attr.get("hdop");
+                    Float hdop = (Float) trkPnt.get(GpxConstants.PT_HDOP);
                     color = hdopScale.getColor(hdop);
                 }
@@ -446 +447 @@
 
 
-                if (hdopCircle && trkPnt.attr.get("hdop") != null) {
+                if (hdopCircle && trkPnt.get(GpxConstants.PT_HDOP) != null) {
                     // hdop value
-                    float hdop = (Float)trkPnt.attr.get("hdop");
+                    float hdop = (Float)trkPnt.get(GpxConstants.PT_HDOP);
                     if (hdop < 0) {
                         hdop = 0;

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.DiskAccessAction;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
@@ -184 +185 @@
                     WayPoint wc = new WayPoint(w.getCoor());
                     wc.time = wNear.time;
-                    if (w.attr.containsKey("name")) {
-                        wc.attr.put("name", w.getString("name"));
+                    if (w.attr.containsKey(GpxConstants.GPX_NAME)) {
+                        wc.put(GpxConstants.GPX_NAME, w.getString(GpxConstants.GPX_NAME));
                     }
                     waypoints.add(wc);
@@ -200 +201 @@
                 for (GpxTrackSegment seg : track.getSegments()) {
                     for (WayPoint w : seg.getWayPoints()) {
-                        if (w.attr.containsKey("name") || w.attr.containsKey("desc")) {
+                        if (w.attr.containsKey(GpxConstants.GPX_NAME) || w.attr.containsKey(GpxConstants.GPX_DESC)) {
                             waypoints.add(w);
                         }
@@ -245 +246 @@
                     name = name.substring(0, dot);
                 }
-                wayPointFromTimeStamp.attr.put("name", name);
+                wayPointFromTimeStamp.put(GpxConstants.GPX_NAME, name);
                 waypoints.add(wayPointFromTimeStamp);
             }
@@ -259 +260 @@
                     for (WayPoint w : seg.getWayPoints()) {
                         WayPoint wStart = new WayPoint(w.getCoor());
-                        wStart.attr.put("name", "start");
+                        wStart.put(GpxConstants.GPX_NAME, "start");
                         wStart.time = w.time;
                         waypoints.add(wStart);