Add in crossOrigin option

This commit is contained in:
Anna Lambrechtsen
2015-07-01 08:27:26 +12:00
committed by llambanna
parent 3f214f6ac4
commit 1d3f8b5d7d
2 changed files with 20 additions and 1 deletions
+19 -1
View File
@@ -472,6 +472,7 @@ olx.ProjectionOptions.prototype.global;
*/ */
olx.ProjectionOptions.prototype.worldExtent; olx.ProjectionOptions.prototype.worldExtent;
/** /**
* Function to determine resolution at a point. The function is called with a * Function to determine resolution at a point. The function is called with a
* `{number}` view resolution and an `{ol.Coordinate}` as arguments, and returns * `{number}` view resolution and an `{ol.Coordinate}` as arguments, and returns
@@ -911,6 +912,7 @@ olx.control.AttributionOptions.prototype.tipLabel;
*/ */
olx.control.AttributionOptions.prototype.label; olx.control.AttributionOptions.prototype.label;
/** /**
* Text label to use for the expanded attributions button. Default is `»`. * Text label to use for the expanded attributions button. Default is `»`.
* Instead of text, also a Node (e.g. a `span` element) can be used. * Instead of text, also a Node (e.g. a `span` element) can be used.
@@ -2828,6 +2830,7 @@ olx.interaction.SelectOptions.prototype.removeCondition;
*/ */
olx.interaction.SelectOptions.prototype.toggleCondition; olx.interaction.SelectOptions.prototype.toggleCondition;
/** /**
* A boolean that determines if the default behaviour should select only * A boolean that determines if the default behaviour should select only
* single features or all (overlapping) features at the clicked map * single features or all (overlapping) features at the clicked map
@@ -2837,6 +2840,7 @@ olx.interaction.SelectOptions.prototype.toggleCondition;
*/ */
olx.interaction.SelectOptions.prototype.multi; olx.interaction.SelectOptions.prototype.multi;
/** /**
* A function that takes an {@link ol.Feature} and an {@link ol.layer.Layer} and * A function that takes an {@link ol.Feature} and an {@link ol.layer.Layer} and
* returns `true` if the feature may be selected or `false` otherwise. * returns `true` if the feature may be selected or `false` otherwise.
@@ -4194,7 +4198,6 @@ olx.source.ImageMapGuideOptions.prototype.ratio;
olx.source.ImageMapGuideOptions.prototype.resolutions; olx.source.ImageMapGuideOptions.prototype.resolutions;
/** /**
* Optional function to load an image given a URL. * Optional function to load an image given a URL.
* @type {ol.TileLoadFunctionType|undefined} * @type {ol.TileLoadFunctionType|undefined}
@@ -4753,6 +4756,7 @@ olx.source.ImageStaticOptions.prototype.url;
/** /**
* @typedef {{attributions: (Array.<ol.Attribution>|undefined), * @typedef {{attributions: (Array.<ol.Attribution>|undefined),
* crossOrigin: (null|string|undefined),
* params: (Object.<string, *>|undefined), * params: (Object.<string, *>|undefined),
* logo: (string|olx.LogoOptions|undefined), * logo: (string|olx.LogoOptions|undefined),
* tileGrid: (ol.tilegrid.TileGrid|undefined), * tileGrid: (ol.tilegrid.TileGrid|undefined),
@@ -4765,6 +4769,7 @@ olx.source.ImageStaticOptions.prototype.url;
*/ */
olx.source.TileArcGISRestOptions; olx.source.TileArcGISRestOptions;
/** /**
* Attributions. * Attributions.
* @type {Array.<ol.Attribution>|undefined} * @type {Array.<ol.Attribution>|undefined}
@@ -4773,6 +4778,18 @@ olx.source.TileArcGISRestOptions;
olx.source.TileArcGISRestOptions.prototype.attributions; olx.source.TileArcGISRestOptions.prototype.attributions;
/**
* The `crossOrigin` attribute for loaded images. Note that you must provide a
* `crossOrigin` value if you are using the WebGL renderer or if you want to
* access pixel data with the Canvas renderer. See
* {@link https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image}
* for more detail.
* @type {null|string|undefined}
* @api
*/
olx.source.TileArcGISRestOptions.prototype.crossOrigin;
/** /**
* ArcGIS Rest parameters. This field is optional. Service defaults will be * ArcGIS Rest parameters. This field is optional. Service defaults will be
* used for any fields not specified. `FORMAT` is `PNG32` by default. `F` is `IMAGE` by * used for any fields not specified. `FORMAT` is `PNG32` by default. `F` is `IMAGE` by
@@ -4806,6 +4823,7 @@ olx.source.TileArcGISRestOptions.prototype.logo;
*/ */
olx.source.TileArcGISRestOptions.prototype.tileGrid; olx.source.TileArcGISRestOptions.prototype.tileGrid;
/** /**
* Projection. * Projection.
* @type {ol.proj.ProjectionLike} * @type {ol.proj.ProjectionLike}
+1
View File
@@ -39,6 +39,7 @@ ol.source.TileArcGISRest = function(opt_options) {
goog.base(this, { goog.base(this, {
attributions: options.attributions, attributions: options.attributions,
crossOrigin: options.crossOrigin,
logo: options.logo, logo: options.logo,
projection: options.projection, projection: options.projection,
tileGrid: options.tileGrid, tileGrid: options.tileGrid,