Changeset 3592 for framework

Timestamp:

07/21/10 11:03:18 (22 months ago)

Author:

aabt

Message:

Add ability to configure print widgets/protocol with geodetic param(boolean, default to false), to fix wrong calculation of print extent for geodedic projection. r=jeichar (closes #571)

Location:

framework/client/trunk/mfbase/mapfish

Files:

• core/PrintProtocol.js (modified) (3 diffs)
• widgets/print/Base.js (modified) (2 diffs)
• widgets/print/BaseWidget.js (modified) (2 diffs)

framework/client/trunk/mfbase/mapfish/core/PrintProtocol.js

@@ -79 +79 @@
 
     /**
+     * APIProperty: geodetic
+     * {Boolean} True if the projection is geodetic, for a correct scale
+     * calculation.
+     */
+    geodetic: false,
+
+    /**
      * Constructor: OpenLayers.Layer
      *
@@ -89 +96 @@
      * params - {Object} additional params to send in the Ajax calls
      */
-    initialize: function(map, config, overrides, dpi, params) {
+    initialize: function(map, config, overrides, dpi, params, geodetic) {
         this.config = config;
         this.spec = {pages: []};
         overrides = this.fixOverrides(overrides, map);
+        this.geodetic = (geodetic != undefined) ? geodetic : this.geodetic;
         this.addMapParams(overrides, map, dpi);
         this.addOverviewMapParams(overrides, map, dpi);
@@ -278 +286 @@
         spec.units = map.baseLayer.units;
         spec.srs = map.baseLayer.projection.getCode();
+        spec.geodetic = this.geodetic;
         var layers = spec.layers = [];
         this.fillLayers(layers, map.layers, overrides, dpi);

framework/client/trunk/mfbase/mapfish/widgets/print/Base.js

@@ -98 +98 @@
 
     /**
+     * APIProperty: geodetic
+     * {Boolean} True if the projection is geodetic, for a correct scale
+     * calculation.
+     */
+    geodetic: false,
+
+    /**
      * Method: initPrint
      * loads the configuration
@@ -155 +162 @@
 
         var printCommand = new mapfish.PrintProtocol(this.map, this.config,
-                this.overrides, this.getCurDpi(), this.serviceParams);
+                this.overrides, this.getCurDpi(), this.serviceParams, this.geodetic);
         if (this.layerTree) {
             this.addLegends(printCommand.spec);

framework/client/trunk/mfbase/mapfish/widgets/print/BaseWidget.js

@@ -25 +25 @@
  * @requires OpenLayers/Layer/Vector.js
  * @requires OpenLayers/Feature/Vector.js
+ * @requires OpenLayers/Geometry/Polygon.js
+ * @requires OpenLayers/Util.js
+ * @requires OpenLayers/Projection.js
  * @requires OpenLayers/Geometry/Polygon.js
  */
@@ -414 +417 @@
         var unitsRatio = OpenLayers.INCHES_PER_UNIT[this.map.baseLayer.units];
 
-        var size = layout.map;
-        var w = size.width / 72.0 / unitsRatio * scale / 2.0;
-        var h = size.height / 72.0 / unitsRatio * scale / 2.0;
+        var w = layout.map.width / 72.0 / unitsRatio * scale / 2.0;
+        var h = layout.map.height / 72.0 / unitsRatio * scale / 2.0;
+
+        var proj = this.map.getProjectionObject();
+        if (this.geodetic && (proj.projCode != 'EPGS:4326')) {
+            var wgs84 = new OpenLayers.Projection('EPSG:4326');
+            var wgs84center = center.clone().transform(proj, wgs84);
+
+            var dest = OpenLayers.Util.destinationVincenty;
+            var wp1 = dest(wgs84center, 90, w);
+            var wp2 = dest(wgs84center, 270, w);
+            var hp1 = dest(wgs84center, 0, h);
+            var hp2 = dest(wgs84center, 180, h);
+
+            var p = OpenLayers.Geometry.Point;
+            var bounds = new OpenLayers.Geometry.Polygon([
+                new OpenLayers.Geometry.LinearRing([
+                    new p(wp1.lon, wp1.lat), new p(hp2.lon, hp2.lat),
+                    new p(wp2.lon, wp2.lat), new p(hp1.lon, hp1.lat)
+                ])
+            ]).getBounds();
+
+            return bounds.transform(wgs84, proj);
+        }
 
         return new OpenLayers.Bounds(
-                center.lon - w,
-                center.lat - h,
-                center.lon + w,
-                center.lat + h);
+            center.lon - w,
+            center.lat - h,
+            center.lon + w,
+            center.lat + h
+        );
     },