Changeset 8804 in josm for trunk/src

Timestamp:

2015-09-29T19:56:37+02:00 (9 years ago)

Author:

simon04

Message:

see #6968 - Allow converting gpx marker layer to osm data layer

Location:

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

Files:

• GpxLayer.java (modified) (1 diff)
• gpx/ConvertToDataLayerAction.java (modified) (3 diffs)
• markerlayer/MarkerLayer.java (modified) (2 diffs)

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

@@ -193 +193 @@
                 new ImportAudioAction(this),
                 new MarkersFromNamedPointsAction(this),
-                new ConvertToDataLayerAction(this),
+                new ConvertToDataLayerAction.FromGpxLayer(this),
                 new DownloadAlongTrackAction(data),
                 new DownloadWmsAlongTrackAction(data),

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

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.widgets.UrlLabel;
 import org.openstreetmap.josm.tools.GBC;
@@ -31 +34 @@
 import org.openstreetmap.josm.tools.date.DateUtils;
 
-public class ConvertToDataLayerAction extends AbstractAction {
-    private final transient GpxLayer layer;
+/**
+ * An abstract action for a conversion from a {@code T} {@link Layer} to a {@link OsmDataLayer}.
+ * @param <T> the source layer class
+ */
+public abstract class ConvertToDataLayerAction<T extends Layer> extends AbstractAction {
+    protected final transient T layer;
 
-    public ConvertToDataLayerAction(final GpxLayer layer) {
+    protected ConvertToDataLayerAction(final T layer) {
         super(tr("Convert to data layer"), ImageProvider.get("converttoosm"));
         this.layer = layer;
         putValue("help", ht("/Action/ConvertToDataLayer"));
     }
+
+    /**
+     * Converts a {@link GpxLayer} to a {@link OsmDataLayer}.
+     */
+    public static class FromGpxLayer extends ConvertToDataLayerAction<GpxLayer> {
+
+        /**
+         * Creates a new {@code FromGpxLayer}.
+         * @param layer the source layer
+         */
+        public FromGpxLayer(GpxLayer layer) {
+            super(layer);
+        }
+
+        @Override
+        public DataSet convert() {
+            final DataSet ds = new DataSet();
+            for (GpxTrack trk : layer.data.tracks) {
+                for (GpxTrackSegment segment : trk.getSegments()) {
+                    List<Node> nodes = new ArrayList<>();
+                    for (WayPoint p : segment.getWayPoints()) {
+                        Node n = new Node(p.getCoor());
+                        String timestr = p.getString(GpxConstants.PT_TIME);
+                        if (timestr != null) {
+                            n.setTimestamp(DateUtils.fromString(timestr));
+                        }
+                        ds.addPrimitive(n);
+                        nodes.add(n);
+                    }
+                    Way w = new Way();
+                    w.setNodes(nodes);
+                    ds.addPrimitive(w);
+                }
+            }
+            return ds;
+        }
+    }
+
+    /**
+     * Converts a {@link MarkerLayer} to a {@link OsmDataLayer}.
+     */
+    public static class FromMarkerLayer extends ConvertToDataLayerAction<MarkerLayer> {
+
+        /**
+         * Converts a {@link MarkerLayer} to a {@link OsmDataLayer}.
+         */
+        public FromMarkerLayer(MarkerLayer layer) {
+            super(layer);
+        }
+
+        @Override
+        public DataSet convert() {
+            final DataSet ds = new DataSet();
+            for (Marker marker : layer.data) {
+                final Node node = new Node(marker.getCoor());
+                node.put("name", marker.getText());
+                ds.addPrimitive(node);
+            }
+            return ds;
+        }
+    }
+
+    /**
+     * Performs the conversion to a {@link DataSet}.
+     * @return the resulting dataset
+     */
+    public abstract DataSet convert();
 
     @Override
@@ -53 +127 @@
             return;
         }
-        DataSet ds = new DataSet();
-        for (GpxTrack trk : layer.data.tracks) {
-            for (GpxTrackSegment segment : trk.getSegments()) {
-                List<Node> nodes = new ArrayList<>();
-                for (WayPoint p : segment.getWayPoints()) {
-                    Node n = new Node(p.getCoor());
-                    String timestr = p.getString(GpxConstants.PT_TIME);
-                    if (timestr != null) {
-                        n.setTimestamp(DateUtils.fromString(timestr));
-                    }
-                    ds.addPrimitive(n);
-                    nodes.add(n);
-                }
-                Way w = new Way();
-                w.setNodes(nodes);
-                ds.addPrimitive(w);
-            }
-        }
-        Main.main.addLayer(new OsmDataLayer(ds, tr("Converted from: {0}", layer.getName()), layer.getAssociatedFile()));
-        Main.main.removeLayer(layer);
+        final DataSet ds = convert();
+        final OsmDataLayer layer = new OsmDataLayer(ds, tr("Converted from: {0}", this.layer.getName()), this.layer.getAssociatedFile());
+        layer.setUploadDiscouraged(true);
+        Main.main.addLayer(layer);
+        Main.main.removeLayer(this.layer);
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -48 +48 @@
 import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToPreviousMarker;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.gpx.ConvertToDataLayerAction;
 import org.openstreetmap.josm.tools.AudioPlayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -261 +262 @@
         components.add(new JumpToNextMarker(this));
         components.add(new JumpToPreviousMarker(this));
+        components.add(new ConvertToDataLayerAction.FromMarkerLayer(this));
         components.add(new RenameLayerAction(getAssociatedFile(), this));
         components.add(SeparatorLayerAction.INSTANCE);