Merge pull request #10429 from mike-000/patch-4
Option to disable image smoothing for Tile layer sources (including reprojected sources)
This commit is contained in:
@@ -0,0 +1,15 @@
|
|||||||
|
@media (min-width: 800px) {
|
||||||
|
.wrapper {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
.half {
|
||||||
|
padding: 0 10px;
|
||||||
|
width: 50%;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#opacity {
|
||||||
|
display: inline-block;
|
||||||
|
width: 150px;
|
||||||
|
vertical-align: text-bottom;
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
---
|
||||||
|
layout: example.html
|
||||||
|
title: Disable Image Smoothing
|
||||||
|
shortdesc: Example of disabling image smoothing
|
||||||
|
docs: >
|
||||||
|
Example of disabling image smoothing when using raster DEM (digital elevation model) data.
|
||||||
|
The <code>imageSmoothing: false</code> setting is used to disable canvas image smoothing during
|
||||||
|
reprojection and rendering. Elevation data is
|
||||||
|
calculated from the pixel value returned by <b>forEachLayerAtPixel<b>. For comparison a second map
|
||||||
|
with smoothing enabled returns inaccuate elevations which are very noticeable close to 3107 meters
|
||||||
|
due to how elevation is calculated from the pixel value.
|
||||||
|
tags: "disable image smoothing, xyz, maptiler, reprojection"
|
||||||
|
cloak:
|
||||||
|
- key: get_your_own_D6rA4zTHduk6KOKTXzGB
|
||||||
|
value: Get your own API key at https://www.maptiler.com/cloud/
|
||||||
|
---
|
||||||
|
<div class="wrapper">
|
||||||
|
<div class="half">
|
||||||
|
<h4>Smoothing Disabled</h4>
|
||||||
|
<div id="map1" class="map"></div>
|
||||||
|
<div>
|
||||||
|
<label>
|
||||||
|
Elevation
|
||||||
|
<span id="info1">0.0</span> meters
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label>
|
||||||
|
Imagery opacity
|
||||||
|
<input id="opacity" type="range" min="0" max="100" value="80" />
|
||||||
|
<span id="output"></span> %
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="half">
|
||||||
|
<h4>Uncorrected Comparison</h4>
|
||||||
|
<div id="map2" class="map"></div>
|
||||||
|
<div>
|
||||||
|
<label>
|
||||||
|
Elevation
|
||||||
|
<span id="info2">0.0</span> meters
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,110 @@
|
|||||||
|
import Map from '../src/ol/Map.js';
|
||||||
|
import View from '../src/ol/View.js';
|
||||||
|
import TileLayer from '../src/ol/layer/Tile.js';
|
||||||
|
import XYZ from '../src/ol/source/XYZ.js';
|
||||||
|
|
||||||
|
const key = 'get_your_own_D6rA4zTHduk6KOKTXzGB';
|
||||||
|
const attributions = '<a href="https://www.maptiler.com/copyright/" target="_blank">© MapTiler</a> ' +
|
||||||
|
'<a href="https://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap contributors</a>';
|
||||||
|
|
||||||
|
const disabledLayer = new TileLayer({
|
||||||
|
// specify className so forEachLayerAtPixel can distinguish layers
|
||||||
|
className: 'ol-layer-dem',
|
||||||
|
source: new XYZ({
|
||||||
|
attributions: attributions,
|
||||||
|
url: 'https://api.maptiler.com/tiles/terrain-rgb/{z}/{x}/{y}.png?key=' + key,
|
||||||
|
maxZoom: 10,
|
||||||
|
crossOrigin: '',
|
||||||
|
imageSmoothing: false
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
const imagery = new TileLayer({
|
||||||
|
className: 'ol-layer-imagery',
|
||||||
|
source: new XYZ({
|
||||||
|
attributions: attributions,
|
||||||
|
url: 'https://api.maptiler.com/tiles/satellite/{z}/{x}/{y}.jpg?key=' + key,
|
||||||
|
maxZoom: 20,
|
||||||
|
crossOrigin: ''
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
const enabledLayer = new TileLayer({
|
||||||
|
source: new XYZ({
|
||||||
|
attributions: attributions,
|
||||||
|
url: 'https://api.maptiler.com/tiles/terrain-rgb/{z}/{x}/{y}.png?key=' + key,
|
||||||
|
maxZoom: 10,
|
||||||
|
crossOrigin: ''
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
imagery.on('prerender', function(evt) {
|
||||||
|
// use opaque background to conceal DEM while fully opaque imagery renders
|
||||||
|
if (imagery.getOpacity() === 1) {
|
||||||
|
evt.context.fillStyle = 'white';
|
||||||
|
evt.context.fillRect(0, 0, evt.context.canvas.width, evt.context.canvas.height);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const control = document.getElementById('opacity');
|
||||||
|
const output = document.getElementById('output');
|
||||||
|
control.addEventListener('input', function() {
|
||||||
|
output.innerText = control.value;
|
||||||
|
imagery.setOpacity(control.value / 100);
|
||||||
|
});
|
||||||
|
output.innerText = control.value;
|
||||||
|
imagery.setOpacity(control.value / 100);
|
||||||
|
|
||||||
|
const view = new View({
|
||||||
|
center: [6.893, 45.8295],
|
||||||
|
zoom: 16,
|
||||||
|
projection: 'EPSG:4326'
|
||||||
|
});
|
||||||
|
|
||||||
|
const map1 = new Map({
|
||||||
|
target: 'map1',
|
||||||
|
layers: [disabledLayer, imagery],
|
||||||
|
view: view
|
||||||
|
});
|
||||||
|
|
||||||
|
const map2 = new Map({
|
||||||
|
target: 'map2',
|
||||||
|
layers: [enabledLayer],
|
||||||
|
view: view
|
||||||
|
});
|
||||||
|
|
||||||
|
const info1 = document.getElementById('info1');
|
||||||
|
const info2 = document.getElementById('info2');
|
||||||
|
|
||||||
|
const showElevations = function(evt) {
|
||||||
|
if (evt.dragging) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
map1.forEachLayerAtPixel(
|
||||||
|
evt.pixel,
|
||||||
|
function(layer, pixel) {
|
||||||
|
const height = -10000 + (pixel[0] * 256 * 256 + pixel[1] * 256 + pixel[2]) * 0.1;
|
||||||
|
info1.innerText = height.toFixed(1);
|
||||||
|
},
|
||||||
|
{
|
||||||
|
layerFilter: function(layer) {
|
||||||
|
return layer === disabledLayer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
map2.forEachLayerAtPixel(
|
||||||
|
evt.pixel,
|
||||||
|
function(layer, pixel) {
|
||||||
|
const height = -10000 + (pixel[0] * 256 * 256 + pixel[1] * 256 + pixel[2]) * 0.1;
|
||||||
|
info2.innerText = height.toFixed(1);
|
||||||
|
},
|
||||||
|
{
|
||||||
|
layerFilter: function(layer) {
|
||||||
|
return layer === enabledLayer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
map1.on('pointermove', showElevations);
|
||||||
|
map2.on('pointermove', showElevations);
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
@@ -0,0 +1,35 @@
|
|||||||
|
import Map from '../../../src/ol/Map.js';
|
||||||
|
import View from '../../../src/ol/View.js';
|
||||||
|
import XYZ from '../../../src/ol/source/XYZ.js';
|
||||||
|
import TileLayer from '../../../src/ol/layer/Tile.js';
|
||||||
|
import {toLonLat} from '../../../src/ol/proj.js';
|
||||||
|
import {createXYZ} from '../../../src/ol/tilegrid.js';
|
||||||
|
|
||||||
|
const tileGrid = createXYZ();
|
||||||
|
const extent = tileGrid.getTileCoordExtent([5, 5, 12]);
|
||||||
|
const center = [(extent[0] + extent[2]) / 2, (extent[1] + extent[3]) / 2];
|
||||||
|
|
||||||
|
const source = new XYZ({
|
||||||
|
transition: 0,
|
||||||
|
minZoom: 5,
|
||||||
|
maxZoom: 5,
|
||||||
|
imageSmoothing: false,
|
||||||
|
url: '/data/tiles/osm/{z}/{x}/{y}.png'
|
||||||
|
});
|
||||||
|
|
||||||
|
const layer = new TileLayer({
|
||||||
|
source: source
|
||||||
|
});
|
||||||
|
|
||||||
|
new Map({
|
||||||
|
pixelRatio: 1,
|
||||||
|
target: 'map',
|
||||||
|
layers: [layer],
|
||||||
|
view: new View({
|
||||||
|
projection: 'EPSG:4326',
|
||||||
|
center: toLonLat(center),
|
||||||
|
zoom: 10
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
render();
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
@@ -0,0 +1,33 @@
|
|||||||
|
import Map from '../../../src/ol/Map.js';
|
||||||
|
import View from '../../../src/ol/View.js';
|
||||||
|
import XYZ from '../../../src/ol/source/XYZ.js';
|
||||||
|
import TileLayer from '../../../src/ol/layer/Tile.js';
|
||||||
|
import {createXYZ} from '../../../src/ol/tilegrid.js';
|
||||||
|
|
||||||
|
const tileGrid = createXYZ();
|
||||||
|
const extent = tileGrid.getTileCoordExtent([5, 5, 12]);
|
||||||
|
const center = [(extent[0] + extent[2]) / 2, (extent[1] + extent[3]) / 2];
|
||||||
|
|
||||||
|
const source = new XYZ({
|
||||||
|
transition: 0,
|
||||||
|
minZoom: 5,
|
||||||
|
maxZoom: 5,
|
||||||
|
imageSmoothing: false,
|
||||||
|
url: '/data/tiles/osm/{z}/{x}/{y}.png'
|
||||||
|
});
|
||||||
|
|
||||||
|
const layer = new TileLayer({
|
||||||
|
source: source
|
||||||
|
});
|
||||||
|
|
||||||
|
new Map({
|
||||||
|
pixelRatio: 1,
|
||||||
|
target: 'map',
|
||||||
|
layers: [layer],
|
||||||
|
view: new View({
|
||||||
|
center: center,
|
||||||
|
zoom: 10
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
render();
|
||||||
@@ -10,6 +10,7 @@ import CanvasLayerRenderer from './Layer.js';
|
|||||||
import {apply as applyTransform, compose as composeTransform, makeInverse} from '../../transform.js';
|
import {apply as applyTransform, compose as composeTransform, makeInverse} from '../../transform.js';
|
||||||
import {numberSafeCompareFunction} from '../../array.js';
|
import {numberSafeCompareFunction} from '../../array.js';
|
||||||
import {createTransformString} from '../../render/canvas.js';
|
import {createTransformString} from '../../render/canvas.js';
|
||||||
|
import {assign} from '../../obj.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @classdesc
|
* @classdesc
|
||||||
@@ -271,6 +272,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|||||||
this.clipUnrotated(context, frameState, layerExtent);
|
this.clipUnrotated(context, frameState, layerExtent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
assign(context, tileSource.getContextOptions());
|
||||||
this.preRender(context, frameState);
|
this.preRender(context, frameState);
|
||||||
|
|
||||||
this.renderedTiles.length = 0;
|
this.renderedTiles.length = 0;
|
||||||
|
|||||||
+5
-1
@@ -5,6 +5,7 @@ import {createCanvasContext2D} from './dom.js';
|
|||||||
import {containsCoordinate, createEmpty, extend, getHeight, getTopLeft, getWidth} from './extent.js';
|
import {containsCoordinate, createEmpty, extend, getHeight, getTopLeft, getWidth} from './extent.js';
|
||||||
import {solveLinearSystem} from './math.js';
|
import {solveLinearSystem} from './math.js';
|
||||||
import {getPointResolution, transform} from './proj.js';
|
import {getPointResolution, transform} from './proj.js';
|
||||||
|
import {assign} from './obj.js';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -88,14 +89,16 @@ function enlargeClipPoint(centroidX, centroidY, x, y) {
|
|||||||
* Array of sources.
|
* Array of sources.
|
||||||
* @param {number} gutter Gutter of the sources.
|
* @param {number} gutter Gutter of the sources.
|
||||||
* @param {boolean=} opt_renderEdges Render reprojection edges.
|
* @param {boolean=} opt_renderEdges Render reprojection edges.
|
||||||
|
* @param {object=} opt_contextOptions Properties to set on the canvas context.
|
||||||
* @return {HTMLCanvasElement} Canvas with reprojected data.
|
* @return {HTMLCanvasElement} Canvas with reprojected data.
|
||||||
*/
|
*/
|
||||||
export function render(width, height, pixelRatio,
|
export function render(width, height, pixelRatio,
|
||||||
sourceResolution, sourceExtent, targetResolution, targetExtent,
|
sourceResolution, sourceExtent, targetResolution, targetExtent,
|
||||||
triangulation, sources, gutter, opt_renderEdges) {
|
triangulation, sources, gutter, opt_renderEdges, opt_contextOptions) {
|
||||||
|
|
||||||
const context = createCanvasContext2D(Math.round(pixelRatio * width),
|
const context = createCanvasContext2D(Math.round(pixelRatio * width),
|
||||||
Math.round(pixelRatio * height));
|
Math.round(pixelRatio * height));
|
||||||
|
assign(context, opt_contextOptions);
|
||||||
|
|
||||||
if (sources.length === 0) {
|
if (sources.length === 0) {
|
||||||
return context.canvas;
|
return context.canvas;
|
||||||
@@ -113,6 +116,7 @@ export function render(width, height, pixelRatio,
|
|||||||
const stitchContext = createCanvasContext2D(
|
const stitchContext = createCanvasContext2D(
|
||||||
Math.round(pixelRatio * canvasWidthInUnits / sourceResolution),
|
Math.round(pixelRatio * canvasWidthInUnits / sourceResolution),
|
||||||
Math.round(pixelRatio * canvasHeightInUnits / sourceResolution));
|
Math.round(pixelRatio * canvasHeightInUnits / sourceResolution));
|
||||||
|
assign(stitchContext, opt_contextOptions);
|
||||||
|
|
||||||
const stitchScale = pixelRatio / sourceResolution;
|
const stitchScale = pixelRatio / sourceResolution;
|
||||||
|
|
||||||
|
|||||||
+11
-3
@@ -38,7 +38,8 @@ class ReprojTile extends Tile {
|
|||||||
* Function returning source tiles (z, x, y, pixelRatio).
|
* Function returning source tiles (z, x, y, pixelRatio).
|
||||||
* @param {number=} opt_errorThreshold Acceptable reprojection error (in px).
|
* @param {number=} opt_errorThreshold Acceptable reprojection error (in px).
|
||||||
* @param {boolean=} opt_renderEdges Render reprojection edges.
|
* @param {boolean=} opt_renderEdges Render reprojection edges.
|
||||||
*/
|
* @param {object=} opt_contextOptions Properties to set on the canvas context.
|
||||||
|
*/
|
||||||
constructor(
|
constructor(
|
||||||
sourceProj,
|
sourceProj,
|
||||||
sourceTileGrid,
|
sourceTileGrid,
|
||||||
@@ -50,7 +51,8 @@ class ReprojTile extends Tile {
|
|||||||
gutter,
|
gutter,
|
||||||
getTileFunction,
|
getTileFunction,
|
||||||
opt_errorThreshold,
|
opt_errorThreshold,
|
||||||
opt_renderEdges
|
opt_renderEdges,
|
||||||
|
opt_contextOptions
|
||||||
) {
|
) {
|
||||||
super(tileCoord, TileState.IDLE);
|
super(tileCoord, TileState.IDLE);
|
||||||
|
|
||||||
@@ -60,6 +62,12 @@ class ReprojTile extends Tile {
|
|||||||
*/
|
*/
|
||||||
this.renderEdges_ = opt_renderEdges !== undefined ? opt_renderEdges : false;
|
this.renderEdges_ = opt_renderEdges !== undefined ? opt_renderEdges : false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @private
|
||||||
|
* @type {object}
|
||||||
|
*/
|
||||||
|
this.contextOptions_ = opt_contextOptions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
* @type {number}
|
* @type {number}
|
||||||
@@ -241,7 +249,7 @@ class ReprojTile extends Tile {
|
|||||||
this.canvas_ = renderReprojected(width, height, this.pixelRatio_,
|
this.canvas_ = renderReprojected(width, height, this.pixelRatio_,
|
||||||
sourceResolution, this.sourceTileGrid_.getExtent(),
|
sourceResolution, this.sourceTileGrid_.getExtent(),
|
||||||
targetResolution, targetExtent, this.triangulation_, sources,
|
targetResolution, targetExtent, this.triangulation_, sources,
|
||||||
this.gutter_, this.renderEdges_);
|
this.gutter_, this.renderEdges_, this.contextOptions_);
|
||||||
|
|
||||||
this.state = TileState.LOADED;
|
this.state = TileState.LOADED;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ const TOS_ATTRIBUTION = '<a class="ol-attribution-bing-tos" ' +
|
|||||||
* @property {string} [culture='en-us'] Culture code.
|
* @property {string} [culture='en-us'] Culture code.
|
||||||
* @property {string} key Bing Maps API key. Get yours at http://www.bingmapsportal.com/.
|
* @property {string} key Bing Maps API key. Get yours at http://www.bingmapsportal.com/.
|
||||||
* @property {string} imagerySet Type of imagery.
|
* @property {string} imagerySet Type of imagery.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {number} [maxZoom=21] Max zoom. Default is what's advertized by the BingMaps service.
|
* @property {number} [maxZoom=21] Max zoom. Default is what's advertized by the BingMaps service.
|
||||||
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
||||||
* Higher values can increase reprojection performance, but decrease precision.
|
* Higher values can increase reprojection performance, but decrease precision.
|
||||||
@@ -128,6 +129,7 @@ class BingMaps extends TileImage {
|
|||||||
super({
|
super({
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: 'anonymous',
|
crossOrigin: 'anonymous',
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
opaque: true,
|
opaque: true,
|
||||||
projection: getProjection('EPSG:3857'),
|
projection: getProjection('EPSG:3857'),
|
||||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import {toSize} from '../size.js';
|
|||||||
* @property {null|string} [crossOrigin]
|
* @property {null|string} [crossOrigin]
|
||||||
* @property {import("../extent.js").Extent} [extent=[0, -height, width, 0]]
|
* @property {import("../extent.js").Extent} [extent=[0, -height, width, 0]]
|
||||||
* @property {string} [format='jpg'] Requested image format.
|
* @property {string} [format='jpg'] Requested image format.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {import("../proj.js").ProjectionLike} [projection]
|
* @property {import("../proj.js").ProjectionLike} [projection]
|
||||||
* @property {string} [quality] Requested IIIF image quality. Default is 'native'
|
* @property {string} [quality] Requested IIIF image quality. Default is 'native'
|
||||||
* for version 1, 'default' for versions 2 and 3.
|
* for version 1, 'default' for versions 2 and 3.
|
||||||
@@ -275,6 +276,7 @@ class IIIF extends TileImage {
|
|||||||
attributionsCollapsible: options.attributionsCollapsible,
|
attributionsCollapsible: options.attributionsCollapsible,
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: options.crossOrigin,
|
crossOrigin: options.crossOrigin,
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
projection: options.projection,
|
projection: options.projection,
|
||||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||||
state: options.state,
|
state: options.state,
|
||||||
|
|||||||
@@ -24,9 +24,10 @@ export const ATTRIBUTION = '© ' +
|
|||||||
* @property {null|string} [crossOrigin='anonymous'] The `crossOrigin` attribute for loaded images. Note that
|
* @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.
|
* 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.
|
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {number} [maxZoom=19] Max zoom.
|
* @property {number} [maxZoom=19] Max zoom.
|
||||||
* @property {boolean} [opaque=true] Whether the layer is opaque.
|
* @property {boolean} [opaque=true] Whether the layer is opaque.
|
||||||
* @property {number} [reprojectionErrorThreshold=1.5] Maximum allowed reprojection error (in pixels).
|
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
||||||
* Higher values can increase reprojection performance, but decrease precision.
|
* Higher values can increase reprojection performance, but decrease precision.
|
||||||
* @property {import("../Tile.js").LoadFunction} [tileLoadFunction] Optional function to load a tile given a URL. The default is
|
* @property {import("../Tile.js").LoadFunction} [tileLoadFunction] Optional function to load a tile given a URL. The default is
|
||||||
* ```js
|
* ```js
|
||||||
@@ -70,6 +71,7 @@ class OSM extends XYZ {
|
|||||||
attributions: attributions,
|
attributions: attributions,
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: crossOrigin,
|
crossOrigin: crossOrigin,
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
opaque: options.opaque !== undefined ? options.opaque : true,
|
opaque: options.opaque !== undefined ? options.opaque : true,
|
||||||
maxZoom: options.maxZoom !== undefined ? options.maxZoom : 19,
|
maxZoom: options.maxZoom !== undefined ? options.maxZoom : 19,
|
||||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ const ProviderConfig = {
|
|||||||
/**
|
/**
|
||||||
* @typedef {Object} Options
|
* @typedef {Object} Options
|
||||||
* @property {number} [cacheSize] Tile cache size. The default depends on the screen size. Will be ignored if too small.
|
* @property {number} [cacheSize] Tile cache size. The default depends on the screen size. Will be ignored if too small.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {string} layer Layer name.
|
* @property {string} layer Layer name.
|
||||||
* @property {number} [minZoom] Minimum zoom.
|
* @property {number} [minZoom] Minimum zoom.
|
||||||
* @property {number} [maxZoom] Maximum zoom.
|
* @property {number} [maxZoom] Maximum zoom.
|
||||||
@@ -134,6 +135,7 @@ class Stamen extends XYZ {
|
|||||||
attributions: ATTRIBUTIONS,
|
attributions: ATTRIBUTIONS,
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: 'anonymous',
|
crossOrigin: 'anonymous',
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
maxZoom: options.maxZoom != undefined ? options.maxZoom : providerConfig.maxZoom,
|
maxZoom: options.maxZoom != undefined ? options.maxZoom : providerConfig.maxZoom,
|
||||||
minZoom: options.minZoom != undefined ? options.minZoom : providerConfig.minZoom,
|
minZoom: options.minZoom != undefined ? options.minZoom : providerConfig.minZoom,
|
||||||
opaque: layerConfig.opaque,
|
opaque: layerConfig.opaque,
|
||||||
|
|||||||
@@ -167,6 +167,13 @@ class TileSource extends Source {
|
|||||||
return covered;
|
return covered;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return {Object|undefined} Context options.
|
||||||
|
*/
|
||||||
|
getContextOptions() {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {import("../proj/Projection.js").default} projection Projection.
|
* @param {import("../proj/Projection.js").default} projection Projection.
|
||||||
* @return {number} Gutter.
|
* @return {number} Gutter.
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import {appendParams} from '../uri.js';
|
|||||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
* @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.
|
* 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.
|
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {Object<string,*>} [params] ArcGIS Rest parameters. This field is optional. Service defaults will be
|
* @property {Object<string,*>} [params] 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
|
||||||
* default. `TRANSPARENT` is `true` by default. `BBOX`, `SIZE`, `BBOXSR`,
|
* default. `TRANSPARENT` is `true` by default. `BBOX`, `SIZE`, `BBOXSR`,
|
||||||
@@ -72,6 +73,7 @@ class TileArcGISRest extends TileImage {
|
|||||||
attributions: options.attributions,
|
attributions: options.attributions,
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: options.crossOrigin,
|
crossOrigin: options.crossOrigin,
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
projection: options.projection,
|
projection: options.projection,
|
||||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||||
tileGrid: options.tileGrid,
|
tileGrid: options.tileGrid,
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import EventType from '../events/EventType.js';
|
|||||||
import {equivalent, get as getProjection} from '../proj.js';
|
import {equivalent, get as getProjection} from '../proj.js';
|
||||||
import ReprojTile from '../reproj/Tile.js';
|
import ReprojTile from '../reproj/Tile.js';
|
||||||
import UrlTile from './UrlTile.js';
|
import UrlTile from './UrlTile.js';
|
||||||
|
import {IMAGE_SMOOTHING_DISABLED} from './common.js';
|
||||||
import {getKey, getKeyZXY} from '../tilecoord.js';
|
import {getKey, getKeyZXY} from '../tilecoord.js';
|
||||||
import {getForProjection as getTileGridForProjection} from '../tilegrid.js';
|
import {getForProjection as getTileGridForProjection} from '../tilegrid.js';
|
||||||
|
|
||||||
@@ -21,6 +22,7 @@ import {getForProjection as getTileGridForProjection} from '../tilegrid.js';
|
|||||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
* @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.
|
* 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.
|
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {boolean} [opaque=true] Whether the layer is opaque.
|
* @property {boolean} [opaque=true] Whether the layer is opaque.
|
||||||
* @property {import("../proj.js").ProjectionLike} [projection] Projection. Default is the view projection.
|
* @property {import("../proj.js").ProjectionLike} [projection] Projection. Default is the view projection.
|
||||||
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
||||||
@@ -123,6 +125,13 @@ class TileImage extends UrlTile {
|
|||||||
*/
|
*/
|
||||||
this.reprojectionErrorThreshold_ = options.reprojectionErrorThreshold;
|
this.reprojectionErrorThreshold_ = options.reprojectionErrorThreshold;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @private
|
||||||
|
* @type {object|undefined}
|
||||||
|
*/
|
||||||
|
this.contextOptions_ = options.imageSmoothing === false ?
|
||||||
|
IMAGE_SMOOTHING_DISABLED : undefined;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
* @type {boolean}
|
* @type {boolean}
|
||||||
@@ -166,6 +175,13 @@ class TileImage extends UrlTile {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritDoc
|
||||||
|
*/
|
||||||
|
getContextOptions() {
|
||||||
|
return this.contextOptions_;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
*/
|
*/
|
||||||
@@ -296,7 +312,7 @@ class TileImage extends UrlTile {
|
|||||||
function(z, x, y, pixelRatio) {
|
function(z, x, y, pixelRatio) {
|
||||||
return this.getTileInternal(z, x, y, pixelRatio, sourceProjection);
|
return this.getTileInternal(z, x, y, pixelRatio, sourceProjection);
|
||||||
}.bind(this), this.reprojectionErrorThreshold_,
|
}.bind(this), this.reprojectionErrorThreshold_,
|
||||||
this.renderReprojectionEdges_);
|
this.renderReprojectionEdges_, this.contextOptions_);
|
||||||
newTile.key = key;
|
newTile.key = key;
|
||||||
|
|
||||||
if (tile) {
|
if (tile) {
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ import {createXYZ, extentFromProjection} from '../tilegrid.js';
|
|||||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
* @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.
|
* 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.
|
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {boolean} [jsonp=false] Use JSONP with callback to load the TileJSON.
|
* @property {boolean} [jsonp=false] Use JSONP with callback to load the TileJSON.
|
||||||
* Useful when the server does not support CORS..
|
* Useful when the server does not support CORS..
|
||||||
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
||||||
@@ -78,6 +79,7 @@ class TileJSON extends TileImage {
|
|||||||
attributions: options.attributions,
|
attributions: options.attributions,
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: options.crossOrigin,
|
crossOrigin: options.crossOrigin,
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
projection: getProjection('EPSG:3857'),
|
projection: getProjection('EPSG:3857'),
|
||||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||||
state: SourceState.LOADING,
|
state: SourceState.LOADING,
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import {appendParams} from '../uri.js';
|
|||||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
* @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.
|
* 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.
|
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {Object<string,*>} params WMS request parameters.
|
* @property {Object<string,*>} params WMS request parameters.
|
||||||
* At least a `LAYERS` param is required. `STYLES` is
|
* At least a `LAYERS` param is required. `STYLES` is
|
||||||
* `''` by default. `VERSION` is `1.3.0` by default. `WIDTH`, `HEIGHT`, `BBOX`
|
* `''` by default. `VERSION` is `1.3.0` by default. `WIDTH`, `HEIGHT`, `BBOX`
|
||||||
@@ -91,6 +92,7 @@ class TileWMS extends TileImage {
|
|||||||
attributions: options.attributions,
|
attributions: options.attributions,
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: options.crossOrigin,
|
crossOrigin: options.crossOrigin,
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
opaque: !transparent,
|
opaque: !transparent,
|
||||||
projection: options.projection,
|
projection: options.projection,
|
||||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import {appendParams} from '../uri.js';
|
|||||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
* @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.
|
* 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.
|
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {import("../tilegrid/WMTS.js").default} tileGrid Tile grid.
|
* @property {import("../tilegrid/WMTS.js").default} tileGrid Tile grid.
|
||||||
* @property {import("../proj.js").ProjectionLike} [projection] Projection. Default is the view projection.
|
* @property {import("../proj.js").ProjectionLike} [projection] Projection. Default is the view projection.
|
||||||
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
||||||
@@ -84,6 +85,7 @@ class WMTS extends TileImage {
|
|||||||
attributions: options.attributions,
|
attributions: options.attributions,
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: options.crossOrigin,
|
crossOrigin: options.crossOrigin,
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
projection: options.projection,
|
projection: options.projection,
|
||||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||||
tileClass: options.tileClass,
|
tileClass: options.tileClass,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import {createXYZ, extentFromProjection} from '../tilegrid.js';
|
|||||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
* @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.
|
* 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.
|
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {boolean} [opaque=true] Whether the layer is opaque.
|
* @property {boolean} [opaque=true] Whether the layer is opaque.
|
||||||
* @property {import("../proj.js").ProjectionLike} [projection='EPSG:3857'] Projection.
|
* @property {import("../proj.js").ProjectionLike} [projection='EPSG:3857'] Projection.
|
||||||
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
||||||
@@ -90,6 +91,7 @@ class XYZ extends TileImage {
|
|||||||
attributions: options.attributions,
|
attributions: options.attributions,
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: options.crossOrigin,
|
crossOrigin: options.crossOrigin,
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
opaque: options.opaque,
|
opaque: options.opaque,
|
||||||
projection: projection,
|
projection: projection,
|
||||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||||
|
|||||||
@@ -85,6 +85,7 @@ export class CustomTile extends ImageTile {
|
|||||||
* @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images. Note that
|
* @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.
|
* 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.
|
* See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
|
||||||
|
* @property {boolean} [imageSmoothing=true] Enable image smoothing.
|
||||||
* @property {import("../proj.js").ProjectionLike} [projection] Projection.
|
* @property {import("../proj.js").ProjectionLike} [projection] Projection.
|
||||||
* @property {number} [tilePixelRatio] The pixel ratio used by the tile service. For example, if the tile service advertizes 256px by 256px tiles but actually sends 512px by 512px images (for retina/hidpi devices) then `tilePixelRatio` should be set to `2`
|
* @property {number} [tilePixelRatio] The pixel ratio used by the tile service. For example, if the tile service advertizes 256px by 256px tiles but actually sends 512px by 512px images (for retina/hidpi devices) then `tilePixelRatio` should be set to `2`
|
||||||
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
* @property {number} [reprojectionErrorThreshold=0.5] Maximum allowed reprojection error (in pixels).
|
||||||
@@ -246,6 +247,7 @@ class Zoomify extends TileImage {
|
|||||||
attributions: options.attributions,
|
attributions: options.attributions,
|
||||||
cacheSize: options.cacheSize,
|
cacheSize: options.cacheSize,
|
||||||
crossOrigin: options.crossOrigin,
|
crossOrigin: options.crossOrigin,
|
||||||
|
imageSmoothing: options.imageSmoothing,
|
||||||
projection: options.projection,
|
projection: options.projection,
|
||||||
tilePixelRatio: tilePixelRatio,
|
tilePixelRatio: tilePixelRatio,
|
||||||
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
reprojectionErrorThreshold: options.reprojectionErrorThreshold,
|
||||||
|
|||||||
@@ -7,3 +7,12 @@
|
|||||||
* @type {string}
|
* @type {string}
|
||||||
*/
|
*/
|
||||||
export const DEFAULT_WMS_VERSION = '1.3.0';
|
export const DEFAULT_WMS_VERSION = '1.3.0';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Context options to disable image smoothing.
|
||||||
|
* @type {Object}
|
||||||
|
*/
|
||||||
|
export const IMAGE_SMOOTHING_DISABLED = {
|
||||||
|
imageSmoothingEnabled: false,
|
||||||
|
msImageSmoothingEnabled: false
|
||||||
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user