Changeset 11784 in josm for trunk/src/org

Timestamp:

2017-03-27T22:10:42+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13922 - fix GPX and Note download area computation

Location:

trunk/src/org/openstreetmap/josm/actions/downloadtasks

Files:

• DownloadGpsTask.java (modified) (1 diff)
• DownloadNotesTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -155 +155 @@
                     tr("Markers from {0}", name));
 
-            gpxLayer = addOrMergeLayer(layers.getGpxLayer(), findGpxMergeLayer());
+            gpxLayer = layers.getGpxLayer();
+            addOrMergeLayer(gpxLayer, findGpxMergeLayer());
             addOrMergeLayer(layers.getMarkerLayer(), findMarkerMergeLayer(gpxLayer));
 

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java

@@ -122 +122 @@
             }
 
+            noteLayer = new NoteLayer(notesData, tr("Notes"));
             List<NoteLayer> noteLayers = Main.getLayerManager().getLayersOfType(NoteLayer.class);
             if (!noteLayers.isEmpty()) {
-                noteLayer = noteLayers.get(0);
-                noteLayer.getNoteData().addNotes(notesData);
+                noteLayers.get(0).getNoteData().addNotes(notesData);
                 if (Main.map != null && zoomAfterDownload) {
                     Main.map.mapView.scheduleZoomTo(new ViewportData(noteLayer.getViewProjectionBounds()));
                 }
             } else {
-                Main.getLayerManager().addLayer(new NoteLayer(notesData, tr("Notes")), zoomAfterDownload);
+                Main.getLayerManager().addLayer(noteLayer, zoomAfterDownload);
             }
         }