Changeset 34435 in osm for applications/editors/josm/plugins/pdfimport/src

Timestamp:

2018-07-27T11:54:47+02:00 (7 years ago)

Author:

nzara

Message:

Bug fix: get from Coordinate

Location:

applications/editors/josm/plugins/pdfimport/src/pdfimport

Files:

• LoadPdfDialog.java (modified) (3 diffs)
• Preview.java (added)
• ProjectionInfo.java (modified) (1 diff)

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

@@ -281 +281 @@
 
         private PathOptimizer pdfData;
-        private OsmDataLayer dataLayer;
+//      private OsmDataLayer dataLayer;
 
         private final JButton loadFileButton = new JButton(tr("Load preview ..."));
@@ -713 +713 @@
                  */
                 removeLayer();
-                dataLayer = _layer;
-                MainApplication.getLayerManager().addLayer(dataLayer);
+                Preview.set(_layer, placement);
+//              dataLayer = _layer;
+//              MainApplication.getLayerManager().addLayer(dataLayer);
                 MainApplication.getMap().mapView.zoomTo(placement.getWorldBounds(pdfData));
         }
@@ -722 +723 @@
                  * remove preview layer
                  */
-                if (dataLayer != null) {
-                        MainApplication.getLayerManager().removeLayer(dataLayer);
-                        dataLayer.data.clear(); // saves memory
-                        dataLayer = null;
-                }
+//              if (dataLayer != null) {
+//                      MainApplication.getLayerManager().removeLayer(dataLayer);
+//                      dataLayer.data.clear(); // saves memory
+//                      dataLayer = null;
+//              }
+                Preview.clear();
                 // No layer ==> no actions
                 actionPanel.showButton.setEnabled(false);

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

@@ -26 +26 @@
     }
 
-    public static Projection getProjectionByCode(String code) {
-                return new SingleProjectionChoice(code.toString(), code.toString(), code).getProjection() ;
+        public static Projection getProjectionByCode(String code) {
+                try {
+                        ProjectionChoice pc = new SingleProjectionChoice(code.toString(), code.toString(), code);
+                        Projection p = pc.getProjection();
+                        return p;
+                } catch (Exception e) {
+                        throw new IllegalArgumentException();
+                }
 
 //        Projection p = allCodes.get(code);