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,8 +1,8 @@
|
||||
import Map from '../src/ol/Map.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import MVT from '../src/ol/format/MVT.js';
|
||||
import Map from '../src/ol/Map.js';
|
||||
import VectorTileLayer from '../src/ol/layer/VectorTile.js';
|
||||
import VectorTileSource from '../src/ol/source/VectorTile.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import {Fill, Stroke, Style} from '../src/ol/style.js';
|
||||
|
||||
// lookup for selection objects
|
||||
@@ -11,20 +11,20 @@ let selection = {};
|
||||
const country = new Style({
|
||||
stroke: new Stroke({
|
||||
color: 'gray',
|
||||
width: 1
|
||||
width: 1,
|
||||
}),
|
||||
fill: new Fill({
|
||||
color: 'rgba(20,20,20,0.9)'
|
||||
})
|
||||
color: 'rgba(20,20,20,0.9)',
|
||||
}),
|
||||
});
|
||||
const selectedCountry = new Style({
|
||||
stroke: new Stroke({
|
||||
color: 'rgba(200,20,20,0.8)',
|
||||
width: 2
|
||||
width: 2,
|
||||
}),
|
||||
fill: new Fill({
|
||||
color: 'rgba(200,20,20,0.4)'
|
||||
})
|
||||
color: 'rgba(200,20,20,0.4)',
|
||||
}),
|
||||
});
|
||||
|
||||
const vtLayer = new VectorTileLayer({
|
||||
@@ -32,24 +32,23 @@ const vtLayer = new VectorTileLayer({
|
||||
source: new VectorTileSource({
|
||||
maxZoom: 15,
|
||||
format: new MVT({
|
||||
idProperty: 'iso_a3'
|
||||
idProperty: 'iso_a3',
|
||||
}),
|
||||
url: 'https://ahocevar.com/geoserver/gwc/service/tms/1.0.0/' +
|
||||
'ne:ne_10m_admin_0_countries@EPSG%3A900913@pbf/{z}/{x}/{-y}.pbf'
|
||||
url:
|
||||
'https://ahocevar.com/geoserver/gwc/service/tms/1.0.0/' +
|
||||
'ne:ne_10m_admin_0_countries@EPSG%3A900913@pbf/{z}/{x}/{-y}.pbf',
|
||||
}),
|
||||
style: country
|
||||
style: country,
|
||||
});
|
||||
|
||||
const map = new Map({
|
||||
layers: [
|
||||
vtLayer
|
||||
],
|
||||
layers: [vtLayer],
|
||||
target: 'map',
|
||||
view: new View({
|
||||
center: [0, 0],
|
||||
zoom: 2,
|
||||
multiWorld: true
|
||||
})
|
||||
multiWorld: true,
|
||||
}),
|
||||
});
|
||||
|
||||
// Selection
|
||||
@@ -57,21 +56,25 @@ const selectionLayer = new VectorTileLayer({
|
||||
map: map,
|
||||
renderMode: 'vector',
|
||||
source: vtLayer.getSource(),
|
||||
style: function(feature) {
|
||||
style: function (feature) {
|
||||
if (feature.getId() in selection) {
|
||||
return selectedCountry;
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
const selectElement = document.getElementById('type');
|
||||
|
||||
map.on(['click', 'pointermove'], function(event) {
|
||||
if (selectElement.value === 'singleselect-hover' && event.type !== 'pointermove' ||
|
||||
selectElement.value !== 'singleselect-hover' && event.type === 'pointermove') {
|
||||
map.on(['click', 'pointermove'], function (event) {
|
||||
if (
|
||||
(selectElement.value === 'singleselect-hover' &&
|
||||
event.type !== 'pointermove') ||
|
||||
(selectElement.value !== 'singleselect-hover' &&
|
||||
event.type === 'pointermove')
|
||||
) {
|
||||
return;
|
||||
}
|
||||
vtLayer.getFeatures(event.pixel).then(function(features) {
|
||||
vtLayer.getFeatures(event.pixel).then(function (features) {
|
||||
if (!features.length) {
|
||||
selection = {};
|
||||
selectionLayer.changed();
|
||||
|
||||
Reference in New Issue
Block a user