Changeset 7575 in josm for trunk/src/org/openstreetmap/josm/data/osm

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/data/osm/DataSet.java (modified) (4 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Data;
+import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -90 +92 @@
  * @author imi
  */
-public final class DataSet implements Cloneable, ProjectionChangeListener {
+public final class DataSet implements Data, Cloneable, ProjectionChangeListener {
 
     /**
@@ -916 +918 @@
     }
 
-    /**
-     * Returns the total area of downloaded data (the "yellow rectangles").
-     * @return Area object encompassing downloaded data.
-     */
+    @Override
+    public Collection<DataSource> getDataSources() {
+        return dataSources;
+    }
+
+    @Override
     public Area getDataSourceArea() {
-        if (dataSources.isEmpty()) return null;
-        Area a = new Area();
-        for (DataSource source : dataSources) {
-            // create area from data bounds
-            a.add(new Area(source.bounds.asRect()));
-        }
-        return a;
+        return DataSource.getDataSourceArea(dataSources);
     }
 
@@ -1317 +1315 @@
     }
 
-    /**
-     * <p>Replies the list of data source bounds.</p>
-     *
-     * <p>Dataset maintains a list of data sources which have been merged into the
-     * data set. Each of these sources can optionally declare a bounding box of the
-     * data it supplied to the dataset.</p>
-     *
-     * <p>This method replies the list of defined (non {@code null}) bounding boxes.</p>
-     *
-     * @return the list of data source bounds. An empty list, if no non-null data source
-     * bounds are defined.
-     */
+    @Override
     public List<Bounds> getDataSourceBounds() {
-        List<Bounds> ret = new ArrayList<>(dataSources.size());
-        for (DataSource ds : dataSources) {
-            if (ds.bounds != null) {
-                ret.add(ds.bounds);
-            }
-        }
-        return ret;
+        return DataSource.getDataSourceBounds(dataSources);
     }