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

Named exports from ol/obj

Browse Source
This commit is contained in:
Frederic Junod
2018-01-16 14:14:17 +01:00
parent 40f97eed85
commit 31e30d28b7
60 changed files with 174 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/source/TileWMS.js
View File

@@ -6,7 +6,7 @@ import {DEFAULT_WMS_VERSION} from './common.js';
import {inherits} from '../index.js';
import {assert} from '../asserts.js';
import {buffer, createEmpty} from '../extent.js';
import _ol_obj_ from '../obj.js';
import {assign} from '../obj.js';
import {modulo} from '../math.js';
import {get as getProjection, transform, transformExtent} from '../proj.js';
import _ol_reproj_ from '../reproj.js';
@@ -148,7 +148,7 @@ TileWMS.prototype.getGetFeatureInfoUrl = function(coordinate, resolution, projec
'TRANSPARENT': true,
'QUERY_LAYERS': this.params_['LAYERS']
};
_ol_obj_.assign(baseParams, this.params_, params);
assign(baseParams, this.params_, params);
const x = Math.floor((coordinate[0] - tileExtent[0]) / tileResolution);
const y = Math.floor((tileExtent[3] - coordinate[1]) / tileResolution);
@@ -317,7 +317,7 @@ TileWMS.prototype.fixedTileUrlFunction = function(tileCoord, pixelRatio, project
'FORMAT': 'image/png',
'TRANSPARENT': true
};
_ol_obj_.assign(baseParams, this.params_);
assign(baseParams, this.params_);
return this.getRequestUrl_(tileCoord, tileSize, tileExtent,
pixelRatio, projection, baseParams);
@@ -329,7 +329,7 @@ TileWMS.prototype.fixedTileUrlFunction = function(tileCoord, pixelRatio, project
* @api
*/
TileWMS.prototype.updateParams = function(params) {
_ol_obj_.assign(this.params_, params);
assign(this.params_, params);
this.updateV13_();
this.setKey(this.getKeyForParams_());
};