Make code prettier
This updates ESLint and our shared eslint-config-openlayers to use Prettier. Most formatting changes were automatically applied with this:
npm run lint -- --fix
A few manual changes were required:
* In `examples/offscreen-canvas.js`, the `//eslint-disable-line` comment needed to be moved to the appropriate line to disable the error about the `'worker-loader!./offscreen-canvas.worker.js'` import.
* In `examples/webpack/exapmle-builder.js`, spaces could not be added after a couple `function`s for some reason. While editing this, I reworked `ExampleBuilder` to be a class.
* In `src/ol/format/WMSGetFeatureInfo.js`, the `// @ts-ignore` comment needed to be moved down one line so it applied to the `parsersNS` argument.
This commit is contained in:
@@ -1,17 +1,22 @@
|
||||
import Map from '../src/ol/Map.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import Layer from '../src/ol/layer/Layer.js';
|
||||
import Map from '../src/ol/Map.js';
|
||||
import Source from '../src/ol/source/Source.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import Worker from 'worker-loader!./offscreen-canvas.worker.js'; //eslint-disable-line
|
||||
import stringify from 'json-stringify-safe';
|
||||
import {FullScreen} from '../src/ol/control.js';
|
||||
import {compose, create} from '../src/ol/transform.js';
|
||||
import {createTransformString} from '../src/ol/render/canvas.js';
|
||||
import {createXYZ} from '../src/ol/tilegrid.js';
|
||||
import {FullScreen} from '../src/ol/control.js';
|
||||
import stringify from 'json-stringify-safe';
|
||||
import Source from '../src/ol/source/Source.js';
|
||||
|
||||
const worker = new Worker();
|
||||
|
||||
let container, transformContainer, canvas, rendering, workerFrameState, mainThreadFrameState;
|
||||
let container,
|
||||
transformContainer,
|
||||
canvas,
|
||||
rendering,
|
||||
workerFrameState,
|
||||
mainThreadFrameState;
|
||||
|
||||
// Transform the container to account for the differnece between the (newer)
|
||||
// main thread frameState and the (older) worker frameState
|
||||
@@ -29,12 +34,16 @@ function updateContainerTransform() {
|
||||
// Skip the extra transform for rotated views, because it will not work
|
||||
// correctly in that case
|
||||
if (!rotation) {
|
||||
compose(transform,
|
||||
compose(
|
||||
transform,
|
||||
(renderedCenter[0] - center[0]) / resolution,
|
||||
(center[1] - renderedCenter[1]) / resolution,
|
||||
renderedResolution / resolution, renderedResolution / resolution,
|
||||
renderedResolution / resolution,
|
||||
renderedResolution / resolution,
|
||||
rotation - renderedRotation,
|
||||
0, 0);
|
||||
0,
|
||||
0
|
||||
);
|
||||
}
|
||||
transformContainer.style.transform = createTransformString(transform);
|
||||
}
|
||||
@@ -43,7 +52,7 @@ function updateContainerTransform() {
|
||||
const map = new Map({
|
||||
layers: [
|
||||
new Layer({
|
||||
render: function(frameState) {
|
||||
render: function (frameState) {
|
||||
if (!container) {
|
||||
container = document.createElement('div');
|
||||
container.style.position = 'absolute';
|
||||
@@ -66,7 +75,7 @@ const map = new Map({
|
||||
rendering = true;
|
||||
worker.postMessage({
|
||||
action: 'render',
|
||||
frameState: JSON.parse(stringify(frameState))
|
||||
frameState: JSON.parse(stringify(frameState)),
|
||||
});
|
||||
} else {
|
||||
frameState.animate = true;
|
||||
@@ -76,34 +85,39 @@ const map = new Map({
|
||||
source: new Source({
|
||||
attributions: [
|
||||
'<a href="https://www.maptiler.com/copyright/" target="_blank">© MapTiler</a>',
|
||||
'<a href="https://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap contributors</a>'
|
||||
]
|
||||
})
|
||||
})
|
||||
'<a href="https://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap contributors</a>',
|
||||
],
|
||||
}),
|
||||
}),
|
||||
],
|
||||
target: 'map',
|
||||
view: new View({
|
||||
resolutions: createXYZ({tileSize: 512}).getResolutions89,
|
||||
center: [0, 0],
|
||||
zoom: 2
|
||||
})
|
||||
zoom: 2,
|
||||
}),
|
||||
});
|
||||
map.addControl(new FullScreen());
|
||||
|
||||
// Worker messaging and actions
|
||||
worker.addEventListener('message', message => {
|
||||
worker.addEventListener('message', (message) => {
|
||||
if (message.data.action === 'loadImage') {
|
||||
// Image loader for ol-mapbox-style
|
||||
const image = new Image();
|
||||
image.crossOrigin = 'anonymous';
|
||||
image.addEventListener('load', function() {
|
||||
createImageBitmap(image, 0, 0, image.width, image.height).then(imageBitmap => {
|
||||
worker.postMessage({
|
||||
action: 'imageLoaded',
|
||||
image: imageBitmap,
|
||||
src: message.data.src
|
||||
}, [imageBitmap]);
|
||||
});
|
||||
image.addEventListener('load', function () {
|
||||
createImageBitmap(image, 0, 0, image.width, image.height).then(
|
||||
(imageBitmap) => {
|
||||
worker.postMessage(
|
||||
{
|
||||
action: 'imageLoaded',
|
||||
image: imageBitmap,
|
||||
src: message.data.src,
|
||||
},
|
||||
[imageBitmap]
|
||||
);
|
||||
}
|
||||
);
|
||||
});
|
||||
image.src = event.data.src;
|
||||
} else if (message.data.action === 'requestRender') {
|
||||
@@ -111,7 +125,7 @@ worker.addEventListener('message', message => {
|
||||
map.render();
|
||||
} else if (canvas && message.data.action === 'rendered') {
|
||||
// Worker provies a new render frame
|
||||
requestAnimationFrame(function() {
|
||||
requestAnimationFrame(function () {
|
||||
const imageData = message.data.imageData;
|
||||
canvas.width = imageData.width;
|
||||
canvas.height = imageData.height;
|
||||
|
||||
Reference in New Issue
Block a user