Changeset 449 in josm for trunk/src/org

Timestamp:

2007-11-01T14:35:36+01:00 (17 years ago)

Author:

gebner

Message:

GpxReader: Handle <extensions> that are not children of <gpx>

File:

• trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) (6 diffs)

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

@@ -102 +102 @@
                                         currentState = state.trkseg;
                                         currentTrackSeg = new ArrayList<WayPoint>();
-                                }
-                                if (qName.equals("link")) {
-                                        states.push(currentState);
-                                        currentState = state.link;
-                                        currentLink = new GpxLink(atts.getValue("href"));
+                                } else if (qName.equals("link")) {
+                                        states.push(currentState);
+                                        currentState = state.link;
+                                        currentLink = new GpxLink(atts.getValue("href"));
+                                } else if (qName.equals("extensions")) {
+                                        states.push(currentState);
+                                        currentState = state.ext;
                                 }
                                 break;
@@ -113 +115 @@
                                         states.push(currentState);
                                         currentState = state.author;
+                                } else if (qName.equals("extensions")) {
+                                        states.push(currentState);
+                                        currentState = state.ext;
                                 }
                                 break;
@@ -128 +133 @@
                                         currentState = state.link;
                                         currentLink = new GpxLink(atts.getValue("href"));
+                                } else if (qName.equals("extensions")) {
+                                        states.push(currentState);
+                                        currentState = state.ext;
                                 }
                                 break;
@@ -135 +143 @@
                                         currentState = state.link;
                                         currentLink = new GpxLink(atts.getValue("href"));
-                                }
-                                if (qName.equals("rtept")) {
+                                } else if (qName.equals("rtept")) {
                                         LatLon ll = new LatLon(Double.parseDouble(atts.getValue("lat")), Double.parseDouble(atts.getValue("lon")));
                                         states.push(currentState);
                                         currentState = state.wpt;
                                         currentWayPoint = new WayPoint(ll);
+                                } else if (qName.equals("extensions")) {
+                                        states.push(currentState);
+                                        currentState = state.ext;
                                 }
                                 break;
@@ -232 +242 @@
                                         currentTrack.attr.put(qName, accumulator.toString());
                                 }
+                                break;
+                        case ext:
+                                if (qName.equals("extensions")) {
+                                        currentState = states.pop();
+                                }
+                                break;
                         default:
                                 if (qName.equals("wpt")) {
@@ -238 +254 @@
                                         currentState = states.pop();
                                         currentData.routes.add(currentRoute);
-                                } else if (qName.equals("extensions")) {
-                                        currentState = states.pop();
                                 }
                         }