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

Timestamp:

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

Author:

bastiK

Message:

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

File:

• trunk/src/org/openstreetmap/josm/io/OsmImporter.java (modified) (3 diffs)

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

@@ -14 +14 @@
 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.NullProgressMonitor;
@@ -32 +33 @@
     public static class OsmImporterData {
 
-        private OsmDataLayer layer;
-        private Runnable postLayerTask;
+        private final OsmDataLayer layer;
+        private final Runnable postLayerTask;
 
         public OsmImporterData(OsmDataLayer layer, Runnable postLayerTask) {
@@ -102 +103 @@
             @Override
             public void run() {
-                Main.main.addLayer(data.layer);
-                data.postLayerTask.run();
-                data.layer.onPostLoadFromFile();
+                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());
+                data.getPostLayerTask().run();
+                data.getLayer().onPostLoadFromFile();
             }
         });