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:
@@ -3,7 +3,6 @@
|
||||
*/
|
||||
import {lerp} from '../../math.js';
|
||||
|
||||
|
||||
/**
|
||||
* @param {Array<number>} flatCoordinates Path to put text on.
|
||||
* @param {number} offset Start offset of the `flatCoordinates`.
|
||||
@@ -20,7 +19,18 @@ import {lerp} from '../../math.js';
|
||||
* exceeded). Entries of the array are x, y, anchorX, angle, chunk.
|
||||
*/
|
||||
export function drawTextOnPath(
|
||||
flatCoordinates, offset, end, stride, text, startM, maxAngle, scale, measureAndCacheTextWidth, font, cache) {
|
||||
flatCoordinates,
|
||||
offset,
|
||||
end,
|
||||
stride,
|
||||
text,
|
||||
startM,
|
||||
maxAngle,
|
||||
scale,
|
||||
measureAndCacheTextWidth,
|
||||
font,
|
||||
cache
|
||||
) {
|
||||
const result = [];
|
||||
|
||||
// Keep text upright
|
||||
@@ -60,7 +70,8 @@ export function drawTextOnPath(
|
||||
if (previousAngle !== undefined) {
|
||||
let delta = angle - previousAngle;
|
||||
angleChanged = angleChanged || delta !== 0;
|
||||
delta += (delta > Math.PI) ? -2 * Math.PI : (delta < -Math.PI) ? 2 * Math.PI : 0;
|
||||
delta +=
|
||||
delta > Math.PI ? -2 * Math.PI : delta < -Math.PI ? 2 * Math.PI : 0;
|
||||
if (Math.abs(delta) > maxAngle) {
|
||||
return null;
|
||||
}
|
||||
@@ -72,5 +83,7 @@ export function drawTextOnPath(
|
||||
result[index] = [x, y, charLength / 2, angle, char];
|
||||
startM += charLength;
|
||||
}
|
||||
return angleChanged ? result : [[result[0][0], result[0][1], result[0][2], result[0][3], text]];
|
||||
return angleChanged
|
||||
? result
|
||||
: [[result[0][0], result[0][1], result[0][2], result[0][3], text]];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user