Ticket #24739: 24739.patch

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

@@ -719 +719 @@
      * To get bounds as read from metadata, see {@link #getMetaBounds()}.<br>
      * To get downloaded areas, see {@link #dataSources}.<br>
      *
+     * @return the bounds
+     * @see #getMetaBounds()
+     * @see #dataSources
+     */
+    public synchronized Bounds recalculateBounds() {
+        return recalculateBounds(false);
+    }
+
+    /**
+     * Calculates the bounding box of available data and returns it.
+     * The bounds are not stored internally, but recalculated every time
+     * this function is called.<br>
+     * To get bounds as read from metadata, see {@link #getMetaBounds()}.<br>
+     * To get downloaded areas, see {@link #dataSources}.<br>
+     *
      * FIXME might perhaps use visitor pattern?
+     * @param ignoreWaypoints if true, data from privateWaypoints is ignored
      * @return the bounds
      * @see #getMetaBounds()
      * @see #dataSources
+     * @since xxx
      */
-    public synchronized Bounds recalculateBounds() {
+    public synchronized Bounds recalculateBounds(boolean ignoreWaypoints) {
         Bounds bounds = null;
-        for (WayPoint wpt : privateWaypoints) {
-            if (bounds == null) {
-                bounds = new Bounds(wpt.getCoor());
-            } else {
-                bounds.extend(wpt.getCoor());
+        if (!ignoreWaypoints) {
+            for (WayPoint wpt : privateWaypoints) {
+                if (bounds == null) {
+                    bounds = new Bounds(wpt.getCoor());
+                } else {
+                    bounds.extend(wpt.getCoor());
+                }
             }
         }
         for (GpxRoute rte : privateRoutes) {

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

@@ -395 +395 @@
     @Override
     public void visitBoundingBox(BoundingXYVisitor v) {
         if (data != null) {
-            v.visit(data.recalculateBounds());
+            v.visit(data.recalculateBounds(true));
         }
     }