Changeset 34435 in osm for applications/editors

Timestamp:

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

Author:

nzara

Message:

Bug fix: get from Coordinate

Location:

applications/editors/josm/plugins/pdfimport

Files:

• README (modified) (2 diffs)
• src/pdfimport/LoadPdfDialog.java (modified) (3 diffs)
• src/pdfimport/Preview.java (added)
• src/pdfimport/ProjectionInfo.java (modified) (1 diff)

applications/editors/josm/plugins/pdfimport/README

@@ -10 +10 @@
 Layout
 ======
-+--- src                                source of your plugin
-  |- images                             images your plugin needs
-  |- resources                          resources your plugin needs
++- src                                source of the plugin
++- images                             images the plugin needs
++- resources                          resources the plugin needs
++- libs                                                           libraries the plugin needs (pdfbox ...)
 
   README                                this file
 
-  GPL-v2.0.txt                          GPL version 2 license text
-  GPL-v3.0.txt                          GPL version 3 license text
+  license                               GPL version 3 license text
   build.xml                             deployment build file
 
@@ -67 +67 @@
  by automatic processes. 
 
+Hints for eclipse
+=================
+. Building:
+  . add pdfimport/src to your buildpath
+  . add to buildpath|libraries: josm-custom.jar, fontbox-...jar, jempbox...jar, pdfbox...jar
+  . build with ant, if any resources have changed (at least after svn update); eclipse cant handle build of resources, etc
+. Run / Debug
+  . main class: org.openstreetmap.josm.gui.MainApplication (found in josm-custom.jar)
+
 See also
 ========

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);