diff --git a/src/objectliterals.exports b/src/objectliterals.exports index 4b5c7c6383..171672ef67 100644 --- a/src/objectliterals.exports +++ b/src/objectliterals.exports @@ -51,6 +51,10 @@ @exportObjectLiteralProperty ol.source.BingMapsOptions.key string @exportObjectLiteralProperty ol.source.BingMapsOptions.style ol.BingMapsStyle +@exportObjectLiteral ol.source.StamenOptions +@exportObjectLiteralProperty ol.source.StamenOptions.flavor string|undefined +@exportObjectLiteralProperty ol.source.StamenOptions.provider string + @exportObjectLiteral ol.source.TiledWMSOptions @exportObjectLiteralProperty ol.source.TiledWMSOptions.attributions Array.|undefined @exportObjectLiteralProperty ol.source.TiledWMSOptions.params Object diff --git a/src/ol/source/stamen.exports b/src/ol/source/stamen.exports index bc110646c5..40b2c8b0e7 100644 --- a/src/ol/source/stamen.exports +++ b/src/ol/source/stamen.exports @@ -1,2 +1,21 @@ @exportSymbol ol.source.Stamen +@exportSymbol ol.source.StamenFlavor +@exportProperty ol.source.StamenFlavor.TERRAIN_BACKGROUND +@exportProperty ol.source.StamenFlavor.TERRAIN_LABELS +@exportProperty ol.source.StamenFlavor.TERRAIN_LINES +@exportProperty ol.source.StamenFlavor.TONER_2010 +@exportProperty ol.source.StamenFlavor.TONER_2011 +@exportProperty ol.source.StamenFlavor.TONER_2011_LABELS +@exportProperty ol.source.StamenFlavor.TONER_2011_LINES +@exportProperty ol.source.StamenFlavor.TONER_2011_LITE +@exportProperty ol.source.StamenFlavor.TONER_BACKGROUND +@exportProperty ol.source.StamenFlavor.TONER_HYBRID +@exportProperty ol.source.StamenFlavor.TONER_LABELS +@exportProperty ol.source.StamenFlavor.TONER_LINES +@exportProperty ol.source.StamenFlavor.TONER_LITE + +@exportSymbol ol.source.StamenProvider +@exportProperty ol.source.StamenProvider.TERRAIN +@exportProperty ol.source.StamenProvider.TONER +@exportProperty ol.source.StamenProvider.WATERCOLOR diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamensource.js index 089f8ece76..6c68e8e720 100644 --- a/src/ol/source/stamensource.js +++ b/src/ol/source/stamensource.js @@ -1,6 +1,8 @@ // FIXME Configure minZoom when supported by TileGrid goog.provide('ol.source.Stamen'); +goog.provide('ol.source.StamenFlavor'); +goog.provide('ol.source.StamenProvider'); goog.require('ol.source.XYZ'); @@ -25,13 +27,6 @@ ol.source.StamenFlavor = { }; -/** - * @typedef {{flavor: (ol.source.StamenFlavor|undefined), - * provider: ol.source.StamenProvider}} - */ -ol.source.StamenOptions; - - /** * @enum {string} */ @@ -43,8 +38,7 @@ ol.source.StamenProvider = { /** - * @type {Object.} + * @type {Object.} */ ol.source.StamenProviderConfig = {}; ol.source.StamenProviderConfig[ol.source.StamenProvider.TERRAIN] = {