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,7 +1,7 @@
|
||||
import Map from '../src/ol/Map.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import TileLayer from '../src/ol/layer/Tile.js';
|
||||
import OSM from '../src/ol/source/OSM.js';
|
||||
import TileLayer from '../src/ol/layer/Tile.js';
|
||||
import View from '../src/ol/View.js';
|
||||
|
||||
// default zoom, center and rotation
|
||||
let zoom = 2;
|
||||
@@ -14,10 +14,7 @@ if (window.location.hash !== '') {
|
||||
const parts = hash.split('/');
|
||||
if (parts.length === 4) {
|
||||
zoom = parseInt(parts[0], 10);
|
||||
center = [
|
||||
parseFloat(parts[1]),
|
||||
parseFloat(parts[2])
|
||||
];
|
||||
center = [parseFloat(parts[1]), parseFloat(parts[2])];
|
||||
rotation = parseFloat(parts[3]);
|
||||
}
|
||||
}
|
||||
@@ -25,20 +22,20 @@ if (window.location.hash !== '') {
|
||||
const map = new Map({
|
||||
layers: [
|
||||
new TileLayer({
|
||||
source: new OSM()
|
||||
})
|
||||
source: new OSM(),
|
||||
}),
|
||||
],
|
||||
target: 'map',
|
||||
view: new View({
|
||||
center: center,
|
||||
zoom: zoom,
|
||||
rotation: rotation
|
||||
})
|
||||
rotation: rotation,
|
||||
}),
|
||||
});
|
||||
|
||||
let shouldUpdate = true;
|
||||
const view = map.getView();
|
||||
const updatePermalink = function() {
|
||||
const updatePermalink = function () {
|
||||
if (!shouldUpdate) {
|
||||
// do not update the URL when the view was changed in the 'popstate' handler
|
||||
shouldUpdate = true;
|
||||
@@ -46,15 +43,19 @@ const updatePermalink = function() {
|
||||
}
|
||||
|
||||
const center = view.getCenter();
|
||||
const hash = '#map=' +
|
||||
view.getZoom() + '/' +
|
||||
Math.round(center[0] * 100) / 100 + '/' +
|
||||
Math.round(center[1] * 100) / 100 + '/' +
|
||||
view.getRotation();
|
||||
const hash =
|
||||
'#map=' +
|
||||
view.getZoom() +
|
||||
'/' +
|
||||
Math.round(center[0] * 100) / 100 +
|
||||
'/' +
|
||||
Math.round(center[1] * 100) / 100 +
|
||||
'/' +
|
||||
view.getRotation();
|
||||
const state = {
|
||||
zoom: view.getZoom(),
|
||||
center: view.getCenter(),
|
||||
rotation: view.getRotation()
|
||||
rotation: view.getRotation(),
|
||||
};
|
||||
window.history.pushState(state, 'map', hash);
|
||||
};
|
||||
@@ -63,7 +64,7 @@ map.on('moveend', updatePermalink);
|
||||
|
||||
// restore the view state when navigating through the history, see
|
||||
// https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onpopstate
|
||||
window.addEventListener('popstate', function(event) {
|
||||
window.addEventListener('popstate', function (event) {
|
||||
if (event.state === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user