ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ol.extent.* functions in ol.source.MapGuide

Browse Source
This commit is contained in:
Frederic Junod
2013-12-16 09:53:28 +01:00
parent ae7d5ab9d5
commit 59e04c5371
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ol/source/mapguidesource.js
View File

@@ -94,8 +94,8 @@ ol.source.MapGuide.prototype.getImage =
* @return {number} The computed map scale. * @return {number} The computed map scale.
*/ */
ol.source.MapGuide.prototype.getScale = function(extent, size) { ol.source.MapGuide.prototype.getScale = function(extent, size) {
var mcsW = extent[2] - extent[0]; var mcsW = ol.extent.getWidth(extent);
var mcsH = extent[3] - extent[1]; var mcsH = ol.extent.getHeight(extent);
var devW = size[0]; var devW = size[0];
var devH = size[1]; var devH = size[1];
var dpi = 96; var dpi = 96;
@@ -120,6 +120,7 @@ ol.source.MapGuide.prototype.getScale = function(extent, size) {
ol.source.MapGuide.prototype.getUrl = ol.source.MapGuide.prototype.getUrl =
function(baseUrl, params, extent, size, projection) { function(baseUrl, params, extent, size, projection) {
var scale = this.getScale(extent, size); var scale = this.getScale(extent, size);
var center = ol.extent.getCenter(extent);
var baseParams = { var baseParams = {
'OPERATION': this.useOverlay_ ? 'GETDYNAMICMAPOVERLAYIMAGE' : 'GETMAPIMAGE', 'OPERATION': this.useOverlay_ ? 'GETDYNAMICMAPOVERLAYIMAGE' : 'GETMAPIMAGE',
'VERSION': '2.0.0', 'VERSION': '2.0.0',
@@ -130,8 +131,8 @@ ol.source.MapGuide.prototype.getUrl =
'SETDISPLAYWIDTH': Math.round(size[0]), 'SETDISPLAYWIDTH': Math.round(size[0]),
'SETDISPLAYHEIGHT': Math.round(size[1]), 'SETDISPLAYHEIGHT': Math.round(size[1]),
'SETVIEWSCALE': scale, 'SETVIEWSCALE': scale,
'SETVIEWCENTERX': (extent[0] + extent[2]) / 2, 'SETVIEWCENTERX': center[0],
'SETVIEWCENTERY': (extent[1] + extent[3]) / 2 'SETVIEWCENTERY': center[1]
}; };
goog.object.extend(baseParams, params); goog.object.extend(baseParams, params);
return goog.uri.utils.appendParamsFromMap(baseUrl, baseParams); return goog.uri.utils.appendParamsFromMap(baseUrl, baseParams);