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,10 +1,10 @@
|
||||
import Map from '../src/ol/Map.js';
|
||||
import View from '../src/ol/View.js';
|
||||
import TopoJSON from '../src/ol/format/TopoJSON.js';
|
||||
import VectorTileLayer from '../src/ol/layer/VectorTile.js';
|
||||
import {fromLonLat} from '../src/ol/proj.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';
|
||||
import {fromLonLat} from '../src/ol/proj.js';
|
||||
|
||||
const key = 'uZNs91nMR-muUTP99MyBSg';
|
||||
|
||||
@@ -12,24 +12,24 @@ const roadStyleCache = {};
|
||||
const roadColor = {
|
||||
'major_road': '#776',
|
||||
'minor_road': '#ccb',
|
||||
'highway': '#f39'
|
||||
'highway': '#f39',
|
||||
};
|
||||
const buildingStyle = new Style({
|
||||
fill: new Fill({
|
||||
color: '#666',
|
||||
opacity: 0.4
|
||||
opacity: 0.4,
|
||||
}),
|
||||
stroke: new Stroke({
|
||||
color: '#444',
|
||||
width: 1
|
||||
})
|
||||
width: 1,
|
||||
}),
|
||||
});
|
||||
const waterStyle = new Style({
|
||||
fill: new Fill({
|
||||
color: '#9db9e8'
|
||||
})
|
||||
color: '#9db9e8',
|
||||
}),
|
||||
});
|
||||
const roadStyle = function(feature) {
|
||||
const roadStyle = function (feature) {
|
||||
const kind = feature.get('kind');
|
||||
const railway = feature.get('railway');
|
||||
const sort_key = feature.get('sort_key');
|
||||
@@ -47,9 +47,9 @@ const roadStyle = function(feature) {
|
||||
style = new Style({
|
||||
stroke: new Stroke({
|
||||
color: color,
|
||||
width: width
|
||||
width: width,
|
||||
}),
|
||||
zIndex: sort_key
|
||||
zIndex: sort_key,
|
||||
});
|
||||
roadStyleCache[styleKey] = style;
|
||||
}
|
||||
@@ -60,29 +60,36 @@ const map = new Map({
|
||||
layers: [
|
||||
new VectorTileLayer({
|
||||
source: new VectorTileSource({
|
||||
attributions: '© OpenStreetMap contributors, Who’s On First, ' +
|
||||
'Natural Earth, and openstreetmapdata.com',
|
||||
attributions:
|
||||
'© OpenStreetMap contributors, Who’s On First, ' +
|
||||
'Natural Earth, and openstreetmapdata.com',
|
||||
format: new TopoJSON({
|
||||
layerName: 'layer',
|
||||
layers: ['water', 'roads', 'buildings']
|
||||
layers: ['water', 'roads', 'buildings'],
|
||||
}),
|
||||
maxZoom: 19,
|
||||
url: 'https://tile.nextzen.org/tilezen/vector/v1/all/{z}/{x}/{y}.topojson?api_key=' + key
|
||||
url:
|
||||
'https://tile.nextzen.org/tilezen/vector/v1/all/{z}/{x}/{y}.topojson?api_key=' +
|
||||
key,
|
||||
}),
|
||||
style: function(feature, resolution) {
|
||||
style: function (feature, resolution) {
|
||||
switch (feature.get('layer')) {
|
||||
case 'water': return waterStyle;
|
||||
case 'roads': return roadStyle(feature);
|
||||
case 'buildings': return (resolution < 10) ? buildingStyle : null;
|
||||
default: return null;
|
||||
case 'water':
|
||||
return waterStyle;
|
||||
case 'roads':
|
||||
return roadStyle(feature);
|
||||
case 'buildings':
|
||||
return resolution < 10 ? buildingStyle : null;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
}),
|
||||
],
|
||||
target: 'map',
|
||||
view: new View({
|
||||
center: fromLonLat([-74.0064, 40.7142]),
|
||||
maxZoom: 19,
|
||||
zoom: 15
|
||||
})
|
||||
zoom: 15,
|
||||
}),
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user