Index: applications/editors/josm/plugins/ImportImagePlugin/build.xml
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/build.xml (revision 26174)
+++ applications/editors/josm/plugins/ImportImagePlugin/build.xml (revision 26413)
@@ -1,3 +1,3 @@
-
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
@@ -67,40 +72,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -118,8 +124,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
-
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
@@ -267,7 +287,8 @@
-
-
-
-
+
+
+
+
+
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (revision 26174)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (revision 26413)
@@ -4,4 +4,5 @@
import java.awt.Component;
+import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Image;
@@ -68,6 +69,4 @@
private CoordinateReferenceSystem sourceRefSys;
-
-
/**
* Constructor
@@ -82,5 +81,4 @@
this.image = (BufferedImage) createImage();
layericon = new ImageIcon(ImportImagePlugin.pluginClassLoader.getResource("images/layericon.png"));
-
}
@@ -97,5 +95,5 @@
try {
// create a grid coverage from the image
- coverage = PluginOperations.createGridFromFile(imageFile, null);
+ coverage = PluginOperations.createGridFromFile(imageFile, null, true);
this.sourceRefSys = coverage.getCoordinateReferenceSystem();
@@ -109,24 +107,19 @@
if(e.getMessage().contains("No projection file found"))
{
- int useDefaultCRS = JOptionPane.showConfirmDialog(Main.parent, "No projection file (.prj) found.
Use the default Coordinate Reference System instead?", "Missing projection", JOptionPane.YES_NO_OPTION);
- if (useDefaultCRS == 0)
- {
+ int useUnprojected = JOptionPane.showConfirmDialog(Main.parent, "No projection file (.prj) found.
Use the image unprojected?", "Missing projection", JOptionPane.YES_NO_OPTION);
+ if (useUnprojected == 0) { // Yes
+ logger.debug("Passing through image un-projected.");
try {
// create a grid coverage from the image
- coverage = PluginOperations.createGridFromFile(imageFile, PluginOperations.defaultSourceCRS);
+ coverage = PluginOperations.createGridFromFile(imageFile, null, false);
this.sourceRefSys = coverage.getCoordinateReferenceSystem();
-
- // now reproject grid coverage
- coverage = PluginOperations.reprojectCoverage(coverage, CRS.decode(Main.proj.toCode()));
} catch (Exception e1) {
logger.error("Error while creating GridCoverage:",e1);
throw new IOException(e1);
}
- }
- else{
- logger.debug("Layer creation cancled by user due to missing projection information.");
+ } else { // No
+ logger.debug("No projection and user declined un-projected use");
throw new LayerCreationCancledException();
}
-
}
else
@@ -140,7 +133,6 @@
// TODO
- upperLeft = new EastNorth(coverage.getEnvelope2D().y, coverage
- .getEnvelope2D().x
- + coverage.getEnvelope2D().width);
+ upperLeft = new EastNorth(coverage.getEnvelope2D().x,
+ coverage.getEnvelope2D().y + coverage.getEnvelope2D().height);
angle = 0;
bbox = coverage.getEnvelope2D();
@@ -163,12 +155,12 @@
EastNorth center = Main.map.mapView.getCenter();
EastNorth leftop = Main.map.mapView.getEastNorth(0, 0);
- double pixel_per_lon_degree = (Main.map.mapView.getWidth() / 2.0)
+ double pixel_per_east_unit = (Main.map.mapView.getWidth() / 2.0)
/ (center.east() - leftop.east());
- double pixel_per_lat_degree = (Main.map.mapView.getHeight() / 2.0)
+ double pixel_per_north_unit = (Main.map.mapView.getHeight() / 2.0)
/ (leftop.north() - center.north());
// This is now the offset in screen pixels
- double pic_offset_x = ((upperLeft.east() - leftop.east()) * pixel_per_lon_degree);
- double pic_offset_y = ((leftop.north() - upperLeft.north()) * pixel_per_lat_degree);
+ double pic_offset_x = ((upperLeft.east() - leftop.east()) * pixel_per_east_unit);
+ double pic_offset_y = ((leftop.north() - upperLeft.north()) * pixel_per_north_unit);
Graphics2D g = (Graphics2D) g2.create();
@@ -187,7 +179,7 @@
double height = projbounds.maxNorth - projbounds.minNorth;
- double ratio_x = (this.bbox.getMaxY() - this.bbox.getMinY())
+ double ratio_x = (this.bbox.getMaxX() - this.bbox.getMinX())
/ width;
- double ratio_y = (this.bbox.getMaxX() - this.bbox.getMinX())
+ double ratio_y = (this.bbox.getMaxY() - this.bbox.getMinY())
/ height;
@@ -199,4 +191,8 @@
double scaley = pixels4bbox_height / image.getHeight();
+ if ((scalex > 10) || (scaley > 10)) {
+ logger.warn("Not drawing image - scale too big");
+ return;
+ }
g.scale(scalex, scaley);
@@ -282,6 +278,6 @@
void resample(CoordinateReferenceSystem refSys) throws IOException, NoSuchAuthorityCodeException, FactoryException
{
-
- GridCoverage2D coverage = PluginOperations.createGridFromFile(this.imageFile, refSys);
+ logger.debug("resample");
+ GridCoverage2D coverage = PluginOperations.createGridFromFile(this.imageFile, refSys, true);
coverage = PluginOperations.reprojectCoverage(coverage, CRS.decode(Main.proj.toCode()));
this.bbox = coverage.getEnvelope2D();
@@ -333,6 +329,4 @@
}
-
-
public CoordinateReferenceSystem getSourceRefSys() {
return sourceRefSys;
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (revision 26174)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (revision 26413)
@@ -14,5 +14,5 @@
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
import org.openstreetmap.josm.plugins.ImportImagePlugin.ImageLayer.LayerCreationCancledException;
@@ -45,5 +45,5 @@
ImageLayer layer = null;
if (result == JFileChooser.APPROVE_OPTION) {
- logger.info("File choosed:" + fc.getSelectedFile());
+ logger.info("File choosen:" + fc.getSelectedFile());
try {
layer = new ImageLayer(fc.getSelectedFile());
@@ -51,5 +51,5 @@
// if user decides that layer should not be created just return.
return;
- }catch (Exception e) {
+ } catch (Exception e) {
logger.error("Error while creating image layer: \n" + e.getMessage());
JOptionPane.showMessageDialog(null, marktr("Error while creating image layer: " + e.getCause()));
@@ -60,10 +60,10 @@
// Add layer:
Main.main.addLayer(layer);
- LatLon min = new LatLon(layer.getBbox().getMinX(), layer.getBbox().getMinY());
- LatLon max = new LatLon(layer.getBbox().getMaxX(), layer.getBbox().getMaxY());
+ EastNorth min = new EastNorth(layer.getBbox().getMinX(), layer.getBbox().getMinY());
+ EastNorth max = new EastNorth(layer.getBbox().getMaxX(), layer.getBbox().getMaxY());
BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
- boundingXYVisitor.visit(new Bounds(min, max));
+ boundingXYVisitor.visit(min);
+ boundingXYVisitor.visit(max);
Main.map.mapView.recalculateCenterScale(boundingXYVisitor);
- Main.map.mapView.zoomTo(new Bounds(min, max));
}
}
Index: applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java
===================================================================
--- applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (revision 26174)
+++ applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (revision 26413)
@@ -107,5 +107,5 @@
* @throws Exception
*/
- public static GridCoverage2D createGridFromFile(File file, CoordinateReferenceSystem refSys) throws IOException{
+ public static GridCoverage2D createGridFromFile(File file, CoordinateReferenceSystem refSys, boolean failIfNoPrjFile) throws IOException {
GridCoverage2D coverage = null;
@@ -125,9 +125,9 @@
// try to read GeoTIFF:
- try{
+ try {
coverage = readGeoTiff(file, refSys);
return coverage;
- }catch (DataSourceException dse) {
- if(!dse.getMessage().contains("Coordinate Reference System is not available")){
+ } catch (DataSourceException dse) {
+ if (!dse.getMessage().contains("Coordinate Reference System is not available")){
dse.printStackTrace();
}
@@ -143,16 +143,20 @@
for (int i = 0; i < postfixes.length; i++) {
File prjFile = new File(fileNameWithoutExt + "." + postfixes[i]);
- if(prjFile.exists()){
+ if (prjFile.exists()){
tfwReader = new WorldFileReader(prjFile);
}
}
- if(tfwReader == null){
+
+ if (tfwReader == null) {
throw new IOException("No Worldfile found.");
}
- if(refSys == null){
+ if (refSys == null) {
// if no crs is delivered try to read projection file:
refSys = readPrjFile(file);
- if(refSys == null) throw new IOException("No projection file found.");
+ if (refSys == null) {
+ if (failIfNoPrjFile) throw new IOException("No projection file found.");
+ logger.debug("no projection given, no projection file found; using unprojected file.");
+ }
}
@@ -178,14 +182,17 @@
for (int i = 0; i < postfixes.length; i++) {
File prjFile = new File(fileNameWithoutExt + "." + postfixes[i]);
- if(prjFile.exists()){
+ if (prjFile.exists()){
tfwReader = new WorldFileReader(prjFile);
}
}
- if(tfwReader == null) throw new IOException("No Worldfile found.");
-
- if(refSys == null){
+ if (tfwReader == null) throw new IOException("No Worldfile found.");
+
+ if (refSys == null) {
// if no crs is delivered try to read projection file:
refSys = readPrjFile(file);
- if(refSys == null) throw new IOException("No projection file found.");
+ if (refSys == null) {
+ if (failIfNoPrjFile) throw new IOException("No projection file found.");
+ logger.debug("no projection given, no projection file found; using unprojected file.");
+ }
}
@@ -209,14 +216,17 @@
for (int i = 0; i < postfixes.length; i++) {
File prjFile = new File(fileNameWithoutExt + "." + postfixes[i]);
- if(prjFile.exists()){
+ if (prjFile.exists()){
tfwReader = new WorldFileReader(prjFile);
}
}
- if(tfwReader == null) throw new IOException("No Worldfile found.");
-
- if(refSys == null){
+ if (tfwReader == null) throw new IOException("No Worldfile found.");
+
+ if (refSys == null) {
// if no crs is delivered try to read projection file:
refSys = readPrjFile(file);
- if(refSys == null) throw new IOException("No projection file found.");
+ if (refSys == null) {
+ if (failIfNoPrjFile) throw new IOException("No projection file found.");
+ logger.debug("no projection given, no projection file found; using unprojected file.");
+ }
}
@@ -240,5 +250,5 @@
for (int i = 0; i < postfixes.length; i++) {
File prjFile = new File(fileNameWithoutExt + "." + postfixes[i]);
- if(prjFile.exists()){
+ if (prjFile.exists()){
tfwReader = new WorldFileReader(prjFile);
}
@@ -246,8 +256,11 @@
if(tfwReader == null) throw new IOException("No Worldfile found.");
- if(refSys == null){
+ if (refSys == null) {
// if no crs is delivered try to read projection file:
refSys = readPrjFile(file);
- if(refSys == null) throw new IOException("No projection file found.");
+ if (refSys == null) {
+ if (failIfNoPrjFile) throw new IOException("No projection file found.");
+ logger.debug("no projection given, no projection file found; using unprojected file.");
+ }
}
@@ -290,5 +303,5 @@
File prjFile = new File(prjFilename);
- if(!prjFile.exists()) throw new IOException("No projection file found (.prj) for image '" + file.getName() + "'");
+ if (!prjFile.exists()) return null;
logger.debug("Loading .prj file: " + prjFile.getAbsolutePath());