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
+48 -18
View File
@@ -1,13 +1,13 @@
/**
* @module ol/renderer/Map
*/
import {abstract} from '../util.js';
import Disposable from '../Disposable.js';
import {getWidth} from '../extent.js';
import {TRUE} from '../functions.js';
import {inView} from '../layer/Layer.js';
import {shared as iconImageCache} from '../style/IconImageCache.js';
import {abstract} from '../util.js';
import {compose as composeTransform, makeInverse} from '../transform.js';
import {getWidth} from '../extent.js';
import {shared as iconImageCache} from '../style/IconImageCache.js';
import {inView} from '../layer/Layer.js';
import {renderDeclutterItems} from '../render.js';
import {wrapX} from '../coordinate.js';
@@ -15,7 +15,6 @@ import {wrapX} from '../coordinate.js';
* @abstract
*/
class MapRenderer extends Disposable {
/**
* @param {import("../PluggableMap.js").default} map Map.
*/
@@ -32,7 +31,6 @@ class MapRenderer extends Disposable {
* @private
*/
this.declutterTree_ = null;
}
/**
@@ -53,11 +51,16 @@ class MapRenderer extends Disposable {
const coordinateToPixelTransform = frameState.coordinateToPixelTransform;
const pixelToCoordinateTransform = frameState.pixelToCoordinateTransform;
composeTransform(coordinateToPixelTransform,
frameState.size[0] / 2, frameState.size[1] / 2,
1 / viewState.resolution, -1 / viewState.resolution,
composeTransform(
coordinateToPixelTransform,
frameState.size[0] / 2,
frameState.size[1] / 2,
1 / viewState.resolution,
-1 / viewState.resolution,
-viewState.rotation,
-viewState.center[0], -viewState.center[1]);
-viewState.center[0],
-viewState.center[1]
);
makeInverse(pixelToCoordinateTransform, coordinateToPixelTransform);
}
@@ -115,7 +118,7 @@ class MapRenderer extends Disposable {
const numLayers = layerStates.length;
let declutteredFeatures;
if (this.declutterTree_) {
declutteredFeatures = this.declutterTree_.all().map(function(entry) {
declutteredFeatures = this.declutterTree_.all().map(function (entry) {
return entry.value;
});
}
@@ -125,17 +128,30 @@ class MapRenderer extends Disposable {
for (let j = numLayers - 1; j >= 0; --j) {
const layerState = layerStates[j];
const layer = /** @type {import("../layer/Layer.js").default} */ (layerState.layer);
if (layer.hasRenderer() && inView(layerState, viewState) && layerFilter.call(thisArg2, layer)) {
if (
layer.hasRenderer() &&
inView(layerState, viewState) &&
layerFilter.call(thisArg2, layer)
) {
const layerRenderer = layer.getRenderer();
const source = layer.getSource();
if (layerRenderer && source) {
const coordinates = source.getWrapX() ? translatedCoordinate : coordinate;
const callback = forEachFeatureAtCoordinate.bind(null, layerState.managed);
const coordinates = source.getWrapX()
? translatedCoordinate
: coordinate;
const callback = forEachFeatureAtCoordinate.bind(
null,
layerState.managed
);
tmpCoord[0] = coordinates[0] + offsets[i][0];
tmpCoord[1] = coordinates[1] + offsets[i][1];
result = layerRenderer.forEachFeatureAtCoordinate(
tmpCoord,
frameState, hitTolerance, callback, declutteredFeatures);
frameState,
hitTolerance,
callback,
declutteredFeatures
);
}
if (result) {
return result;
@@ -177,9 +193,24 @@ class MapRenderer extends Disposable {
* @return {boolean} Is there a feature at the given coordinate?
* @template U
*/
hasFeatureAtCoordinate(coordinate, frameState, hitTolerance, checkWrapped, layerFilter, thisArg) {
hasFeatureAtCoordinate(
coordinate,
frameState,
hitTolerance,
checkWrapped,
layerFilter,
thisArg
) {
const hasFeature = this.forEachFeatureAtCoordinate(
coordinate, frameState, hitTolerance, checkWrapped, TRUE, this, layerFilter, thisArg);
coordinate,
frameState,
hitTolerance,
checkWrapped,
TRUE,
this,
layerFilter,
thisArg
);
return hasFeature !== undefined;
}
@@ -210,7 +241,6 @@ class MapRenderer extends Disposable {
}
}
/**
* @param {import("../PluggableMap.js").default} map Map.
* @param {import("../PluggableMap.js").FrameState} frameState Frame state.