Move ol.AttributionLike to ol/source/Source

src/ol/source/CartoDB.js

@@ -8,7 +8,7 @@ import XYZ from '../source/XYZ.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=2048] Cache size.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to

src/ol/source/Cluster.js

@@ -14,7 +14,7 @@ import VectorSource from '../source/Vector.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [distance=20] Minimum distance in pixels between clusters.
  * @property {module:ol/extent~Extent} [extent] Extent.
  * @property {ol.format.Feature} [format] Format.

src/ol/source/Image.js

@@ -69,7 +69,7 @@ inherits(ImageSourceEvent, Event);
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions]
+ * @property {module:ol/source/Source~AttributionLike} [attributions]
  * @property {module:ol/extent~Extent} [extent]
  * @property {module:ol/proj~ProjectionLike} projection
  * @property {Array.<number>} [resolutions]

src/ol/source/ImageArcGISRest.js

@@ -14,7 +14,7 @@ import {appendParams} from '../uri.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to
  * access pixel data with the Canvas renderer.  See

src/ol/source/ImageCanvas.js

@@ -8,7 +8,7 @@ import ImageSource from '../source/Image.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {ol.CanvasFunctionType} [canvasFunction] Canvas function.
  * The function returning the canvas element used by the source
  * as an image. The arguments passed to the function are: `{module:ol/extent~Extent}` the

src/ol/source/ImageStatic.js

@@ -13,7 +13,7 @@ import ImageSource, {defaultImageLoadFunction} from '../source/Image.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to
  * access pixel data with the Canvas renderer.  See

src/ol/source/ImageWMS.js

@@ -19,7 +19,7 @@ import {appendParams} from '../uri.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to
  * access pixel data with the Canvas renderer.  See

src/ol/source/OSM.js

@@ -19,7 +19,7 @@ export const ATTRIBUTION = '© ' +
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=2048] Cache size.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to

src/ol/source/Source.js

@@ -8,9 +8,21 @@ import {get as getProjection} from '../proj.js';
 import SourceState from '../source/State.js';
 
 
+/**
+ * A type that can be used to provide attribution information for data sources.
+ *
+ * It represents either
+ * * a simple string (e.g. `'© Acme Inc.'`)
+ * * an array of simple strings (e.g. `['© Acme Inc.', '© Bacme Inc.']`)
+ * * a function that returns a string or array of strings (`{@link ol.Attribution}`)
+ *
+ * @typedef {string|Array.<string>|ol.Attribution} AttributionLike
+ */
+
+
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions]
+ * @property {module:ol/source/Source~AttributionLike} [attributions]
  * @property {module:ol/proj~ProjectionLike} projection
  * @property {module:ol/source/State~State} [state]
  * @property {boolean} [wrapX]
@@ -66,7 +78,7 @@ inherits(Source, BaseObject);
 
 /**
  * Turns the attributions option into an attributions function.
- * @param {ol.AttributionLike|undefined} attributionLike The attribution option.
+ * @param {module:ol/source/Source~AttributionLike|undefined} attributionLike The attribution option.
  * @return {?ol.Attribution} An attribution function (or null).
  */
 Source.prototype.adaptAttributions_ = function(attributionLike) {
@@ -157,7 +169,7 @@ Source.prototype.refresh = function() {
 
 /**
  * Set the attributions of the source.
- * @param {ol.AttributionLike|undefined} attributions Attributions.
+ * @param {module:ol/source/Source~AttributionLike|undefined} attributions Attributions.
  *     Can be passed as `string`, `Array<string>`, `{@link ol.Attribution}`,
  *     or `undefined`.
  * @api

src/ol/source/Tile.js

@@ -14,7 +14,7 @@ import {wrapX, getForProjection as getTileGridForProjection} from '../tilegrid.j
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions]
+ * @property {module:ol/source/Source~AttributionLike} [attributions]
  * @property {number} [cacheSize]
  * @property {module:ol/extent~Extent} [extent]
  * @property {boolean} [opaque]

src/ol/source/TileImage.js

@@ -16,7 +16,7 @@ import {getForProjection as getTileGridForProjection} from '../tilegrid.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=2048] Cache size.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to

src/ol/source/TileJSON.js

@@ -19,7 +19,7 @@ import {createXYZ, extentFromProjection} from '../tilegrid.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=2048] Cache size.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to

src/ol/source/TileWMS.js

@@ -19,7 +19,7 @@ import {appendParams} from '../uri.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=2048] Cache size.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to

src/ol/source/UrlTile.js

@@ -10,7 +10,7 @@ import {getKeyZXY} from '../tilecoord.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions]
+ * @property {module:ol/source/Source~AttributionLike} [attributions]
  * @property {number} [cacheSize]
  * @property {module:ol/extent~Extent} [extent]
  * @property {boolean} [opaque]

src/ol/source/Vector.js

@@ -50,7 +50,7 @@ inherits(VectorSourceEvent, Event);
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {Array.<module:ol/Feature~Feature>|ol.Collection.<module:ol/Feature~Feature>} [features]
  * Features. If provided as {@link ol.Collection}, the features in the source
  * and the collection will stay in sync.

src/ol/source/VectorTile.js

@@ -12,7 +12,7 @@ import {createXYZ, extentFromProjection, createForProjection} from '../tilegrid.
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=128] Cache size.
  * @property {module:ol/format/Feature~FeatureFormat} [format] Feature format for tiles. Used and required by the default.
  * @property {boolean} [overlaps=true] This source may have overlapping geometries. Setting this

src/ol/source/WMTS.js

@@ -14,7 +14,7 @@ import {appendParams} from '../uri.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=2048] Cache size.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to

src/ol/source/XYZ.js

@@ -7,7 +7,7 @@ import {createXYZ, extentFromProjection} from '../tilegrid.js';
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=2048] Cache size.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to

src/ol/source/Zoomify.js

@@ -81,7 +81,7 @@ CustomTile.prototype.getImage = function() {
 
 /**
  * @typedef {Object} Options
- * @property {ol.AttributionLike} [attributions] Attributions.
+ * @property {module:ol/source/Source~AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=2048] Cache size.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to

src/ol/typedefs.js

@@ -21,19 +21,6 @@ const ol = {};
  */
 
 
-/**
- * A type that can be used to provide attribution information for data sources.
- *
- * It represents either
- * * a simple string (e.g. `'© Acme Inc.'`)
- * * an array of simple strings (e.g. `['© Acme Inc.', '© Bacme Inc.']`)
- * * a function that returns a string or array of strings (`{@link ol.Attribution}`)
- *
- * @typedef {string|Array.<string>|ol.Attribution}
- */
-ol.AttributionLike;
-
-
 /**
  * A function that returns a string or an array of strings representing source
  * attributions.