From d0216c80cd4070c19904696cc16f0cc3dc5acf43 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Wed, 11 Sep 2013 16:43:31 +0200 Subject: [PATCH] Rename ol.source.StaticImage to ol.source.ImageStatic --- src/objectliterals.jsdoc | 2 +- src/ol/source/imagestaticsource.exports | 1 + .../{staticimagesource.js => imagestaticsource.js} | 14 +++++++------- src/ol/source/staticimagesource.exports | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 src/ol/source/imagestaticsource.exports rename src/ol/source/{staticimagesource.js => imagestaticsource.js} (78%) delete mode 100644 src/ol/source/staticimagesource.exports diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index dd8af4ece4..9a34537668 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -510,7 +510,7 @@ */ /** - * @typedef {Object} ol.source.StaticImageOptions + * @typedef {Object} ol.source.ImageStaticOptions * @property {Array.|undefined} attributions Attributions. * @property {null|string|undefined} crossOrigin crossOrigin setting for image * requests. diff --git a/src/ol/source/imagestaticsource.exports b/src/ol/source/imagestaticsource.exports new file mode 100644 index 0000000000..4968e8f6f0 --- /dev/null +++ b/src/ol/source/imagestaticsource.exports @@ -0,0 +1 @@ +@exportClass ol.source.ImageStatic ol.source.ImageStaticOptions diff --git a/src/ol/source/staticimagesource.js b/src/ol/source/imagestaticsource.js similarity index 78% rename from src/ol/source/staticimagesource.js rename to src/ol/source/imagestaticsource.js index d426549fa7..9e0723ea15 100644 --- a/src/ol/source/staticimagesource.js +++ b/src/ol/source/imagestaticsource.js @@ -1,4 +1,4 @@ -goog.provide('ol.source.StaticImage'); +goog.provide('ol.source.ImageStatic'); goog.require('ol.Image'); goog.require('ol.ImageUrlFunctionType'); @@ -11,11 +11,11 @@ goog.require('ol.source.Image'); /** * @constructor * @extends {ol.source.Image} - * @param {ol.source.StaticImageOptions} options Static image options. + * @param {ol.source.ImageStaticOptions} options Options. */ -ol.source.StaticImage = function(options) { +ol.source.ImageStatic = function(options) { - var imageFunction = ol.source.StaticImage.createImageFunction( + var imageFunction = ol.source.ImageStatic.createImageFunction( options.url); var imageExtent = options.imageExtent; @@ -40,13 +40,13 @@ ol.source.StaticImage = function(options) { imageExtent, imageResolution, imageSize, projection); }; -goog.inherits(ol.source.StaticImage, ol.source.Image); +goog.inherits(ol.source.ImageStatic, ol.source.Image); /** * @inheritDoc */ -ol.source.StaticImage.prototype.getImage = +ol.source.ImageStatic.prototype.getImage = function(extent, resolution, projection) { if (ol.extent.intersects(extent, this.image_.getExtent())) { return this.image_; @@ -59,7 +59,7 @@ ol.source.StaticImage.prototype.getImage = * @param {string|undefined} url URL. * @return {ol.ImageUrlFunctionType} Function. */ -ol.source.StaticImage.createImageFunction = function(url) { +ol.source.ImageStatic.createImageFunction = function(url) { return ( /** * @param {ol.Extent} extent Extent. diff --git a/src/ol/source/staticimagesource.exports b/src/ol/source/staticimagesource.exports deleted file mode 100644 index 5df3d4893f..0000000000 --- a/src/ol/source/staticimagesource.exports +++ /dev/null @@ -1 +0,0 @@ -@exportClass ol.source.StaticImage ol.source.StaticImageOptions