Changeset 36483 in osm for applications/editors/josm/plugins/cadastre-fr/src

Timestamp:

2026-02-12T15:12:05+01:00 (8 days ago)

Author:

stoecker

Message:

set eol-style, fix checkstyle issues, add ignores

Location:

applications/editors/josm/plugins

Files:

• . (modified) (1 prop)
• cadastre-fr (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionBoundaries.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionCancelGrab.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionGrabPlanImage.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionOpenPreferences.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionRefineGeoRef.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionSaveRasterAs.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java (modified) (1 diff, 1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/WMSAdjustAction.java (modified) (1 diff, 1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadSourcePanel.java (modified) (1 diff)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileGEN.java (modified) (1 diff)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/session/CadastreSessionExporter.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/session/CadastreSessionImporter.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileLambert4ZoneFilter.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileLambert9ZoneFilter.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileUTM20NFilter.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreGrabber.java (modified) (2 diffs)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreInterface.java (modified) (2 diffs)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/DownloadSVGBuilding.java (modified) (1 diff, 1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/DownloadSVGTask.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/DownloadWMSPlanImage.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/GrabThread.java (modified) (9 diffs, 1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/RasterImageGeoreferencer.java (modified) (1 diff, 1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/RasterImageModifier.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/SVGParser.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/VectorImageModifier.java (modified) (1 prop)
• cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/WMSException.java (modified) (1 prop)

applications/editors/josm/plugins

@@ -25 +25 @@
 validations_testing
 wikipedia
+target

@@ -25 +25 @@
 validations_testing
 wikipedia
+target

applications/editors/josm/plugins/cadastre-fr

@@ -7 +7 @@
 findbugs-josm-cadastre-fr.xml
 javadoc
+target

@@ -7 +7 @@
 findbugs-josm-cadastre-fr.xml
 javadoc
+target

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java

@@ -182 +182 @@
             }
             setSelectedWay(null);
-        } else if (houseStreet == null){
+        } else if (houseStreet == null) {
             // check if the node belongs to an associatedStreet relation
             Way wayInRelationAddr = findWayInRelationAddr(currentMouseNode);

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/WMSAdjustAction.java

@@ -26 +26 @@
     private boolean rasterMoved;
     private EastNorth prevEastNorth;
-    enum Mode {MOVE_XY, MOVE_Z, ROTATE}
+    enum Mode { MOVE_XY, MOVE_Z, ROTATE }
 
     private static Mode mode;

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadSourcePanel.java

@@ -241 +241 @@
             return;
         }
-/*
-        boolean isAreaTooLarge = false;
-        if (!isDownloadNotes() && !isDownloadOsmData() && !isDownloadGpxData()) {
-            isAreaTooLarge = false;
-        } else if (isDownloadNotes() && !isDownloadOsmData() && !isDownloadGpxData()) {
-            // see max_note_request_area in https://github.com/openstreetmap/openstreetmap-website/blob/master/config/example.application.yml
-            isAreaTooLarge = bbox.getArea() > Config.getPref().getDouble("osm-server.max-request-area-notes", 25);
-        } else {
-            // see max_request_area in https://github.com/openstreetmap/openstreetmap-website/blob/master/config/example.application.yml
-            isAreaTooLarge = bbox.getArea() > Config.getPref().getDouble("osm-server.max-request-area", 0.25);
-        }
-
-        displaySizeCheckResult(isAreaTooLarge);*/
     }
 

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileGEN.java

@@ -72 +72 @@
          */
         public Bounds getBounds() {
-/*
-            for (String s : Projections.getAllProjectionCodes()) {
-                Projection p = Projections.getProjectionByCode(s);
-                LatLon en = p.eastNorth2latlon(min);
-                double lat = en.lat();
-                double lon = en.lon();
-                if (43 <= lat && lat <= 44 && 1.38 <= lon && lon <= 1.45) {
-                    System.out.println(s + ": " + p);
-                }
-            }
-*/
             Projection proj = lot.geo.getCoorReference().getProjection();
             return new Bounds(proj.eastNorth2latlon(min), proj.eastNorth2latlon(max));

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreGrabber.java

@@ -44 +44 @@
 
     private static URL getURLRaster(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) throws MalformedURLException {
-        // GET /scpc/wms?version=1.1&request=GetMap&layers=CDIF:PMC@QH4480001701&format=image/png&bbox=-1186,0,13555,8830&width=576&height=345&exception=application/vnd.ogc.se_inimage&styles= HTTP/1.1
+        // GET /scpc/wms?version=1.1&request=GetMap&layers=CDIF:PMC@QH4480001701&format=image/png&bbox=-1186,0,13555,8830
+        // &width=576&height=345&exception=application/vnd.ogc.se_inimage&styles= HTTP/1.1
         final int cRasterX = CadastrePlugin.imageWidth; // keep width constant and adjust width to original image proportions
         String str = CadastreInterface.BASE_URL+"/scpc/wms?version=1.1&request=GetMap";
@@ -54 +55 @@
         str += wmsLayer.eastNorth2raster(lambertMin, lambertMax);
         str += "&width="+cRasterX+"&height="; // maximum allowed by wms server (576/345, 800/378, 1000/634)
-        str += (int) (cRasterX*(wmsLayer.communeBBox.max.getY() - wmsLayer.communeBBox.min.getY())/(wmsLayer.communeBBox.max.getX() - wmsLayer.communeBBox.min.getX()));
+        str += (int) (cRasterX*(wmsLayer.communeBBox.max.getY() - wmsLayer.communeBBox.min.getY())
+            / (wmsLayer.communeBBox.max.getX() - wmsLayer.communeBBox.min.getX()));
         str += "&exception=application/vnd.ogc.se_inimage&styles="; // required for raster images
         Logging.info("URL="+str);

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreInterface.java

@@ -477 +477 @@
         String line = getHttpClient(searchFormURL).connect().fetchContent();
         parseBBoxCommune(wmsLayer, line);
-        if (wmsLayer.isRaster() && !wmsLayer.isAlreadyGeoreferenced()) {
-            parseGeoreferences(wmsLayer, line);
-        }
     }
 
@@ -497 +494 @@
     }
 
-    private static void parseGeoreferences(WMSLayer wmsLayer, String input) {
-        /* commented since cadastre WMS changes mid july 2013
-         * until new GeoBox coordinates parsing is solved */
-//        if (input.lastIndexOf(cBBoxCommunStart) != -1) {
-//            input = input.substring(input.lastIndexOf(cBBoxCommunStart));
-//            input = input.substring(input.indexOf(cBBoxCommunEnd)+cBBoxCommunEnd.length());
-//            int i = input.indexOf(",");
-//            int j = input.indexOf(",", i+1);
-//            String str = input.substring(i+1, j);
-//            double unknown_yet = tryParseDouble(str);
-//            int j_ = input.indexOf(",", j+1);
-//            double angle = Double.parseDouble(input.substring(j+1, j_));
-//            int k = input.indexOf(",", j_+1);
-//            double scale_origin = Double.parseDouble(input.substring(j_+1, k));
-//            int l = input.indexOf(",", k+1);
-//            double dpi = Double.parseDouble(input.substring(k+1, l));
-//            int m = input.indexOf(",", l+1);
-//            double fX = Double.parseDouble(input.substring(l+1, m));
-//            int n = input.indexOf(",", m+1);
-//            double fY = Double.parseDouble(input.substring(m+1, n));
-//            int o = input.indexOf(",", n+1);
-//            double X0 = Double.parseDouble(input.substring(n+1, o));
-//            int p = input.indexOf(",", o+1);
-//            double Y0 = Double.parseDouble(input.substring(o+1, p));
-//            if (X0 != 0.0 && Y0 != 0) {
-//                wmsLayer.setAlreadyGeoreferenced(true);
-//                wmsLayer.fX = fX;
-//                wmsLayer.fY = fY;
-//                wmsLayer.angle = angle;
-//                wmsLayer.X0 = X0;
-//                wmsLayer.Y0 = Y0;
-//            }
-//            Main.info("parse georef:"+unknown_yet+","+angle+","+scale_origin+","+dpi+","+fX+","+fY+","+X0+","+Y0);
-//        }
-    }
-
     private static void checkLayerDuplicates(WMSLayer wmsLayer) throws DuplicateLayerException {
         if (MainApplication.getMap() != null) {

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/DownloadSVGBuilding.java

@@ -216 +216 @@
     private String grabBoundary(EastNorthBound bbox) throws IOException, OsmTransferException {
         try {
-            URL url = null;
-            url = getURLsvg(bbox);
+            URL url = getURLsvg(bbox);
             return grabSVG(url);
         } catch (MalformedURLException e) {

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/GrabThread.java

@@ -7 +7 @@
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -26 +27 @@
     private Lock lockImagesToGrag = new ReentrantLock();
 
-    private ArrayList<EastNorthBound> imagesToGrab = new ArrayList<>();
+    private List<EastNorthBound> imagesToGrab = new ArrayList<>();
 
     private CacheControl cacheControl = null;
@@ -38 +39 @@
      * @param moreImages more images to grab
      */
-    void addImages(ArrayList<EastNorthBound> moreImages) {
+    void addImages(List<EastNorthBound> moreImages) {
         lockImagesToGrag.lock();
         try {
@@ -63 +64 @@
     }
 
-    ArrayList<EastNorthBound> getImagesToGrabCopy() {
-        ArrayList<EastNorthBound> copyList = new ArrayList<>();
+    List<EastNorthBound> getImagesToGrabCopy() {
+        List<EastNorthBound> copyList = new ArrayList<>();
         lockImagesToGrag.lock();
         try {
@@ -91 +92 @@
             while (getImagesToGrabSize() > 0) {
                 lockImagesToGrag.lock();
-                lockCurrentGrabImage.lock();
-                currentGrabImage = imagesToGrab.get(0);
-                lockCurrentGrabImage.unlock();
-                imagesToGrab.remove(0);
-                lockImagesToGrag.unlock();
+                try {
+                    lockCurrentGrabImage.lock();
+                    try {
+                        currentGrabImage = imagesToGrab.get(0);
+                        lockCurrentGrabImage.unlock();
+                    } finally {
+                        imagesToGrab.remove(0);
+                    }
+                } finally {
+                    lockImagesToGrag.unlock();
+                }
                 if (canceled) {
                     break;
@@ -145 +152 @@
             Logging.info("grab thread list empty");
             lockCurrentGrabImage.lock();
-            currentGrabImage = null;
-            lockCurrentGrabImage.unlock();
+            try {
+                currentGrabImage = null;
+            } finally {
+                lockCurrentGrabImage.unlock();
+            }
             if (canceled) {
                 clearImagesToGrab();
@@ -168 +178 @@
             getCacheControl().deleteCacheFile();
             wmsLayer.imagesLock.lock();
-            for (GeorefImage image : wmsLayer.getImages()) {
-                getCacheControl().saveCache(image);
-            }
-            wmsLayer.imagesLock.unlock();
+            try {
+                for (GeorefImage image : wmsLayer.getImages()) {
+                    getCacheControl().saveCache(image);
+                }
+            } finally {
+                wmsLayer.imagesLock.unlock();
+            }
         }
     }
@@ -204 +217 @@
     void paintBoxesToGrab(Graphics g, MapView mv) {
         if (getImagesToGrabSize() > 0) {
-            ArrayList<EastNorthBound> imagesToGrab = getImagesToGrabCopy();
+            List<EastNorthBound> imagesToGrab = getImagesToGrabCopy();
             for (EastNorthBound img : imagesToGrab) {
                 paintBox(g, mv, img, Color.red);
@@ -210 +223 @@
         }
         lockCurrentGrabImage.lock();
-        if (currentGrabImage != null) {
-            paintBox(g, mv, currentGrabImage, Color.orange);
-        }
-        lockCurrentGrabImage.unlock();
+        try {
+            if (currentGrabImage != null) {
+                paintBox(g, mv, currentGrabImage, Color.orange);
+            }
+        } finally {
+            lockCurrentGrabImage.unlock();
+        }
     }
 

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/RasterImageGeoreferencer.java

@@ -48 +48 @@
     }
 
-   /**
-    *
+    /**
+     *
+     * @param wmsLayer WMS layer
+     * @return false if all operations are canceled
+     */
+    public boolean startCropping(WMSLayer wmsLayer) {
+        this.wmsLayer = wmsLayer;
+        mode = cGetCorners;
+        countMouseClicked = 0;
+        initialClickDelay = Config.getPref().getInt("cadastrewms.georef-click-delay", 200);
+        mouseClickedTime = System.currentTimeMillis();
+        Object[] options = {"OK", "Cancel"};
+        int ret = GuiHelper.runInEDTAndWaitAndReturn(() -> 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;
+    }
+
+    /**
     * @param wmsLayer WMS layer
     * @return false if all operations are canceled
     */
-   public boolean startCropping(WMSLayer wmsLayer) {
-       this.wmsLayer = wmsLayer;
-       mode = cGetCorners;
-       countMouseClicked = 0;
-       initialClickDelay = Config.getPref().getInt("cadastrewms.georef-click-delay", 200);
-       mouseClickedTime = System.currentTimeMillis();
-       Object[] options = {"OK", "Cancel"};
-       int ret = GuiHelper.runInEDTAndWaitAndReturn(() -> 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;
-   }
-
-  /**
-   * @param wmsLayer WMS layer
-   * @return false if all operations are canceled
-   */
-  public boolean startGeoreferencing(WMSLayer wmsLayer) {
-      this.wmsLayer = wmsLayer;
-      countMouseClicked = 0;
-      mode = cGetLambertCrosspieces;
-      initialClickDelay = Config.getPref().getInt("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);
-  }
-
-  @Override
-  public void mouseClicked(MouseEvent e) {
-      if (System.currentTimeMillis() - mouseClickedTime < initialClickDelay) {
-          Logging.info("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 = ProjectionRegistry.getProjection().latlon2eastNorth(MainApplication.getMap().mapView.getLatLon(e.getX(), e.getY()));
-      Logging.info("click:"+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()) {
-              Logging.info("ignore click outside the image");
-              return;
-          }
-          countMouseClicked++;
-          if (mode == cGetCorners) {
-              if (countMouseClicked == 1) {
-                  ea1 = ea;
-                  continueCropping();
-              }
-              if (countMouseClicked == 2) {
-                  wmsLayer.cropImage(ea1, ea);
-                  wmsLayer.invalidate();
-                  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
-         MainApplication.getLayerManager().removeLayer(wmsLayer);
-         wmsLayer = null;
-         MainApplication.getMap().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(MainApplication.getMainFrame(),
-                 tr("Ooops. I failed to catch all coordinates\n"+
-                    "correctly. Retry please."));
-         Logging.warn("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);
-     // rotate : dst1 is anchor for rotation and scale
-     wmsLayer.getImage(0).rotate(dst1, angle);
-     // scale image from anchor dst1
-     wmsLayer.getImage(0).scale(dst1, proportion);
- }
-
- /**
-  * Ends the georeferencing by computing the affine transformation
-  */
- private void endGeoreferencing() {
-     MainApplication.getMap().mapView.removeMouseListener(this);
-     affineTransform(ea1, ea2, georefpoint1, georefpoint2);
-     wmsLayer.grabThread.saveNewCache();
-     wmsLayer.invalidate();
-     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(MainApplication.getMainFrame(), 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() {
-         @Override
-         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,
+    public boolean startGeoreferencing(WMSLayer wmsLayer) {
+        this.wmsLayer = wmsLayer;
+        countMouseClicked = 0;
+        mode = cGetLambertCrosspieces;
+        initialClickDelay = Config.getPref().getInt("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);
+    }
+
+    @Override
+    public void mouseClicked(MouseEvent e) {
+        if (System.currentTimeMillis() - mouseClickedTime < initialClickDelay) {
+            Logging.info("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 = ProjectionRegistry.getProjection().latlon2eastNorth(MainApplication.getMap().mapView.getLatLon(e.getX(), e.getY()));
+        Logging.info("click:"+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()) {
+                Logging.info("ignore click outside the image");
+                return;
+            }
+            countMouseClicked++;
+            if (mode == cGetCorners) {
+                if (countMouseClicked == 1) {
+                    ea1 = ea;
+                    continueCropping();
+                }
+                if (countMouseClicked == 2) {
+                    wmsLayer.cropImage(ea1, ea);
+                    wmsLayer.invalidate();
+                    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]);
-    if (ret != JOptionPane.OK_OPTION) {
-        if (canceledOrRestartCurrAction("image cropping"))
-            return startCropping(wmsLayer);
-    }
-    return true;
+        countMouseClicked = 0;
+        if (selectedValue == 0) { // "Cancel"
+            // remove layer
+            MainApplication.getLayerManager().removeLayer(wmsLayer);
+            wmsLayer = null;
+            MainApplication.getMap().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(MainApplication.getMainFrame(),
+                    tr("Ooops. I failed to catch all coordinates\n"+
+                        "correctly. Retry please."));
+            Logging.warn("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);
+        // rotate : dst1 is anchor for rotation and scale
+        wmsLayer.getImage(0).rotate(dst1, angle);
+        // scale image from anchor dst1
+        wmsLayer.getImage(0).scale(dst1, proportion);
+    }
+
+    /**
+    * Ends the georeferencing by computing the affine transformation
+    */
+    private void endGeoreferencing() {
+        MainApplication.getMap().mapView.removeMouseListener(this);
+        affineTransform(ea1, ea2, georefpoint1, georefpoint2);
+        wmsLayer.grabThread.saveNewCache();
+        wmsLayer.invalidate();
+        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(MainApplication.getMainFrame(), tr(
+                "Set {0} Lambert coordinates", number));
+        dialog.setModal(false);
+        // To avoid mouseClicked from being called during coordinates reading
+        ignoreMouseClick = true;
+        dialog.setAlwaysOnTop(true);
+        dialog.setVisible(true);
+        pane.addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
+            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);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+    * Ask if cropping should be continued
+    * @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();
+        wmsLayer.invalidate();
+    }
+
+    /**
+     * Ask if georeferencing should be continued
+     * @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) {
+            MainApplication.getLayerManager().removeLayer(wmsLayer);
+            wmsLayer = null;
+        }
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+    }
+
+    @Override
+    public void mousePressed(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent e) {
+    }
 }
-
-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();
-    wmsLayer.invalidate();
-}
-
-
- /**
- *
- * @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) {
-         MainApplication.getLayerManager().removeLayer(wmsLayer);
-         wmsLayer = null;
-     }
- }
-
- @Override
- public void mouseEntered(MouseEvent e) {
- }
-
- @Override
- public void mouseExited(MouseEvent e) {
- }
-
- @Override
- public void mousePressed(MouseEvent e) {
- }
-
- @Override
- public void mouseReleased(MouseEvent e) {
- }
-}

@@ -25 +25 @@
 validations_testing
 wikipedia
+target

@@ -7 +7 @@
 findbugs-josm-cadastre-fr.xml
 javadoc
+target