Skip to content

Commit

Permalink
Merge pull request #7270 from mircokroon/master
Browse files Browse the repository at this point in the history
Add credit option to ArcGisMapServerImageryProvider
  • Loading branch information
Hannah authored Dec 26, 2018
2 parents 845c94d + a408471 commit 873cd37
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 7 additions & 1 deletion Source/Scene/ArcGisMapServerImageryProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 873cd37

Please sign in to comment.