Changeset 26835 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java

Timestamp:

2011-10-12T00:39:26+02:00 (14 years ago)

Author:

pieren

Message:

Fixed issues with new offset in grabbing vector images

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (modified) (8 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java

@@ -85 +85 @@
     private double rasterRatio;
 
+    // offset for vector images temporarily shifted (correcting Cadastre artifacts), in pixels
+    public double deltaEast=0;
+    public double deltaNorth=0;
+
     private Action saveAsPng;
 
@@ -91 +95 @@
     @SuppressWarnings("serial")
     class ResetOffsetActionMenu extends JosmAction {
-        private WMSLayer wmsLayer;
-        public ResetOffsetActionMenu(WMSLayer wmsLayer) {
+        public ResetOffsetActionMenu() {
             super(tr("Reset offset"), null, tr("Reset offset (only vector images)"), null, false);
-            this.wmsLayer = wmsLayer;
         }
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            for (GeorefImage img:wmsLayer.images) {
-                img.deltaEast = 0;
-                img.deltaNorth = 0;
-            }
+            deltaEast = 0;
+            deltaNorth = 0;
             Main.map.mapView.repaint();
         }
@@ -180 +180 @@
         EastNorth lambertMin = Main.getProjection().latlon2eastNorth(b.getMin());
         EastNorth lambertMax = Main.getProjection().latlon2eastNorth(b.getMax());
-        double minEast = lambertMin.east();
-        double minNorth = lambertMin.north();
+        double minEast = lambertMin.east()+deltaEast;
+        double minNorth = lambertMin.north()+deltaNorth;
         double dEast = (lambertMax.east() - minEast) / factor;
         double dNorth = (lambertMax.north() - minNorth) / factor;
@@ -309 +309 @@
         cancelGrab = new MenuActionCancelGrab(this);
         cancelGrab.setEnabled(!isRaster && grabThread.getImagesToGrabSize() > 0);
-        Action resetOffset = new ResetOffsetActionMenu(this);
-        resetOffset.setEnabled(!isRaster && images.size() > 0 && (images.get(0).deltaEast!=0.0 || images.get(0).deltaNorth!=0.0));
+        Action resetOffset = new ResetOffsetActionMenu();
+        resetOffset.setEnabled(!isRaster && images.size() > 0 && (deltaEast!=0.0 || deltaNorth!=0.0));
         return new Action[] {
                 LayerListDialog.getInstance().createShowHideLayerAction(),
@@ -338 +338 @@
             new GeorefImage(null,
             Main.getProjection().latlon2eastNorth(bounds.getMin()),
-            Main.getProjection().latlon2eastNorth(bounds.getMax()));
+            Main.getProjection().latlon2eastNorth(bounds.getMax()), this);
         for (GeorefImage img : images) {
             if (img.overlap(georefImage))
@@ -509 +509 @@
                         }
                     }
+                    newImage.wmsLayer = this;
                     this.images.add(newImage);
                 }
@@ -550 +551 @@
             synchronized(this) {
                 images.clear();
-                images.add(new GeorefImage(new_img, min, max));
+                images.add(new GeorefImage(new_img, min, max, this));
             }
         }
@@ -626 +627 @@
             images.get(0).shear(dx, dy);
         } else {
-            for (GeorefImage image:images)
-                image.tempShear(dx, dy);
+            deltaEast+=dx;
+            deltaNorth+=dy;
         }
     }