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

Timestamp:

2008-08-05T02:14:58+02:00 (16 years ago)

Author:

framm

Message:

• changed AutoScaleAction to leave some margin around selected objects when zooming to selection
• added code to support the new RemoteControl plugin

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Bounds.java (modified) (2 diffs)
• osm/DataSet.java (modified) (2 diffs)

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data;
+
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RectangularShape;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -66 +69 @@
                 return true;
         }
+        
+        /**
+         * Returns the lat/lon bounding box as an object of type Rectangle2D.Double
+         * @return
+         */
+        public Rectangle2D.Double asRect() {
+                return new Rectangle2D.Double(min.lon(), min.lat(), max.lon()-min.lon(), max.lat()-min.lat());
+        }
+
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.awt.Polygon;
+import java.awt.Shape;
+import java.awt.geom.Area;
 import java.util.Arrays;
 import java.util.Collection;
@@ -204 +207 @@
             return ds;
     }
+        
+        /**
+         * Returns the total area of downloaded data (the "yellow rectangles").
+         * @return Area object encompassing downloaded data.
+         */
+        public Area getDataSourceArea()
+        {
+                Area a = new Area();
+                for (DataSource source : dataSources) {
+                        // create area from data bounds
+                        a.add(new Area(source.bounds.asRect()));
+                }
+                return a;
+                
+        }
 }