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

Timestamp:

2010-12-29T23:18:37+01:00 (15 years ago)

Author:

pieren

Message:

Removed the building shapes recognition

File:

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

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

@@ -59 +59 @@
     public static int currentFormat;
 
-    private static final int cBBoxForBuildings = 50; // hard coded size of grabbed boxes for building layers
-
     private ArrayList<EastNorthBound> dividedBbox = new ArrayList<EastNorthBound>();
 
@@ -77 +75 @@
     private boolean isRaster = false;
     private boolean isAlreadyGeoreferenced = false;
-    private boolean buildingsOnly = false;
     public double X0, Y0, angle, fX, fY;
 
@@ -95 +92 @@
 
     public WMSLayer(String location, String codeCommune, int lambertZone) {
-        super(buildName(location, codeCommune, false));
+        super(buildName(location, codeCommune));
         this.location = location;
         this.codeCommune = codeCommune;
@@ -118 +115 @@
     }
 
-    private static String buildName(String location, String codeCommune, boolean buildingOnly) {
+    private static String buildName(String location, String codeCommune) {
         String ret = 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, this.buildingsOnly);
+        return buildName(this.location.toUpperCase(), this.codeCommune);
     }
 
@@ -142 +137 @@
                 divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider",
                         CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)), 0);
-            } else if (buildingsOnly)
-                divideBbox(b, 5, cBBoxForBuildings);
-            else
+            } else
                 divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())), 0);
         } else
@@ -155 +148 @@
             GeorefImage newImage;
             try {
-                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;
-                }
+                newImage = grabber.grab(this, n.min, n.max);
             } catch (IOException e) {
                 System.out.println("Download action cancelled by user or server did not respond");
@@ -189 +175 @@
         }
         if (!cancelled) {
-            if (buildingsOnly)
-                joinBufferedImages();
             for (int i=lastSavedImage; i < images.size(); i++)
                 saveToCache(images.get(i));
@@ -197 +181 @@
 
     /**
-     *
+     * Divides the bounding box in smaller polygons.
+     * 
      * @param b      the original bbox, usually the current bbox on screen
      * @param factor 1 = source bbox 1:1
@@ -398 +383 @@
     }
 
-    public boolean isBuildingsOnly() {
-        return buildingsOnly;
-    }
-
-    public void setBuildingsOnly(boolean buildingsOnly) {
-        this.buildingsOnly = buildingsOnly;
-        setName(rebuildName());
-    }
-
     public boolean isRaster() {
         return isRaster;
@@ -458 +434 @@
         oos.writeInt(this.lambertZone);
         oos.writeBoolean(this.isRaster);
-        oos.writeBoolean(this.buildingsOnly);
+        oos.writeBoolean(false); // previously buildingsOnly
         if (this.isRaster) {
             oos.writeDouble(this.rasterMin.getX());
@@ -491 +467 @@
         this.setRaster(ois.readBoolean());
         if (currentFormat >= 4)
-            this.setBuildingsOnly(ois.readBoolean());
+            ois.readBoolean();
         if (this.isRaster) {
             double X = ois.readDouble();