Changeset 20390 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.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/CadastreGrabber.java (modified) (4 diffs)

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

@@ -35 +35 @@
                 imageModified = new RasterImageModifier(img);
             else
-                imageModified = new VectorImageModifier(img);
+                imageModified = new VectorImageModifier(img, false);
             return new GeorefImage(imageModified.bufferedImage, lambertMin, lambertMax);
         } catch (MalformedURLException e) {
@@ -42 +42 @@
     }
 
+    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);
+        }
+    }
+    
     private URL getURLRaster(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) throws MalformedURLException {
         // GET /scpc/wms?version=1.1&request=GetMap&layers=CDIF:PMC@QH4480001701&format=image/png&bbox=-1186,0,13555,8830&width=576&height=345&exception=application/vnd.ogc.se_inimage&styles= HTTP/1.1
@@ -49 +71 @@
         str += wmsLayer.getCodeCommune();
         str += "&format=image/png";
+        //str += "&format=image/jpeg";
         str += "&bbox=";
         str += wmsLayer.eastNorth2raster(lambertMin, lambertMax);
-        //str += "&width=1000&height=800"; // maximum allowed by wms server
         str += "&width="+cRasterX+"&height="; // maximum allowed by wms server (576/345, 800/378, 1000/634)
         str += (int)(cRasterX*(wmsLayer.communeBBox.max.getY() - wmsLayer.communeBBox.min.getY())/(wmsLayer.communeBBox.max.getX() - wmsLayer.communeBBox.min.getX()));
-        str += "&exception=application/vnd.ogc.se_inimage&styles=";
+        str += "&exception=application/vnd.ogc.se_inimage&styles="; // required for raster images
+        System.out.println("URL="+str);
         return new URL(str.replace(" ", "%20"));
     }
 
-    private URL getURLVector(EastNorth lambertMin, EastNorth lambertMax) throws MalformedURLException {
+    private URL buildURLVector(String layers, String styles,
+            int width, int height,
+            EastNorth lambertMin, EastNorth lambertMax) throws MalformedURLException {
         String str = new String(wmsInterface.baseURL+"/scpc/wms?version=1.1&request=GetMap");
-        str += "&layers="+CadastrePlugin.grabLayers;
+        str += "&layers="+ layers;  
         str += "&format=image/png";
         //str += "&format=image/jpeg";
@@ -67 +92 @@
         str += lambertMax.east() + ",";
         str += lambertMax.north();
-        str += "&width="+CadastrePlugin.imageWidth+"&height="+CadastrePlugin.imageHeight;
-        //str += "&exception=application/vnd.ogc.se_inimage"; // used by normal client but not required
-        str += "&styles="+CadastrePlugin.grabStyles;
+        str += "&width="+width+"&height="+height;
+        str += "&exception=application/vnd.ogc.se_inimage"; // works also without (but slower ?)
+        str += "&styles=" + styles;
         System.out.println("URL="+str);
         return new URL(str.replace(" ", "%20"));
+    }
+
+    private URL getURLVector(EastNorth lambertMin, EastNorth lambertMax) throws MalformedURLException {
+        return buildURLVector(CadastrePlugin.grabLayers, CadastrePlugin.grabStyles, 
+                CadastrePlugin.imageWidth, CadastrePlugin.imageHeight, 
+                lambertMin, lambertMax);
+    }
+
+    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);
     }