Merge pull request #7793 from tschaub/default-names

More renaming of default exports
This commit is contained in:
Tim Schaub
2018-02-09 06:54:07 -07:00
committed by GitHub
12 changed files with 72 additions and 69 deletions

View File

@@ -2,7 +2,7 @@
* @module ol/source/ImageArcGISRest
*/
import {inherits} from '../index.js';
import _ol_Image_ from '../Image.js';
import ImageWrapper from '../Image.js';
import {assert} from '../asserts.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
@@ -168,7 +168,7 @@ ImageArcGISRest.prototype.getImageInternal = function(extent, resolution, pixelR
const url = this.getRequestUrl_(extent, this.imageSize_, pixelRatio,
projection, params);
this.image_ = new _ol_Image_(extent, resolution, pixelRatio,
this.image_ = new ImageWrapper(extent, resolution, pixelRatio,
url, this.crossOrigin_, this.imageLoadFunction_);
this.renderedRevision_ = this.getRevision();

View File

@@ -2,7 +2,7 @@
* @module ol/source/ImageMapGuide
*/
import {inherits} from '../index.js';
import _ol_Image_ from '../Image.js';
import ImageWrapper from '../Image.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
import {containsExtent, getCenter, getHeight, getWidth, scaleFromCenter} from '../extent.js';
@@ -141,7 +141,7 @@ ImageMapGuide.prototype.getImageInternal = function(extent, resolution, pixelRat
if (this.url_ !== undefined) {
const imageUrl = this.getUrl(this.url_, this.params_, extent, size,
projection);
image = new _ol_Image_(extent, resolution, pixelRatio,
image = new ImageWrapper(extent, resolution, pixelRatio,
imageUrl, this.crossOrigin_,
this.imageLoadFunction_);
listen(image, EventType.CHANGE,

View File

@@ -2,7 +2,7 @@
* @module ol/source/ImageStatic
*/
import {inherits} from '../index.js';
import _ol_Image_ from '../Image.js';
import ImageWrapper from '../Image.js';
import ImageState from '../ImageState.js';
import {createCanvasContext2D} from '../dom.js';
import {listen} from '../events.js';
@@ -39,7 +39,7 @@ const Static = function(options) {
* @private
* @type {ol.Image}
*/
this.image_ = new _ol_Image_(imageExtent, undefined, 1, options.url, crossOrigin, imageLoadFunction);
this.image_ = new ImageWrapper(imageExtent, undefined, 1, options.url, crossOrigin, imageLoadFunction);
/**
* @private

View File

@@ -4,7 +4,7 @@
import {DEFAULT_WMS_VERSION} from './common.js';
import {inherits} from '../index.js';
import _ol_Image_ from '../Image.js';
import ImageWrapper from '../Image.js';
import {assert} from '../asserts.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
@@ -231,7 +231,7 @@ ImageWMS.prototype.getImageInternal = function(extent, resolution, pixelRatio, p
const url = this.getRequestUrl_(requestExtent, this.imageSize_, pixelRatio,
projection, params);
this.image_ = new _ol_Image_(requestExtent, resolution, pixelRatio,
this.image_ = new ImageWrapper(requestExtent, resolution, pixelRatio,
url, this.crossOrigin_, this.imageLoadFunction_);
this.renderedRevision_ = this.getRevision();