Changeset 34485 in osm for applications/editors

Timestamp:

2018-08-15T19:10:19+02:00 (6 years ago)

Author:

donvip

Message:

fix #josm16543 - Fix crash when gpx contains multiple segments (patch by reubot)

File:

• applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java (modified) (1 diff)

applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java

@@ -60 +60 @@
                     return;
                 }
+                GpxData dataNew = new GpxData();
 
                 for (GpxTrack trk : data.getTracks()) {
                     HashMap<String, Object> attrib = new HashMap<>(trk.getAttributes());
                     if (!trk.getAttributes().containsKey(GpxConstants.GPX_NAME)) {
-                        System.out.println(track.filename);
                         attrib.put(GpxConstants.GPX_NAME, track.filename);
                     }
                     if (!trk.getAttributes().containsKey(GpxConstants.GPX_DESC)) {
-                        System.out.println(track.description);
                         attrib.put(GpxConstants.GPX_DESC, track.description);
                     }
                     // replace the existing trace in the unmodifiable tracks
                     data.removeTrack(trk);
-                    trk = new ImmutableGpxTrack(new ArrayList<>(trk.getSegments()), attrib);
-                    data.addTrack(trk);
+                    dataNew.addTrack(new ImmutableGpxTrack(new ArrayList<>(trk.getSegments()), attrib));
                 }
+
+                data = dataNew;
 
                 final GpxLayer gpxLayer = new GpxLayer(data, (track.filename + " " + track.description).trim());