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

Timestamp:

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

Author:

pieren

Message:

Removed the building shapes recognition

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• Buildings.java (deleted)
• BuildingsImageModifier.java (deleted)
• CacheControl.java (modified) (1 diff)
• CadastreGrabber.java (modified) (2 diffs)
• DownloadWMSVectorImage.java (modified) (2 diffs)
• MenuActionBuildings.java (deleted)
• MenuActionGrab.java (modified) (1 diff)
• MenuActionNewLocation.java (modified) (1 diff)
• WMSDownloadAction.java (modified) (1 diff)
• WMSLayer.java (modified) (11 diffs)

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

@@ -96 +96 @@
     public boolean loadCacheIfExist() {
         try {
-            if (!wmsLayer.isBuildingsOnly()) {
-                File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension());
-                if (file.exists()) {
-                    JOptionPane pane = new JOptionPane(
-                            tr("Location \"{0}\" found in cache.\n"+
-                            "Load cache first ?\n"+
-                            "(No = new cache)", wmsLayer.getName()),
-                            JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_NO_OPTION, null);
-                    // this below is a temporary workaround to fix the "always on top" issue
-                    JDialog dialog = pane.createDialog(Main.parent, tr("Select Feuille"));
-                    CadastrePlugin.prepareDialog(dialog);
-                    dialog.setVisible(true);
-                    int reply = (Integer)pane.getValue();
-                    // till here
-
-                    if (reply == JOptionPane.OK_OPTION && loadCache(file, wmsLayer.getLambertZone())) {
-                        return true;
-                    } else {
-                        delete(file);
-                    }
-                }
-            } else {
-                int i=0;
-                while (new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "."+i+"."+ WMSFileExtension()).exists())
-                    i++;
-                wmsLayer.setName(wmsLayer.getName()+"."+i);
+            File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension());
+            if (file.exists()) {
+                JOptionPane pane = new JOptionPane(
+                        tr("Location \"{0}\" found in cache.\n"+
+                        "Load cache first ?\n"+
+                        "(No = new cache)", wmsLayer.getName()),
+                        JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_NO_OPTION, null);
+                // this below is a temporary workaround to fix the "always on top" issue
+                JDialog dialog = pane.createDialog(Main.parent, tr("Select Feuille"));
+                CadastrePlugin.prepareDialog(dialog);
+                dialog.setVisible(true);
+                int reply = (Integer)pane.getValue();
+                // till here
+
+                if (reply == JOptionPane.OK_OPTION && loadCache(file, wmsLayer.getLambertZone())) {
+                    return true;
+                } else {
+                    delete(file);
+                }
             }
         } catch (Exception e) {

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

@@ -37 +37 @@
                 imageModified = new VectorImageModifier(img, false);
             return new GeorefImage(imageModified.bufferedImage, lambertMin, lambertMax);
-        } catch (MalformedURLException e) {
-            throw (IOException) new IOException(tr("CadastreGrabber: Illegal url.")).initCause(e);
-        }
-    }
-
-    public GeorefImage grabBuildings(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) throws IOException, OsmTransferException {
-        try {
-            URL url = getURLVectorBuildings(lambertMin, lambertMax);
-            BufferedImage img = grab(url);
-            ImageModifier imageModified = new VectorImageModifier(img, true);
-            return new GeorefImage(imageModified.bufferedImage, lambertMin, lambertMax);
-        } catch (MalformedURLException e) {
-            throw (IOException) new IOException(tr("CadastreGrabber: Illegal url.")).initCause(e);
-        }
-    }
-
-    public GeorefImage grabParcels(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) throws IOException, OsmTransferException {
-        try {
-            URL url = getURLVectorParcels(lambertMin, lambertMax);
-            BufferedImage img = grab(url);
-            //ImageModifier imageModified = new VectorImageModifier(img, true);
-            return new GeorefImage(/*imageModified.bufferedImage*/img, lambertMin, lambertMax);
         } catch (MalformedURLException e) {
             throw (IOException) new IOException(tr("CadastreGrabber: Illegal url.")).initCause(e);
@@ -105 +83 @@
     }
 
-    private URL getURLVectorBuildings(EastNorth lambertMin, EastNorth lambertMax) throws MalformedURLException {
-        return buildURLVector("CDIF:LS2", "LS2_90", 1000, 800, lambertMin, lambertMax);
-    }
-
-    private URL getURLVectorParcels(EastNorth lambertMin, EastNorth lambertMax) throws MalformedURLException {
-        return buildURLVector("CDIF:PARCELLE", "PARCELLE_90", 1000, 800, lambertMin, lambertMax);
-    }
-
     private BufferedImage grab(URL url) throws IOException, OsmTransferException {
         wmsInterface.urlConn = (HttpURLConnection)url.openConnection();

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

@@ -20 +20 @@
     private static String errorMessage;
 
-    public DownloadWMSVectorImage(WMSLayer wmsLayer, Bounds bounds, boolean buildingsOnly) {
+    public DownloadWMSVectorImage(WMSLayer wmsLayer, Bounds bounds) {
         super(tr("Downloading {0}", wmsLayer.getName()));
 
         this.wmsLayer = wmsLayer;
         this.bounds = bounds;
-        this.wmsLayer.setBuildingsOnly(buildingsOnly);
     }
 
@@ -84 +83 @@
     }
 
-    public static void download(WMSLayer wmsLayer, boolean buildingsOnly) {
+    public static void download(WMSLayer wmsLayer) {
         MapView mv = Main.map.mapView;
         Bounds bounds = new Bounds(mv.getLatLon(0, mv.getHeight()), mv.getLatLon(mv.getWidth(), 0));
 
-        Main.worker.execute(new DownloadWMSVectorImage(wmsLayer, bounds, buildingsOnly));
+        Main.worker.execute(new DownloadWMSVectorImage(wmsLayer, bounds));
         if (errorMessage != null)
             JOptionPane.showMessageDialog(Main.parent, errorMessage);

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

@@ -33 +33 @@
                 WMSLayer wmsLayer = WMSDownloadAction.getLayer();
                 if (wmsLayer != null)
-                    DownloadWMSVectorImage.download(wmsLayer, false);
+                    DownloadWMSVectorImage.download(wmsLayer);
             } else {
                 JOptionPane.showMessageDialog(Main.parent,

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

@@ -58 +58 @@
         WMSLayer wmsLayer = addNewLayer(new ArrayList<WMSLayer>());
         if (wmsLayer != null)
-            DownloadWMSVectorImage.download(wmsLayer, false);
+            DownloadWMSVectorImage.download(wmsLayer);
     }
 

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

@@ -30 +30 @@
         if (Main.map != null) {
             Layer activeLayer = Main.map.mapView.getActiveLayer();
-            if (activeLayer instanceof WMSLayer && !((WMSLayer)activeLayer).isBuildingsOnly())
+            if (activeLayer instanceof WMSLayer)
                 return (WMSLayer) activeLayer;
             for (Layer l : Main.map.mapView.getAllLayers()) {
-                if (l instanceof WMSLayer && !((WMSLayer)l).isBuildingsOnly()) {
+                if (l instanceof WMSLayer) {
                     existingWMSlayers.add((WMSLayer)l);
                 }

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();