Changeset 7575 in josm for trunk/src/org/openstreetmap/josm/io/GpxReader.java

Timestamp:

2014-09-21T23:00:38+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #7976 - Get downloaded gpx areas, on the same model as osm data

File:

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

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

@@ -21 +21 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.Extensions;
@@ -38 +39 @@
  * Read a gpx file.
  *
- * Bounds are not read, as we caluclate them. @see GpxData.recalculateBounds()
+ * Bounds are read, even if we calculate them, see {@link GpxData#recalculateBounds}.<br>
  * Both GPX version 1.0 and 1.1 are supported.
  *
@@ -73 +74 @@
         private boolean nokiaSportsTrackerBug = false;
 
-        @Override public void startDocument() {
+        @Override
+        public void startDocument() {
             accumulator = new StringBuffer();
             states = new Stack<>();
@@ -162 +164 @@
                     currentState = State.link;
                     currentLink = new GpxLink(atts.getValue("href"));
+                    break;
+                case "bounds":
+                    data.put(META_BOUNDS, new Bounds(
+                                parseCoord(atts.getValue("minlat")),
+                                parseCoord(atts.getValue("minlon")),
+                                parseCoord(atts.getValue("maxlat")),
+                                parseCoord(atts.getValue("maxlon"))));
                 }
                 break;
@@ -312 +321 @@
                         break;
                     }
+                case "bounds":
+                    // do nothing, has been parsed on startElement
+                    break;
                 default:
-                    //TODO: parse bounds, extensions
+                    //TODO: parse extensions
                 }
                 break;