Changeset 7575 in josm for trunk/src/org/openstreetmap/josm/io

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

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• BoundingBoxDownloader.java (modified) (4 diffs)
• GpxReader.java (modified) (5 diffs)
• OsmReader.java (modified) (1 diff)
• OsmWriter.java (modified) (1 diff)

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

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.notes.Note;
@@ -45 +46 @@
     }
 
-    private GpxData downloadRawGps(String url, ProgressMonitor progressMonitor) throws IOException, OsmTransferException, SAXException {
+    private GpxData downloadRawGps(Bounds b, ProgressMonitor progressMonitor) throws IOException, OsmTransferException, SAXException {
         boolean done = false;
         GpxData result = null;
+        String url = "trackpoints?bbox="+b.getMinLon()+","+b.getMinLat()+","+b.getMaxLon()+","+b.getMaxLat()+"&page=";
         for (int i = 0;!done;++i) {
             progressMonitor.subTask(tr("Downloading points {0} to {1}...", i * 5000, ((i + 1) * 5000)));
@@ -70 +72 @@
         if (result != null) {
             result.fromServer = true;
+            result.dataSources.add(new DataSource(b, "OpenStreetMap server"));
         }
         return result;
@@ -81 +84 @@
             if (crosses180th) {
                 // API 0.6 does not support requests crossing the 180th meridian, so make two requests
-                GpxData result = downloadRawGps("trackpoints?bbox="+lon1+","+lat1+",180.0,"+lat2+"&page=", progressMonitor);
-                result.mergeFrom(downloadRawGps("trackpoints?bbox=-180.0,"+lat1+","+lon2+","+lat2+"&page=", progressMonitor));
+                GpxData result = downloadRawGps(new Bounds(lat1, lon1, lat2, 180.0), progressMonitor);
+                result.mergeFrom(downloadRawGps(new Bounds(lat1, -180.0, lat2, lon2), progressMonitor));
                 return result;
             } else {
                 // Simple request
-                return downloadRawGps("trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=", progressMonitor);
+                return downloadRawGps(new Bounds(lat1, lon1, lat2, lon2), progressMonitor);
             }
         } catch (IllegalArgumentException e) {

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;

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

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.NodeData;

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

@@ -12 +12 @@
 import java.util.Map.Entry;
 
+import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;