diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ea4c8551cde5..2148018751d0 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -199,3 +199,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu * [Cedric Le Roux](https://github.com/cleroux) * [Dag Wästberg](https://github.com/dwastberg) * [Mussab Abdalla](https://github.com/baloola) +* [Mirco Kroon](https://github.com/mircokroon) diff --git a/Source/Scene/ArcGisMapServerImageryProvider.js b/Source/Scene/ArcGisMapServerImageryProvider.js index 1a76dd8caabc..03a5ad1a245f 100644 --- a/Source/Scene/ArcGisMapServerImageryProvider.js +++ b/Source/Scene/ArcGisMapServerImageryProvider.js @@ -83,6 +83,7 @@ define([ * @param {Ellipsoid} [options.ellipsoid] The ellipsoid. If the tilingScheme is specified and used, * this parameter is ignored and the tiling scheme's ellipsoid is used instead. If neither * parameter is specified, the WGS84 ellipsoid is used. + * @param {Credit|String} [options.credit] A credit for the data source, which is displayed on the canvas. This parameter is ignored when accessing a tiled server. * @param {Number} [options.tileWidth=256] The width of each tile in pixels. This parameter is ignored when accessing a tiled server. * @param {Number} [options.tileHeight=256] The height of each tile in pixels. This parameter is ignored when accessing a tiled server. * @param {Number} [options.maximumLevel] The maximum tile level to request, or undefined if there is no maximum. This parameter is ignored when accessing @@ -131,11 +132,16 @@ define([ this._tileHeight = defaultValue(options.tileHeight, 256); this._maximumLevel = options.maximumLevel; this._tilingScheme = defaultValue(options.tilingScheme, new GeographicTilingScheme({ ellipsoid : options.ellipsoid })); - this._credit = undefined; this._useTiles = defaultValue(options.usePreCachedTilesIfAvailable, true); this._rectangle = defaultValue(options.rectangle, this._tilingScheme.rectangle); this._layers = options.layers; + var credit = options.credit; + if (typeof credit === 'string') { + credit = new Credit(credit); + } + this._credit = credit; + /** * Gets or sets a value indicating whether feature picking is enabled. If true, {@link ArcGisMapServerImageryProvider#pickFeatures} will * invoke the "identify" operation on the ArcGIS server and return the features included in the response. If false,