Changeset 5395 in josm

Timestamp:

Aug 5, 2012 12:37:29 PM (10 months ago)

Author:

bastiK

Message:

gpxreader: minor refactoring, read version & creator (see #7927)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxData.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (1 diff)
• io/GpxReader.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -34 +34 @@
     public File storageFile;
     public boolean fromServer;
+
+    public String creator;
 
     public final Collection<GpxTrack> tracks = new LinkedList<GpxTrack>();

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

@@ -446 +446 @@
         int maxLineLength;
         boolean lines;
-        if (this.isLocalFile) {
+        if (!this.data.fromServer) {
             maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length.local", spec, -1);
             lines = Main.pref.getBoolean("draw.rawgps.lines.local", spec, true);

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

@@ -5 +5 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.Utils.equal;
 
 import java.io.IOException;
@@ -37 +38 @@
     // TODO: implement GPX 1.0 parsing
 
+    private String version;
     /**
      * The resulting gpx data
      */
     public GpxData data;
-    private enum State { init, metadata, wpt, rte, trk, ext, author, link, trkseg, copyright}
+    private enum State { init, gpx, metadata, wpt, rte, trk, ext, author, link, trkseg, copyright}
     private InputSource inputSource;
 
@@ -87 +89 @@
             switch(currentState) {
             case init:
+                states.push(currentState);
+                currentState = State.gpx;
+                currentData.creator = atts.getValue("creator");
+                version = atts.getValue("version");
+                if (!equal(version, "1.0") && !equal(version, "1.1")) {
+                    version = "1.1";
+                }
+                System.err.println("Version: "+version);
+            case gpx:
                 if (qName.equals("metadata")) {
                     states.push(currentState);
@@ -110 +121 @@
                 }
                 break;
+            case metadata:
+                if (qName.equals("author")) {
+                    states.push(currentState);
+                    currentState = State.author;
+                } else if (qName.equals("extensions")) {
+                    states.push(currentState);
+                    currentState = State.ext;
+                } else if (qName.equals("copyright")) {
+                    states.push(currentState);
+                    currentState = State.copyright;
+                    currentData.attr.put(GpxData.META_COPYRIGHT_AUTHOR, atts.getValue("author"));
+                } else if (qName.equals("link")) {
+                    states.push(currentState);
+                    currentState = State.link;
+                    currentLink = new GpxLink(atts.getValue("href"));
+                }
+                break;
             case author:
                 if (qName.equals("link")) {
@@ -131 +159 @@
                     states.push(currentState);
                     currentState = State.ext;
-                }
-                break;
-            case metadata:
-                if (qName.equals("author")) {
-                    states.push(currentState);
-                    currentState = State.author;
-                } else if (qName.equals("extensions")) {
-                    states.push(currentState);
-                    currentState = State.ext;
-                } else if (qName.equals("copyright")) {
-                    states.push(currentState);
-                    currentState = State.copyright;
-                    currentData.attr.put(GpxData.META_COPYRIGHT_AUTHOR, atts.getValue("author"));
-                } else if (qName.equals("link")) {
-                    states.push(currentState);
-                    currentState = State.link;
-                    currentLink = new GpxLink(atts.getValue("href"));
                 }
                 break;
@@ -323 +334 @@
                     currentState = states.pop();
                 }
+                break;
+            case gpx:
+                currentState = states.pop();
                 break;
             default: