diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index a4c784dbd6..dd56096480 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -1,5 +1,4 @@ goog.provide('ol.layer.Layer'); -goog.provide('ol.layer.LayerOptions'); goog.provide('ol.layer.LayerProperty'); goog.require('goog.events'); @@ -9,18 +8,6 @@ goog.require('ol.Object'); goog.require('ol.source.Source'); -/** - * @typedef {{brightness: (number|undefined), - * contrast: (number|undefined), - * hue: (number|undefined), - * opacity: (number|undefined), - * saturation: (number|undefined), - * source: ol.source.Source, - * visible: (boolean|undefined)}} - */ -ol.layer.LayerOptions; - - /** * @enum {string} */ @@ -38,7 +25,7 @@ ol.layer.LayerProperty = { /** * @constructor * @extends {ol.Object} - * @param {ol.layer.LayerOptions} layerOptions LayerOptions. + * @param {olx.layer.LayerOptions} layerOptions LayerOptions. */ ol.layer.Layer = function(layerOptions) { diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js index 3596e567ff..1782679962 100644 --- a/src/ol/layer/tilelayer.js +++ b/src/ol/layer/tilelayer.js @@ -1,7 +1,6 @@ goog.provide('ol.layer.TileLayer'); goog.require('ol.layer.Layer'); -goog.require('ol.layer.LayerOptions'); goog.require('ol.source.TileSource'); @@ -9,7 +8,7 @@ goog.require('ol.source.TileSource'); /** * @constructor * @extends {ol.layer.Layer} - * @param {ol.layer.LayerOptions} layerOptions Layer options. + * @param {olx.layer.LayerOptions} layerOptions Layer options. */ ol.layer.TileLayer = function(layerOptions) { goog.base(this, layerOptions); diff --git a/src/ol/types.txt b/src/ol/types.txt index 9c42fc7915..e18b33a95b 100644 --- a/src/ol/types.txt +++ b/src/ol/types.txt @@ -23,3 +23,12 @@ userProjection: ol.Projection|string|undefined zoom: number|undefined zoomDelta: number|undefined zoomFactor: number|undefined + +@exportType olx.layer.LayerOptions +brightness: number|undefined +contrast: number|undefined +hue: number|undefined +opacity: number|undefined +saturation: number|undefined +source: ol.source.Source +visible: boolean|undefined