diff --git a/src/ol/source/Tile.js b/src/ol/source/Tile.js index 7ff1d5e020..8d0ad4b727 100644 --- a/src/ol/source/Tile.js +++ b/src/ol/source/Tile.js @@ -36,7 +36,7 @@ import {wrapX, getForProjection as getTileGridForProjection} from '../tilegrid.j * @constructor * @abstract * @extends {ol.source.Source} - * @param {module:ol/source/SourceTile~Options} options SourceTile source options. + * @param {module:ol/source/SourceTile~Options=} options SourceTile source options. * @api */ const TileSource = function(options) { diff --git a/src/ol/source/UrlTile.js b/src/ol/source/UrlTile.js index 7c43c8bc91..bac594efaa 100644 --- a/src/ol/source/UrlTile.js +++ b/src/ol/source/UrlTile.js @@ -8,6 +8,25 @@ import TileSource, {TileSourceEvent} from '../source/Tile.js'; import TileEventType from '../source/TileEventType.js'; import {getKeyZXY} from '../tilecoord.js'; +/** + * @typedef {Object} Options + * @property {ol.AttributionLike} [attributions] + * @property {number} [cacheSize] + * @property {module:ol/extent~Extent} [extent] + * @property {boolean} [opaque] + * @property {module:ol/proj~ProjectionLike} [projection] + * @property {ol.source.State} [state] + * @property {ol.tilegrid.TileGrid} [tileGrid] + * @property {module:ol/Tile~LoadFunction} tileLoadFunction + * @property {number} [tilePixelRatio] + * @property {module:ol/Tile~UrlFunction} [tileUrlFunction] + * @property {string} [url] + * @property {Array.} [urls] + * @property {boolean} [wrapX=true] + * @property {number} [transition] + */ + + /** * @classdesc * Base class for sources providing tiles divided into a tile grid over http. @@ -16,7 +35,7 @@ import {getKeyZXY} from '../tilecoord.js'; * @abstract * @fires ol.source.Tile.Event * @extends {ol.source.Tile} - * @param {ol.SourceUrlTileOptions} options Image tile options. + * @param {module:ol/source/UrlTile~Options=} options Image tile options. */ const UrlTile = function(options) { diff --git a/src/ol/typedefs.js b/src/ol/typedefs.js index d6f6300365..9ae0b8405e 100644 --- a/src/ol/typedefs.js +++ b/src/ol/typedefs.js @@ -217,25 +217,6 @@ ol.ReprojTriangle; ol.SourceRasterRenderedState; -/** - * @typedef {{attributions: (ol.AttributionLike|undefined), - * cacheSize: (number|undefined), - * extent: (module:ol/extent~Extent|undefined), - * opaque: (boolean|undefined), - * projection: module:ol/proj~ProjectionLike, - * state: (ol.source.State|undefined), - * tileGrid: (ol.tilegrid.TileGrid|undefined), - * tileLoadFunction: module:ol/Tile~LoadFunction, - * tilePixelRatio: (number|undefined), - * tileUrlFunction: (module:ol/Tile~UrlFunction|undefined), - * url: (string|undefined), - * urls: (Array.|undefined), - * wrapX: (boolean|undefined), - * transition: (number|undefined)}} - */ -ol.SourceUrlTileOptions; - - /** * A function that takes an {@link module:ol/Feature~Feature} as argument and returns an * {@link module:ol/geom/Geometry~Geometry} that will be rendered and styled for the feature.