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

Timestamp:

2010-03-09T22:02:00+01:00 (15 years ago)

Author:

pieren

Message:

Many small fixes and improvements

File:

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

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

@@ -19 +19 @@
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Vector;
 
@@ -72 +73 @@
 
     private boolean isRaster = false;
-
     private boolean isAlreadyGeoreferenced = false;
-
+    private boolean buildingsOnly = false;
     public double X0, Y0, angle, fX, fY;
 
@@ -86 +86 @@
     public boolean adjustModeEnabled;
 
+
     public WMSLayer() {
         this(tr("Blank Layer"), "", -1);
@@ -91 +92 @@
 
     public WMSLayer(String location, String codeCommune, int lambertZone) {
-        super(buildName(location, codeCommune));
+        super(buildName(location, codeCommune, false));
         this.location = location;
         this.codeCommune = codeCommune;
@@ -113 +114 @@
     }
     
-    private static String buildName(String location, String codeCommune) {
+    private static String buildName(String location, String codeCommune, boolean buildingOnly) {
         String ret = new String(location.toUpperCase());
         if (codeCommune != null && !codeCommune.equals(""))
             ret += "(" + codeCommune + ")";
+        if (buildingOnly)
+            ret += ".b";
         return  ret;
     }
 
     private String rebuildName() {
-        return buildName(this.location.toUpperCase(), this.codeCommune);
+        return buildName(this.location.toUpperCase(), this.codeCommune, this.buildingsOnly);
     }
 
@@ -133 +136 @@
                 b = new Bounds(Main.proj.eastNorth2latlon(rasterMin), Main.proj.eastNorth2latlon(rasterMax));
                 divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider",
-                        CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)));
-            } else
-                divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())));
+                        CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)), 0);
+            } else if (buildingsOnly)
+                divideBbox(b, 5, 80); // hard coded size of 80 meters per box
+            else
+                divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())), 0);
         } else
-            divideBbox(b, 1);
-
+            divideBbox(b, 1, 0);
+
+        int lastSavedImage = images.size();
         for (EastNorthBound n : dividedBbox) {
             GeorefImage newImage;
             try {
-                newImage = grabber.grab(this, n.min, n.max);
+                if (buildingsOnly == false)
+                    newImage = grabber.grab(this, n.min, n.max);
+                else { // TODO
+                    GeorefImage buildings = grabber.grabBuildings(this, n.min, n.max);
+                    GeorefImage parcels = grabber.grabParcels(this, n.min, n.max);
+                    new BuildingsImageModifier(buildings, parcels);
+                    newImage = buildings;
+                }
             } catch (IOException e) {
                 System.out.println("Download action cancelled by user or server did not respond");
@@ -166 +179 @@
             }
             images.add(newImage);
-            saveToCache(newImage);
             Main.map.mapView.repaint();
         }
+        if (buildingsOnly)
+            joinBufferedImages();
+        for (int i=lastSavedImage; i < images.size(); i++)
+            saveToCache(images.get(i));
     }
 
@@ -177 +193 @@
      *               2 = source bbox divided by 2x2 smaller boxes
      *               3 = source bbox divided by 3x3 smaller boxes
-     *               4 = hard coded size of boxes (100 meters) rounded allowing
-     *                   grabbing of next contiguous zone
-     */
-    private void divideBbox(Bounds b, int factor) {
+     *               4 = configurable size from preferences (100 meters per default) rounded
+     *                   allowing grabbing of next contiguous zone
+     *               5 = use the size provided in next argument optionalSize
+     * @param optionalSize box size used when factor is 5.
+     */
+    private void divideBbox(Bounds b, int factor, int optionalSize) {
         EastNorth lambertMin = Main.proj.latlon2eastNorth(b.getMin());
         EastNorth lambertMax = Main.proj.latlon2eastNorth(b.getMax());
@@ -196 +214 @@
         } else {
             // divide to fixed size squares
-            int cSquare = Integer.parseInt(Main.pref.get("cadastrewms.squareSize", "100"));
+            int cSquare = factor == 4 ? Integer.parseInt(Main.pref.get("cadastrewms.squareSize", "100")) : optionalSize;   
             minEast = minEast - minEast % cSquare;
             minNorth = minNorth - minNorth % cSquare;
@@ -298 +316 @@
     public boolean isOverlapping(Bounds bounds) {
         GeorefImage georefImage =
-            new GeorefImage(new BufferedImage(1,1,BufferedImage.TYPE_INT_RGB ), // not really important
+            new GeorefImage(null,
             Main.proj.latlon2eastNorth(bounds.getMin()),
             Main.proj.latlon2eastNorth(bounds.getMax()));
@@ -358 +376 @@
     public void setCodeCommune(String codeCommune) {
         this.codeCommune = codeCommune;
+        setName(rebuildName());
+    }
+
+    public boolean isBuildingsOnly() {
+        return buildingsOnly;
+    }
+
+    public void setBuildingsOnly(boolean buildingsOnly) {
+        this.buildingsOnly = buildingsOnly;
         setName(rebuildName());
     }
@@ -412 +439 @@
         oos.writeInt(this.lambertZone);
         oos.writeBoolean(this.isRaster);
+        oos.writeBoolean(this.buildingsOnly);
         if (this.isRaster) {
             oos.writeDouble(this.rasterMin.getX());
@@ -443 +471 @@
         this.lambertZone = ois.readInt();
         this.setRaster(ois.readBoolean());
+        if (currentFormat >= 4)
+            this.setBuildingsOnly(ois.readBoolean());
         if (this.isRaster) {
             double X = ois.readDouble();
@@ -491 +521 @@
     /**
      * Join the grabbed images into one single.
-     * Works only for images grabbed from non-georeferenced images (Feuilles cadastrales)(same amount of
-     * images in x and y)
-     */
-    public void joinRasterImages() {
+     */
+    public void joinBufferedImages() {
         if (images.size() > 1) {
             EastNorth min = images.get(0).min;
@@ -500 +528 @@
             int oldImgWidth = images.get(0).image.getWidth();
             int oldImgHeight = images.get(0).image.getHeight();
-            int newWidth = oldImgWidth*(int)Math.sqrt(images.size());
-            int newHeight = oldImgHeight*(int)Math.sqrt(images.size());
-            BufferedImage new_img = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_INT_ARGB);
+            HashSet<Double> lx = new HashSet<Double>();
+            HashSet<Double> ly = new HashSet<Double>();
+            for (GeorefImage img : images) {
+                lx.add(img.min.east());
+                ly.add(img.min.north());
+            }
+            int newWidth = oldImgWidth*lx.size();
+            int newHeight = oldImgHeight*ly.size();
+            BufferedImage new_img = new BufferedImage(newWidth, newHeight, images.get(0).image.getType()/*BufferedImage.TYPE_INT_ARGB*/);
             Graphics g = new_img.getGraphics();
             // Coordinate (0,0) is on top,left corner where images are grabbed from bottom left
             int rasterDivider = (int)Math.sqrt(images.size());
-            for (int h = 0; h < rasterDivider; h++) {
-                for (int v = 0; v < rasterDivider; v++) {
+            for (int h = 0; h < lx.size(); h++) {
+                for (int v = 0; v < ly.size(); v++) {
                     int newx = h*oldImgWidth;
                     int newy = newHeight - oldImgHeight - (v*oldImgHeight);
@@ -543 +577 @@
         rasterRatio = (rasterMax.getX()-rasterMin.getX())/(communeBBox.max.getX() - communeBBox.min.getX());
     }
-
+    
     public EastNorthBound getCommuneBBox() {
         return communeBBox;