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:
+23
-17
@@ -1,12 +1,13 @@
|
||||
import Map from '../src/ol/Map.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import TileLayer from '../src/ol/layer/Tile.js';
|
||||
import {fromLonLat} from '../src/ol/proj.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import XYZ from '../src/ol/source/XYZ.js';
|
||||
import {fromLonLat} from '../src/ol/proj.js';
|
||||
import {getRenderPixel} from '../src/ol/render.js';
|
||||
|
||||
const key = 'get_your_own_D6rA4zTHduk6KOKTXzGB';
|
||||
const attributions = '<a href="https://www.maptiler.com/copyright/" target="_blank">© MapTiler</a> ' +
|
||||
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 roads = new TileLayer({
|
||||
@@ -14,16 +15,16 @@ const roads = new TileLayer({
|
||||
attributions: attributions,
|
||||
url: 'https://api.maptiler.com/maps/streets/{z}/{x}/{y}.png?key=' + key,
|
||||
tileSize: 512,
|
||||
maxZoom: 22
|
||||
})
|
||||
maxZoom: 22,
|
||||
}),
|
||||
});
|
||||
|
||||
const imagery = new TileLayer({
|
||||
source: new XYZ({
|
||||
attributions: attributions,
|
||||
url: 'https://api.maptiler.com/tiles/satellite/{z}/{x}/{y}.jpg?key=' + key,
|
||||
maxZoom: 20
|
||||
})
|
||||
maxZoom: 20,
|
||||
}),
|
||||
});
|
||||
|
||||
const container = document.getElementById('map');
|
||||
@@ -33,12 +34,12 @@ const map = new Map({
|
||||
target: container,
|
||||
view: new View({
|
||||
center: fromLonLat([-109, 46.5]),
|
||||
zoom: 6
|
||||
})
|
||||
zoom: 6,
|
||||
}),
|
||||
});
|
||||
|
||||
let radius = 75;
|
||||
document.addEventListener('keydown', function(evt) {
|
||||
document.addEventListener('keydown', function (evt) {
|
||||
if (evt.which === 38) {
|
||||
radius = Math.min(radius + 5, 150);
|
||||
map.render();
|
||||
@@ -53,28 +54,33 @@ document.addEventListener('keydown', function(evt) {
|
||||
// get the pixel position with every move
|
||||
let mousePosition = null;
|
||||
|
||||
container.addEventListener('mousemove', function(event) {
|
||||
container.addEventListener('mousemove', function (event) {
|
||||
mousePosition = map.getEventPixel(event);
|
||||
map.render();
|
||||
});
|
||||
|
||||
container.addEventListener('mouseout', function() {
|
||||
container.addEventListener('mouseout', function () {
|
||||
mousePosition = null;
|
||||
map.render();
|
||||
});
|
||||
|
||||
// before rendering the layer, do some clipping
|
||||
imagery.on('prerender', function(event) {
|
||||
imagery.on('prerender', function (event) {
|
||||
const ctx = event.context;
|
||||
ctx.save();
|
||||
ctx.beginPath();
|
||||
if (mousePosition) {
|
||||
// only show a circle around the mouse
|
||||
const pixel = getRenderPixel(event, mousePosition);
|
||||
const offset = getRenderPixel(event, [mousePosition[0] + radius, mousePosition[1]]);
|
||||
const canvasRadius = Math.sqrt(Math.pow(offset[0] - pixel[0], 2) + Math.pow(offset[1] - pixel[1], 2));
|
||||
const offset = getRenderPixel(event, [
|
||||
mousePosition[0] + radius,
|
||||
mousePosition[1],
|
||||
]);
|
||||
const canvasRadius = Math.sqrt(
|
||||
Math.pow(offset[0] - pixel[0], 2) + Math.pow(offset[1] - pixel[1], 2)
|
||||
);
|
||||
ctx.arc(pixel[0], pixel[1], canvasRadius, 0, 2 * Math.PI);
|
||||
ctx.lineWidth = 5 * canvasRadius / radius;
|
||||
ctx.lineWidth = (5 * canvasRadius) / radius;
|
||||
ctx.strokeStyle = 'rgba(0,0,0,0.5)';
|
||||
ctx.stroke();
|
||||
}
|
||||
@@ -82,7 +88,7 @@ imagery.on('prerender', function(event) {
|
||||
});
|
||||
|
||||
// after rendering the layer, restore the canvas context
|
||||
imagery.on('postrender', function(event) {
|
||||
imagery.on('postrender', function (event) {
|
||||
const ctx = event.context;
|
||||
ctx.restore();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user