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

Timestamp:

2011-10-09T23:41:21+02:00 (14 years ago)

Author:

pieren

Message:

Add a new possibility to shift cadastre vector maps (not saved in cache)

File:

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

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

@@ -29 +29 @@
     public EastNorth min;
     public EastNorth max;
+    // offset for vector images temporarily shifted (correcting Cadastre artifacts), in pixels
+    public double deltaEast=0;
+    public double deltaNorth=0;
     // bbox of the georeferenced original image (raster only) (inclined if rotated and before cropping)
     // P[0] is bottom,left then next are clockwise.
@@ -107 +110 @@
             return;
 
-        Point minPt = nc.getPoint(min), maxPt = nc.getPoint(max);
+        // apply offsets defined manually when vector images are translated manually (not saved in cache)
+        Point minPt = nc.getPoint(new EastNorth(min.east()+deltaEast, min.north()+deltaNorth));
+        Point maxPt = nc.getPoint(new EastNorth(max.east()+deltaEast, max.north()+deltaNorth));
 
         if (!g.hitClip(minPt.x, maxPt.y, maxPt.x - minPt.x, minPt.y - maxPt.y))
@@ -171 +176 @@
         double maxMaskNorth = (georefImage.max.north() < this.max.north()) ? georefImage.max.north() : this.max.north();
         if ((maxMaskNorth - minMaskNorth) > 0 && (maxMaskEast - minMaskEast) > 0) {
-            double pixelPerEast = (max.east() - min.east()) / image.getWidth();
-            double pixelPerNorth = (max.north() - min.north()) / image.getHeight();
-            int minXMaskPixel = (int) ((minMaskEast - min.east()) / pixelPerEast);
-            int minYMaskPixel = (int) ((max.north() - maxMaskNorth) / pixelPerNorth);
-            int widthXMaskPixel = Math.abs((int) ((maxMaskEast - minMaskEast) / pixelPerEast));
-            int heightYMaskPixel = Math.abs((int) ((maxMaskNorth - minMaskNorth) / pixelPerNorth));
+            double pxPerEast = (max.east() - min.east()) / image.getWidth();
+            double pxPerNorth = (max.north() - min.north()) / image.getHeight();
+            int minXMaskPixel = (int) ((minMaskEast - min.east()) / pxPerEast);
+            int minYMaskPixel = (int) ((max.north() - maxMaskNorth) / pxPerNorth);
+            int widthXMaskPixel = Math.abs((int) ((maxMaskEast - minMaskEast) / pxPerEast));
+            int heightYMaskPixel = Math.abs((int) ((maxMaskNorth - minMaskNorth) / pxPerNorth));
             Graphics g = image.getGraphics();
             for (int x = minXMaskPixel; x < minXMaskPixel + widthXMaskPixel; x++)
@@ -279 +284 @@
         }
     }
-
+    
     /**
      * Change this image scale by moving the min,max coordinates around an anchor
@@ -364 +369 @@
     }
 
+    /**
+     * Add a temporary translation (dx, dy) to this image (for vector images only)
+     * @param dx delta added to X image coordinate
+     * @param dy delta added to Y image coordinate
+     */
+    public void tempShear(double dx, double dy) {
+        this.deltaEast+=dx;
+        this.deltaNorth+=dy;
+    }
 }