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

Timestamp:

2010-03-01T18:48:22+01:00 (15 years ago)

Author:

pieren

Message:

Grabbed images resolution configurable + fixed minor issues

File:

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

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

@@ -46 +46 @@
     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 = 800; // keep width constant and adjust width to original image proportions
+        final int cRasterX = CadastrePlugin.imageWidth; // 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@";
@@ -53 +53 @@
         str += "&bbox=";
         str += wmsLayer.eastNorth2raster(lambertMin, lambertMax);
-        //str += "&width=800&height=800"; // maximum allowed by wms server
+        //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()));
@@ -73 +73 @@
         str += lambertMax.east() + ",";
         str += lambertMax.north();
-        str += "&width=800&height=600"; // maximum allowed by wms server
-        //str += "&width=1000&height=800"; // maximum allowed by wms server
+        str += "&width="+CadastrePlugin.imageWidth+"&height="+CadastrePlugin.imageHeight;
         //str += "&exception=application/vnd.ogc.se_inimage"; // used by normal client but not required
         str += "&styles=LS3_90,LS2_90,LS1_90,PARCELLE_90,NUMERO_90,PT3_90,PT2_90,PT1_90,LIEUDIT_90";