Changeset 7816 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-12-17T01:49:45+01:00 (9 years ago)

Author:

bastiK

Message:

fixed #10860 - set initial viewport correctly when mapview is opened

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• ProjectionBounds.java (modified) (1 diff)
• ViewportData.java (modified) (3 diffs)
• osm/DataSet.java (modified) (3 diffs)
• osm/visitor/BoundingXYVisitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java

@@ -84 +84 @@
     }
 
+    public boolean hasExtend() {
+        return minEast != maxEast || minNorth != maxNorth;
+    }
 }

trunk/src/org/openstreetmap/josm/data/ViewportData.java

@@ -5 +5 @@
 
 /**
- * Simple data class that keeps map center and scale in one object.
+ * Data class to keep viewport information.
+ *
+ * This can be either a combination of map center and map scale or
+ * a rectangle in east-north coordinate space.
+ *
+ * Either of those will be null, so the consumer of the ViewportData
+ * object has to check, which one is set.
+ *
  * @since 5670 (creation)
- * @since 6992 (extraction in this package) 
+ * @since 6992 (extraction in this package)
  */
 public class ViewportData {
-    private EastNorth center;
-    private Double scale;
+    private final EastNorth center;
+    private final Double scale;
+
+    private final ProjectionBounds bounds;
 
     /**
@@ -21 +30 @@
         this.center = center;
         this.scale = scale;
+        this.bounds = null;
+    }
+
+    public ViewportData(ProjectionBounds bounds) {
+        this.center = null;
+        this.scale = null;
+        this.bounds = bounds;
     }
 
@@ -38 +54 @@
         return scale;
     }
+
+    /**
+     * Return the bounds in east-north coordinate space.
+     * @return the bounds
+     */
+    public ProjectionBounds getBounds() {
+        return bounds;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.Data;
 import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -39 +40 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
@@ -1348 +1350 @@
         invalidateEastNorthCache();
     }
+
+    public ProjectionBounds getDataSourceBoundingBox() {
+        BoundingXYVisitor bbox = new BoundingXYVisitor();
+        for (DataSource source : dataSources) {
+            bbox.visit(source.bounds);
+        }
+        if (bbox.hasExtend()) {
+            return bbox.getBounds();
+        }
+        return null;
+    }
+
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -85 +85 @@
     }
 
-    public boolean hasExtend()
-    {
-        return bounds != null && !bounds.getMin().equals(bounds.getMax());
+    public boolean hasExtend() {
+        return bounds != null && bounds.hasExtend();
     }