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,12 +1,12 @@
|
||||
import Map from '../src/ol/Map.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import OSMXML from '../src/ol/format/OSMXML.js';
|
||||
import VectorSource from '../src/ol/source/Vector.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import XYZ from '../src/ol/source/XYZ.js';
|
||||
import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js';
|
||||
import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js';
|
||||
import {bbox as bboxStrategy} from '../src/ol/loadingstrategy.js';
|
||||
import {transformExtent} from '../src/ol/proj.js';
|
||||
import XYZ from '../src/ol/source/XYZ.js';
|
||||
import VectorSource from '../src/ol/source/Vector.js';
|
||||
import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js';
|
||||
|
||||
let map = null;
|
||||
|
||||
@@ -15,87 +15,93 @@ const styles = {
|
||||
'parking': new Style({
|
||||
stroke: new Stroke({
|
||||
color: 'rgba(170, 170, 170, 1.0)',
|
||||
width: 1
|
||||
width: 1,
|
||||
}),
|
||||
fill: new Fill({
|
||||
color: 'rgba(170, 170, 170, 0.3)'
|
||||
})
|
||||
})
|
||||
color: 'rgba(170, 170, 170, 0.3)',
|
||||
}),
|
||||
}),
|
||||
},
|
||||
'building': {
|
||||
'.*': new Style({
|
||||
zIndex: 100,
|
||||
stroke: new Stroke({
|
||||
color: 'rgba(246, 99, 79, 1.0)',
|
||||
width: 1
|
||||
width: 1,
|
||||
}),
|
||||
fill: new Fill({
|
||||
color: 'rgba(246, 99, 79, 0.3)'
|
||||
})
|
||||
})
|
||||
color: 'rgba(246, 99, 79, 0.3)',
|
||||
}),
|
||||
}),
|
||||
},
|
||||
'highway': {
|
||||
'service': new Style({
|
||||
stroke: new Stroke({
|
||||
color: 'rgba(255, 255, 255, 1.0)',
|
||||
width: 2
|
||||
})
|
||||
width: 2,
|
||||
}),
|
||||
}),
|
||||
'.*': new Style({
|
||||
stroke: new Stroke({
|
||||
color: 'rgba(255, 255, 255, 1.0)',
|
||||
width: 3
|
||||
})
|
||||
})
|
||||
width: 3,
|
||||
}),
|
||||
}),
|
||||
},
|
||||
'landuse': {
|
||||
'forest|grass|allotments': new Style({
|
||||
stroke: new Stroke({
|
||||
color: 'rgba(140, 208, 95, 1.0)',
|
||||
width: 1
|
||||
width: 1,
|
||||
}),
|
||||
fill: new Fill({
|
||||
color: 'rgba(140, 208, 95, 0.3)'
|
||||
})
|
||||
})
|
||||
color: 'rgba(140, 208, 95, 0.3)',
|
||||
}),
|
||||
}),
|
||||
},
|
||||
'natural': {
|
||||
'tree': new Style({
|
||||
image: new CircleStyle({
|
||||
radius: 2,
|
||||
fill: new Fill({
|
||||
color: 'rgba(140, 208, 95, 1.0)'
|
||||
color: 'rgba(140, 208, 95, 1.0)',
|
||||
}),
|
||||
stroke: null
|
||||
})
|
||||
})
|
||||
}
|
||||
stroke: null,
|
||||
}),
|
||||
}),
|
||||
},
|
||||
};
|
||||
|
||||
const vectorSource = new VectorSource({
|
||||
format: new OSMXML(),
|
||||
loader: function(extent, resolution, projection) {
|
||||
loader: function (extent, resolution, projection) {
|
||||
const epsg4326Extent = transformExtent(extent, projection, 'EPSG:4326');
|
||||
const client = new XMLHttpRequest();
|
||||
client.open('POST', 'https://overpass-api.de/api/interpreter');
|
||||
client.addEventListener('load', function() {
|
||||
client.addEventListener('load', function () {
|
||||
const features = new OSMXML().readFeatures(client.responseText, {
|
||||
featureProjection: map.getView().getProjection()
|
||||
featureProjection: map.getView().getProjection(),
|
||||
});
|
||||
vectorSource.addFeatures(features);
|
||||
});
|
||||
const query = '(node(' +
|
||||
epsg4326Extent[1] + ',' + Math.max(epsg4326Extent[0], -180) + ',' +
|
||||
epsg4326Extent[3] + ',' + Math.min(epsg4326Extent[2], 180) +
|
||||
');rel(bn)->.foo;way(bn);node(w)->.foo;rel(bw););out meta;';
|
||||
const query =
|
||||
'(node(' +
|
||||
epsg4326Extent[1] +
|
||||
',' +
|
||||
Math.max(epsg4326Extent[0], -180) +
|
||||
',' +
|
||||
epsg4326Extent[3] +
|
||||
',' +
|
||||
Math.min(epsg4326Extent[2], 180) +
|
||||
');rel(bn)->.foo;way(bn);node(w)->.foo;rel(bw););out meta;';
|
||||
client.send(query);
|
||||
},
|
||||
strategy: bboxStrategy
|
||||
strategy: bboxStrategy,
|
||||
});
|
||||
|
||||
const vector = new VectorLayer({
|
||||
source: vectorSource,
|
||||
style: function(feature) {
|
||||
style: function (feature) {
|
||||
for (const key in styles) {
|
||||
const value = feature.get(key);
|
||||
if (value !== undefined) {
|
||||
@@ -107,19 +113,20 @@ const vector = new VectorLayer({
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
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 raster = new TileLayer({
|
||||
source: new XYZ({
|
||||
attributions: attributions,
|
||||
url: 'https://api.maptiler.com/tiles/satellite/{z}/{x}/{y}.jpg?key=' + key,
|
||||
maxZoom: 20
|
||||
})
|
||||
maxZoom: 20,
|
||||
}),
|
||||
});
|
||||
|
||||
map = new Map({
|
||||
@@ -128,6 +135,6 @@ map = new Map({
|
||||
view: new View({
|
||||
center: [739218, 5906096],
|
||||
maxZoom: 19,
|
||||
zoom: 17
|
||||
})
|
||||
zoom: 17,
|
||||
}),
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user