diff --git a/examples/offscreen-canvas.js b/examples/offscreen-canvas.js index 20ef8666b6..beb844bed4 100644 --- a/examples/offscreen-canvas.js +++ b/examples/offscreen-canvas.js @@ -5,9 +5,12 @@ import View from '../src/ol/View.js'; import Worker from 'worker-loader!./offscreen-canvas.worker.js'; //eslint-disable-line import stringify from 'json-stringify-safe'; import {FullScreen} from '../src/ol/control.js'; -import {compose, create} from '../src/ol/transform.js'; +import { + compose, + create, + toString as toTransformString, +} from '../src/ol/transform.js'; import {createXYZ} from '../src/ol/tilegrid.js'; -import {toString as toTransformString} from '../src/ol/transform.js'; const worker = new Worker(); diff --git a/examples/offscreen-canvas.worker.js b/examples/offscreen-canvas.worker.js index 13a9c480fd..b375ad9632 100644 --- a/examples/offscreen-canvas.worker.js +++ b/examples/offscreen-canvas.worker.js @@ -1,12 +1,13 @@ import MVT from '../src/ol/format/MVT.js'; -import TileQueue from '../src/ol/TileQueue.js'; +import TileQueue, { + getTilePriority as tilePriorityFunction, +} from '../src/ol/TileQueue.js'; import VectorTileLayer from '../src/ol/layer/VectorTile.js'; import VectorTileSource from '../src/ol/source/VectorTile.js'; import stringify from 'json-stringify-safe'; import styleFunction from 'ol-mapbox-style/dist/stylefunction.js'; import {get} from '../src/ol/proj.js'; import {inView} from '../src/ol/layer/Layer.js'; -import {getTilePriority as tilePriorityFunction} from '../src/ol/TileQueue.js'; /** @type {any} */ const worker = self; diff --git a/package-lock.json b/package-lock.json index 8a02994a13..4350728a25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "copy-webpack-plugin": "^10.0.0", "es-main": "^1.0.2", "eslint": "^8.0.1", - "eslint-config-openlayers": "^16.0.1", + "eslint-config-openlayers": "^16.1.0", "expect.js": "0.3.1", "express": "^4.17.1", "front-matter": "^4.0.0", @@ -4134,9 +4134,9 @@ } }, "node_modules/eslint-config-openlayers": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/eslint-config-openlayers/-/eslint-config-openlayers-16.0.1.tgz", - "integrity": "sha512-1Lw+UtH9lfatuKRQWIDUWdhlYCfG1YP9YV+2qgyeOlOGuI6ARO8cTrdUnsjUgXiiEjfofKwGcA51sVInv+TJEg==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-openlayers/-/eslint-config-openlayers-16.1.0.tgz", + "integrity": "sha512-KhHtXrDsHA+/Xj4lD0aiqKPFD0Wwg/BUXLV2gQCXI03+sk/rVC2Dt4DtzHJodkxa7yY680urj+RUGfAiCkqfiw==", "dev": true, "dependencies": { "eslint-config-prettier": "^8.3.0", @@ -13651,9 +13651,9 @@ } }, "eslint-config-openlayers": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/eslint-config-openlayers/-/eslint-config-openlayers-16.0.1.tgz", - "integrity": "sha512-1Lw+UtH9lfatuKRQWIDUWdhlYCfG1YP9YV+2qgyeOlOGuI6ARO8cTrdUnsjUgXiiEjfofKwGcA51sVInv+TJEg==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-openlayers/-/eslint-config-openlayers-16.1.0.tgz", + "integrity": "sha512-KhHtXrDsHA+/Xj4lD0aiqKPFD0Wwg/BUXLV2gQCXI03+sk/rVC2Dt4DtzHJodkxa7yY680urj+RUGfAiCkqfiw==", "dev": true, "requires": { "eslint-config-prettier": "^8.3.0", diff --git a/package.json b/package.json index ce4faa35ea..c32b832476 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "copy-webpack-plugin": "^10.0.0", "es-main": "^1.0.2", "eslint": "^8.0.1", - "eslint-config-openlayers": "^16.0.1", + "eslint-config-openlayers": "^16.1.0", "expect.js": "0.3.1", "express": "^4.17.1", "front-matter": "^4.0.0", diff --git a/src/ol/View.js b/src/ol/View.js index c09bf01cd3..4acc41003a 100644 --- a/src/ol/View.js +++ b/src/ol/View.js @@ -20,25 +20,25 @@ import {VOID} from './functions.js'; import { add as addCoordinate, equals as coordinatesEqual, + equals, rotate as rotateCoordinate, } from './coordinate.js'; import {assert} from './asserts.js'; import {assign} from './obj.js'; import {none as centerNone, createExtent} from './centerconstraint.js'; import {clamp, modulo} from './math.js'; -import {createMinMaxResolution} from './resolutionconstraint.js'; +import { + createMinMaxResolution, + createSnapToPower, + createSnapToResolutions, +} from './resolutionconstraint.js'; import { createSnapToN, createSnapToZero, disable, none as rotationNone, } from './rotationconstraint.js'; -import { - createSnapToPower, - createSnapToResolutions, -} from './resolutionconstraint.js'; -import {easeOut} from './easing.js'; -import {equals} from './coordinate.js'; +import {easeOut, inAndOut} from './easing.js'; import { getCenter, getForViewAndSize, @@ -46,7 +46,6 @@ import { getWidth, isEmpty, } from './extent.js'; -import {inAndOut} from './easing.js'; import {linearFindNearest} from './array.js'; import {fromExtent as polygonFromExtent} from './geom/Polygon.js'; diff --git a/src/ol/render/canvas/Executor.js b/src/ol/render/canvas/Executor.js index 4aa9f4a5dc..144eeeeb69 100644 --- a/src/ol/render/canvas/Executor.js +++ b/src/ol/render/canvas/Executor.js @@ -13,11 +13,9 @@ import { import {createEmpty, createOrUpdate, intersects} from '../../extent.js'; import { defaultPadding, + defaultTextAlign, defaultTextBaseline, drawImageOrLabel, -} from '../canvas.js'; -import { - defaultTextAlign, measureAndCacheTextWidth, measureTextHeight, measureTextWidths, diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index c24653a799..4543e852ab 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -6,11 +6,18 @@ import ViewHint from '../../ViewHint.js'; import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; import {IMAGE_SMOOTHING_DISABLED, IMAGE_SMOOTHING_ENABLED} from './common.js'; import {assign} from '../../obj.js'; -import {compose as composeTransform, makeInverse} from '../../transform.js'; -import {containsExtent, intersects as intersectsExtent} from '../../extent.js'; +import { + compose as composeTransform, + makeInverse, + toString as toTransformString, +} from '../../transform.js'; +import { + containsExtent, + getIntersection, + intersects as intersectsExtent, + isEmpty, +} from '../../extent.js'; import {fromUserExtent} from '../../proj.js'; -import {getIntersection, isEmpty} from '../../extent.js'; -import {toString as toTransformString} from '../../transform.js'; /** * @classdesc diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index 3ba7c3d0b7..ded6fea88c 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -9,6 +9,7 @@ import { apply as applyTransform, compose as composeTransform, makeInverse, + toString as toTransformString, } from '../../transform.js'; import {assign} from '../../obj.js'; import { @@ -21,7 +22,6 @@ import {cssOpacity} from '../../css.js'; import {fromUserExtent} from '../../proj.js'; import {getUid} from '../../util.js'; import {numberSafeCompareFunction} from '../../array.js'; -import {toString as toTransformString} from '../../transform.js'; /** * @classdesc diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index 2cd8930937..ed48cc2a6b 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -23,9 +23,8 @@ import { getKey as getTileCoordKey, } from '../../tilecoord.js'; import {fromUserExtent} from '../../proj.js'; -import {getIntersection} from '../../extent.js'; +import {getIntersection, isEmpty} from '../../extent.js'; import {getUid} from '../../util.js'; -import {isEmpty} from '../../extent.js'; import {numberSafeCompareFunction} from '../../array.js'; import {toSize} from '../../size.js'; diff --git a/src/ol/webgl/Buffer.js b/src/ol/webgl/Buffer.js index 92ac10946a..d29a08d8b4 100644 --- a/src/ol/webgl/Buffer.js +++ b/src/ol/webgl/Buffer.js @@ -1,8 +1,13 @@ /** * @module ol/webgl/Buffer */ -import {ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER} from '../webgl.js'; -import {DYNAMIC_DRAW, STATIC_DRAW, STREAM_DRAW} from '../webgl.js'; +import { + ARRAY_BUFFER, + DYNAMIC_DRAW, + ELEMENT_ARRAY_BUFFER, + STATIC_DRAW, + STREAM_DRAW, +} from '../webgl.js'; import {assert} from '../asserts.js'; /** diff --git a/tasks/generate-index.js b/tasks/generate-index.js index 73d7fb3730..d2d09f5097 100644 --- a/tasks/generate-index.js +++ b/tasks/generate-index.js @@ -1,8 +1,7 @@ import esMain from 'es-main'; import fse from 'fs-extra'; import generateInfo from './generate-info.js'; -import path from 'path'; -import {dirname} from 'path'; +import path, {dirname} from 'path'; import {fileURLToPath} from 'url'; /** diff --git a/tasks/generate-info.js b/tasks/generate-info.js index c011f1448f..bcf89bedce 100644 --- a/tasks/generate-info.js +++ b/tasks/generate-info.js @@ -1,7 +1,6 @@ import esMain from 'es-main'; import fse from 'fs-extra'; -import path from 'path'; -import {dirname} from 'path'; +import path, {dirname} from 'path'; import {fileURLToPath} from 'url'; import {spawn} from 'child_process'; import {walk} from 'walk'; diff --git a/tasks/prepare-package.js b/tasks/prepare-package.js index a49f0a2d31..0c1f85a989 100644 --- a/tasks/prepare-package.js +++ b/tasks/prepare-package.js @@ -1,7 +1,6 @@ import esMain from 'es-main'; import fse from 'fs-extra'; -import path from 'path'; -import {dirname} from 'path'; +import path, {dirname} from 'path'; import {fileURLToPath} from 'url'; const baseDir = dirname(fileURLToPath(import.meta.url)); diff --git a/test/browser/spec/ol/format/iiif.test.js b/test/browser/spec/ol/format/iiif.test.js index 19fb73fe69..91a63cab52 100644 --- a/test/browser/spec/ol/format/iiif.test.js +++ b/test/browser/spec/ol/format/iiif.test.js @@ -1,5 +1,4 @@ -import IIIFInfo from '../../../../../src/ol/format/IIIFInfo.js'; -import {Versions} from '../../../../../src/ol/format/IIIFInfo.js'; +import IIIFInfo, {Versions} from '../../../../../src/ol/format/IIIFInfo.js'; describe('ol.format.IIIFInfo', function () { const iiifInfo = new IIIFInfo(); diff --git a/test/browser/spec/ol/resolutionconstraint.test.js b/test/browser/spec/ol/resolutionconstraint.test.js index 8677778bb1..f7c5a9dd29 100644 --- a/test/browser/spec/ol/resolutionconstraint.test.js +++ b/test/browser/spec/ol/resolutionconstraint.test.js @@ -1,5 +1,5 @@ -import {createMinMaxResolution} from '../../../../src/ol/resolutionconstraint.js'; import { + createMinMaxResolution, createSnapToPower, createSnapToResolutions, } from '../../../../src/ol/resolutionconstraint.js'; diff --git a/test/browser/spec/ol/vectorrendertile.test.js b/test/browser/spec/ol/vectorrendertile.test.js index 26bc4eb067..b33dfc5ef5 100644 --- a/test/browser/spec/ol/vectorrendertile.test.js +++ b/test/browser/spec/ol/vectorrendertile.test.js @@ -2,8 +2,9 @@ import EventType from '../../../../src/ol/events/EventType.js'; import GeoJSON from '../../../../src/ol/format/GeoJSON.js'; import TileGrid from '../../../../src/ol/tilegrid/TileGrid.js'; import TileState from '../../../../src/ol/TileState.js'; -import VectorTileSource from '../../../../src/ol/source/VectorTile.js'; -import {defaultLoadFunction} from '../../../../src/ol/source/VectorTile.js'; +import VectorTileSource, { + defaultLoadFunction, +} from '../../../../src/ol/source/VectorTile.js'; import {listen, unlistenByKey} from '../../../../src/ol/events.js'; describe('ol.VectorRenderTile', function () { diff --git a/test/rendering/cases/layer-tile-extent/main.js b/test/rendering/cases/layer-tile-extent/main.js index 8f6a5122f9..3c67a82957 100644 --- a/test/rendering/cases/layer-tile-extent/main.js +++ b/test/rendering/cases/layer-tile-extent/main.js @@ -6,8 +6,7 @@ import Map from '../../../../src/ol/Map.js'; import TileLayer from '../../../../src/ol/layer/Tile.js'; import View from '../../../../src/ol/View.js'; import XYZ from '../../../../src/ol/source/XYZ.js'; -import {fromLonLat} from '../../../../src/ol/proj.js'; -import {transformExtent} from '../../../../src/ol/proj.js'; +import {fromLonLat, transformExtent} from '../../../../src/ol/proj.js'; const center = fromLonLat([7, 50]); const extent = transformExtent([2, 47, 10, 53], 'EPSG:4326', 'EPSG:3857'); diff --git a/test/rendering/test.js b/test/rendering/test.js index 64fdf23a0e..731533afac 100755 --- a/test/rendering/test.js +++ b/test/rendering/test.js @@ -4,7 +4,7 @@ import esMain from 'es-main'; import express from 'express'; import fs from 'fs'; import fse from 'fs-extra'; -import path from 'path'; +import path, {dirname} from 'path'; import pixelmatch from 'pixelmatch'; import png from 'pngjs'; import puppeteer from 'puppeteer'; @@ -13,7 +13,6 @@ import webpack from 'webpack'; import webpackMiddleware from 'webpack-dev-middleware'; import yargs from 'yargs'; import {LogLevel} from 'loglevelnext/dist/LogLevel.js'; -import {dirname} from 'path'; import {fileURLToPath} from 'url'; import {globby} from 'globby'; import {hideBin} from 'yargs/helpers';