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

Timestamp:

2009-08-16T23:36:16+02:00 (16 years ago)

Author:

pieren

Message:

raster image feature implementation

File:

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

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

@@ -19 +19 @@
 public class CadastreGrabber {
 
-    public static final double epsilon = 1e-11;
+    public final static double epsilon = 1e-11;
 
-    private CadastreInterface wmsInterface = new CadastreInterface(this);
-    private String lastWMSLayerName = null;
-
-    CadastreGrabber() {
-        getWmsInterface().downloadCancelled = false;
-    }
+    private CadastreInterface wmsInterface = new CadastreInterface();
 
     public GeorefImage grab(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) throws IOException, OsmTransferException {
@@ -36 +31 @@
             else
                 url = getURLVector(lambertMin, lambertMax);
-            System.out.println("grab:"+url);
             BufferedImage img = grab(url);
-            ImageModifier imageModified = new ImageModifier(img);
+            ImageModifier imageModified;
+            if (wmsLayer.isRaster())
+                imageModified = new RasterImageModifier(img);
+            else
+                imageModified = new VectorImageModifier(img);
             return new GeorefImage(imageModified.bufferedImage, lambertMin, lambertMax);
         } catch (MalformedURLException e) {
@@ -46 +44 @@
 
     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
+        final int cRasterX = 1000; // keep width constant and adjust width to original image proportions
         String str = new String(wmsInterface.baseURL+"/scpc/wms?version=1.1&request=GetMap");
         str += "&layers=CDIF:PMC@";
@@ -52 +52 @@
         str += "&bbox=";
         str += wmsLayer.eastNorth2raster(lambertMin, lambertMax);
-        str += "&width=600&height=600"; // maximum allowed by wms server
+        //str += "&width=800&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=";
         return new URL(str.replace(" ", "%20"));
@@ -94 +96 @@
     }
 
-    public String getLastWMSLayerName() {
-        return lastWMSLayerName;
-    }
-
-    public void setLastWMSLayerName(String lastWMSLayerName) {
-        this.lastWMSLayerName = lastWMSLayerName;
-    }
-
 }