Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java (revision 29713) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java (revision 29714) @@ -159,8 +159,8 @@ } } - if (successfulRead && wmsLayer.isRaster()) { - // serialized raster bufferedImage hangs-up on Java6. Recreate them here - wmsLayer.getImage(0).image = RasterImageModifier.fixRasterImage(wmsLayer.getImage(0).image); - } + /* + Previously contained a call to RasterImageModifier.fixRasterImage() to fix a de-serialization bug on some + older java 6 versions. Request a jre update if any complains. + */ return successfulRead; } Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java (revision 29713) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java (revision 29714) @@ -131,5 +131,7 @@ * 2.2 01-Jul-2011 - replace deprecated Main.proj by newest Main.getProjection() * - fix list of raster images (Feuilles) parsing failing after a Cadastre server change/maintenance - * 2.3 11-Jan-2013 - add various improvements from Don-Vip (Vincent Privat) trac #8175, #8229 and #5626. + * 2.3 11-Jan-2013 - add various improvements from Don-Vip (Vincent Privat) trac #8175, #8229 and #5626. + * 2.4 27-Jun-2013 - fix raster image georeferencing issues. Add new MenuActionRefineGeoRef for a new georeferencing + * of already referenced plan image. */ public class CadastrePlugin extends Plugin { Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java (revision 29713) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java (revision 29714) @@ -5,25 +5,14 @@ import static org.openstreetmap.josm.tools.I18n.marktr; -import java.awt.GridBagLayout; import java.awt.event.ActionEvent; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.ArrayList; -import javax.swing.JDialog; -import javax.swing.JLabel; import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JTextField; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.tools.GBC; -public class MenuActionGrabPlanImage extends JosmAction implements Runnable, MouseListener { +public class MenuActionGrabPlanImage extends JosmAction implements Runnable { /** @@ -36,37 +25,9 @@ private DownloadWMSPlanImage downloadWMSPlanImage; private WMSLayer wmsLayer; - private int countMouseClicked = 0; - private int mode = 0; - private int cGetCorners = 1; - private int cGetLambertCrosspieces = 2; - private EastNorth ea1; - private EastNorth ea2; - private long mouseClickedTime = 0; - private EastNorth georefpoint1; - private EastNorth georefpoint2; - private boolean ignoreMouseClick = false; - private boolean clickOnTheMap = false; + private RasterImageGeoreferencer rasterImageGeoreferencer; - /** - * The time which needs to pass between two clicks during georeferencing, in milliseconds - */ - private int initialClickDelay; - public MenuActionGrabPlanImage() { super(tr(name), "cadastre_small", tr("Grab non-georeferenced image"), null, false, "cadastrefr/grabplanimage", true); - } - - public void actionCompleted() { - countMouseClicked = 0; - mode = 0; - mouseClickedTime = System.currentTimeMillis(); - } - - public void actionInterrupted() { - actionCompleted(); - if (wmsLayer != null) { - Main.main.removeLayer(wmsLayer); - wmsLayer = null; - } + rasterImageGeoreferencer = new RasterImageGeoreferencer(); } @@ -74,10 +35,10 @@ protected void updateEnabledState() { if (wmsLayer == null || Main.map == null || Main.map.mapView == null) return; - if (countMouseClicked == 0 && mode == 0) return; + if (!rasterImageGeoreferencer.isRunning()) return; for (Layer l : Main.map.mapView.getAllLayersAsList()) if (l == wmsLayer) return; JOptionPane.showMessageDialog(Main.parent, tr("Georeferencing interrupted")); - actionInterrupted(); + rasterImageGeoreferencer.actionInterrupted(); } @@ -85,10 +46,8 @@ if (Main.map != null) { if (CadastrePlugin.isCadastreProjection()) { - //wmsLayer = WMSDownloadAction.getLayer(); wmsLayer = new MenuActionNewLocation().addNewLayer(new ArrayList()); if (wmsLayer == null) return; downloadWMSPlanImage = new DownloadWMSPlanImage(); downloadWMSPlanImage.download(wmsLayer); - initialClickDelay = Main.pref.getInteger("cadastrewms.georef-click-delay",200); // download sub-images of the cadastre scan and join them into one single Main.worker.execute(this); @@ -106,5 +65,5 @@ } else if (wmsLayer.getImages().size() == 0) { // action canceled or image loaded from cache (and already georeferenced) - actionInterrupted(); + rasterImageGeoreferencer.actionInterrupted(); } else { int reply = JOptionPane.CANCEL_OPTION; @@ -117,308 +76,13 @@ } if (reply == JOptionPane.OK_OPTION) { - transformGeoreferencedImg(); + rasterImageGeoreferencer.transformGeoreferencedImg(); } else { - mouseClickedTime = System.currentTimeMillis(); - Main.map.mapView.addMouseListener(this); + rasterImageGeoreferencer.addListener(); if (Main.pref.getBoolean("cadastrewms.noImageCropping", false) == false) - startCropping(); + rasterImageGeoreferencer.startCropping(wmsLayer); else - startGeoreferencing(); + rasterImageGeoreferencer.startGeoreferencing(wmsLayer); } } } - - public void mouseClicked(MouseEvent e) { - if (System.currentTimeMillis() - mouseClickedTime < initialClickDelay) { - System.out.println("mouse click bounce detected"); - return; // mouse click anti-bounce - } - else - mouseClickedTime = System.currentTimeMillis(); - if (e.getButton() != MouseEvent.BUTTON1) - return; - if (ignoreMouseClick) return; // In case we are currently just allowing zooming to read lambert coordinates - EastNorth ea = Main.getProjection().latlon2eastNorth(Main.map.mapView.getLatLon(e.getX(), e.getY())); - System.out.println("clic:"+countMouseClicked+" ,"+ea+", mode:"+mode); - if (clickOnTheMap) { - clickOnTheMap = false; - handleNewCoordinates(ea.east(), ea.north()); - } else { - // ignore clicks outside the image - if (ea.east() < wmsLayer.getImage(0).min.east() || ea.east() > wmsLayer.getImage(0).max.east() - || ea.north() < wmsLayer.getImage(0).min.north() || ea.north() > wmsLayer.getImage(0).max.north()) - { - System.out.println("ignore clic outside the image"); - return; - } - countMouseClicked++; - if (mode == cGetCorners) { - if (countMouseClicked == 1) { - ea1 = ea; - continueCropping(); - } - if (countMouseClicked == 2) { - wmsLayer.cropImage(ea1, ea); - Main.map.mapView.repaint(); - startGeoreferencing(); - } - } else if (mode == cGetLambertCrosspieces) { - if (countMouseClicked == 1) { - ea1 = ea; - inputLambertPosition(); // This will automatically asks for second point and continue the georeferencing - } - if (countMouseClicked == 2) { - ea2 = ea; - inputLambertPosition(); // This will automatically ends the georeferencing - } - } - } - } - - /** - * - * @return false if all operations are canceled - */ - private boolean startCropping() { - mode = cGetCorners; - countMouseClicked = 0; - Object[] options = { "OK", "Cancel" }; - int ret = JOptionPane.showOptionDialog( null, - tr("Click first corner for image cropping\n(two points required)"), - tr("Image cropping"), - JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, - null, options, options[0]); - if (ret == JOptionPane.OK_OPTION) { - mouseClickedTime = System.currentTimeMillis(); - } else - if (canceledOrRestartCurrAction("image cropping")) - return startCropping(); - return true; - } - - /** - * - * @return false if all operations are canceled - */ - private boolean continueCropping() { - Object[] options = { "OK", "Cancel" }; - int ret = JOptionPane.showOptionDialog( null, - tr("Click second corner for image cropping"), - tr("Image cropping"), - JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, - null, options, options[0]); - if (ret != JOptionPane.OK_OPTION) { - if (canceledOrRestartCurrAction("image cropping")) - return startCropping(); - } - return true; - } - - /** - * - * @return false if all operations are canceled - */ - private boolean startGeoreferencing() { - countMouseClicked = 0; - mode = cGetLambertCrosspieces; - Object[] options = { "OK", "Cancel" }; - int ret = JOptionPane.showOptionDialog( null, - tr("Click first Lambert crosspiece for georeferencing\n(two points required)"), - tr("Image georeferencing"), - JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, - null, options, options[0]); - if (ret == JOptionPane.OK_OPTION) { - mouseClickedTime = System.currentTimeMillis(); - } else - if (canceledOrRestartCurrAction("georeferencing")) - return startGeoreferencing(); - return true; - } - - /** - * - * @return false if all operations are canceled - */ - private boolean continueGeoreferencing() { - Object[] options = { "OK", "Cancel" }; - int ret = JOptionPane.showOptionDialog( null, - tr("Click second Lambert crosspiece for georeferencing"), - tr("Image georeferencing"), - JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, - null, options, options[0]); - if (ret != JOptionPane.OK_OPTION) { - if (canceledOrRestartCurrAction("georeferencing")) - return startGeoreferencing(); - } - return true; - } - - /** - * Ends the georeferencing by computing the affine transformation - */ - private void endGeoreferencing() { - Main.map.mapView.removeMouseListener(this); - affineTransform(ea1, ea2, georefpoint1, georefpoint2); - wmsLayer.grabThread.saveNewCache(); - Main.map.mapView.repaint(); - actionCompleted(); - clickOnTheMap = false; - ignoreMouseClick = false; - } - - /** - * - * @return false if all operations are canceled - */ - private boolean canceledOrRestartCurrAction(String action) { - Object[] options = { "Cancel", "Retry" }; - int selectedValue = JOptionPane.showOptionDialog( null, - tr("Do you want to cancel completely\n"+ - "or just retry "+action+" ?"), "", - JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, - null, options, options[0]); - countMouseClicked = 0; - if (selectedValue == 0) { // "Cancel" - // remove layer - Main.main.removeLayer(wmsLayer); - wmsLayer = null; - Main.map.mapView.removeMouseListener(this); - return false; - } - return true; - } - - private void inputLambertPosition() { - JLabel labelEnterPosition = new JLabel( - tr("Enter cadastre east,north position")); - JLabel labelWarning = new JLabel( - tr("(Warning: verify north with arrow !!)")); - JPanel p = new JPanel(new GridBagLayout()); - JLabel labelEast = new JLabel(tr("East")); - JLabel labelNorth = new JLabel(tr("North")); - final JTextField inputEast = new JTextField(); - final JTextField inputNorth = new JTextField(); - p.add(labelEnterPosition, GBC.eol()); - p.add(labelWarning, GBC.eol()); - p.add(labelEast, GBC.std().insets(0, 0, 10, 0)); - p.add(inputEast, GBC.eol().fill(GBC.HORIZONTAL).insets(10, 5, 0, 5)); - p.add(labelNorth, GBC.std().insets(0, 0, 10, 0)); - p.add(inputNorth, GBC.eol().fill(GBC.HORIZONTAL).insets(10, 5, 0, 5)); - final Object[] options = {tr("OK"), - tr("Cancel"), - tr("I use the mouse")}; - final JOptionPane pane = new JOptionPane(p, - JOptionPane.INFORMATION_MESSAGE, JOptionPane.YES_NO_CANCEL_OPTION, - null, options, options[0]); - String number; - if (countMouseClicked == 1) - number = "first"; - else - number = "second"; - JDialog dialog = pane.createDialog(Main.parent, tr( - "Set {0} Lambert coordinates", number)); - dialog.setModal(false); - ignoreMouseClick = true; // To avoid mouseClicked from being called - // during coordinates reading - dialog.setAlwaysOnTop(true); - dialog.setVisible(true); - pane.addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (JOptionPane.VALUE_PROPERTY.equals(evt.getPropertyName())) { - ignoreMouseClick = false; - // Cancel - if (pane.getValue().equals(options[1])) { - if (canceledOrRestartCurrAction("georeferencing")) - startGeoreferencing(); - } - // Click on the map - if (pane.getValue().equals(options[2])) { - clickOnTheMap = true; - } else { - // OK (coordinates manually entered) - clickOnTheMap = false; - if (inputEast.getText().length() != 0 - && inputNorth.getText().length() != 0) { - double e, n; - try { - e = Double.parseDouble(inputEast.getText()); - n = Double.parseDouble(inputNorth.getText()); - } catch (NumberFormatException ex) { - return; - } - handleNewCoordinates(e, n); - } - } - } - } - }); - } - - private void handleNewCoordinates(double e, double n) { - if (countMouseClicked == 1) { - georefpoint1 = new EastNorth(e, n); - continueGeoreferencing(); - } else { - georefpoint2 = new EastNorth(e, n); - endGeoreferencing(); - } - } - - /** - * Use point org1 as anchor for scale, then move org1 to dst1, then rotate org2 on dst2 - * around org1/dst1 anchor - * @param org1 first point at original coordinate system (the grabbed image) - * @param org2 second point " - * @param dst1 first point at final destination coordinate system (the real east/north coordinate system) - * @param dst2 second point " - */ - private void affineTransform(EastNorth org1, EastNorth org2, EastNorth dst1, EastNorth dst2) { - // handle an NPE case I'm not able to reproduce - if(org1==null || org2==null || dst1==null || dst2==null) - { - JOptionPane.showMessageDialog(Main.parent, - tr("Ooops. I failed to catch all coordinates\n"+ - "correctly. Retry please.")); - System.out.println("failed to transform: one coordinate missing:" - +"org1="+org1+", org2="+org2+", dst1="+dst1+", dst2="+dst2); - return; - } - double angle = dst1.heading(dst2) - org1.heading(org2); - double proportion = dst1.distance(dst2)/org1.distance(org2); - // move - double dx = dst1.getX() - org1.getX(); - double dy = dst1.getY() - org1.getY(); - wmsLayer.getImage(0).shear(dx, dy); - org1 = org1.add(dx, dy); // org1=dst1 now - org2 = org2.add(dx, dy); - // rotate : org1(=dst1 now) is anchor for rotation and scale - wmsLayer.getImage(0).rotate(dst1, angle); - org2 = org2.rotate(dst1, angle); - // scale image from anchor org1(=dst1 now) - wmsLayer.getImage(0).scale(dst1, proportion); - } - - private void transformGeoreferencedImg() { - georefpoint1 = new EastNorth(wmsLayer.X0, wmsLayer.Y0); - georefpoint2 = new EastNorth(wmsLayer.X0+wmsLayer.fX*wmsLayer.communeBBox.max.getX(), - wmsLayer.Y0+wmsLayer.fY*wmsLayer.communeBBox.max.getX()); - ea1 = new EastNorth(wmsLayer.getImage(0).min.east(), wmsLayer.getImage(0).max.north()); - EastNorth ea2 = wmsLayer.getImage(0).max; - affineTransform(ea1, ea2, georefpoint1, georefpoint2); - wmsLayer.grabThread.saveNewCache(); - Main.map.mapView.repaint(); - } - - public void mouseEntered(MouseEvent arg0) { - } - - public void mouseExited(MouseEvent arg0) { - } - - public void mousePressed(MouseEvent arg0) { - } - - public void mouseReleased(MouseEvent arg0) { - } - } Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionRefineGeoRef.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionRefineGeoRef.java (revision 29714) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionRefineGeoRef.java (revision 29714) @@ -0,0 +1,44 @@ +package cadastre_fr; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.marktr; + +import java.awt.event.ActionEvent; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; + +@SuppressWarnings("serial") +public class MenuActionRefineGeoRef extends JosmAction { + + public static String name = marktr("Refine georeferencing"); + + private WMSLayer wmsLayer; + private RasterImageGeoreferencer rasterImageGeoreferencer; + + public MenuActionRefineGeoRef(WMSLayer wmsLayer) { + super(tr(name), null, tr("Improve georeferencing (only raster images)"), null, false); + this.wmsLayer = wmsLayer; + rasterImageGeoreferencer = new RasterImageGeoreferencer(); + } + + @Override + public void actionPerformed(ActionEvent arg0) { + if(!wmsLayer.isRaster()) + { + System.out.println("MenuActionRefineGeoRef called for unexpected layer type"); + return; + } + if (CadastrePlugin.isCadastreProjection()) { + //wmsLayer = WMSDownloadAction.getLayer(); + } else { + CadastrePlugin.askToChangeProjection(); + } + rasterImageGeoreferencer.addListener(); + if (Main.pref.getBoolean("cadastrewms.noImageCropping", false) == false) + rasterImageGeoreferencer.startCropping(wmsLayer); + else + rasterImageGeoreferencer.startGeoreferencing(wmsLayer); + } + +} Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/RasterImageGeoreferencer.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/RasterImageGeoreferencer.java (revision 29714) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/RasterImageGeoreferencer.java (revision 29714) @@ -0,0 +1,366 @@ +package cadastre_fr; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagLayout; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextField; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.tools.GBC; + +public class RasterImageGeoreferencer implements MouseListener { + + private int countMouseClicked = 0; + private int mode = 0; + private int cGetCorners = 1; + private int cGetLambertCrosspieces = 2; + private EastNorth ea1; + private EastNorth ea2; + private long mouseClickedTime = 0; + private WMSLayer wmsLayer; + private EastNorth georefpoint1; + private EastNorth georefpoint2; + private boolean ignoreMouseClick = false; + private boolean clickOnTheMap = false; + + /** + * The time which needs to pass between two clicks during georeferencing, in milliseconds + */ + private int initialClickDelay; + + public void addListener(){ + Main.map.mapView.addMouseListener(this); + } + + /** + * + * @return false if all operations are canceled + */ + public boolean startCropping(WMSLayer wmsLayer) { + this.wmsLayer = wmsLayer; + mode = cGetCorners; + countMouseClicked = 0; + initialClickDelay = Main.pref.getInteger("cadastrewms.georef-click-delay",200); + mouseClickedTime = System.currentTimeMillis(); + Object[] options = { "OK", "Cancel" }; + int ret = JOptionPane.showOptionDialog( null, + tr("Click first corner for image cropping\n(two points required)"), + tr("Image cropping"), + JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, + null, options, options[0]); + if (ret == JOptionPane.OK_OPTION) { + mouseClickedTime = System.currentTimeMillis(); + } else + if (canceledOrRestartCurrAction("image cropping")) + return startCropping(wmsLayer); + return true; + } + + /** + * + * @return false if all operations are canceled + */ + public boolean startGeoreferencing(WMSLayer wmsLayer) { + this.wmsLayer = wmsLayer; + countMouseClicked = 0; + mode = cGetLambertCrosspieces; + initialClickDelay = Main.pref.getInteger("cadastrewms.georef-click-delay",200); + mouseClickedTime = System.currentTimeMillis(); + Object[] options = { "OK", "Cancel" }; + int ret = JOptionPane.showOptionDialog( null, + tr("Click first Lambert crosspiece for georeferencing\n(two points required)"), + tr("Image georeferencing"), + JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, + null, options, options[0]); + if (ret == JOptionPane.OK_OPTION) { + mouseClickedTime = System.currentTimeMillis(); + } else + if (canceledOrRestartCurrAction("georeferencing")) + return startGeoreferencing(wmsLayer); + return true; + } + + + public boolean isRunning() + { + return (countMouseClicked != 0 || mode != 0); + } + + public void mouseClicked(MouseEvent e) { + if (System.currentTimeMillis() - mouseClickedTime < initialClickDelay) { + System.out.println("mouse click bounce detected"); + return; // mouse click anti-bounce + } + else + mouseClickedTime = System.currentTimeMillis(); + if (e.getButton() != MouseEvent.BUTTON1) + return; + if (ignoreMouseClick) return; // In case we are currently just allowing zooming to read lambert coordinates + EastNorth ea = Main.getProjection().latlon2eastNorth(Main.map.mapView.getLatLon(e.getX(), e.getY())); + System.out.println("clic:"+countMouseClicked+" ,"+ea+", mode:"+mode); + if (clickOnTheMap) { + clickOnTheMap = false; + handleNewCoordinates(ea.east(), ea.north()); + } else { + // ignore clicks outside the image + if (ea.east() < wmsLayer.getImage(0).min.east() || ea.east() > wmsLayer.getImage(0).max.east() + || ea.north() < wmsLayer.getImage(0).min.north() || ea.north() > wmsLayer.getImage(0).max.north()) + { + System.out.println("ignore clic outside the image"); + return; + } + countMouseClicked++; + if (mode == cGetCorners) { + if (countMouseClicked == 1) { + ea1 = ea; + continueCropping(); + } + if (countMouseClicked == 2) { + wmsLayer.cropImage(ea1, ea); + Main.map.mapView.repaint(); + startGeoreferencing(wmsLayer); + } + } else if (mode == cGetLambertCrosspieces) { + if (countMouseClicked == 1) { + ea1 = ea; + inputLambertPosition(); // This will automatically asks for second point and continue the georeferencing + } + if (countMouseClicked == 2) { + ea2 = ea; + inputLambertPosition(); // This will automatically ends the georeferencing + } + } + } + } + + + /** + * + * @return false if all operations are canceled + */ + private boolean canceledOrRestartCurrAction(String action) { + Object[] options = { "Cancel", "Retry" }; + int selectedValue = JOptionPane.showOptionDialog( null, + tr("Do you want to cancel completely\n"+ + "or just retry "+action+" ?"), "", + JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, + null, options, options[0]); + countMouseClicked = 0; + if (selectedValue == 0) { // "Cancel" + // remove layer + Main.main.removeLayer(wmsLayer); + wmsLayer = null; + Main.map.mapView.removeMouseListener(this); + return false; + } + return true; + } + + /** + * Use point org1 as anchor for scale, then move org1 to dst1, then rotate org2 on dst2 + * around org1/dst1 anchor + * @param org1 first point at original coordinate system (the grabbed image) + * @param org2 second point " + * @param dst1 first point at final destination coordinate system (the real east/north coordinate system) + * @param dst2 second point " + */ + private void affineTransform(EastNorth org1, EastNorth org2, EastNorth dst1, EastNorth dst2) { + // handle an NPE case I'm not able to reproduce + if(org1==null || org2==null || dst1==null || dst2==null) + { + JOptionPane.showMessageDialog(Main.parent, + tr("Ooops. I failed to catch all coordinates\n"+ + "correctly. Retry please.")); + System.out.println("failed to transform: one coordinate missing:" + +"org1="+org1+", org2="+org2+", dst1="+dst1+", dst2="+dst2); + return; + } + double angle = dst1.heading(dst2) - org1.heading(org2); + double proportion = dst1.distance(dst2)/org1.distance(org2); + // move + double dx = dst1.getX() - org1.getX(); + double dy = dst1.getY() - org1.getY(); + wmsLayer.getImage(0).shear(dx, dy); + org1 = org1.add(dx, dy); // org1=dst1 now + org2 = org2.add(dx, dy); + // rotate : org1(=dst1 now) is anchor for rotation and scale + wmsLayer.getImage(0).rotate(dst1, angle); + org2 = org2.rotate(dst1, angle); + // scale image from anchor org1(=dst1 now) + wmsLayer.getImage(0).scale(dst1, proportion); + } + + /** + * Ends the georeferencing by computing the affine transformation + */ + private void endGeoreferencing() { + Main.map.mapView.removeMouseListener(this); + affineTransform(ea1, ea2, georefpoint1, georefpoint2); + wmsLayer.grabThread.saveNewCache(); + Main.map.mapView.repaint(); + actionCompleted(); + clickOnTheMap = false; + ignoreMouseClick = false; + } + + private void inputLambertPosition() { + JLabel labelEnterPosition = new JLabel( + tr("Enter cadastre east,north position")); + JLabel labelWarning = new JLabel( + tr("(Warning: verify north with arrow !!)")); + JPanel p = new JPanel(new GridBagLayout()); + JLabel labelEast = new JLabel(tr("East")); + JLabel labelNorth = new JLabel(tr("North")); + final JTextField inputEast = new JTextField(); + final JTextField inputNorth = new JTextField(); + p.add(labelEnterPosition, GBC.eol()); + p.add(labelWarning, GBC.eol()); + p.add(labelEast, GBC.std().insets(0, 0, 10, 0)); + p.add(inputEast, GBC.eol().fill(GBC.HORIZONTAL).insets(10, 5, 0, 5)); + p.add(labelNorth, GBC.std().insets(0, 0, 10, 0)); + p.add(inputNorth, GBC.eol().fill(GBC.HORIZONTAL).insets(10, 5, 0, 5)); + final Object[] options = {tr("OK"), + tr("Cancel"), + tr("I use the mouse")}; + final JOptionPane pane = new JOptionPane(p, + JOptionPane.INFORMATION_MESSAGE, JOptionPane.YES_NO_CANCEL_OPTION, + null, options, options[0]); + String number; + if (countMouseClicked == 1) + number = "first"; + else + number = "second"; + JDialog dialog = pane.createDialog(Main.parent, tr( + "Set {0} Lambert coordinates", number)); + dialog.setModal(false); + ignoreMouseClick = true; // To avoid mouseClicked from being called + // during coordinates reading + dialog.setAlwaysOnTop(true); + dialog.setVisible(true); + pane.addPropertyChangeListener(new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (JOptionPane.VALUE_PROPERTY.equals(evt.getPropertyName())) { + ignoreMouseClick = false; + // Cancel + if (pane.getValue().equals(options[1])) { + if (canceledOrRestartCurrAction("georeferencing")) + startGeoreferencing(wmsLayer); + } + // Click on the map + if (pane.getValue().equals(options[2])) { + clickOnTheMap = true; + } else { + // OK (coordinates manually entered) + clickOnTheMap = false; + if (inputEast.getText().length() != 0 + && inputNorth.getText().length() != 0) { + double e, n; + try { + e = Double.parseDouble(inputEast.getText()); + n = Double.parseDouble(inputNorth.getText()); + } catch (NumberFormatException ex) { + return; + } + handleNewCoordinates(e, n); + } + } + } + } + }); + } + + /** + * + * @return false if all operations are canceled + */ +private boolean continueCropping() { + Object[] options = { "OK", "Cancel" }; + int ret = JOptionPane.showOptionDialog( null, + tr("Click second corner for image cropping"), + tr("Image cropping"), + JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, + null, options, options[0]); + if (ret != JOptionPane.OK_OPTION) { + if (canceledOrRestartCurrAction("image cropping")) + return startCropping(wmsLayer); + } + return true; +} + +public void transformGeoreferencedImg() { + georefpoint1 = new EastNorth(wmsLayer.X0, wmsLayer.Y0); + georefpoint2 = new EastNorth(wmsLayer.X0+wmsLayer.fX*wmsLayer.communeBBox.max.getX(), + wmsLayer.Y0+wmsLayer.fY*wmsLayer.communeBBox.max.getX()); + ea1 = new EastNorth(wmsLayer.getImage(0).min.east(), wmsLayer.getImage(0).max.north()); + EastNorth ea2 = wmsLayer.getImage(0).max; + affineTransform(ea1, ea2, georefpoint1, georefpoint2); + wmsLayer.grabThread.saveNewCache(); + Main.map.mapView.repaint(); +} + + + /** + * + * @return false if all operations are canceled + */ +private boolean continueGeoreferencing() { + Object[] options = { "OK", "Cancel" }; + int ret = JOptionPane.showOptionDialog( null, + tr("Click second Lambert crosspiece for georeferencing"), + tr("Image georeferencing"), + JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, + null, options, options[0]); + if (ret != JOptionPane.OK_OPTION) { + if (canceledOrRestartCurrAction("georeferencing")) + return startGeoreferencing(wmsLayer); + } + return true; +} + + private void handleNewCoordinates(double e, double n) { + if (countMouseClicked == 1) { + georefpoint1 = new EastNorth(e, n); + continueGeoreferencing(); + } else { + georefpoint2 = new EastNorth(e, n); + endGeoreferencing(); + } + } + + private void actionCompleted() { + countMouseClicked = 0; + mode = 0; + mouseClickedTime = System.currentTimeMillis(); + } + + public void actionInterrupted() { + actionCompleted(); + if (wmsLayer != null) { + Main.main.removeLayer(wmsLayer); + wmsLayer = null; + } + } + + public void mouseEntered(MouseEvent arg0) { + } + + public void mouseExited(MouseEvent arg0) { + } + + public void mousePressed(MouseEvent arg0) { + } + + public void mouseReleased(MouseEvent arg0) { + } + +} Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (revision 29713) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (revision 29714) @@ -92,4 +92,6 @@ private Action cancelGrab; + + private Action refineGeoRef; @SuppressWarnings("serial") @@ -309,4 +311,6 @@ cancelGrab = new MenuActionCancelGrab(this); cancelGrab.setEnabled(!isRaster && grabThread.getImagesToGrabSize() > 0); + refineGeoRef = new MenuActionRefineGeoRef(this); + refineGeoRef.setEnabled(isRaster && grabThread.getImagesToGrabSize() == 0); Action resetOffset = new ResetOffsetActionMenu(); resetOffset.setEnabled(!isRaster && images.size() > 0 && (deltaEast!=0.0 || deltaNorth!=0.0)); @@ -317,4 +321,5 @@ saveAsPng, cancelGrab, + refineGeoRef, resetOffset, new LayerListPopup.InfoAction(this),