From aa138feb9436b867728085cc69620db22e2b7cc0 Mon Sep 17 00:00:00 2001 From: Florent gravin Date: Wed, 28 Mar 2018 16:43:33 +0200 Subject: [PATCH] Remove ol.SourceTileOptions --- src/ol/source/Tile.js | 17 ++++++++++++++++- src/ol/typedefs.js | 15 --------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ol/source/Tile.js b/src/ol/source/Tile.js index b075939e99..7ff1d5e020 100644 --- a/src/ol/source/Tile.js +++ b/src/ol/source/Tile.js @@ -12,6 +12,21 @@ import Source from '../source/Source.js'; import {getKeyZXY, withinExtentAndZ} from '../tilecoord.js'; import {wrapX, getForProjection as getTileGridForProjection} from '../tilegrid.js'; +/** + * @typedef {Object} Options + * @property {ol.AttributionLike} [attributions] + * @property {number} [cacheSize] + * @property {module:ol/extent~Extent} [extent] + * @property {boolean} [opaque] + * @property {number} [tilePixelRatio] + * @property {module:ol/proj~ProjectionLike} [projection] + * @property {ol.source.State} [state] + * @property {ol.tilegrid.TileGrid} [tileGrid] + * @property {boolean} [wrapX=true] + * @property {number} [transition] + */ + + /** * @classdesc * Abstract base class; normally only used for creating subclasses and not @@ -21,7 +36,7 @@ import {wrapX, getForProjection as getTileGridForProjection} from '../tilegrid.j * @constructor * @abstract * @extends {ol.source.Source} - * @param {ol.SourceTileOptions} options Tile source options. + * @param {module:ol/source/SourceTile~Options} options SourceTile source options. * @api */ const TileSource = function(options) { diff --git a/src/ol/typedefs.js b/src/ol/typedefs.js index f4c40033cd..d6f6300365 100644 --- a/src/ol/typedefs.js +++ b/src/ol/typedefs.js @@ -217,21 +217,6 @@ ol.ReprojTriangle; ol.SourceRasterRenderedState; -/** - * @typedef {{attributions: (ol.AttributionLike|undefined), - * cacheSize: (number|undefined), - * extent: (module:ol/extent~Extent|undefined), - * opaque: (boolean|undefined), - * tilePixelRatio: (number|undefined), - * projection: module:ol/proj~ProjectionLike, - * state: (ol.source.State|undefined), - * tileGrid: (ol.tilegrid.TileGrid|undefined), - * wrapX: (boolean|undefined), - * transition: (number|undefined)}} - */ -ol.SourceTileOptions; - - /** * @typedef {{attributions: (ol.AttributionLike|undefined), * cacheSize: (number|undefined),