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:
@@ -2,15 +2,15 @@
|
||||
* @module ol/source/Cluster
|
||||
*/
|
||||
|
||||
import {getUid} from '../util.js';
|
||||
import {assert} from '../asserts.js';
|
||||
import EventType from '../events/EventType.js';
|
||||
import Feature from '../Feature.js';
|
||||
import GeometryType from '../geom/GeometryType.js';
|
||||
import {scale as scaleCoordinate, add as addCoordinate} from '../coordinate.js';
|
||||
import EventType from '../events/EventType.js';
|
||||
import {buffer, createEmpty, createOrUpdateFromCoordinate} from '../extent.js';
|
||||
import Point from '../geom/Point.js';
|
||||
import VectorSource from './Vector.js';
|
||||
import {add as addCoordinate, scale as scaleCoordinate} from '../coordinate.js';
|
||||
import {assert} from '../asserts.js';
|
||||
import {buffer, createEmpty, createOrUpdateFromCoordinate} from '../extent.js';
|
||||
import {getUid} from '../util.js';
|
||||
|
||||
/**
|
||||
* @typedef {Object} Options
|
||||
@@ -33,7 +33,6 @@ import VectorSource from './Vector.js';
|
||||
* @property {boolean} [wrapX=true] Whether to wrap the world horizontally.
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* @classdesc
|
||||
* Layer source to cluster vector data. Works out of the box with point
|
||||
@@ -52,7 +51,7 @@ class Cluster extends VectorSource {
|
||||
constructor(options) {
|
||||
super({
|
||||
attributions: options.attributions,
|
||||
wrapX: options.wrapX
|
||||
wrapX: options.wrapX,
|
||||
});
|
||||
|
||||
/**
|
||||
@@ -78,12 +77,13 @@ class Cluster extends VectorSource {
|
||||
* @return {Point} Cluster calculation point.
|
||||
* @protected
|
||||
*/
|
||||
this.geometryFunction = options.geometryFunction || function(feature) {
|
||||
const geometry = feature.getGeometry();
|
||||
assert(geometry.getType() == GeometryType.POINT,
|
||||
10); // The default `geometryFunction` can only handle `Point` geometries
|
||||
return geometry;
|
||||
};
|
||||
this.geometryFunction =
|
||||
options.geometryFunction ||
|
||||
function (feature) {
|
||||
const geometry = feature.getGeometry();
|
||||
assert(geometry.getType() == GeometryType.POINT, 10); // The default `geometryFunction` can only handle `Point` geometries
|
||||
return geometry;
|
||||
};
|
||||
|
||||
this.boundRefresh_ = this.refresh.bind(this);
|
||||
|
||||
@@ -194,7 +194,7 @@ class Cluster extends VectorSource {
|
||||
buffer(extent, mapDistance, extent);
|
||||
|
||||
let neighbors = this.source.getFeaturesInExtent(extent);
|
||||
neighbors = neighbors.filter(function(neighbor) {
|
||||
neighbors = neighbors.filter(function (neighbor) {
|
||||
const uid = getUid(neighbor);
|
||||
if (!(uid in clustered)) {
|
||||
clustered[uid] = true;
|
||||
@@ -232,5 +232,4 @@ class Cluster extends VectorSource {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export default Cluster;
|
||||
|
||||
Reference in New Issue
Block a user