Changeset 8805 in josm for trunk/src

Timestamp:

2015-09-29T19:56:42+02:00 (10 years ago)

Author:

simon04

Message:

see #6968 - Add also markers when converting data layer to gpx layer

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -83 +83 @@
 import org.openstreetmap.josm.gui.io.UploadDialog;
 import org.openstreetmap.josm.gui.io.UploadLayerTask;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -730 +731 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Main.main.addLayer(new GpxLayer(toGpxData(), tr("Converted from: {0}", getName())));
+            final GpxData data = toGpxData();
+            final GpxLayer gpxLayer = new GpxLayer(data, tr("Converted from: {0}", getName()));
+            Main.main.addLayer(gpxLayer);
+            if (Main.pref.getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
+                Main.main.addLayer(new MarkerLayer(data, tr("Converted from: {0}", getName()), null, gpxLayer));
+            }
             Main.main.removeLayer(OsmDataLayer.this);
         }