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:
Tim Schaub
2020-04-06 12:25:12 -06:00
parent 53b48baf62
commit 054af09032
790 changed files with 46833 additions and 33765 deletions
+28 -16
View File
@@ -1,10 +1,10 @@
/**
* @module ol/Feature
*/
import BaseObject, {getChangeEventType} from './Object.js';
import EventType from './events/EventType.js';
import {assert} from './asserts.js';
import {listen, unlistenByKey} from './events.js';
import EventType from './events/EventType.js';
import BaseObject, {getChangeEventType} from './Object.js';
/**
* @typedef {typeof Feature|typeof import("./render/Feature.js").default} FeatureClass
@@ -67,7 +67,6 @@ class Feature extends BaseObject {
* associated with a `geometry` key.
*/
constructor(opt_geometryOrProperties) {
super();
/**
@@ -101,10 +100,17 @@ class Feature extends BaseObject {
*/
this.geometryChangeKey_ = null;
this.addEventListener(getChangeEventType(this.geometryName_), this.handleGeometryChanged_);
this.addEventListener(
getChangeEventType(this.geometryName_),
this.handleGeometryChanged_
);
if (opt_geometryOrProperties) {
if (typeof /** @type {?} */ (opt_geometryOrProperties).getSimplifiedGeometry === 'function') {
if (
typeof (
/** @type {?} */ (opt_geometryOrProperties).getSimplifiedGeometry
) === 'function'
) {
const geometry = /** @type {Geometry} */ (opt_geometryOrProperties);
this.setGeometry(geometry);
} else {
@@ -144,9 +150,7 @@ class Feature extends BaseObject {
* @observable
*/
getGeometry() {
return (
/** @type {Geometry|undefined} */ (this.get(this.geometryName_))
);
return /** @type {Geometry|undefined} */ (this.get(this.geometryName_));
}
/**
@@ -208,8 +212,12 @@ class Feature extends BaseObject {
}
const geometry = this.getGeometry();
if (geometry) {
this.geometryChangeKey_ = listen(geometry,
EventType.CHANGE, this.handleGeometryChange_, this);
this.geometryChangeKey_ = listen(
geometry,
EventType.CHANGE,
this.handleGeometryChange_,
this
);
}
this.changed();
}
@@ -261,14 +269,19 @@ class Feature extends BaseObject {
* @api
*/
setGeometryName(name) {
this.removeEventListener(getChangeEventType(this.geometryName_), this.handleGeometryChanged_);
this.removeEventListener(
getChangeEventType(this.geometryName_),
this.handleGeometryChanged_
);
this.geometryName_ = name;
this.addEventListener(getChangeEventType(this.geometryName_), this.handleGeometryChanged_);
this.addEventListener(
getChangeEventType(this.geometryName_),
this.handleGeometryChanged_
);
this.handleGeometryChanged_();
}
}
/**
* Convert the provided object into a feature style function. Functions passed
* through unchanged. Arrays of Style or single style objects wrapped
@@ -288,12 +301,11 @@ export function createStyleFunction(obj) {
if (Array.isArray(obj)) {
styles = obj;
} else {
assert(typeof /** @type {?} */ (obj).getZIndex === 'function',
41); // Expected an `import("./style/Style.js").Style` or an array of `import("./style/Style.js").Style`
assert(typeof (/** @type {?} */ (obj).getZIndex) === 'function', 41); // Expected an `import("./style/Style.js").Style` or an array of `import("./style/Style.js").Style`
const style = /** @type {import("./style/Style.js").default} */ (obj);
styles = [style];
}
return function() {
return function () {
return styles;
};
}