Changeset 31746 in osm for applications/editors/josm/plugins/ImportImagePlugin/src/org

Timestamp:

2015-11-15T15:20:17+01:00 (9 years ago)

Author:

donvip

Message:

[josm_importimageplugin] add a unit test for geotiff reading

Location:

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin

Files:

• ImageLayer.java (modified) (2 diffs)
• ImportImageFileImporter.java (modified) (2 diffs)
• ImportImagePlugin.java (modified) (1 diff)
• LoadImageAction.java (modified) (2 diffs)
• PluginOperations.java (modified) (3 diffs)

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java

@@ -111 +111 @@
                 if (val == 3) {
                     logger.debug("No projection and user declined un-projected use");
-                    throw new LayerCreationCancledException();
+                    throw new LayerCreationCanceledException();
                 }
                 CoordinateReferenceSystem src = null;
@@ -327 +327 @@
             layerProps.setVisible(true);
         }
-
-    }
-
-    /**
-     * Exception which represents that the layer creation has been cancled by the
-     * user.
-     *
-     */
-    class LayerCreationCancledException extends IOException{
+    }
+
+    /**
+     * Exception which represents that the layer creation has been canceled by the user.
+     */
+    class LayerCreationCanceledException extends IOException{
     }
 

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java

@@ -14 +14 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.FileImporter;
-import org.openstreetmap.josm.plugins.ImportImagePlugin.ImageLayer.LayerCreationCancledException;
+import org.openstreetmap.josm.plugins.ImportImagePlugin.ImageLayer.LayerCreationCanceledException;
 
 /**
@@ -47 +47 @@
             try {
                 layer = new ImageLayer(file);
-            } catch (LayerCreationCancledException e) {
+            } catch (LayerCreationCanceledException e) {
             // if user decides that layer should not be created just return.
                 continue;

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java

@@ -91 +91 @@
             loadFileAction = new LoadImageAction();
             loadFileAction.setEnabled(true);
-            MainMenu.add(Main.main.menu.imagerySubMenu, loadFileAction);
-
-            // add menu entries
-            //Main.main.menu.fileMenu.insert(loadFileAction, 8);
-
-            //Main.main.menu.fileMenu.insertSeparator(9);
+            if (Main.main != null) {
+                MainMenu.add(Main.main.menu.imagerySubMenu, loadFileAction);
+    
+                // add menu entries
+                //Main.main.menu.fileMenu.insert(loadFileAction, 8);
+                //Main.main.menu.fileMenu.insertSeparator(9);
+            }
 
             ExtensionFileFilter.importers.add(new ImportImageFileImporter());

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java

@@ -12 +12 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.plugins.ImportImagePlugin.ImageLayer.LayerCreationCancledException;
+import org.openstreetmap.josm.plugins.ImportImagePlugin.ImageLayer.LayerCreationCanceledException;
 
 
@@ -46 +46 @@
             try {
                 layer = new ImageLayer(fc.getSelectedFile());
-            } catch (LayerCreationCancledException e) {
+            } catch (LayerCreationCanceledException e) {
                 // if user decides that layer should not be created just return.
                 return;

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java

@@ -154 +154 @@
 
             BufferedImage img = ImageIO.read(file);
+            if (img == null) {
+                throw new IOException("Cannot read image file " + file.getAbsolutePath());
+            }
 
             // create Envelope
@@ -336 +339 @@
     {
         GridCoverage2D coverage = null;
-        Hints hints = new Hints();
+        Hints hints = new Hints(Hints.FORCE_LONGITUDE_FIRST_AXIS_ORDER, true);
         if(refSys != null)
         {
             hints.put(Hints.DEFAULT_COORDINATE_REFERENCE_SYSTEM, refSys);
-
-        }
-        // dont't use the EPSG-Factory because of wrong behaviour
-        hints.put(Hints.CRS_AUTHORITY_FACTORY, CRS.getAuthorityFactory(true));
+        }
+        // don't use the EPSG-Factory because of wrong behaviour
+        //hints.put(Hints.CRS_AUTHORITY_FACTORY, CRS.getAuthorityFactory(true));
 
         GeoTiffReader reader = new GeoTiffReader(file, hints);
@@ -352 +354 @@
     }
 
-
-    /**
-     * Loads CRS data from an EPSG database and creates descrptions for each one.
+    /**
+     * Loads CRS data from an EPSG database and creates descriptions for each one.
      *
      * @param pluginProps