Changeset 10371 in josm for trunk/src/org

Timestamp:

2016-06-14T18:47:33+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12944 - Reduce use of addLayer(..., bounds) - patch by michael2402 - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• gui/layer/Layer.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• io/OsmImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -75 +75 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
-import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
@@ -769 +768 @@
      */
     public final void addLayer(final Layer layer) {
-        BoundingXYVisitor v = new BoundingXYVisitor();
-        layer.visitBoundingBox(v);
-        addLayer(layer, v.getBounds());
+        addLayer(layer, layer.getViewProjectionBounds());
     }
 

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -259 +259 @@
                 final OsmDataLayer layer = createNewLayer(newLayerName);
                 if (Main.main != null)
-                    Main.main.addLayer(layer, computeBbox(bounds));
+                    Main.main.addLayer(layer);
                 return layer;
             }

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -23 +23 @@
 import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.actions.SaveAsAction;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -593 +594 @@
         }
     }
+
+    /**
+     * Gets the {@link ProjectionBounds} for this layer to be visible to the user. This can be the exact bounds, the UI handles padding. Return
+     * <code>null</code> if you cannot provide this information. The default implementation uses the bounds from
+     * {@link #visitBoundingBox(BoundingXYVisitor)}.
+     * @return The bounds for this layer.
+     * @since 10371
+     */
+    public ProjectionBounds getViewProjectionBounds() {
+        BoundingXYVisitor v = new BoundingXYVisitor();
+        visitBoundingBox(v);
+        return v.getBounds();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -49 +49 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -1079 +1080 @@
         return dialog;
     }
+
+    @Override
+    public ProjectionBounds getViewProjectionBounds() {
+        BoundingXYVisitor v = new BoundingXYVisitor();
+        v.visit(data.getDataSourceBoundingBox());
+        if (!v.hasExtend()) {
+            v.computeBoundingBox(data.getNodes());
+        }
+        return v.getBounds();
+    }
 }

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

@@ -15 +15 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -97 +96 @@
             public void run() {
                 OsmDataLayer layer = data.getLayer();
-                BoundingXYVisitor v = new BoundingXYVisitor();
-                v.visit(layer.data.getDataSourceBoundingBox());
-                if (!v.hasExtend()) {
-                    v.computeBoundingBox(layer.data.getNodes());
-                }
-                Main.main.addLayer(layer, v.getBounds());
+                Main.main.addLayer(layer);
                 data.getPostLayerTask().run();
                 data.getLayer().onPostLoadFromFile();