Changeset 10 in josm

Timestamp:

2005-10-04T20:14:54+02:00 (19 years ago)

Author:

imi

Message:

GPX export added

Files:

• .classpath (modified) (1 diff)
• src/org/openstreetmap/josm/actions/SaveGpxAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/GpxReader.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/GpxWriter.java (added)

.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-        <classpathentry sourcepath="/home/imi/download/jdom-1.0.zip" kind="lib" path="lib/jdom.jar"/>
+        <classpathentry sourcepath="/home/imi/src/jdom-1.0/src" kind="lib" path="lib/jdom.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

src/org/openstreetmap/josm/actions/SaveGpxAction.java

@@ -4 +4 @@
 import java.awt.event.KeyEvent;
 import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.gui.Main;
+import org.openstreetmap.josm.io.GpxWriter;
 
 /**
@@ -29 +33 @@
         
         @SuppressWarnings("unchecked")
-        public void actionPerformed(ActionEvent e) {
+        public void actionPerformed(ActionEvent event) {
+                if (Main.main.getMapFrame() == null) {
+                        JOptionPane.showMessageDialog(Main.main, "No document open so nothing to save.");
+                        return;
+                }
                 JFileChooser fc = new JFileChooser("data");
                 fc.showSaveDialog(Main.main);
@@ -35 +43 @@
                 if (gpxFile == null)
                         return;
+                
+                try {
+                        FileWriter fileWriter = new FileWriter(gpxFile);
+                        GpxWriter out = new GpxWriter(fileWriter, Main.main.getMapFrame().mapView.dataSet);
+                        out.output();
+                        fileWriter.close();
+                } catch (IOException e) {
+                        e.printStackTrace();
+                        JOptionPane.showMessageDialog(Main.main, "An error occoured while saving.\n"+e.getMessage());
+                }
         }
 

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -66 +66 @@
                 return true;
         }
-        
+
         /**
          * Mark the primitive as selected or not selected and fires a selection 

src/org/openstreetmap/josm/io/GpxReader.java

@@ -92 +92 @@
 
         /**
+         * Read a data set from the element.
+         * @param e     The element to parse
+         * @return              The DataSet read from the element
+         */
+        private DataSet parseDataSet(Element e) {
+                DataSet data = new DataSet();
+                // read waypoints not contained in tracks or areas
+                for (Object o : e.getChildren("wpt", GPX))
+                        addNode(data, parseWaypoint((Element)o));
+        
+                // read tracks
+                for (Object trackElement : e.getChildren("trk", GPX))
+                        parseTrack((Element)trackElement, data);
+        
+                return data;
+        }
+
+        /**
+         * Parse and read a track from the element. Store it in the dataSet, as well
+         * as all nodes in it.
+         *
+         * @param e             The element that contain the track.
+         * @param ds    The DataSet to store the data in.
+         */
+        private void parseTrack(Element e, DataSet ds) {
+                Track track = new Track();
+                for (Object o : e.getChildren()) {
+                        Element child = (Element)o;
+                        if (child.getName().equals("extensions"))
+                                parseKeyValueExtensions(track, child);
+                        else if (child.getName().equals("link"))
+                                parseKeyValueLink(track, child);
+                        else if (child.getName().equals("trkseg")) {
+                                Node start = null;
+                                for (Object w : child.getChildren("trkpt", GPX)) {
+                                        Node node = parseWaypoint((Element)w);
+                                        node = addNode(ds, node);
+                                        if (start == null)
+                                                start = node;
+                                        else {
+                                                LineSegment lineSegment = new LineSegment(start, node);
+                                                parseKeyValueExtensions(lineSegment, ((Element)w).getChild("extensions", GPX));
+                                                track.add(lineSegment);
+                                                start = null;
+                                        }
+                                }
+                        } else
+                                parseKeyValueTag(track, child);
+                }
+                ds.addTrack(track);
+        }
+        
+
+        /**
+         * Adds the node to allNodes if it is not already listed. Does respect the
+         * preference setting "mergeNodes". Return the node in the list that correspond
+         * to the node in the list (either the new added or the old found).
+         * 
+         * @param data The DataSet to add the node to.
+         * @param node The node that should be added.
+         * @return Either the parameter node or the old node found in the dataset. 
+         */
+        private Node addNode (DataSet data, Node node) {
+                if (Main.pref.mergeNodes)
+                        for (Node n : data.nodes)
+                                if (node.coor.lat == n.coor.lat && node.coor.lon == n.coor.lon)
+                                        return n;
+                data.nodes.add(node);
+                return node;
+        }
+
+        /**
          * Parse the extensions tag and add all properties found as key/value. 
          * <code>osm.keys</code> may be <code>null</code>, in which case it is 
@@ -138 +210 @@
          * The format stored is: mimetype;url
          * Example: text/html;http://www.openstreetmap.org
+         * 
          * @param osm   The osm primitive to store the data in.
          * @param e             The element in gpx:linkType - format.
          */
-        private void parseKeyValueLink(Node osm, Element e) {
+        private void parseKeyValueLink(OsmPrimitive osm, Element e) {
                 if (e != null) {
                         if (osm.keys == null)
@@ -149 +222 @@
                 }
         }
-
-        /**
-         * Read a data set from the element.
-         * @param e     The element to parse
-         * @return              The DataSet read from the element
-         */
-        private DataSet parseDataSet(Element e) {
-                DataSet data = new DataSet();
-                // read waypoints not contained in tracks or areas
-                for (Object o : e.getChildren("wpt", GPX))
-                        addNode(data, parseWaypoint((Element)o));
-
-                // read tracks
-                for (Object trackElement : e.getChildren("trk", GPX)) {
-                        Track track = new Track();
-                        for (Object trackSegmentElement : ((Element)trackElement).getChildren("trkseg", GPX)) {
-                                Node start = null;
-                                for (Object w : ((Element)trackSegmentElement).getChildren("trkpt", GPX)) {
-                                        Node node = parseWaypoint((Element)w);
-                                        node = addNode(data, node);
-                                        if (start == null)
-                                                start = node;
-                                        else {
-                                                LineSegment lineSegment = new LineSegment(start, node);
-                                                track.add(lineSegment);
-                                                start = null;
-                                        }
-                                }
-                        }
-                        data.addTrack(track);
-                }
-
-                return data;
-        }
-        
-        /**
-         * Adds the node to allNodes if it is not already listed. Does respect the
-         * preference setting "mergeNodes". Return the node in the list that correspond
-         * to the node in the list (either the new added or the old found).
-         * 
-         * @param data The DataSet to add the node to.
-         * @param node The node that should be added.
-         * @return Either the parameter node or the old node found in the dataset. 
-         */
-        private Node addNode (DataSet data, Node node) {
-                if (Main.pref.mergeNodes)
-                        for (Node n : data.nodes)
-                                if (node.coor.lat == n.coor.lat && node.coor.lon == n.coor.lon)
-                                        return n;
-                data.nodes.add(node);
-                return node;
-        }
 }