remove deprecated imageSmoothing
This commit is contained in:
@@ -52,7 +52,6 @@ const TOS_ATTRIBUTION =
|
||||
* @property {string} [culture='en-us'] Culture code.
|
||||
* @property {string} key Bing Maps API key. Get yours at https://www.bingmapsportal.com/.
|
||||
* @property {string} imagerySet Type of imagery.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {number} [maxZoom=21] Max zoom. Default is what's advertized by the BingMaps service.
|
||||
@@ -121,16 +120,10 @@ class BingMaps extends TileImage {
|
||||
constructor(options) {
|
||||
const hidpi = options.hidpi !== undefined ? options.hidpi : false;
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: 'anonymous',
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
opaque: true,
|
||||
projection: getProjection('EPSG:3857'),
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
|
||||
@@ -19,7 +19,6 @@ import {toSize} from '../size.js';
|
||||
* @property {null|string} [crossOrigin] The value for the crossOrigin option of the request.
|
||||
* @property {import("../extent.js").Extent} [extent=[0, -height, width, 0]] The extent.
|
||||
* @property {string} [format='jpg'] Requested image format.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {import("../proj.js").ProjectionLike} [projection] Projection.
|
||||
@@ -70,12 +69,6 @@ class IIIF extends TileImage {
|
||||
*/
|
||||
const options = opt_options || {};
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
let baseUrl = options.url || '';
|
||||
baseUrl =
|
||||
baseUrl +
|
||||
@@ -340,7 +333,7 @@ class IIIF extends TileImage {
|
||||
attributionsCollapsible: options.attributionsCollapsible,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: options.crossOrigin,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: options.projection,
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
state: options.state,
|
||||
|
||||
@@ -75,7 +75,6 @@ export class ImageSourceEvent extends Event {
|
||||
/**
|
||||
* @typedef {Object} Options
|
||||
* @property {import("./Source.js").AttributionLike} [attributions] Attributions.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {import("../proj.js").ProjectionLike} [projection] Projection.
|
||||
@@ -97,17 +96,12 @@ class ImageSource extends Source {
|
||||
* @param {Options} options Single image source options.
|
||||
*/
|
||||
constructor(options) {
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
projection: options.projection,
|
||||
state: options.state,
|
||||
interpolate: interpolate,
|
||||
interpolate:
|
||||
options.interpolate !== undefined ? options.interpolate : true,
|
||||
});
|
||||
|
||||
/***
|
||||
|
||||
@@ -19,7 +19,6 @@ import {containsExtent, getHeight, getWidth} from '../extent.js';
|
||||
* the remote server.
|
||||
* @property {import("../Image.js").LoadFunction} [imageLoadFunction] Optional function to load an image given
|
||||
* a URL.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {Object<string,*>} [params] ArcGIS Rest parameters. This field is optional. Service
|
||||
@@ -58,15 +57,9 @@ class ImageArcGISRest extends ImageSource {
|
||||
constructor(opt_options) {
|
||||
const options = opt_options ? opt_options : {};
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: options.projection,
|
||||
resolutions: options.resolutions,
|
||||
});
|
||||
|
||||
@@ -36,7 +36,6 @@ import {
|
||||
* the value returned by the function is later changed then
|
||||
* `changed` should be called on the source for the source to
|
||||
* invalidate the current cached image. See: {@link module:ol/Observable~Observable#changed}
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {import("../proj.js").ProjectionLike} [projection] Projection. Default is the view projection.
|
||||
@@ -59,15 +58,9 @@ class ImageCanvasSource extends ImageSource {
|
||||
constructor(opt_options) {
|
||||
const options = opt_options ? opt_options : {};
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: options.projection,
|
||||
resolutions: options.resolutions,
|
||||
state: options.state,
|
||||
|
||||
@@ -31,7 +31,6 @@ import {
|
||||
* @property {Array<number>} [resolutions] Resolutions.
|
||||
* If specified, requests will be made for these resolutions only.
|
||||
* @property {import("../Image.js").LoadFunction} [imageLoadFunction] Optional function to load an image given a URL.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {Object} [params] Additional parameters.
|
||||
@@ -49,14 +48,8 @@ class ImageMapGuide extends ImageSource {
|
||||
* @param {Options} options ImageMapGuide options.
|
||||
*/
|
||||
constructor(options) {
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: options.projection,
|
||||
resolutions: options.resolutions,
|
||||
});
|
||||
|
||||
@@ -19,7 +19,6 @@ import {get as getProjection} from '../proj.js';
|
||||
* @property {import("../extent.js").Extent} [imageExtent] Extent of the image in map coordinates.
|
||||
* This is the [left, bottom, right, top] map coordinates of your image.
|
||||
* @property {import("../Image.js").LoadFunction} [imageLoadFunction] Optional function to load an image given a URL.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {import("../proj.js").ProjectionLike} [projection] Projection. Default is the view projection.
|
||||
@@ -46,15 +45,9 @@ class Static extends ImageSource {
|
||||
? options.imageLoadFunction
|
||||
: defaultImageLoadFunction;
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: getProjection(options.projection),
|
||||
});
|
||||
|
||||
|
||||
@@ -44,7 +44,6 @@ const GETFEATUREINFO_IMAGE_SIZE = [101, 101];
|
||||
* the remote WMS server: `mapserver`, `geoserver`, `carmentaserver`, or `qgis`.
|
||||
* Only needed if `hidpi` is `true`.
|
||||
* @property {import("../Image.js").LoadFunction} [imageLoadFunction] Optional function to load an image given a URL.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {Object<string,*>} params WMS request parameters.
|
||||
@@ -74,15 +73,9 @@ class ImageWMS extends ImageSource {
|
||||
constructor(opt_options) {
|
||||
const options = opt_options ? opt_options : {};
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: options.projection,
|
||||
resolutions: options.resolutions,
|
||||
});
|
||||
|
||||
@@ -19,7 +19,6 @@ import {getTileSetInfo} from './ogcTileUtil.js';
|
||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
||||
* you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
|
||||
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
||||
@@ -46,17 +45,11 @@ class OGCMapTile extends TileImage {
|
||||
* @param {Options} options OGC map tile options.
|
||||
*/
|
||||
constructor(options) {
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: options.crossOrigin,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: options.projection,
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
state: 'loading',
|
||||
|
||||
@@ -23,7 +23,6 @@ export const ATTRIBUTION =
|
||||
* @property {null|string} [crossOrigin='anonymous'] The `crossOrigin` attribute for loaded images. Note that
|
||||
* you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
|
||||
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {number} [maxZoom=19] Max zoom.
|
||||
@@ -58,12 +57,6 @@ class OSM extends XYZ {
|
||||
constructor(opt_options) {
|
||||
const options = opt_options || {};
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
let attributions;
|
||||
if (options.attributions !== undefined) {
|
||||
attributions = options.attributions;
|
||||
@@ -84,7 +77,7 @@ class OSM extends XYZ {
|
||||
attributionsCollapsible: false,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: crossOrigin,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
maxZoom: options.maxZoom !== undefined ? options.maxZoom : 19,
|
||||
opaque: options.opaque !== undefined ? options.opaque : true,
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
|
||||
@@ -87,7 +87,6 @@ const ProviderConfig = {
|
||||
/**
|
||||
* @typedef {Object} Options
|
||||
* @property {number} [cacheSize] Initial tile cache size. Will auto-grow to hold at least the number of tiles in the viewport.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {string} layer Layer name.
|
||||
@@ -121,12 +120,6 @@ class Stamen extends XYZ {
|
||||
* @param {Options} options Stamen options.
|
||||
*/
|
||||
constructor(options) {
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
const i = options.layer.indexOf('-');
|
||||
const provider = i == -1 ? options.layer : options.layer.slice(0, i);
|
||||
const providerConfig = ProviderConfig[provider];
|
||||
@@ -145,7 +138,7 @@ class Stamen extends XYZ {
|
||||
attributions: ATTRIBUTIONS,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: 'anonymous',
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
maxZoom:
|
||||
options.maxZoom != undefined ? options.maxZoom : providerConfig.maxZoom,
|
||||
minZoom:
|
||||
|
||||
@@ -16,7 +16,6 @@ import {hash as tileCoordHash} from '../tilecoord.js';
|
||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
||||
* you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
|
||||
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {Object<string,*>} [params] ArcGIS Rest parameters. This field is optional. Service defaults will be
|
||||
@@ -73,17 +72,11 @@ class TileArcGISRest extends TileImage {
|
||||
constructor(opt_options) {
|
||||
const options = opt_options ? opt_options : {};
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: options.crossOrigin,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: options.projection,
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
tileGrid: options.tileGrid,
|
||||
|
||||
@@ -21,7 +21,6 @@ import {getUid} from '../util.js';
|
||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
||||
* you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
|
||||
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {boolean} [opaque=false] Whether the layer is opaque.
|
||||
@@ -71,12 +70,6 @@ class TileImage extends UrlTile {
|
||||
* @param {!Options} options Image tile options.
|
||||
*/
|
||||
constructor(options) {
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
cacheSize: options.cacheSize,
|
||||
@@ -93,7 +86,8 @@ class TileImage extends UrlTile {
|
||||
urls: options.urls,
|
||||
wrapX: options.wrapX,
|
||||
transition: options.transition,
|
||||
interpolate: interpolate,
|
||||
interpolate:
|
||||
options.interpolate !== undefined ? options.interpolate : true,
|
||||
key: options.key,
|
||||
attributionsCollapsible: options.attributionsCollapsible,
|
||||
zDirection: options.zDirection,
|
||||
|
||||
@@ -39,7 +39,6 @@ import {jsonp as requestJSONP} from '../net.js';
|
||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
||||
* you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
|
||||
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {boolean} [jsonp=false] Use JSONP with callback to load the TileJSON.
|
||||
@@ -75,17 +74,11 @@ class TileJSON extends TileImage {
|
||||
* @param {Options} options TileJSON options.
|
||||
*/
|
||||
constructor(options) {
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: options.crossOrigin,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: getProjection('EPSG:3857'),
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
state: 'loading',
|
||||
|
||||
@@ -22,7 +22,6 @@ import {hash as tileCoordHash} from '../tilecoord.js';
|
||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
||||
* you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
|
||||
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {Object<string,*>} params WMS request parameters.
|
||||
@@ -85,12 +84,6 @@ class TileWMS extends TileImage {
|
||||
constructor(opt_options) {
|
||||
const options = opt_options ? opt_options : /** @type {Options} */ ({});
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
const params = options.params || {};
|
||||
|
||||
const transparent = 'TRANSPARENT' in params ? params['TRANSPARENT'] : true;
|
||||
@@ -100,7 +93,7 @@ class TileWMS extends TileImage {
|
||||
attributionsCollapsible: options.attributionsCollapsible,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: options.crossOrigin,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
opaque: !transparent,
|
||||
projection: options.projection,
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
|
||||
@@ -22,7 +22,6 @@ import {equivalent, get as getProjection, transformExtent} from '../proj.js';
|
||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
||||
* you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
|
||||
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {import("../tilegrid/WMTS.js").default} tileGrid Tile grid.
|
||||
@@ -73,12 +72,6 @@ class WMTS extends TileImage {
|
||||
* @param {Options} options WMTS options.
|
||||
*/
|
||||
constructor(options) {
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
// TODO: add support for TileMatrixLimits
|
||||
|
||||
const requestEncoding =
|
||||
@@ -98,7 +91,7 @@ class WMTS extends TileImage {
|
||||
attributionsCollapsible: options.attributionsCollapsible,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: options.crossOrigin,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: options.projection,
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
tileClass: options.tileClass,
|
||||
|
||||
@@ -13,7 +13,6 @@ import {createXYZ, extentFromProjection} from '../tilegrid.js';
|
||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
||||
* you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
|
||||
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {boolean} [opaque=false] Whether the layer is opaque.
|
||||
@@ -78,12 +77,6 @@ class XYZ extends TileImage {
|
||||
constructor(opt_options) {
|
||||
const options = opt_options || {};
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
const projection =
|
||||
options.projection !== undefined ? options.projection : 'EPSG:3857';
|
||||
|
||||
@@ -102,7 +95,7 @@ class XYZ extends TileImage {
|
||||
attributions: options.attributions,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: options.crossOrigin,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
opaque: options.opaque,
|
||||
projection: projection,
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
|
||||
@@ -83,7 +83,6 @@ export class CustomTile extends ImageTile {
|
||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
||||
* you must provide a `crossOrigin` value you want to access pixel data with the Canvas renderer.
|
||||
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||
* @property {boolean} [imageSmoothing=true] Deprecated. Use the `interpolate` option instead.
|
||||
* @property {boolean} [interpolate=true] Use interpolated values when resampling. By default,
|
||||
* linear interpolation is used when resampling. Set to false to use the nearest neighbor instead.
|
||||
* @property {import("../proj.js").ProjectionLike} [projection] Projection.
|
||||
@@ -129,12 +128,6 @@ class Zoomify extends TileImage {
|
||||
constructor(opt_options) {
|
||||
const options = opt_options;
|
||||
|
||||
let interpolate =
|
||||
options.imageSmoothing !== undefined ? options.imageSmoothing : true;
|
||||
if (options.interpolate !== undefined) {
|
||||
interpolate = options.interpolate;
|
||||
}
|
||||
|
||||
const size = options.size;
|
||||
const tierSizeCalculation =
|
||||
options.tierSizeCalculation !== undefined
|
||||
@@ -264,7 +257,7 @@ class Zoomify extends TileImage {
|
||||
attributions: options.attributions,
|
||||
cacheSize: options.cacheSize,
|
||||
crossOrigin: options.crossOrigin,
|
||||
interpolate: interpolate,
|
||||
interpolate: options.interpolate,
|
||||
projection: options.projection,
|
||||
tilePixelRatio: tilePixelRatio,
|
||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||
|
||||
@@ -20,11 +20,6 @@ describe('ol/source/BingMaps', function () {
|
||||
const source = new BingMaps({interpolate: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new BingMaps({imageSmoothing: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#tileUrlFunction()', function () {
|
||||
|
||||
@@ -151,11 +151,6 @@ describe('ol/source/IIIF', function () {
|
||||
const source = new IIIF({size: size, interpolate: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new IIIF({size: size, imageSmoothing: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('tileUrlFunction', function () {
|
||||
|
||||
@@ -26,13 +26,6 @@ describe('ol/source/ImageArcGISRest', function () {
|
||||
);
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new ImageArcGISRest(
|
||||
Object.assign({imageSmoothing: false}, options)
|
||||
);
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#getImage', function () {
|
||||
|
||||
@@ -23,11 +23,6 @@ describe('ol/source/ImageStatic', function () {
|
||||
const source = new Static({interpolate: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new Static({imageSmoothing: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#getImage', function () {
|
||||
|
||||
@@ -41,11 +41,6 @@ describe('ol/source/TileImage', function () {
|
||||
const source = new TileImage({interpolate: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new TileImage({imageSmoothing: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#getTileCacheForProjection', function () {
|
||||
|
||||
@@ -27,14 +27,6 @@ describe('ol/source/TileJSON', function () {
|
||||
});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new TileJSON({
|
||||
imageSmoothing: false,
|
||||
url: 'spec/ol/data/tilejson.json',
|
||||
});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#getTileJSON', function () {
|
||||
|
||||
@@ -42,11 +42,6 @@ describe('ol/source/TileWMS', function () {
|
||||
const source = new TileWMS({interpolate: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new TileWMS({imageSmoothing: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#getTile', function () {
|
||||
|
||||
@@ -240,11 +240,6 @@ describe('ol/source/WMTS', function () {
|
||||
const source = new WMTS({interpolate: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new WMTS({imageSmoothing: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('when creating tileUrlFunction', function () {
|
||||
|
||||
@@ -57,11 +57,6 @@ describe('ol/source/XYZ', function () {
|
||||
const source = new XYZ({interpolate: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new XYZ({imageSmoothing: false});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('tileUrlFunction', function () {
|
||||
|
||||
@@ -151,15 +151,6 @@ describe('ol/source/Zoomify', function () {
|
||||
const source = new Zoomify({interpolate: false, url: '', size: [47, 11]});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
|
||||
it('is false if constructed with imageSmoothing: false', function () {
|
||||
const source = new Zoomify({
|
||||
imageSmoothing: false,
|
||||
url: '',
|
||||
size: [47, 11],
|
||||
});
|
||||
expect(source.getInterpolate()).to.be(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('generated tileGrid', function () {
|
||||
|
||||
Reference in New Issue
Block a user