Changeset 34438 in osm for applications/editors/josm/plugins/pdfimport

Timestamp:

2018-08-01T11:32:45+02:00 (6 years ago)

Author:

nzara

Message:

Bug fix: get from Coordinate; multiple imports

File:

• applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java (modified) (3 diffs)

applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java

@@ -407 +407 @@
                                 LoadPdfDialog.this.pdfFile = newFileName;
                                 if (pdfData != null) {
-                                        LoadPdfDialog.this.placeLayer(newLayer, new FilePlacement());
+                                        Preview.set(newLayer, new FilePlacement());
+                                        MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(pdfData));
                                         try {
                                                 LoadPdfDialog.this.placement.load(newFileName);
                                         } catch (IOException e) {
-                                                // Dont care
+                                                // Saved placement does not exist, corrupt, ... ---> ignore it
                                         } finally {
                                                 LoadPdfDialog.this.placement.verify();
@@ -455 +456 @@
                                 // sync part
                                 // rebuild layer with latest projection
-                                LoadPdfDialog.this.placeLayer(newLayer, placement);
+                                MainApplication.getLayerManager().addLayer(newLayer);
+                                MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(pdfData));
                                 LoadPdfDialog.this.setVisible(false);
                         }
@@ -708 +710 @@
         }
 
-        private void placeLayer(OsmDataLayer _layer, FilePlacement placement) {
-                /*
-                 *
-                 */
-                removeLayer();
-                Preview.set(_layer, placement);
-//              dataLayer = _layer;
-//              MainApplication.getLayerManager().addLayer(dataLayer);
-                MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(pdfData));
-        }
-
-        private void removeLayer() {
+                private void removeLayer() {
                 /*
                  * remove preview layer