From 2bbec9573f3485c67007d5554038de21dc12d285 Mon Sep 17 00:00:00 2001 From: "Rifa'i M. Hanif" Date: Wed, 16 Nov 2022 10:15:55 +0700 Subject: [PATCH] update ol to v7.1.0 --- @types/ol/Collection.d.ts | 4 +- @types/ol/Feature.d.ts | 4 +- @types/ol/Geolocation.d.ts | 2 +- @types/ol/ImageCanvas.d.ts | 2 +- @types/ol/ImageTile.d.ts | 32 +- @types/ol/Map.d.ts | 300 +++- @types/ol/MapBrowserEvent.d.ts | 10 +- @types/ol/MapBrowserEventHandler.d.ts | 4 +- @types/ol/MapEvent.d.ts | 6 +- @types/ol/Object.d.ts | 8 +- @types/ol/Overlay.d.ts | 13 +- @types/ol/PluggableMap.d.ts | 365 ---- @types/ol/Tile.d.ts | 6 +- @types/ol/TileQueue.d.ts | 2 +- @types/ol/VectorTile.d.ts | 2 +- @types/ol/View.d.ts | 44 +- @types/ol/array.d.ts | 10 +- @types/ol/control.d.ts | 27 +- @types/ol/control/Attribution.d.ts | 2 +- @types/ol/control/Control.d.ts | 6 +- @types/ol/control/FullScreen.d.ts | 6 +- @types/ol/control/MousePosition.d.ts | 9 +- @types/ol/control/OverviewMap.d.ts | 18 +- @types/ol/control/Rotate.d.ts | 2 +- @types/ol/control/ScaleLine.d.ts | 17 +- @types/ol/control/Zoom.d.ts | 2 +- @types/ol/control/ZoomSlider.d.ts | 6 +- @types/ol/control/ZoomToExtent.d.ts | 2 +- @types/ol/control/defaults.d.ts | 25 + @types/ol/coordinate.d.ts | 62 +- @types/ol/dom.d.ts | 8 +- @types/ol/events.d.ts | 6 +- @types/ol/events/Target.d.ts | 4 +- @types/ol/extent.d.ts | 29 +- @types/ol/format/EsriJSON.d.ts | 18 +- @types/ol/format/Feature.d.ts | 18 +- @types/ol/format/GML.d.ts | 6 +- @types/ol/format/GML2.d.ts | 2 +- @types/ol/format/GML3.d.ts | 8 +- @types/ol/format/GML32.d.ts | 2 +- @types/ol/format/GMLBase.d.ts | 8 +- @types/ol/format/GPX.d.ts | 8 +- @types/ol/format/GeoJSON.d.ts | 14 +- @types/ol/format/IGC.d.ts | 24 +- @types/ol/format/IIIFInfo.d.ts | 2 +- @types/ol/format/JSONFeature.d.ts | 27 +- @types/ol/format/KML.d.ts | 11 +- @types/ol/format/MVT.d.ts | 14 +- @types/ol/format/OSMXML.d.ts | 2 +- @types/ol/format/Polyline.d.ts | 25 +- @types/ol/format/TextFeature.d.ts | 24 +- @types/ol/format/TopoJSON.d.ts | 14 +- @types/ol/format/WFS.d.ts | 8 +- @types/ol/format/WKB.d.ts | 17 +- @types/ol/format/WKT.d.ts | 14 +- @types/ol/format/WMSGetFeatureInfo.d.ts | 4 +- @types/ol/format/XMLFeature.d.ts | 30 +- @types/ol/format/filter.d.ts | 24 +- @types/ol/format/filter/Bbox.d.ts | 2 +- @types/ol/format/filter/ComparisonBinary.d.ts | 2 +- @types/ol/format/filter/Contains.d.ts | 2 +- @types/ol/format/filter/DWithin.d.ts | 2 +- @types/ol/format/filter/Disjoint.d.ts | 2 +- @types/ol/format/filter/EqualTo.d.ts | 2 +- @types/ol/format/filter/Intersects.d.ts | 2 +- @types/ol/format/filter/IsLike.d.ts | 8 +- @types/ol/format/filter/NotEqualTo.d.ts | 2 +- @types/ol/format/filter/Spatial.d.ts | 2 +- @types/ol/format/filter/Within.d.ts | 2 +- @types/ol/geom/Circle.d.ts | 9 +- @types/ol/geom/Geometry.d.ts | 13 +- @types/ol/geom/GeometryCollection.d.ts | 6 +- @types/ol/geom/GeometryLayout.d.ts | 13 - @types/ol/geom/LineString.d.ts | 15 +- @types/ol/geom/LinearRing.d.ts | 7 +- @types/ol/geom/MultiLineString.d.ts | 23 +- @types/ol/geom/MultiPoint.d.ts | 7 +- @types/ol/geom/MultiPolygon.d.ts | 13 +- @types/ol/geom/Point.d.ts | 7 +- @types/ol/geom/Polygon.d.ts | 15 +- @types/ol/geom/SimpleGeometry.d.ts | 13 +- @types/ol/geom/flat/closest.d.ts | 6 +- @types/ol/geom/flat/deflate.d.ts | 4 +- @types/ol/geom/flat/flip.d.ts | 4 +- @types/ol/geom/flat/inflate.d.ts | 6 +- @types/ol/geom/flat/interiorpoint.d.ts | 2 +- @types/ol/geom/flat/interpolate.d.ts | 4 +- @types/ol/geom/flat/orient.d.ts | 16 +- @types/ol/geom/flat/simplify.d.ts | 2 +- @types/ol/geom/flat/transform.d.ts | 8 +- @types/ol/index.d.ts | 1 - @types/ol/interaction.d.ts | 42 +- @types/ol/interaction/DoubleClickZoom.d.ts | 2 +- @types/ol/interaction/DragAndDrop.d.ts | 13 +- @types/ol/interaction/DragBox.d.ts | 2 +- @types/ol/interaction/DragPan.d.ts | 2 +- @types/ol/interaction/DragRotate.d.ts | 2 +- @types/ol/interaction/DragRotateAndZoom.d.ts | 2 +- @types/ol/interaction/DragZoom.d.ts | 2 +- @types/ol/interaction/Draw.d.ts | 45 +- @types/ol/interaction/Extent.d.ts | 6 +- @types/ol/interaction/Interaction.d.ts | 12 +- @types/ol/interaction/KeyboardPan.d.ts | 2 +- @types/ol/interaction/KeyboardZoom.d.ts | 2 +- @types/ol/interaction/Link.d.ts | 6 +- @types/ol/interaction/Modify.d.ts | 7 +- @types/ol/interaction/MouseWheelZoom.d.ts | 7 +- @types/ol/interaction/PinchRotate.d.ts | 2 +- @types/ol/interaction/PinchZoom.d.ts | 2 +- @types/ol/interaction/Pointer.d.ts | 2 +- @types/ol/interaction/Select.d.ts | 16 +- @types/ol/interaction/Snap.d.ts | 12 +- @types/ol/interaction/Translate.d.ts | 6 +- @types/ol/interaction/defaults.d.ts | 39 + @types/ol/layer/Base.d.ts | 8 +- @types/ol/layer/BaseImage.d.ts | 6 +- @types/ol/layer/BaseTile.d.ts | 6 +- @types/ol/layer/BaseVector.d.ts | 20 +- @types/ol/layer/Graticule.d.ts | 2 +- @types/ol/layer/Group.d.ts | 8 +- @types/ol/layer/Heatmap.d.ts | 2 +- @types/ol/layer/Image.d.ts | 2 +- @types/ol/layer/Layer.d.ts | 17 +- @types/ol/layer/MapboxVector.d.ts | 9 +- @types/ol/layer/Tile.d.ts | 2 +- @types/ol/layer/Vector.d.ts | 2 +- @types/ol/layer/VectorImage.d.ts | 6 +- @types/ol/layer/VectorTile.d.ts | 14 +- @types/ol/layer/VectorTileRenderType.d.ts | 10 - @types/ol/layer/WebGLTile.d.ts | 6 +- @types/ol/math.d.ts | 14 - @types/ol/net.d.ts | 2 +- @types/ol/obj.d.ts | 11 - @types/ol/proj.d.ts | 16 +- @types/ol/proj/Projection.d.ts | 4 +- @types/ol/proj/Units.d.ts | 26 +- @types/ol/proj/epsg3857.d.ts | 4 +- @types/ol/proj/proj4.d.ts | 2 +- @types/ol/render.d.ts | 13 +- @types/ol/render/Box.d.ts | 4 +- @types/ol/render/Event.d.ts | 8 +- @types/ol/render/Feature.d.ts | 4 +- @types/ol/render/VectorContext.d.ts | 4 +- @types/ol/render/canvas.d.ts | 19 +- @types/ol/render/canvas/Executor.d.ts | 6 +- @types/ol/render/canvas/ExecutorGroup.d.ts | 6 +- @types/ol/render/canvas/ImageBuilder.d.ts | 2 +- @types/ol/render/canvas/Immediate.d.ts | 6 +- @types/ol/render/canvas/TextBuilder.d.ts | 2 +- @types/ol/render/webgl/BatchRenderer.d.ts | 44 + .../render/webgl/LineStringBatchRenderer.d.ts | 21 + .../ol/render/webgl/MixedGeometryBatch.d.ts | 65 + .../ol/render/webgl/PointBatchRenderer.d.ts | 20 + .../ol/render/webgl/PolygonBatchRenderer.d.ts | 19 + @types/ol/render/webgl/constants.d.ts | 22 + @types/ol/render/webgl/utils.d.ts | 17 + @types/ol/renderer/Composite.d.ts | 14 +- @types/ol/renderer/Layer.d.ts | 3 +- @types/ol/renderer/Map.d.ts | 14 +- @types/ol/renderer/canvas/ImageLayer.d.ts | 2 +- @types/ol/renderer/canvas/Layer.d.ts | 6 +- @types/ol/renderer/canvas/TileLayer.d.ts | 4 +- .../ol/renderer/canvas/VectorImageLayer.d.ts | 2 +- @types/ol/renderer/canvas/VectorLayer.d.ts | 8 +- .../ol/renderer/canvas/VectorTileLayer.d.ts | 12 +- @types/ol/renderer/canvas/common.d.ts | 12 - @types/ol/renderer/vector.d.ts | 4 +- @types/ol/renderer/webgl/Layer.d.ts | 39 +- @types/ol/renderer/webgl/PointsLayer.d.ts | 2 +- @types/ol/renderer/webgl/TileLayer.d.ts | 3 +- @types/ol/renderer/webgl/VectorLayer.d.ts | 72 + @types/ol/renderer/webgl/shaders.d.ts | 35 + @types/ol/reproj.d.ts | 4 +- @types/ol/reproj/Tile.d.ts | 6 +- @types/ol/reproj/Triangulation.d.ts | 2 +- @types/ol/reproj/common.d.ts | 5 - @types/ol/resolutionconstraint.d.ts | 20 +- @types/ol/rotationconstraint.d.ts | 2 +- @types/ol/size.d.ts | 6 +- @types/ol/source/BingMaps.d.ts | 1 - @types/ol/source/Cluster.d.ts | 2 +- @types/ol/source/DataTile.d.ts | 1 - @types/ol/source/GeoTIFF.d.ts | 2 +- @types/ol/source/IIIF.d.ts | 3 +- @types/ol/source/Image.d.ts | 1 - @types/ol/source/ImageArcGISRest.d.ts | 3 +- @types/ol/source/ImageCanvas.d.ts | 3 +- @types/ol/source/ImageMapGuide.d.ts | 1 - @types/ol/source/ImageStatic.d.ts | 1 - @types/ol/source/ImageWMS.d.ts | 7 +- @types/ol/source/OGCMapTile.d.ts | 1 - @types/ol/source/OSM.d.ts | 3 +- @types/ol/source/Raster.d.ts | 11 +- @types/ol/source/Source.d.ts | 4 +- @types/ol/source/Stamen.d.ts | 1 - @types/ol/source/Tile.d.ts | 2 +- @types/ol/source/TileArcGISRest.d.ts | 3 +- @types/ol/source/TileDebug.d.ts | 2 +- @types/ol/source/TileImage.d.ts | 1 - @types/ol/source/TileJSON.d.ts | 1 - @types/ol/source/TileWMS.d.ts | 3 +- @types/ol/source/UTFGrid.d.ts | 4 +- @types/ol/source/Vector.d.ts | 16 +- @types/ol/source/WMTS.d.ts | 1 - @types/ol/source/XYZ.d.ts | 3 +- @types/ol/source/Zoomify.d.ts | 8 +- @types/ol/sphere.d.ts | 8 +- @types/ol/string.d.ts | 2 +- @types/ol/structs/LRUCache.d.ts | 4 +- @types/ol/structs/LinkedList.d.ts | 2 +- @types/ol/structs/RBush.d.ts | 4 +- @types/ol/style/Circle.d.ts | 2 +- @types/ol/style/Fill.d.ts | 2 +- @types/ol/style/Icon.d.ts | 18 +- @types/ol/style/IconAnchorUnits.d.ts | 9 - @types/ol/style/IconOrigin.d.ts | 11 - @types/ol/style/RegularShape.d.ts | 2 +- @types/ol/style/Stroke.d.ts | 9 +- @types/ol/style/Style.d.ts | 2 +- @types/ol/style/Text.d.ts | 35 +- @types/ol/style/TextPlacement.d.ts | 12 - @types/ol/style/flat.d.ts | 137 ++ @types/ol/tilecoord.d.ts | 2 +- @types/ol/tilegrid.d.ts | 15 +- @types/ol/tilegrid/TileGrid.d.ts | 14 +- @types/ol/tilegrid/WMTS.d.ts | 6 +- @types/ol/util.d.ts | 2 +- @types/ol/webgl.d.ts | 2 +- @types/ol/webgl/Buffer.d.ts | 4 +- @types/ol/webgl/Helper.d.ts | 27 +- @types/ol/webgl/PostProcessingPass.d.ts | 2 +- @types/ol/webgl/RenderTarget.d.ts | 2 +- @types/ol/worker/version.d.ts | 1 - @types/ol/xml.d.ts | 40 +- jsdoc/conf.json | 1 + jsdoc/template/publish.js | 1 + package.json | 43 +- patches/ol-Collection.patch | 28 - patches/ol-layer-generic-type.patch | 46 +- patches/ol-obj.patch | 14 - patches/ol-render-canvas.patch | 4 +- patches/ol-renderer-canvas-common.patch | 30 - patches/ol-worker.patch | 93 +- patches/ol-xml.patch | 27 +- scripts/applyPatches.js | 2 +- test/custom-interactions.ts | 9 +- test/geolocation-orientation.ts | 3 +- test/getfeatureinfo-image.ts | 2 +- test/getfeatureinfo-tile.ts | 2 +- test/icon.ts | 5 +- test/mouse-position.ts | 2 +- test/ol-tests.ts | 6 +- test/popup.ts | 7 +- test/region-growing.ts | 4 +- test/shaded-relief.ts | 4 +- test/zoomslider.ts | 3 +- yarn.lock | 1599 ++++++++++++----- 257 files changed, 2894 insertions(+), 2088 deletions(-) delete mode 100644 @types/ol/PluggableMap.d.ts create mode 100644 @types/ol/control/defaults.d.ts delete mode 100644 @types/ol/geom/GeometryLayout.d.ts create mode 100644 @types/ol/interaction/defaults.d.ts delete mode 100644 @types/ol/layer/VectorTileRenderType.d.ts create mode 100644 @types/ol/render/webgl/BatchRenderer.d.ts create mode 100644 @types/ol/render/webgl/LineStringBatchRenderer.d.ts create mode 100644 @types/ol/render/webgl/MixedGeometryBatch.d.ts create mode 100644 @types/ol/render/webgl/PointBatchRenderer.d.ts create mode 100644 @types/ol/render/webgl/PolygonBatchRenderer.d.ts create mode 100644 @types/ol/render/webgl/constants.d.ts create mode 100644 @types/ol/render/webgl/utils.d.ts delete mode 100644 @types/ol/renderer/canvas/common.d.ts create mode 100644 @types/ol/renderer/webgl/VectorLayer.d.ts create mode 100644 @types/ol/renderer/webgl/shaders.d.ts delete mode 100644 @types/ol/style/IconAnchorUnits.d.ts delete mode 100644 @types/ol/style/IconOrigin.d.ts delete mode 100644 @types/ol/style/TextPlacement.d.ts create mode 100644 @types/ol/style/flat.d.ts delete mode 100644 @types/ol/worker/version.d.ts delete mode 100644 patches/ol-Collection.patch delete mode 100644 patches/ol-obj.patch delete mode 100644 patches/ol-renderer-canvas-common.patch diff --git a/@types/ol/Collection.d.ts b/@types/ol/Collection.d.ts index 941f5c87..ed2d55e0 100644 --- a/@types/ol/Collection.d.ts +++ b/@types/ol/Collection.d.ts @@ -10,7 +10,7 @@ export interface Options { unique?: boolean | undefined; } export default class Collection extends BaseObject { - constructor(opt_array?: T[], opt_options?: Options); + constructor(array?: T[], options?: Options); /** * Remove all elements from the collection. */ @@ -88,7 +88,7 @@ export default class Collection extends BaseObject { ): void; } export class CollectionEvent extends BaseEvent { - constructor(type: CollectionEventType, opt_element?: T, opt_index?: number); + constructor(type: CollectionEventType, element: T, index: number); /** * The element that is added to or removed from the collection. */ diff --git a/@types/ol/Feature.d.ts b/@types/ol/Feature.d.ts index 65344cff..8fbafa0f 100644 --- a/@types/ol/Feature.d.ts +++ b/@types/ol/Feature.d.ts @@ -10,7 +10,7 @@ export type TFeatureObjectEventTypes = 'change:geometry' | 'propertychange'; export type FeatureClass = typeof Feature | typeof RenderFeature; export type FeatureLike = Feature | RenderFeature; export default class Feature extends BaseObject { - constructor(opt_geometryOrProperties?: Geometry | ObjectWithGeometry); + constructor(geometryOrProperties?: Geometry | ObjectWithGeometry); /** * Clone this feature. If the original feature has a geometry it * is also cloned. The feature id is not set in the clone. @@ -66,7 +66,7 @@ export default class Feature extends B * resolution and returns an array of styles. To unset the feature style, call * setStyle() without arguments or a falsey value. */ - setStyle(opt_style?: StyleLike): void; + setStyle(style?: StyleLike): void; on(type: TFeatureBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TFeatureBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TFeatureBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/Geolocation.d.ts b/@types/ol/Geolocation.d.ts index 1ce6fef4..d4fc14cf 100644 --- a/@types/ol/Geolocation.d.ts +++ b/@types/ol/Geolocation.d.ts @@ -39,7 +39,7 @@ export interface Options { projection?: ProjectionLike | undefined; } export default class Geolocation extends BaseObject { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Clean up. */ diff --git a/@types/ol/ImageCanvas.d.ts b/@types/ol/ImageCanvas.d.ts index 5ea72cb2..e6267cdb 100644 --- a/@types/ol/ImageCanvas.d.ts +++ b/@types/ol/ImageCanvas.d.ts @@ -9,7 +9,7 @@ import { Extent } from './extent'; */ export type Loader = (p0: (p0?: Error) => void) => void; export default class ImageCanvas extends ImageBase { - constructor(extent: Extent, resolution: number, pixelRatio: number, canvas: HTMLCanvasElement, opt_loader?: Loader); + constructor(extent: Extent, resolution: number, pixelRatio: number, canvas: HTMLCanvasElement, loader?: Loader); /** * Get any error associated with asynchronous rendering. */ diff --git a/@types/ol/ImageTile.d.ts b/@types/ol/ImageTile.d.ts index bd6d0f27..9bd139e6 100644 --- a/@types/ol/ImageTile.d.ts +++ b/@types/ol/ImageTile.d.ts @@ -9,14 +9,42 @@ export default class ImageTile extends Tile { src: string, crossOrigin: string, tileLoadFunction: LoadFunction, - opt_options?: Options, + options?: Options, ); /** * Get the HTML image element for this tile (may be a Canvas, Image, or Video). */ getImage(): HTMLCanvasElement | HTMLImageElement | HTMLVideoElement; /** - * Load not yet loaded URI. + * Load the image or retry if loading previously failed. + * Loading is taken care of by the tile queue, and calling this method is + * only needed for preloading or for reloading in case of an error. + * To retry loading tiles on failed requests, use a custom tileLoadFunction + * that checks for error status codes and reloads only when the status code is + * 408, 429, 500, 502, 503 and 504, and only when not too many retries have been + * made already: + * const retryCodes = [408, 429, 500, 502, 503, 504]; + * const retries = {}; + * source.setTileLoadFunction((tile, src) => { + * const image = tile.getImage(); + * fetch(src) + * .then((response) => { + * if (retryCodes.includes(response.status)) { + * retries[src] = (retries[src] || 0) + 1; + * if (retries[src] <= 3) { + * setTimeout(() => tile.load(), retries[src] * 1000); + * } + * return Promise.reject(); + * } + * return response.blob(); + * }) + * .then((blob) => { + * const imageUrl = URL.createObjectURL(blob); + * image.src = imageUrl; + * setTimeout(() => URL.revokeObjectURL(imageUrl), 5000); + * }) + * .catch(() => tile.setState(3)); // error + * }); */ load(): void; /** diff --git a/@types/ol/Map.d.ts b/@types/ol/Map.d.ts index 85495f86..7689cf21 100644 --- a/@types/ol/Map.d.ts +++ b/@types/ol/Map.d.ts @@ -1,11 +1,31 @@ +import Collection from './Collection'; +import { FeatureLike } from './Feature'; import MapBrowserEvent from './MapBrowserEvent'; import MapEvent from './MapEvent'; -import { ObjectEvent } from './Object'; -import PluggableMap, { MapOptions } from './PluggableMap'; +import BaseObject, { ObjectEvent } from './Object'; +import Types from './ObjectEventType'; +import Overlay from './Overlay'; +import Tile from './Tile'; +import TileQueue from './TileQueue'; +import View, { State, ViewOptions } from './View'; +import Control from './control/Control'; +import { Coordinate } from './coordinate'; import { EventsKey, ListenerFunction } from './events'; import BaseEvent from './events/Event'; +import { Extent } from './extent'; +import SimpleGeometry from './geom/SimpleGeometry'; +import Interaction from './interaction/Interaction'; +import BaseLayer from './layer/Base'; +import LayerGroup from './layer/Group'; +import Layer, { State as State_1 } from './layer/Layer'; +import { Pixel } from './pixel'; import RenderEvent from './render/Event'; +import LayerRenderer from './renderer/Layer'; import MapRenderer from './renderer/Map'; +import { Size } from './size'; +import Source from './source/Source'; +import { Transform } from './transform'; +import RBush from 'rbush'; export type TMapBaseEventTypes = 'change' | 'error'; export type TMapObjectEventTypes = @@ -17,9 +37,279 @@ export type TMapObjectEventTypes = export type TMapMapBrowserEventTypes = 'click' | 'dblclick' | 'pointerdrag' | 'pointermove' | 'singleclick'; export type TMapMapEventTypes = 'loadend' | 'loadstart' | 'moveend' | 'movestart' | 'postrender'; export type TMapRenderEventTypes = 'postcompose' | 'precompose' | 'rendercomplete'; -export default class Map extends PluggableMap { - constructor(options: MapOptions); - createRenderer(): MapRenderer; +export interface AtPixelOptions { + layerFilter?: ((p0: Layer) => boolean) | undefined; + hitTolerance?: number | undefined; + checkWrapped?: boolean | undefined; +} +/** + * State of the current frame. Only pixelRatio, time and viewState should + * be used in applications. + */ +export interface FrameState { + pixelRatio: number; + time: number; + viewState: State; + animate: boolean; + coordinateToPixelTransform: Transform; + declutterTree: RBush; + extent: null | Extent; + nextExtent?: Extent | undefined; + index: number; + layerStatesArray: State_1[]; + layerIndex: number; + pixelToCoordinateTransform: Transform; + postRenderFunctions: PostRenderFunction[]; + size: Size; + tileQueue: TileQueue; + usedTiles: Record>; + viewHints: number[]; + wantedTiles: Record>; + mapId: string; + renderTargets: Record; +} +export type MapObjectEventTypes = Types | 'change:layergroup' | 'change:size' | 'change:target' | 'change:view'; +/** + * Object literal with config options for the map. + */ +export interface MapOptions { + controls?: Collection | Control[] | undefined; + pixelRatio?: number | undefined; + interactions?: Collection | Interaction[] | undefined; + keyboardEventTarget?: HTMLElement | Document | string | undefined; + layers?: BaseLayer[] | Collection | LayerGroup | undefined; + maxTilesLoading?: number | undefined; + moveTolerance?: number | undefined; + overlays?: Collection | Overlay[] | undefined; + target?: HTMLElement | string | undefined; + view?: View | Promise | undefined; +} +export interface MapOptionsInternal { + controls?: Collection | undefined; + interactions?: Collection | undefined; + keyboardEventTarget: HTMLElement | Document; + overlays: Collection; + values: Record; +} +export type PostRenderFunction = (p0: Map, p1: FrameState) => any; +export default class Map extends BaseObject { + constructor(options?: MapOptions); + protected controls: Collection; + protected interactions: Collection; + protected handlePostRender(): void; + /** + * Add the given control to the map. + */ + addControl(control: Control): void; + /** + * Add the given interaction to the map. If you want to add an interaction + * at another point of the collection use getInteractions() and the methods + * available on {@link module:ol/Collection~Collection}. This can be used to + * stop the event propagation from the handleEvent function. The interactions + * get to handle the events in the reverse order of this collection. + */ + addInteraction(interaction: Interaction): void; + /** + * Adds the given layer to the top of this map. If you want to add a layer + * elsewhere in the stack, use getLayers() and the methods available on + * {@link module:ol/Collection~Collection}. + */ + addLayer(layer: BaseLayer): void; + /** + * Add the given overlay to the map. + */ + addOverlay(overlay: Overlay): void; + /** + * Clean up. + */ + disposeInternal(): void; + /** + * Detect features that intersect a pixel on the viewport, and execute a + * callback with each intersecting feature. Layers included in the detection can + * be configured through the layerFilter option in options. + */ + forEachFeatureAtPixel( + pixel: Pixel, + callback: (p0: FeatureLike, p1: Layer, p2: SimpleGeometry) => T, + options?: AtPixelOptions, + ): T | undefined; + /** + * Get all layers from all layer groups. + */ + getAllLayers(): Layer[]; + /** + * Get the map controls. Modifying this collection changes the controls + * associated with the map. + */ + getControls(): Collection; + /** + * Get the coordinate for a given pixel. This returns a coordinate in the + * user projection. + */ + getCoordinateFromPixel(pixel: Pixel): Coordinate; + /** + * Get the coordinate for a given pixel. This returns a coordinate in the + * map view projection. + */ + getCoordinateFromPixelInternal(pixel: Pixel): Coordinate; + /** + * Returns the coordinate in user projection for a browser event. + */ + getEventCoordinate(event: MouseEvent): Coordinate; + /** + * Returns the coordinate in view projection for a browser event. + */ + getEventCoordinateInternal(event: MouseEvent): Coordinate; + /** + * Returns the map pixel position for a browser event relative to the viewport. + */ + getEventPixel(event: UIEvent): Pixel; + /** + * Get all features that intersect a pixel on the viewport. + */ + getFeaturesAtPixel(pixel: Pixel, options?: AtPixelOptions): FeatureLike[]; + /** + * Get the map interactions. Modifying this collection changes the interactions + * associated with the map. + * Interactions are used for e.g. pan, zoom and rotate. + */ + getInteractions(): Collection; + /** + * Get the layergroup associated with this map. + */ + getLayerGroup(): LayerGroup; + /** + * Get the collection of layers associated with this map. + */ + getLayers(): Collection; + getLoadingOrNotReady(): boolean; + /** + * Get an overlay by its identifier (the value returned by overlay.getId()). + * Note that the index treats string and numeric identifiers as the same. So + * map.getOverlayById(2) will return an overlay with id '2' or 2. + */ + getOverlayById(id: string | number): Overlay; + /** + * Get the element that serves as the container for overlays. Elements added to + * this container will let mousedown and touchstart events through to the map, + * so clicks and gestures on an overlay will trigger {@link module:ol/MapBrowserEvent~MapBrowserEvent} + * events. + */ + getOverlayContainer(): HTMLElement; + /** + * Get the element that serves as a container for overlays that don't allow + * event propagation. Elements added to this container won't let mousedown and + * touchstart events through to the map, so clicks and gestures on an overlay + * don't trigger any {@link module:ol/MapBrowserEvent~MapBrowserEvent}. + */ + getOverlayContainerStopEvent(): HTMLElement; + /** + * Get the map overlays. Modifying this collection changes the overlays + * associated with the map. + */ + getOverlays(): Collection; + getOwnerDocument(): Document; + /** + * Get the pixel for a coordinate. This takes a coordinate in the user + * projection and returns the corresponding pixel. + */ + getPixelFromCoordinate(coordinate: Coordinate): Pixel; + /** + * Get the pixel for a coordinate. This takes a coordinate in the map view + * projection and returns the corresponding pixel. + */ + getPixelFromCoordinateInternal(coordinate: Coordinate): Pixel; + /** + * Get the map renderer. + */ + getRenderer(): MapRenderer | null; + /** + * Get the size of this map. + */ + getSize(): Size | undefined; + /** + * Get the target in which this map is rendered. + * Note that this returns what is entered as an option or in setTarget: + * if that was an element, it returns an element; if a string, it returns that. + */ + getTarget(): HTMLElement | string | undefined; + /** + * Get the DOM element into which this map is rendered. In contrast to + * getTarget this method always return an Element, or null if the + * map has no target. + */ + getTargetElement(): HTMLElement; + getTilePriority(tile: Tile, tileSourceKey: string, tileCenter: Coordinate, tileResolution: number): number; + /** + * Get the view associated with this map. A view manages properties such as + * center and resolution. + */ + getView(): View; + /** + * Get the element that serves as the map viewport. + */ + getViewport(): HTMLElement; + handleBrowserEvent(browserEvent: UIEvent, type?: string): void; + handleMapBrowserEvent(mapBrowserEvent: MapBrowserEvent): void; + /** + * Detect if features intersect a pixel on the viewport. Layers included in the + * detection can be configured through the layerFilter option. + */ + hasFeatureAtPixel(pixel: Pixel, options?: AtPixelOptions): boolean; + isRendered(): boolean; + /** + * Redraws all text after new fonts have loaded + */ + redrawText(): void; + /** + * Remove the given control from the map. + */ + removeControl(control: Control): Control | undefined; + /** + * Remove the given interaction from the map. + */ + removeInteraction(interaction: Interaction): Interaction | undefined; + /** + * Removes the given layer from the map. + */ + removeLayer(layer: BaseLayer): BaseLayer | undefined; + /** + * Remove the given overlay from the map. + */ + removeOverlay(overlay: Overlay): Overlay | undefined; + /** + * Request a map rendering (at the next animation frame). + */ + render(): void; + /** + * Requests an immediate render in a synchronous manner. + */ + renderSync(): void; + /** + * Sets the layergroup of this map. + */ + setLayerGroup(layerGroup: LayerGroup): void; + /** + * Clear any existing layers and add layers to the map. + */ + setLayers(layers: BaseLayer[] | Collection): void; + /** + * Set the size of this map. + */ + setSize(size: Size | undefined): void; + /** + * Set the target element to render this map into. + */ + setTarget(target?: HTMLElement | string): void; + /** + * Set the view for this map. + */ + setView(view: View | Promise): void; + /** + * Force a recalculation of the map viewport size. This should be called when + * third-party code changes the size of the map viewport. + */ + updateSize(): void; on(type: TMapBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TMapBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TMapBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/MapBrowserEvent.d.ts b/@types/ol/MapBrowserEvent.d.ts index 60c3aaf8..c0bfe455 100644 --- a/@types/ol/MapBrowserEvent.d.ts +++ b/@types/ol/MapBrowserEvent.d.ts @@ -1,16 +1,16 @@ +import Map, { FrameState } from './Map'; import MapEvent from './MapEvent'; -import PluggableMap, { FrameState } from './PluggableMap'; import { Coordinate } from './coordinate'; import { Pixel } from './pixel'; export default class MapBrowserEvent extends MapEvent { constructor( type: string, - map: PluggableMap, + map: Map, originalEvent: EVENT, - opt_dragging?: boolean, - opt_frameState?: FrameState, - opt_activePointers?: PointerEvent[], + dragging?: boolean, + frameState?: FrameState, + activePointers?: PointerEvent[], ); /** * The coordinate corresponding to the original browser event. This will be in the user diff --git a/@types/ol/MapBrowserEventHandler.d.ts b/@types/ol/MapBrowserEventHandler.d.ts index a82938c1..2699e5e0 100644 --- a/@types/ol/MapBrowserEventHandler.d.ts +++ b/@types/ol/MapBrowserEventHandler.d.ts @@ -1,8 +1,8 @@ -import PluggableMap from './PluggableMap'; +import Map from './Map'; import Target from './events/Target'; export default class MapBrowserEventHandler extends Target { - constructor(map: PluggableMap, moveTolerance?: number); + constructor(map: Map, moveTolerance?: number); /** * Clean up. */ diff --git a/@types/ol/MapEvent.d.ts b/@types/ol/MapEvent.d.ts index 490482a3..24df9c67 100644 --- a/@types/ol/MapEvent.d.ts +++ b/@types/ol/MapEvent.d.ts @@ -1,8 +1,8 @@ -import PluggableMap, { FrameState } from './PluggableMap'; +import Map, { FrameState } from './Map'; import BaseEvent from './events/Event'; export default class MapEvent extends BaseEvent { - constructor(type: string, map: PluggableMap, opt_frameState?: FrameState); + constructor(type: string, map: Map, frameState?: FrameState); /** * The frame state at the time of the event. */ @@ -10,5 +10,5 @@ export default class MapEvent extends BaseEvent { /** * The map where the event occurred. */ - map: PluggableMap; + map: Map; } diff --git a/@types/ol/Object.d.ts b/@types/ol/Object.d.ts index 0ef8f657..a8a1993d 100644 --- a/@types/ol/Object.d.ts +++ b/@types/ol/Object.d.ts @@ -5,7 +5,7 @@ import BaseEvent from './events/Event'; export type TBaseObjectBaseEventTypes = 'change' | 'error'; export type TBaseObjectObjectEventTypes = 'propertychange'; export default class BaseObject extends Observable { - constructor(opt_values?: Record); + constructor(values?: Record); /** * Apply any properties from another object without triggering events. */ @@ -29,16 +29,16 @@ export default class BaseObject extends Observable { /** * Sets a value. */ - set(key: string, value: any, opt_silent?: boolean): void; + set(key: string, value: any, silent?: boolean): void; /** * Sets a collection of key-value pairs. Note that this changes any existing * properties and adds new ones (it does not remove any existing properties). */ - setProperties(values: Record, opt_silent?: boolean): void; + setProperties(values: Record, silent?: boolean): void; /** * Unsets a property. */ - unset(key: string, opt_silent?: boolean): void; + unset(key: string, silent?: boolean): void; on(type: TBaseObjectBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TBaseObjectBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TBaseObjectBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/Overlay.d.ts b/@types/ol/Overlay.d.ts index a744d17c..14dac85f 100644 --- a/@types/ol/Overlay.d.ts +++ b/@types/ol/Overlay.d.ts @@ -1,6 +1,6 @@ +import Map from './Map'; import BaseObject, { ObjectEvent } from './Object'; import Types from './ObjectEventType'; -import PluggableMap from './PluggableMap'; import { Coordinate } from './coordinate'; import { EventsKey, ListenerFunction } from './events'; import BaseEvent from './events/Event'; @@ -25,9 +25,6 @@ export interface Options { stopEvent?: boolean | undefined; insertFirst?: boolean | undefined; autoPan?: PanIntoViewOptions | boolean | undefined; - autoPanAnimation?: PanOptions | undefined; - autoPanMargin?: number | undefined; - autoPanOptions?: PanIntoViewOptions | undefined; className?: string | undefined; } export type OverlayObjectEventTypes = @@ -62,7 +59,7 @@ export type Positioning = | 'top-right'; export default class Overlay extends BaseObject { constructor(options: Options); - protected autoPan: PanIntoViewOptions | false; + protected autoPan: PanIntoViewOptions; protected element: HTMLElement; protected id: number | string; protected insertFirst: boolean; @@ -105,7 +102,7 @@ export default class Overlay extends BaseObject { /** * Get the map associated with this overlay. */ - getMap(): PluggableMap | null; + getMap(): Map | null; /** * Get the offset of this overlay. */ @@ -126,7 +123,7 @@ export default class Overlay extends BaseObject { * Pan the map so that the overlay is entirely visible in the current viewport * (if necessary). */ - panIntoView(opt_panIntoViewOptions?: PanIntoViewOptions): void; + panIntoView(panIntoViewOptions?: PanIntoViewOptions): void; /** * Set the DOM element to be associated with this overlay. */ @@ -134,7 +131,7 @@ export default class Overlay extends BaseObject { /** * Set the map to be associated with this overlay. */ - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; /** * Set the offset for this overlay. */ diff --git a/@types/ol/PluggableMap.d.ts b/@types/ol/PluggableMap.d.ts deleted file mode 100644 index 83b5269a..00000000 --- a/@types/ol/PluggableMap.d.ts +++ /dev/null @@ -1,365 +0,0 @@ -import Collection from './Collection'; -import { FeatureLike } from './Feature'; -import MapBrowserEvent from './MapBrowserEvent'; -import MapEvent from './MapEvent'; -import BaseObject, { ObjectEvent } from './Object'; -import Types from './ObjectEventType'; -import Overlay from './Overlay'; -import Tile from './Tile'; -import TileQueue from './TileQueue'; -import View, { State, ViewOptions } from './View'; -import Control from './control/Control'; -import { Coordinate } from './coordinate'; -import { EventsKey, ListenerFunction } from './events'; -import BaseEvent from './events/Event'; -import { Extent } from './extent'; -import SimpleGeometry from './geom/SimpleGeometry'; -import Interaction from './interaction/Interaction'; -import BaseLayer from './layer/Base'; -import LayerGroup from './layer/Group'; -import Layer, { State as State_1 } from './layer/Layer'; -import { Pixel } from './pixel'; -import RenderEvent from './render/Event'; -import LayerRenderer from './renderer/Layer'; -import MapRenderer from './renderer/Map'; -import { Size } from './size'; -import Source from './source/Source'; -import { Transform } from './transform'; -import RBush from 'rbush'; - -export type TPluggableMapBaseEventTypes = 'change' | 'error'; -export type TPluggableMapObjectEventTypes = - | 'change:layerGroup' - | 'change:size' - | 'change:target' - | 'change:view' - | 'propertychange'; -export type TPluggableMapMapBrowserEventTypes = 'click' | 'dblclick' | 'pointerdrag' | 'pointermove' | 'singleclick'; -export type TPluggableMapMapEventTypes = 'loadend' | 'loadstart' | 'moveend' | 'movestart' | 'postrender'; -export type TPluggableMapRenderEventTypes = 'postcompose' | 'precompose' | 'rendercomplete'; -export interface AtPixelOptions { - layerFilter?: ((p0: Layer) => boolean) | undefined; - hitTolerance?: number | undefined; - checkWrapped?: boolean | undefined; -} -/** - * State of the current frame. Only pixelRatio, time and viewState should - * be used in applications. - */ -export interface FrameState { - pixelRatio: number; - time: number; - viewState: State; - animate: boolean; - coordinateToPixelTransform: Transform; - declutterTree: RBush; - extent: null | Extent; - nextExtent?: Extent | undefined; - index: number; - layerStatesArray: State_1[]; - layerIndex: number; - pixelToCoordinateTransform: Transform; - postRenderFunctions: PostRenderFunction[]; - size: Size; - tileQueue: TileQueue; - usedTiles: Record>; - viewHints: number[]; - wantedTiles: Record>; - mapId: string; - renderTargets: Record; -} -export type MapObjectEventTypes = Types | 'change:layergroup' | 'change:size' | 'change:target' | 'change:view'; -/** - * Object literal with config options for the map. - */ -export interface MapOptions { - controls?: Collection | Control[] | undefined; - pixelRatio?: number | undefined; - interactions?: Collection | Interaction[] | undefined; - keyboardEventTarget?: HTMLElement | Document | string | undefined; - layers?: BaseLayer[] | Collection | LayerGroup | undefined; - maxTilesLoading?: number | undefined; - moveTolerance?: number | undefined; - overlays?: Collection | Overlay[] | undefined; - target?: HTMLElement | string | undefined; - view?: View | Promise | undefined; -} -export interface MapOptionsInternal { - controls?: Collection | undefined; - interactions?: Collection | undefined; - keyboardEventTarget: HTMLElement | Document; - overlays: Collection; - values: Record; -} -export type PostRenderFunction = (p0: PluggableMap, p1: FrameState) => any; -export default class PluggableMap extends BaseObject { - constructor(options: MapOptions); - protected controls: Collection; - protected interactions: Collection; - protected handlePostRender(): void; - /** - * Add the given control to the map. - */ - addControl(control: Control): void; - /** - * Add the given interaction to the map. If you want to add an interaction - * at another point of the collection use getInteractions() and the methods - * available on {@link module:ol/Collection~Collection}. This can be used to - * stop the event propagation from the handleEvent function. The interactions - * get to handle the events in the reverse order of this collection. - */ - addInteraction(interaction: Interaction): void; - /** - * Adds the given layer to the top of this map. If you want to add a layer - * elsewhere in the stack, use getLayers() and the methods available on - * {@link module:ol/Collection~Collection}. - */ - addLayer(layer: BaseLayer): void; - /** - * Add the given overlay to the map. - */ - addOverlay(overlay: Overlay): void; - createRenderer(): MapRenderer; - /** - * Clean up. - */ - disposeInternal(): void; - /** - * Detect features that intersect a pixel on the viewport, and execute a - * callback with each intersecting feature. Layers included in the detection can - * be configured through the layerFilter option in opt_options. - */ - forEachFeatureAtPixel( - pixel: Pixel, - callback: (p0: FeatureLike, p1: Layer, p2: SimpleGeometry) => T, - opt_options?: AtPixelOptions, - ): T | undefined; - /** - * Please the layer.getData() method for {@link module:ol/layer/Tile~TileLayer#getData tile layers} or - * {@link module:ol/layer/Image~ImageLayer#getData image layers} instead of using this method. - * Detect layers that have a color value at a pixel on the viewport, and - * execute a callback with each matching layer. Layers included in the - * detection can be configured through opt_layerFilter. - * Note: In maps with more than one layer, this method will typically return pixel data - * representing the composed image of all layers visible at the given pixel – because layers - * will generally share the same rendering context. To force layers to render separately, and - * to get pixel data representing only one layer at a time, you can assign each layer a unique - * className in its constructor. - */ - forEachLayerAtPixel( - pixel: Pixel, - callback: (this: S, p0: Layer, p1: Uint8ClampedArray | Uint8Array) => T, - opt_options?: AtPixelOptions, - ): T | undefined; - /** - * Get all layers from all layer groups. - */ - getAllLayers(): Layer[]; - /** - * Get the map controls. Modifying this collection changes the controls - * associated with the map. - */ - getControls(): Collection; - /** - * Get the coordinate for a given pixel. This returns a coordinate in the - * user projection. - */ - getCoordinateFromPixel(pixel: Pixel): Coordinate; - /** - * Get the coordinate for a given pixel. This returns a coordinate in the - * map view projection. - */ - getCoordinateFromPixelInternal(pixel: Pixel): Coordinate; - /** - * Returns the coordinate in user projection for a browser event. - */ - getEventCoordinate(event: MouseEvent): Coordinate; - /** - * Returns the coordinate in view projection for a browser event. - */ - getEventCoordinateInternal(event: MouseEvent): Coordinate; - /** - * Returns the map pixel position for a browser event relative to the viewport. - */ - getEventPixel(event: UIEvent): Pixel; - /** - * Get all features that intersect a pixel on the viewport. - */ - getFeaturesAtPixel(pixel: Pixel, opt_options?: AtPixelOptions): FeatureLike[]; - /** - * Get the map interactions. Modifying this collection changes the interactions - * associated with the map. - * Interactions are used for e.g. pan, zoom and rotate. - */ - getInteractions(): Collection; - /** - * Get the layergroup associated with this map. - */ - getLayerGroup(): LayerGroup; - /** - * Get the collection of layers associated with this map. - */ - getLayers(): Collection; - getLoadingOrNotReady(): boolean; - /** - * Get an overlay by its identifier (the value returned by overlay.getId()). - * Note that the index treats string and numeric identifiers as the same. So - * map.getOverlayById(2) will return an overlay with id '2' or 2. - */ - getOverlayById(id: string | number): Overlay; - /** - * Get the element that serves as the container for overlays. Elements added to - * this container will let mousedown and touchstart events through to the map, - * so clicks and gestures on an overlay will trigger {@link module:ol/MapBrowserEvent~MapBrowserEvent} - * events. - */ - getOverlayContainer(): HTMLElement; - /** - * Get the element that serves as a container for overlays that don't allow - * event propagation. Elements added to this container won't let mousedown and - * touchstart events through to the map, so clicks and gestures on an overlay - * don't trigger any {@link module:ol/MapBrowserEvent~MapBrowserEvent}. - */ - getOverlayContainerStopEvent(): HTMLElement; - /** - * Get the map overlays. Modifying this collection changes the overlays - * associated with the map. - */ - getOverlays(): Collection; - getOwnerDocument(): Document; - /** - * Get the pixel for a coordinate. This takes a coordinate in the user - * projection and returns the corresponding pixel. - */ - getPixelFromCoordinate(coordinate: Coordinate): Pixel; - /** - * Get the pixel for a coordinate. This takes a coordinate in the map view - * projection and returns the corresponding pixel. - */ - getPixelFromCoordinateInternal(coordinate: Coordinate): Pixel; - /** - * Get the map renderer. - */ - getRenderer(): MapRenderer | null; - /** - * Get the size of this map. - */ - getSize(): Size | undefined; - /** - * Get the target in which this map is rendered. - * Note that this returns what is entered as an option or in setTarget: - * if that was an element, it returns an element; if a string, it returns that. - */ - getTarget(): HTMLElement | string | undefined; - /** - * Get the DOM element into which this map is rendered. In contrast to - * getTarget this method always return an Element, or null if the - * map has no target. - */ - getTargetElement(): HTMLElement; - getTilePriority(tile: Tile, tileSourceKey: string, tileCenter: Coordinate, tileResolution: number): number; - /** - * Get the view associated with this map. A view manages properties such as - * center and resolution. - */ - getView(): View; - /** - * Get the element that serves as the map viewport. - */ - getViewport(): HTMLElement; - handleBrowserEvent(browserEvent: UIEvent, opt_type?: string): void; - handleMapBrowserEvent(mapBrowserEvent: MapBrowserEvent): void; - /** - * Detect if features intersect a pixel on the viewport. Layers included in the - * detection can be configured through opt_layerFilter. - */ - hasFeatureAtPixel(pixel: Pixel, opt_options?: AtPixelOptions): boolean; - isRendered(): boolean; - /** - * Redraws all text after new fonts have loaded - */ - redrawText(): void; - /** - * Remove the given control from the map. - */ - removeControl(control: Control): Control | undefined; - /** - * Remove the given interaction from the map. - */ - removeInteraction(interaction: Interaction): Interaction | undefined; - /** - * Removes the given layer from the map. - */ - removeLayer(layer: BaseLayer): BaseLayer | undefined; - /** - * Remove the given overlay from the map. - */ - removeOverlay(overlay: Overlay): Overlay | undefined; - /** - * Request a map rendering (at the next animation frame). - */ - render(): void; - /** - * Requests an immediate render in a synchronous manner. - */ - renderSync(): void; - /** - * Sets the layergroup of this map. - */ - setLayerGroup(layerGroup: LayerGroup): void; - /** - * Clear any existing layers and add layers to the map. - */ - setLayers(layers: BaseLayer[] | Collection): void; - /** - * Set the size of this map. - */ - setSize(size: Size | undefined): void; - /** - * Set the target element to render this map into. - */ - setTarget(target?: HTMLElement | string): void; - /** - * Set the view for this map. - */ - setView(view: View | Promise): void; - /** - * Force a recalculation of the map viewport size. This should be called when - * third-party code changes the size of the map viewport. - */ - updateSize(): void; - on(type: TPluggableMapBaseEventTypes, listener: ListenerFunction): EventsKey; - on(type: TPluggableMapBaseEventTypes[], listener: ListenerFunction): EventsKey[]; - once(type: TPluggableMapBaseEventTypes, listener: ListenerFunction): EventsKey; - once(type: TPluggableMapBaseEventTypes[], listener: ListenerFunction): EventsKey[]; - un(type: TPluggableMapBaseEventTypes | TPluggableMapBaseEventTypes[], listener: ListenerFunction): void; - on(type: TPluggableMapObjectEventTypes, listener: ListenerFunction): EventsKey; - on(type: TPluggableMapObjectEventTypes[], listener: ListenerFunction): EventsKey[]; - once(type: TPluggableMapObjectEventTypes, listener: ListenerFunction): EventsKey; - once(type: TPluggableMapObjectEventTypes[], listener: ListenerFunction): EventsKey[]; - un( - type: TPluggableMapObjectEventTypes | TPluggableMapObjectEventTypes[], - listener: ListenerFunction, - ): void; - on(type: TPluggableMapMapBrowserEventTypes, listener: ListenerFunction>): EventsKey; - on(type: TPluggableMapMapBrowserEventTypes[], listener: ListenerFunction>): EventsKey[]; - once(type: TPluggableMapMapBrowserEventTypes, listener: ListenerFunction>): EventsKey; - once(type: TPluggableMapMapBrowserEventTypes[], listener: ListenerFunction>): EventsKey[]; - un( - type: TPluggableMapMapBrowserEventTypes | TPluggableMapMapBrowserEventTypes[], - listener: ListenerFunction>, - ): void; - on(type: TPluggableMapMapEventTypes, listener: ListenerFunction): EventsKey; - on(type: TPluggableMapMapEventTypes[], listener: ListenerFunction): EventsKey[]; - once(type: TPluggableMapMapEventTypes, listener: ListenerFunction): EventsKey; - once(type: TPluggableMapMapEventTypes[], listener: ListenerFunction): EventsKey[]; - un(type: TPluggableMapMapEventTypes | TPluggableMapMapEventTypes[], listener: ListenerFunction): void; - on(type: TPluggableMapRenderEventTypes, listener: ListenerFunction): EventsKey; - on(type: TPluggableMapRenderEventTypes[], listener: ListenerFunction): EventsKey[]; - once(type: TPluggableMapRenderEventTypes, listener: ListenerFunction): EventsKey; - once(type: TPluggableMapRenderEventTypes[], listener: ListenerFunction): EventsKey[]; - un( - type: TPluggableMapRenderEventTypes | TPluggableMapRenderEventTypes[], - listener: ListenerFunction, - ): void; -} diff --git a/@types/ol/Tile.d.ts b/@types/ol/Tile.d.ts index 2d717a8a..d5795127 100644 --- a/@types/ol/Tile.d.ts +++ b/@types/ol/Tile.d.ts @@ -13,10 +13,10 @@ import { TileCoord } from './tilecoord'; * import TileState from 'ol/TileState'; * * source.setTileLoadFunction(function(tile, src) { - * var xhr = new XMLHttpRequest(); + * const xhr = new XMLHttpRequest(); * xhr.responseType = 'blob'; * xhr.addEventListener('loadend', function (evt) { - * var data = this.response; + * const data = this.response; * if (data == undefined) { * tile.getImage().src = URL.createObjectURL(data); * } else { @@ -46,7 +46,7 @@ export interface Options { */ export type UrlFunction = (p0: TileCoord, p1: number, p2: Projection) => string | undefined; export default abstract class Tile extends Target { - constructor(tileCoord: TileCoord, state: TileState, opt_options?: Options); + constructor(tileCoord: TileCoord, state: TileState, options?: Options); protected state: TileState; protected changed(): void; /** diff --git a/@types/ol/TileQueue.d.ts b/@types/ol/TileQueue.d.ts index 0824ce8d..c8b49a90 100644 --- a/@types/ol/TileQueue.d.ts +++ b/@types/ol/TileQueue.d.ts @@ -1,4 +1,4 @@ -import { FrameState } from './PluggableMap'; +import { FrameState } from './Map'; import Tile from './Tile'; import { Coordinate } from './coordinate'; import BaseEvent from './events/Event'; diff --git a/@types/ol/VectorTile.d.ts b/@types/ol/VectorTile.d.ts index b837d4c8..4eb50a36 100644 --- a/@types/ol/VectorTile.d.ts +++ b/@types/ol/VectorTile.d.ts @@ -14,7 +14,7 @@ export default class VectorTile extends Tile { src: string, format: FeatureFormat, tileLoadFunction: LoadFunction, - opt_options?: Options, + options?: Options, ); /** * Get the features for this tile. Geometries will be in the view projection. diff --git a/@types/ol/View.d.ts b/@types/ol/View.d.ts index 3eb37edb..785c2a08 100644 --- a/@types/ol/View.d.ts +++ b/@types/ol/View.d.ts @@ -92,7 +92,7 @@ export interface ViewOptions { padding?: number[] | undefined; } export default class View extends BaseObject { - constructor(opt_options?: ViewOptions); + constructor(options?: ViewOptions); /** * Padding (in css pixels). * If the map viewport is partially covered with other content (overlays) along @@ -113,23 +113,23 @@ export default class View extends BaseObject { * Multiply the view resolution by a ratio, optionally using an anchor. Any resolution * constraint will apply. */ - adjustResolution(ratio: number, opt_anchor?: Coordinate): void; + adjustResolution(ratio: number, anchor?: Coordinate): void; /** * Multiply the view resolution by a ratio, optionally using an anchor. Any resolution * constraint will apply. */ - adjustResolutionInternal(ratio: number, opt_anchor?: Coordinate): void; + adjustResolutionInternal(ratio: number, anchor?: Coordinate): void; /** * Adds a value to the view rotation, optionally using an anchor. Any rotation * constraint will apply. */ - adjustRotation(delta: number, opt_anchor?: Coordinate): void; - adjustRotationInternal(delta: number, opt_anchor?: Coordinate): void; + adjustRotation(delta: number, anchor?: Coordinate): void; + adjustRotationInternal(delta: number, anchor?: Coordinate): void; /** * Adds a value to the view zoom level, optionally using an anchor. Any resolution * constraint will apply. */ - adjustZoom(delta: number, opt_anchor?: Coordinate): void; + adjustZoom(delta: number, anchor?: Coordinate): void; /** * Animate the view. The view's center, zoom (or resolution), and rotation * can be animated for smooth transitions between view states. For example, @@ -171,8 +171,8 @@ export default class View extends BaseObject { * should fit. In most cases you want to get the extent of the entire map, * that is map.getSize(). */ - calculateExtent(opt_size?: Size): Extent; - calculateExtentInternal(opt_size?: Size): Extent; + calculateExtent(size?: Size): Extent; + calculateExtentInternal(size?: Size): Extent; /** * Cancel any ongoing animations. */ @@ -186,20 +186,20 @@ export default class View extends BaseObject { * Notify the View that an interaction has ended. The view state will be resolved * to a stable one if needed (depending on its constraints). */ - endInteraction(opt_duration?: number, opt_resolutionDirection?: number, opt_anchor?: Coordinate): void; + endInteraction(duration?: number, resolutionDirection?: number, anchor?: Coordinate): void; /** * Notify the View that an interaction has ended. The view state will be resolved * to a stable one if needed (depending on its constraints). */ - endInteractionInternal(opt_duration?: number, opt_resolutionDirection?: number, opt_anchor?: Coordinate): void; + endInteractionInternal(duration?: number, resolutionDirection?: number, anchor?: Coordinate): void; /** * Fit the given geometry or extent based on the given map size and border. * The size is pixel dimensions of the box to fit the extent into. * In most cases you will want to use the map size, that is map.getSize(). * Takes care of the map angle. */ - fit(geometryOrExtent: SimpleGeometry | Extent, opt_options?: FitOptions): void; - fitInternal(geometry: SimpleGeometry, opt_options?: FitOptions): void; + fit(geometryOrExtent: SimpleGeometry | Extent, options?: FitOptions): void; + fitInternal(geometry: SimpleGeometry, options?: FitOptions): void; /** * Determine if the view is being animated. */ @@ -215,18 +215,18 @@ export default class View extends BaseObject { /** * Get a valid position for the view center according to the current constraints. */ - getConstrainedCenter(targetCenter: Coordinate | undefined, opt_targetResolution?: number): Coordinate | undefined; + getConstrainedCenter(targetCenter: Coordinate | undefined, targetResolution?: number): Coordinate | undefined; /** * Get a valid resolution according to the current view constraints. */ - getConstrainedResolution(targetResolution: number | undefined, opt_direction?: number): number | undefined; + getConstrainedResolution(targetResolution: number | undefined, direction?: number): number | undefined; /** * Get a valid zoom level according to the current view constraints. */ - getConstrainedZoom(targetZoom: number | undefined, opt_direction?: number): number | undefined; + getConstrainedZoom(targetZoom: number | undefined, direction?: number): number | undefined; getConstrainResolution(): boolean; getConstraints(): Constraints; - getHints(opt_hints?: number[]): number[]; + getHints(hints?: number[]): number[]; /** * Determine if the user is interacting with the view, such as panning or zooming. */ @@ -258,16 +258,16 @@ export default class View extends BaseObject { /** * Get the resolution for a provided extent (in map units) and size (in pixels). */ - getResolutionForExtent(extent: Extent, opt_size?: Size): number; + getResolutionForExtent(extent: Extent, size?: Size): number; /** * Get the resolution for a provided extent (in map units) and size (in pixels). */ - getResolutionForExtentInternal(extent: Extent, opt_size?: Size): number; + getResolutionForExtentInternal(extent: Extent, size?: Size): number; /** * Return a function that returns a value between 0 and 1 for a * resolution. Exponential scaling is assumed. */ - getResolutionForValueFunction(opt_power?: number): (p0: number) => number; + getResolutionForValueFunction(power?: number): (p0: number) => number; /** * Get the resolution for a zoom level. */ @@ -293,7 +293,7 @@ export default class View extends BaseObject { * Return a function that returns a resolution for a value between * 0 and 1. Exponential scaling is assumed. */ - getValueForResolutionFunction(opt_power?: number): (p0: number) => number; + getValueForResolutionFunction(power?: number): (p0: number) => number; /** * Get the current zoom level. This method may return non-integer zoom levels * if the view does not constrain the resolution, or if an interaction or @@ -311,7 +311,7 @@ export default class View extends BaseObject { * Note: calling this with a duration of 0 will apply the constrained values straight away, * without animation. */ - resolveConstraints(opt_duration?: number, opt_resolutionDirection?: number, opt_anchor?: Coordinate): void; + resolveConstraints(duration?: number, resolutionDirection?: number, anchor?: Coordinate): void; /** * Calculate rotated extent */ @@ -351,7 +351,7 @@ export default class View extends BaseObject { * This should be done on map size change. * Note: the constraints are not resolved during an animation to avoid stopping it */ - setViewportSize(opt_size?: Size): void; + setViewportSize(size?: Size): void; /** * Zoom to a specific zoom level. Any resolution constrain will apply. */ diff --git a/@types/ol/array.d.ts b/@types/ol/array.d.ts index 7b2aa4e3..b94e1332 100644 --- a/@types/ol/array.d.ts +++ b/@types/ol/array.d.ts @@ -13,16 +13,10 @@ export type NearestDirectionFunction = (p0: number, p1: number, p2: number) => n * Performs a binary search on the provided sorted list and returns the index of the item if found. If it can't be found it'll return -1. * https://github.com/darkskyapp/binary-search */ -export function binarySearch(haystack: any[], needle: any, opt_comparator?: () => void): number; +export function binarySearch(haystack: any[], needle: any, comparator?: () => void): number; export function equals(arr1: any[] | Uint8ClampedArray, arr2: any[] | Uint8ClampedArray): boolean; export function extend(arr: VALUE[], data: VALUE[] | VALUE): void; -export function find(arr: VALUE[], func: (p0: VALUE, p1: number, p2: any) => boolean): VALUE | null; -export function findIndex(arr: any[], func: () => void): number; -/** - * Whether the array contains the given object. - */ -export function includes(arr: any[], obj: any): boolean; -export function isSorted(arr: any[], opt_func?: () => void, opt_strict?: boolean): boolean; +export function isSorted(arr: any[], func?: () => void, strict?: boolean): boolean; export function linearFindNearest(arr: number[], target: number, direction: number | NearestDirectionFunction): number; /** * Compare function for array sort that is safe for numbers. diff --git a/@types/ol/control.d.ts b/@types/ol/control.d.ts index 3ae4743d..b894e033 100644 --- a/@types/ol/control.d.ts +++ b/@types/ol/control.d.ts @@ -1,9 +1,3 @@ -import Collection from './Collection'; -import { Options } from './control/Attribution'; -import Control from './control/Control'; -import { Options as Options_1 } from './control/Rotate'; -import { Options as Options_2 } from './control/Zoom'; - export { default as Attribution } from './control/Attribution'; export { default as Control } from './control/Control'; export { default as FullScreen } from './control/FullScreen'; @@ -14,23 +8,4 @@ export { default as ScaleLine } from './control/ScaleLine'; export { default as Zoom } from './control/Zoom'; export { default as ZoomSlider } from './control/ZoomSlider'; export { default as ZoomToExtent } from './control/ZoomToExtent'; - -export interface DefaultsOptions { - attribution?: boolean | undefined; - attributionOptions?: Options | undefined; - rotate?: boolean | undefined; - rotateOptions?: Options_1 | undefined; - zoom?: boolean | undefined; - zoomOptions?: Options_2 | undefined; -} -/** - * Set of controls included in maps by default. Unless configured otherwise, - * this returns a collection containing an instance of each of the following - * controls: - * - * {@link module:ol/control/Zoom~Zoom} - * {@link module:ol/control/Rotate~Rotate} - * {@link module:ol/control/Attribution~Attribution} - * - */ -export function defaults(opt_options?: DefaultsOptions): Collection; +export { defaults } from './control/defaults'; diff --git a/@types/ol/control/Attribution.d.ts b/@types/ol/control/Attribution.d.ts index 5dd7aad9..b7967aba 100644 --- a/@types/ol/control/Attribution.d.ts +++ b/@types/ol/control/Attribution.d.ts @@ -19,7 +19,7 @@ export interface Options { render?: ((p0: MapEvent) => void) | undefined; } export default class Attribution extends Control { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Return true when the attribution is currently collapsed or false * otherwise. diff --git a/@types/ol/control/Control.d.ts b/@types/ol/control/Control.d.ts index 8f81931a..74f38ce5 100644 --- a/@types/ol/control/Control.d.ts +++ b/@types/ol/control/Control.d.ts @@ -1,6 +1,6 @@ +import Map from '../Map'; import MapEvent from '../MapEvent'; import BaseObject, { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; @@ -22,7 +22,7 @@ export default class Control extends BaseObject { /** * Get the map associated with this control. */ - getMap(): PluggableMap | null; + getMap(): Map | null; /** * Renders the control. */ @@ -33,7 +33,7 @@ export default class Control extends BaseObject { * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; /** * This function is used to set a target element for the control. It has no * effect if it is called after the control has been added to the map (i.e. diff --git a/@types/ol/control/FullScreen.d.ts b/@types/ol/control/FullScreen.d.ts index 7b996df8..3509e729 100644 --- a/@types/ol/control/FullScreen.d.ts +++ b/@types/ol/control/FullScreen.d.ts @@ -1,5 +1,5 @@ +import Map from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import Control from './Control'; @@ -22,14 +22,14 @@ declare enum FullScreenEventType { LEAVEFULLSCREEN = 'leavefullscreen', } export default class FullScreen extends Control { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Remove the control from its current map and attach it to the new map. * Pass null to just remove the control from the current map. * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; on(type: TFullScreenBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TFullScreenBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TFullScreenBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/control/MousePosition.d.ts b/@types/ol/control/MousePosition.d.ts index 095b8b85..bbdfa5e8 100644 --- a/@types/ol/control/MousePosition.d.ts +++ b/@types/ol/control/MousePosition.d.ts @@ -1,6 +1,6 @@ +import Map from '../Map'; import MapEvent from '../MapEvent'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { CoordinateFormat } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; @@ -16,11 +16,10 @@ export interface Options { projection?: ProjectionLike | undefined; render?: ((p0: MapEvent) => void) | undefined; target?: HTMLElement | string | undefined; - placeholder?: string | boolean | undefined; - undefinedHTML?: string | undefined; + placeholder?: string | undefined; } export default class MousePosition extends Control { - constructor(opt_options?: Options); + constructor(options?: Options); protected handleMouseMove(event: MouseEvent): void; protected handleMouseOut(event: Event): void; /** @@ -42,7 +41,7 @@ export default class MousePosition extends Control { * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; /** * Set the projection that is used to report the mouse position. */ diff --git a/@types/ol/control/OverviewMap.d.ts b/@types/ol/control/OverviewMap.d.ts index 068aa0f4..29aab9c0 100644 --- a/@types/ol/control/OverviewMap.d.ts +++ b/@types/ol/control/OverviewMap.d.ts @@ -1,23 +1,13 @@ import Collection from '../Collection'; +import Map from '../Map'; import MapEvent from '../MapEvent'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import View from '../View'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import BaseLayer from '../layer/Base'; import Control from './Control'; -export type TControlledMapBaseEventTypes = 'change' | 'error'; -export type TControlledMapObjectEventTypes = - | 'change:layerGroup' - | 'change:size' - | 'change:target' - | 'change:view' - | 'propertychange'; -export type TControlledMapMapBrowserEventTypes = 'click' | 'dblclick' | 'pointerdrag' | 'pointermove' | 'singleclick'; -export type TControlledMapMapEventTypes = 'loadend' | 'loadstart' | 'moveend' | 'movestart' | 'postrender'; -export type TControlledMapRenderEventTypes = 'postcompose' | 'precompose' | 'rendercomplete'; export type TOverviewMapBaseEventTypes = 'change' | 'error'; export type TOverviewMapObjectEventTypes = 'propertychange'; export interface Options { @@ -34,7 +24,7 @@ export interface Options { view?: View | undefined; } export default class OverviewMap extends Control { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Determine if the overview map is collapsed. */ @@ -46,7 +36,7 @@ export default class OverviewMap extends Control { /** * Return the overview map. */ - getOverviewMap(): PluggableMap; + getOverviewMap(): Map; /** * Return true if the overview map view can rotate, false otherwise. */ @@ -67,7 +57,7 @@ export default class OverviewMap extends Control { * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; /** * Set whether the overview map view should rotate with the main map view. */ diff --git a/@types/ol/control/Rotate.d.ts b/@types/ol/control/Rotate.d.ts index c63af8b9..bde9b674 100644 --- a/@types/ol/control/Rotate.d.ts +++ b/@types/ol/control/Rotate.d.ts @@ -18,7 +18,7 @@ export interface Options { target?: HTMLElement | string | undefined; } export default class Rotate extends Control { - constructor(opt_options?: Options); + constructor(options?: Options); on(type: TRotateBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TRotateBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TRotateBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/control/ScaleLine.d.ts b/@types/ol/control/ScaleLine.d.ts index 72ff5ae0..4eb692ac 100644 --- a/@types/ol/control/ScaleLine.d.ts +++ b/@types/ol/control/ScaleLine.d.ts @@ -12,29 +12,22 @@ export interface Options { maxWidth?: number | undefined; render?: ((p0: MapEvent) => void) | undefined; target?: HTMLElement | string | undefined; - units?: Units | string | undefined; + units?: Units | undefined; bar?: boolean | undefined; steps?: number | undefined; text?: boolean | undefined; dpi?: number | undefined; } /** - * Units for the scale line. Supported values are 'degrees', 'imperial', - * 'nautical', 'metric', 'us'. + * Units for the scale line. */ -export enum Units { - DEGREES = 'degrees', - IMPERIAL = 'imperial', - NAUTICAL = 'nautical', - METRIC = 'metric', - US = 'us', -} +export type Units = 'degrees' | 'imperial' | 'nautical' | 'metric' | 'us'; export default class ScaleLine extends Control { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Creates a marker at given position */ - createMarker(position: string, i: number): string; + createMarker(position: 'absolute' | 'relative'): string; /** * Creates the label for a marker marker at given position */ diff --git a/@types/ol/control/Zoom.d.ts b/@types/ol/control/Zoom.d.ts index 48eb00eb..93c59c4a 100644 --- a/@types/ol/control/Zoom.d.ts +++ b/@types/ol/control/Zoom.d.ts @@ -18,7 +18,7 @@ export interface Options { target?: HTMLElement | string | undefined; } export default class Zoom extends Control { - constructor(opt_options?: Options); + constructor(options?: Options); on(type: TZoomBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TZoomBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TZoomBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/control/ZoomSlider.d.ts b/@types/ol/control/ZoomSlider.d.ts index 41c668a0..b1c7c027 100644 --- a/@types/ol/control/ZoomSlider.d.ts +++ b/@types/ol/control/ZoomSlider.d.ts @@ -1,6 +1,6 @@ +import Map from '../Map'; import MapEvent from '../MapEvent'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import Control from './Control'; @@ -13,14 +13,14 @@ export interface Options { render?: ((p0: MapEvent) => void) | undefined; } export default class ZoomSlider extends Control { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Remove the control from its current map and attach it to the new map. * Pass null to just remove the control from the current map. * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; on(type: TZoomSliderBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TZoomSliderBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TZoomSliderBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/control/ZoomToExtent.d.ts b/@types/ol/control/ZoomToExtent.d.ts index 37e46dfb..e21cd0a8 100644 --- a/@types/ol/control/ZoomToExtent.d.ts +++ b/@types/ol/control/ZoomToExtent.d.ts @@ -14,7 +14,7 @@ export interface Options { extent?: Extent | undefined; } export default class ZoomToExtent extends Control { - constructor(opt_options?: Options); + constructor(options?: Options); protected extent: Extent | null; protected handleZoomToExtent(): void; on(type: TZoomToExtentBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/control/defaults.d.ts b/@types/ol/control/defaults.d.ts new file mode 100644 index 00000000..9688ae6f --- /dev/null +++ b/@types/ol/control/defaults.d.ts @@ -0,0 +1,25 @@ +import Collection from '../Collection'; +import { Options } from './Attribution'; +import Control from './Control'; +import { Options as Options_1 } from './Rotate'; +import { Options as Options_2 } from './Zoom'; + +export interface DefaultsOptions { + attribution?: boolean | undefined; + attributionOptions?: Options | undefined; + rotate?: boolean | undefined; + rotateOptions?: Options_1 | undefined; + zoom?: boolean | undefined; + zoomOptions?: Options_2 | undefined; +} +/** + * Set of controls included in maps by default. Unless configured otherwise, + * this returns a collection containing an instance of each of the following + * controls: + * + * {@link module:ol/control/Zoom~Zoom} + * {@link module:ol/control/Rotate~Rotate} + * {@link module:ol/control/Attribution~Attribution} + * + */ +export function defaults(options?: DefaultsOptions): Collection; diff --git a/@types/ol/coordinate.d.ts b/@types/ol/coordinate.d.ts index 3780dbaa..fe563767 100644 --- a/@types/ol/coordinate.d.ts +++ b/@types/ol/coordinate.d.ts @@ -16,7 +16,7 @@ export type CoordinateFormat = (p0: Coordinate | undefined) => string; * Example: * import {add} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; + * const coord = [7.85, 47.983333]; * add(coord, [-2, 4]); * // coord is now [5.85, 51.983333] */ @@ -39,19 +39,19 @@ export function closestOnSegment(coordinate: Coordinate, segment: Coordinate[]): * Example without specifying the fractional digits: * import {createStringXY} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var stringifyFunc = createStringXY(); - * var out = stringifyFunc(coord); + * const coord = [7.85, 47.983333]; + * const stringifyFunc = createStringXY(); + * const out = stringifyFunc(coord); * // out is now '8, 48'Example with explicitly specifying 2 fractional digits: * import {createStringXY} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var stringifyFunc = createStringXY(2); - * var out = stringifyFunc(coord); + * const coord = [7.85, 47.983333]; + * const stringifyFunc = createStringXY(2); + * const out = stringifyFunc(coord); * // out is now '7.85, 47.98' */ -export function createStringXY(opt_fractionDigits?: number): CoordinateFormat; -export function degreesToStringHDMS(hemispheres: string, degrees: number, opt_fractionDigits?: number): string; +export function createStringXY(fractionDigits?: number): CoordinateFormat; +export function degreesToStringHDMS(hemispheres: string, degrees: number, fractionDigits?: number): string; export function distance(coord1: Coordinate, coord2: Coordinate): number; export function equals(coordinate1: Coordinate, coordinate2: Coordinate): boolean; /** @@ -61,27 +61,27 @@ export function equals(coordinate1: Coordinate, coordinate2: Coordinate): boolea * Example without specifying the fractional digits: * import {format} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var template = 'Coordinate is ({x}|{y}).'; - * var out = format(coord, template); + * const coord = [7.85, 47.983333]; + * const template = 'Coordinate is ({x}|{y}).'; + * const out = format(coord, template); * // out is now 'Coordinate is (8|48).'Example explicitly specifying the fractional digits: * import {format} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var template = 'Coordinate is ({x}|{y}).'; - * var out = format(coord, template, 2); + * const coord = [7.85, 47.983333]; + * const template = 'Coordinate is ({x}|{y}).'; + * const out = format(coord, template, 2); * // out is now 'Coordinate is (7.85|47.98).' */ -export function format(coordinate: Coordinate, template: string, opt_fractionDigits?: number): string; -export function getWorldsAway(coordinate: Coordinate, projection: Projection, opt_sourceExtentWidth?: number): number; +export function format(coordinate: Coordinate, template: string, fractionDigits?: number): string; +export function getWorldsAway(coordinate: Coordinate, projection: Projection, sourceExtentWidth?: number): number; /** * Rotate coordinate by angle. coordinate is modified in place and * returned by the function. * Example: * import {rotate} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var rotateRadians = Math.PI / 2; // 90 degrees + * const coord = [7.85, 47.983333]; + * const rotateRadians = Math.PI / 2; // 90 degrees * rotate(coord, rotateRadians); * // coord is now [-47.983333, 7.85] */ @@ -92,8 +92,8 @@ export function rotate(coordinate: Coordinate, angle: number): Coordinate; * Example: * import {scale as scaleCoordinate} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var scale = 1.2; + * const coord = [7.85, 47.983333]; + * const scale = 1.2; * scaleCoordinate(coord, scale); * // coord is now [9.42, 57.5799996] */ @@ -109,31 +109,31 @@ export function squaredDistanceToSegment(coordinate: Coordinate, segment: Coordi * Example without specifying fractional digits: * import {toStringHDMS} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var out = toStringHDMS(coord); + * const coord = [7.85, 47.983333]; + * const out = toStringHDMS(coord); * // out is now '47° 58′ 60″ N 7° 50′ 60″ E'Example explicitly specifying 1 fractional digit: * import {toStringHDMS} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var out = toStringHDMS(coord, 1); + * const coord = [7.85, 47.983333]; + * const out = toStringHDMS(coord, 1); * // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E' */ -export function toStringHDMS(coordinate: Coordinate, opt_fractionDigits?: number): string; +export function toStringHDMS(coordinate: Coordinate, fractionDigits?: number): string; /** * Format a coordinate as a comma delimited string. * Example without specifying fractional digits: * import {toStringXY} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var out = toStringXY(coord); + * const coord = [7.85, 47.983333]; + * const out = toStringXY(coord); * // out is now '8, 48'Example explicitly specifying 1 fractional digit: * import {toStringXY} from 'ol/coordinate'; * - * var coord = [7.85, 47.983333]; - * var out = toStringXY(coord, 1); + * const coord = [7.85, 47.983333]; + * const out = toStringXY(coord, 1); * // out is now '7.8, 48.0' */ -export function toStringXY(coordinate: Coordinate, opt_fractionDigits?: number): string; +export function toStringXY(coordinate: Coordinate, fractionDigits?: number): string; /** * Modifies the provided coordinate in-place to be within the real world * extent. The lower projection extent boundary is inclusive, the upper one diff --git a/@types/ol/dom.d.ts b/@types/ol/dom.d.ts index df3246e5..0d375c77 100644 --- a/@types/ol/dom.d.ts +++ b/@types/ol/dom.d.ts @@ -2,10 +2,10 @@ * Create an html canvas element and returns its 2d context. */ export function createCanvasContext2D( - opt_width?: number, - opt_height?: number, - opt_canvasPool?: HTMLCanvasElement[], - opt_Context2DSettings?: CanvasRenderingContext2DSettings, + width?: number, + height?: number, + canvasPool?: HTMLCanvasElement[], + settings?: CanvasRenderingContext2DSettings, ): CanvasRenderingContext2D; /** * Get the current computed height for the given element including margin, diff --git a/@types/ol/events.d.ts b/@types/ol/events.d.ts index 73373947..8d1d494e 100644 --- a/@types/ol/events.d.ts +++ b/@types/ol/events.d.ts @@ -28,8 +28,8 @@ export function listen( target: EventTargetLike, type: string, listener: ListenerFunction, - opt_this?: any, - opt_once?: boolean, + thisArg?: any, + once?: boolean, ): EventsKey; /** * Registers a one-off event listener on an event target. Inspired by @@ -46,7 +46,7 @@ export function listenOnce( target: EventTargetLike, type: string, listener: ListenerFunction, - opt_this?: any, + thisArg?: any, ): EventsKey; /** * Unregisters event listeners on an event target. Inspired by diff --git a/@types/ol/events/Target.d.ts b/@types/ol/events/Target.d.ts index a01a586e..ea598c0c 100644 --- a/@types/ol/events/Target.d.ts +++ b/@types/ol/events/Target.d.ts @@ -4,7 +4,7 @@ import BaseEvent from './Event'; export type EventTargetLike = EventTarget | Target; export default class Target extends Disposable { - constructor(opt_target?: any); + constructor(target?: any); addEventListener(type: string, listener: Listener): void; /** * Dispatches an event and calls all listeners listening for events @@ -21,6 +21,6 @@ export default class Target extends Disposable { * order that they will be called in. */ getListeners(type: string): Listener[] | undefined; - hasListener(opt_type?: string): boolean; + hasListener(type?: string): boolean; removeEventListener(type: string, listener: Listener): void; } diff --git a/@types/ol/extent.d.ts b/@types/ol/extent.d.ts index 6d40cede..4a0ee391 100644 --- a/@types/ol/extent.d.ts +++ b/@types/ol/extent.d.ts @@ -15,12 +15,7 @@ export type Extent = [number, number, number, number]; /** * Apply a transform function to the extent. */ -export function applyTransform( - extent: Extent, - transformFn: TransformFunction, - opt_extent?: Extent, - opt_stops?: number, -): Extent; +export function applyTransform(extent: Extent, transformFn: TransformFunction, dest?: Extent, stops?: number): Extent; /** * Determine if two extents are approximately equivalent. */ @@ -32,11 +27,11 @@ export function boundingExtent(coordinates: Coordinate[]): Extent; /** * Return extent increased by the provided value. */ -export function buffer(extent: Extent, value: number, opt_extent?: Extent): Extent; +export function buffer(extent: Extent, value: number, dest?: Extent): Extent; /** * Creates a clone of an extent. */ -export function clone(extent: Extent, opt_extent?: Extent): Extent; +export function clone(extent: Extent, dest?: Extent): Extent; export function closestSquaredDistanceXY(extent: Extent, x: number, y: number): number; /** * Check if the passed coordinate is contained or on the edge of the extent. @@ -63,21 +58,21 @@ export function createEmpty(): Extent; /** * Create a new extent or update the provided extent. */ -export function createOrUpdate(minX: number, minY: number, maxX: number, maxY: number, opt_extent?: Extent): Extent; +export function createOrUpdate(minX: number, minY: number, maxX: number, maxY: number, dest?: Extent): Extent; /** * Create a new empty extent or make the provided one empty. */ -export function createOrUpdateEmpty(opt_extent?: Extent): Extent; -export function createOrUpdateFromCoordinate(coordinate: Coordinate, opt_extent?: Extent): Extent; -export function createOrUpdateFromCoordinates(coordinates: Coordinate[], opt_extent?: Extent): Extent; +export function createOrUpdateEmpty(dest?: Extent): Extent; +export function createOrUpdateFromCoordinate(coordinate: Coordinate, dest?: Extent): Extent; +export function createOrUpdateFromCoordinates(coordinates: Coordinate[], dest?: Extent): Extent; export function createOrUpdateFromFlatCoordinates( flatCoordinates: number[], offset: number, end: number, stride: number, - opt_extent?: Extent, + dest?: Extent, ): Extent; -export function createOrUpdateFromRings(rings: Coordinate[][], opt_extent?: Extent): Extent; +export function createOrUpdateFromRings(rings: Coordinate[][], dest?: Extent): Extent; /** * Determine if two extents are equivalent. */ @@ -129,7 +124,7 @@ export function getForViewAndSize( resolution: number, rotation: number, size: Size, - opt_extent?: Extent, + dest?: Extent, ): Extent; /** * Get the height of an extent. @@ -138,7 +133,7 @@ export function getHeight(extent: Extent): number; /** * Get the intersection of two extents. */ -export function getIntersection(extent1: Extent, extent2: Extent, opt_extent?: Extent): Extent; +export function getIntersection(extent1: Extent, extent2: Extent, dest?: Extent): Extent; export function getIntersectionArea(extent1: Extent, extent2: Extent): number; export function getMargin(extent: Extent): number; export function getRotatedViewport(center: Coordinate, resolution: number, rotation: number, size: Size): number[]; @@ -171,7 +166,7 @@ export function intersectsSegment(extent: Extent, start: Coordinate, end: Coordi * Determine if an extent is empty. */ export function isEmpty(extent: Extent): boolean; -export function returnOrUpdate(extent: Extent, opt_extent?: Extent): Extent; +export function returnOrUpdate(extent: Extent, dest?: Extent): Extent; export function scaleFromCenter(extent: Extent, value: number): void; /** * Fits the extent to the real world diff --git a/@types/ol/format/EsriJSON.d.ts b/@types/ol/format/EsriJSON.d.ts index 8ab16e2a..cf69466d 100644 --- a/@types/ol/format/EsriJSON.d.ts +++ b/@types/ol/format/EsriJSON.d.ts @@ -36,25 +36,21 @@ export interface Options { geometryName?: string | undefined; } export default class EsriJSON extends JSONFeature { - constructor(opt_options?: Options); - protected readFeatureFromObject( - object: any, - opt_options?: ReadOptions, - opt_idField?: string, - ): Feature_1; - protected readFeaturesFromObject(object: any, opt_options?: ReadOptions): Feature_1[]; - protected readGeometryFromObject(object: EsriJSONGeometry, opt_options?: ReadOptions): Geometry_1; + constructor(options?: Options); + protected readFeatureFromObject(object: any, options?: ReadOptions, idField?: string): Feature_1; + protected readFeaturesFromObject(object: any, options?: ReadOptions): Feature_1[]; + protected readGeometryFromObject(object: EsriJSONGeometry, options?: ReadOptions): Geometry_1; protected readProjectionFromObject(object: any): Projection; /** * Encode a feature as a esriJSON Feature object. */ - writeFeatureObject(feature: Feature_1, opt_options?: WriteOptions): any; + writeFeatureObject(feature: Feature_1, options?: WriteOptions): any; /** * Encode an array of features as a EsriJSON object. */ - writeFeaturesObject(features: Feature_1[], opt_options?: WriteOptions): EsriJSONFeatureSet; + writeFeaturesObject(features: Feature_1[], options?: WriteOptions): EsriJSONFeatureSet; /** * Encode a geometry as a EsriJSON object. */ - writeGeometryObject(geometry: Geometry_1, opt_options?: WriteOptions): EsriJSONGeometry; + writeGeometryObject(geometry: Geometry_1, options?: WriteOptions): EsriJSONGeometry; } diff --git a/@types/ol/format/Feature.d.ts b/@types/ol/format/Feature.d.ts index 8b0e5ff9..9307409a 100644 --- a/@types/ol/format/Feature.d.ts +++ b/@types/ol/format/Feature.d.ts @@ -30,24 +30,24 @@ export default abstract class FeatureFormat { */ protected getReadOptions( source: Document | Element | object | string, - opt_options?: ReadOptions, + options?: ReadOptions, ): ReadOptions | undefined; abstract getType(): Type; /** * Read a single feature from a source. */ - abstract readFeature(source: Document | Element | object | string, opt_options?: ReadOptions): FeatureLike; + abstract readFeature(source: Document | Element | object | string, options?: ReadOptions): FeatureLike; /** * Read all features from a source. */ abstract readFeatures( source: Document | Element | ArrayBuffer | object | string, - opt_options?: ReadOptions, + options?: ReadOptions, ): FeatureLike[]; /** * Read a single geometry from a source. */ - abstract readGeometry(source: Document | Element | object | string, opt_options?: ReadOptions): Geometry; + abstract readGeometry(source: Document | Element | object | string, options?: ReadOptions): Geometry; /** * Read the projection from a source. */ @@ -55,19 +55,19 @@ export default abstract class FeatureFormat { /** * Encode a feature in this format. */ - abstract writeFeature(feature: Feature, opt_options?: WriteOptions): string | ArrayBuffer; + abstract writeFeature(feature: Feature, options?: WriteOptions): string | ArrayBuffer; /** * Encode an array of features in this format. */ - abstract writeFeatures(features: Feature[], opt_options?: WriteOptions): string | ArrayBuffer; + abstract writeFeatures(features: Feature[], options?: WriteOptions): string | ArrayBuffer; /** * Write a single geometry in this format. */ - abstract writeGeometry(geometry: Geometry, opt_options?: WriteOptions): string | ArrayBuffer; + abstract writeGeometry(geometry: Geometry, options?: WriteOptions): string | ArrayBuffer; } -export function transformExtentWithOptions(extent: Extent, opt_options?: ReadOptions): Extent; +export function transformExtentWithOptions(extent: Extent, options?: ReadOptions): Extent; export function transformGeometryWithOptions( geometry: Geometry, write: boolean, - opt_options?: WriteOptions | ReadOptions, + options?: WriteOptions | ReadOptions, ): Geometry; diff --git a/@types/ol/format/GML.d.ts b/@types/ol/format/GML.d.ts index 308ef26d..a0e0c2b2 100644 --- a/@types/ol/format/GML.d.ts +++ b/@types/ol/format/GML.d.ts @@ -9,13 +9,13 @@ import { Options } from './GMLBase'; * Currently only supports GML 3.1.1 Simple Features profile. */ export default class GML { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Encode an array of features in GML 3.1.1 Simple Features. */ - writeFeatures(features: Feature[], opt_options?: WriteOptions): string; + writeFeatures(features: Feature[], options?: WriteOptions): string; /** * Encode an array of features in the GML 3.1.1 format as an XML node. */ - writeFeaturesNode(features: Feature[], opt_options?: WriteOptions): Node; + writeFeaturesNode(features: Feature[], options?: WriteOptions): Node; } diff --git a/@types/ol/format/GML2.d.ts b/@types/ol/format/GML2.d.ts index 39839cb5..eb10c69b 100644 --- a/@types/ol/format/GML2.d.ts +++ b/@types/ol/format/GML2.d.ts @@ -11,7 +11,7 @@ import Polygon from '../geom/Polygon'; import GMLBase, { Options } from './GMLBase'; export default class GML2 extends GMLBase { - constructor(opt_options?: Options); + constructor(options?: Options); innerBoundaryIsParser(node: Element, objectStack: any[]): void; outerBoundaryIsParser(node: Element, objectStack: any[]): void; readBox(node: Element, objectStack: any[]): Extent | undefined; diff --git a/@types/ol/format/GML3.d.ts b/@types/ol/format/GML3.d.ts index baaccf42..c7592d1a 100644 --- a/@types/ol/format/GML3.d.ts +++ b/@types/ol/format/GML3.d.ts @@ -12,7 +12,7 @@ import { WriteOptions } from './Feature'; import GMLBase, { Options } from './GMLBase'; export default class GML3 extends GMLBase { - constructor(opt_options?: Options); + constructor(options?: Options); curveMemberParser(node: Element, objectStack: any[]): void; exteriorParser(node: Element, objectStack: any[]): void; interiorParser(node: Element, objectStack: any[]): void; @@ -35,16 +35,16 @@ export default class GML3 extends GMLBase { /** * Encode an array of features in GML 3.1.1 Simple Features. */ - writeFeatures(features: Feature[], opt_options?: WriteOptions): string; + writeFeatures(features: Feature[], options?: WriteOptions): string; /** * Encode an array of features in the GML 3.1.1 format as an XML node. */ - writeFeaturesNode(features: Feature[], opt_options?: WriteOptions): Element; + writeFeaturesNode(features: Feature[], options?: WriteOptions): Element; writeGeometryElement(node: Node, geometry: Geometry | Extent, objectStack: any[]): void; /** * Encode a geometry in GML 3.1.1 Simple Features. */ - writeGeometryNode(geometry: Geometry, opt_options?: WriteOptions): Node; + writeGeometryNode(geometry: Geometry, options?: WriteOptions): Node; writeLinearRing(node: Element, geometry: LinearRing, objectStack: any[]): void; writeLineStringOrCurveMember(node: Node, line: LineString, objectStack: any[]): void; writeMultiCurveOrLineString(node: Element, geometry: MultiLineString, objectStack: any[]): void; diff --git a/@types/ol/format/GML32.d.ts b/@types/ol/format/GML32.d.ts index d1ce2d2a..6533f304 100644 --- a/@types/ol/format/GML32.d.ts +++ b/@types/ol/format/GML32.d.ts @@ -2,5 +2,5 @@ import GML3 from './GML3'; import { Options } from './GMLBase'; export default class GML32 extends GML3 { - constructor(opt_options?: Options); + constructor(options?: Options); } diff --git a/@types/ol/format/GMLBase.d.ts b/@types/ol/format/GMLBase.d.ts index b6d99832..0fa13f3a 100644 --- a/@types/ol/format/GMLBase.d.ts +++ b/@types/ol/format/GMLBase.d.ts @@ -15,7 +15,7 @@ import XMLFeature from './XMLFeature'; export interface Options { featureNS?: Record | string | undefined; featureType?: string[] | string | undefined; - srsName: string; + srsName?: string | undefined; surface?: boolean | undefined; curve?: boolean | undefined; multiCurve?: boolean | undefined; @@ -25,19 +25,19 @@ export interface Options { } export const GMLNS: string; export default abstract class GMLBase extends XMLFeature { - constructor(opt_options?: Options); + constructor(options?: Options); protected featureNS: Record | string; protected featureType: string[] | string; protected schemaLocation: string; protected srsName: string; - protected readGeometryFromNode(node: Element, opt_options?: ReadOptions): Geometry; + protected readGeometryFromNode(node: Element, options?: ReadOptions): Geometry; lineStringMemberParser(node: Element, objectStack: any[]): void; pointMemberParser(node: Element, objectStack: any[]): void; polygonMemberParser(node: Element, objectStack: any[]): void; readExtentElement(node: Element, objectStack: any[]): Extent | undefined; readFeatureElement(node: Element, objectStack: any[]): Feature; readFeatureElementInternal(node: Element, objectStack: any[], asFeature: boolean): Feature | object; - readFeaturesFromNode(node: Element, opt_options?: ReadOptions): Feature[]; + readFeaturesFromNode(node: Element, options?: ReadOptions): Feature[]; readFeaturesInternal(node: Element, objectStack: any[]): Feature[] | undefined; readFlatCoordinatesFromNode(node: Element, objectStack: any[]): number[]; readFlatLinearRing(node: Element, objectStack: any[]): number[] | undefined; diff --git a/@types/ol/format/GPX.d.ts b/@types/ol/format/GPX.d.ts index d9d3793b..62bbcc25 100644 --- a/@types/ol/format/GPX.d.ts +++ b/@types/ol/format/GPX.d.ts @@ -11,13 +11,13 @@ export interface Options { readExtensions?: ((p0: Feature, p1: Node) => void) | undefined; } export default class GPX extends XMLFeature { - constructor(opt_options?: Options); - readFeatureFromNode(node: Element, opt_options?: ReadOptions): Feature; - readFeaturesFromNode(node: Element, opt_options?: ReadOptions): Feature[]; + constructor(options?: Options); + readFeatureFromNode(node: Element, options?: ReadOptions): Feature; + readFeaturesFromNode(node: Element, options?: ReadOptions): Feature[]; /** * Encode an array of features in the GPX format as an XML node. * LineString geometries are output as routes (), and MultiLineString * as tracks (). */ - writeFeaturesNode(features: Feature[], opt_options?: WriteOptions): Node; + writeFeaturesNode(features: Feature[], options?: WriteOptions): Node; } diff --git a/@types/ol/format/GeoJSON.d.ts b/@types/ol/format/GeoJSON.d.ts index 7b492779..f8f9bcb9 100644 --- a/@types/ol/format/GeoJSON.d.ts +++ b/@types/ol/format/GeoJSON.d.ts @@ -36,21 +36,21 @@ export interface Options { extractGeometryName?: boolean | undefined; } export default class GeoJSON extends JSONFeature { - constructor(opt_options?: Options); - protected readFeatureFromObject(object: any, opt_options?: ReadOptions): Feature_1; - protected readFeaturesFromObject(object: any, opt_options?: ReadOptions): Feature_1[]; - protected readGeometryFromObject(object: GeoJSONGeometry, opt_options?: ReadOptions): Geometry_1; + constructor(options?: Options); + protected readFeatureFromObject(object: any, options?: ReadOptions): Feature_1; + protected readFeaturesFromObject(object: any, options?: ReadOptions): Feature_1[]; + protected readGeometryFromObject(object: GeoJSONGeometry, options?: ReadOptions): Geometry_1; protected readProjectionFromObject(object: any): Projection; /** * Encode a feature as a GeoJSON Feature object. */ - writeFeatureObject(feature: Feature_1, opt_options?: WriteOptions): GeoJSONFeature; + writeFeatureObject(feature: Feature_1, options?: WriteOptions): GeoJSONFeature; /** * Encode an array of features as a GeoJSON object. */ - writeFeaturesObject(features: Feature_1[], opt_options?: WriteOptions): GeoJSONFeatureCollection; + writeFeaturesObject(features: Feature_1[], options?: WriteOptions): GeoJSONFeatureCollection; /** * Encode a geometry as a GeoJSON object. */ - writeGeometryObject(geometry: Geometry_1, opt_options?: WriteOptions): GeoJSONGeometry | GeoJSONGeometryCollection; + writeGeometryObject(geometry: Geometry_1, options?: WriteOptions): GeoJSONGeometry | GeoJSONGeometryCollection; } diff --git a/@types/ol/format/IGC.d.ts b/@types/ol/format/IGC.d.ts index bc8758dc..80fbca86 100644 --- a/@types/ol/format/IGC.d.ts +++ b/@types/ol/format/IGC.d.ts @@ -3,23 +3,19 @@ import Geometry from '../geom/Geometry'; import { ReadOptions, WriteOptions } from './Feature'; import TextFeature from './TextFeature'; -export interface Options { - altitudeMode?: IGCZ | string | undefined; -} /** * IGC altitude/z. One of 'barometric', 'gps', 'none'. */ -declare enum IGCZ { - BAROMETRIC = 'barometric', - GPS = 'gps', - NONE = 'none', +export type IGCZ = 'barometric' | 'gps' | 'none'; +export interface Options { + altitudeMode?: IGCZ | undefined; } export default class IGC extends TextFeature { - constructor(opt_options?: Options); - protected readFeatureFromText(text: string, opt_options?: ReadOptions): Feature; - protected readFeaturesFromText(text: string, opt_options?: ReadOptions): Feature[]; - protected readGeometryFromText(text: string, opt_options?: ReadOptions): Geometry; - protected writeFeaturesText(features: Feature[], opt_options?: WriteOptions): string; - protected writeFeatureText(feature: Feature, opt_options?: WriteOptions): string; - protected writeGeometryText(geometry: Geometry, opt_options?: WriteOptions): string; + constructor(options?: Options); + protected readFeatureFromText(text: string, options?: ReadOptions): Feature; + protected readFeaturesFromText(text: string, options?: ReadOptions): Feature[]; + protected readGeometryFromText(text: string, options?: ReadOptions): Geometry; + protected writeFeaturesText(features: Feature[], options?: WriteOptions): string; + protected writeFeatureText(feature: Feature, options?: WriteOptions): string; + protected writeGeometryText(geometry: Geometry, options?: WriteOptions): string; } diff --git a/@types/ol/format/IIIFInfo.d.ts b/@types/ol/format/IIIFInfo.d.ts index 2d3ccbce..92980191 100644 --- a/@types/ol/format/IIIFInfo.d.ts +++ b/@types/ol/format/IIIFInfo.d.ts @@ -40,6 +40,6 @@ export default class IIIFInfo { getComplianceLevelFromProfile(version: Versions): string; getComplianceLevelSupportedFeatures(): SupportedFeatures; getImageApiVersion(): Versions; - getTileSourceOptions(opt_preferredOptions?: PreferredOptions): Options; + getTileSourceOptions(preferredOptions?: PreferredOptions): Options; setImageInfo(imageInfo: string | ImageInformationResponse): void; } diff --git a/@types/ol/format/JSONFeature.d.ts b/@types/ol/format/JSONFeature.d.ts index fbe8cf3d..de85df1f 100644 --- a/@types/ol/format/JSONFeature.d.ts +++ b/@types/ol/format/JSONFeature.d.ts @@ -5,31 +5,28 @@ import FeatureFormat, { ReadOptions, Type, WriteOptions } from './Feature'; export default abstract class JSONFeature extends FeatureFormat { constructor(); - protected abstract readFeatureFromObject(object: any, opt_options?: ReadOptions): Feature; - protected abstract readFeaturesFromObject(object: any, opt_options?: ReadOptions): Feature[]; - protected abstract readGeometryFromObject(object: any, opt_options?: ReadOptions): Geometry; + protected abstract readFeatureFromObject(object: any, options?: ReadOptions): Feature; + protected abstract readFeaturesFromObject(object: any, options?: ReadOptions): Feature[]; + protected abstract readGeometryFromObject(object: any, options?: ReadOptions): Geometry; protected abstract readProjectionFromObject(object: any): Projection; getType(): Type; /** * Read a feature. Only works for a single feature. Use readFeatures to * read a feature collection. */ - readFeature( - source: ArrayBuffer | Document | Element | object | string, - opt_options?: ReadOptions, - ): Feature; + readFeature(source: ArrayBuffer | Document | Element | object | string, options?: ReadOptions): Feature; /** * Read all features. Works with both a single feature and a feature * collection. */ readFeatures( source: ArrayBuffer | Document | Element | object | string, - opt_options?: ReadOptions, + options?: ReadOptions, ): Feature[]; /** * Read a geometry. */ - readGeometry(source: ArrayBuffer | Document | Element | object | string, opt_options?: ReadOptions): Geometry; + readGeometry(source: ArrayBuffer | Document | Element | object | string, options?: ReadOptions): Geometry; /** * Read the projection. */ @@ -37,16 +34,16 @@ export default abstract class JSONFeature extends FeatureFormat { /** * Encode a feature as string. */ - writeFeature(feature: Feature, opt_options?: WriteOptions): string; - abstract writeFeatureObject(feature: Feature, opt_options?: WriteOptions): any; + writeFeature(feature: Feature, options?: WriteOptions): string; + abstract writeFeatureObject(feature: Feature, options?: WriteOptions): any; /** * Encode an array of features as string. */ - writeFeatures(features: Feature[], opt_options?: WriteOptions): string; - abstract writeFeaturesObject(features: Feature[], opt_options?: WriteOptions): any; + writeFeatures(features: Feature[], options?: WriteOptions): string; + abstract writeFeaturesObject(features: Feature[], options?: WriteOptions): any; /** * Encode a geometry as string. */ - writeGeometry(geometry: Geometry, opt_options?: WriteOptions): string; - abstract writeGeometryObject(geometry: Geometry, opt_options?: WriteOptions): any; + writeGeometry(geometry: Geometry, options?: WriteOptions): string; + abstract writeGeometryObject(geometry: Geometry, options?: WriteOptions): any; } diff --git a/@types/ol/format/KML.d.ts b/@types/ol/format/KML.d.ts index 87357f99..09cfff62 100644 --- a/@types/ol/format/KML.d.ts +++ b/@types/ol/format/KML.d.ts @@ -1,8 +1,7 @@ import Feature from '../Feature'; import Geometry from '../geom/Geometry'; import Fill from '../style/Fill'; -import IconAnchorUnits from '../style/IconAnchorUnits'; -import IconOrigin from '../style/IconOrigin'; +import { IconAnchorUnits, IconOrigin } from '../style/Icon'; import ImageStyle from '../style/Image'; import Stroke from '../style/Stroke'; import Style from '../style/Style'; @@ -36,9 +35,9 @@ export interface Vec2 { origin?: IconOrigin | undefined; } export default class KML extends XMLFeature { - constructor(opt_options?: Options); - protected readFeaturesFromNode(node: Element, opt_options?: ReadOptions): Feature[]; - readFeatureFromNode(node: Element, opt_options?: ReadOptions): Feature; + constructor(options?: Options); + protected readFeaturesFromNode(node: Element, options?: ReadOptions): Feature[]; + readFeatureFromNode(node: Element, options?: ReadOptions): Feature; /** * Read the name of the KML. */ @@ -61,7 +60,7 @@ export default class KML extends XMLFeature { * Encode an array of features in the KML format as an XML node. GeometryCollections, * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries. */ - writeFeaturesNode(features: Feature[], opt_options?: WriteOptions): Node; + writeFeaturesNode(features: Feature[], options?: WriteOptions): Node; } /** * Get the default fill style (or null if not yet set). diff --git a/@types/ol/format/MVT.d.ts b/@types/ol/format/MVT.d.ts index 973574e7..94a8cc42 100644 --- a/@types/ol/format/MVT.d.ts +++ b/@types/ol/format/MVT.d.ts @@ -11,20 +11,20 @@ export interface Options { idProperty?: string | undefined; } export default class MVT extends FeatureFormat { - constructor(opt_options?: Options); + constructor(options?: Options); getType(): Type; /** * Read a single feature from a source. */ - readFeature(source: Document | Element | object | string, opt_options?: ReadOptions): FeatureLike; + readFeature(source: Document | Element | object | string, options?: ReadOptions): FeatureLike; /** * Read all features. */ - readFeatures(source: ArrayBuffer, opt_options?: ReadOptions): FeatureLike[]; + readFeatures(source: ArrayBuffer, options?: ReadOptions): FeatureLike[]; /** * Read a single geometry from a source. */ - readGeometry(source: Document | Element | object | string, opt_options?: ReadOptions): Geometry; + readGeometry(source: Document | Element | object | string, options?: ReadOptions): Geometry; /** * Read the projection from the source. */ @@ -36,13 +36,13 @@ export default class MVT extends FeatureFormat { /** * Encode a feature in this format. */ - writeFeature(feature: Feature, opt_options?: WriteOptions): string | ArrayBuffer; + writeFeature(feature: Feature, options?: WriteOptions): string | ArrayBuffer; /** * Encode an array of features in this format. */ - writeFeatures(features: Feature[], opt_options?: WriteOptions): string | ArrayBuffer; + writeFeatures(features: Feature[], options?: WriteOptions): string | ArrayBuffer; /** * Write a single geometry in this format. */ - writeGeometry(geometry: Geometry, opt_options?: WriteOptions): string | ArrayBuffer; + writeGeometry(geometry: Geometry, options?: WriteOptions): string | ArrayBuffer; } diff --git a/@types/ol/format/OSMXML.d.ts b/@types/ol/format/OSMXML.d.ts index 1ed0bba8..32ce7cc5 100644 --- a/@types/ol/format/OSMXML.d.ts +++ b/@types/ol/format/OSMXML.d.ts @@ -5,5 +5,5 @@ import XMLFeature from './XMLFeature'; export default class OSMXML extends XMLFeature { constructor(); - protected readFeaturesFromNode(node: Element, opt_options?: ReadOptions): Feature[]; + protected readFeaturesFromNode(node: Element, options?: ReadOptions): Feature[]; } diff --git a/@types/ol/format/Polyline.d.ts b/@types/ol/format/Polyline.d.ts index dec3f6b0..1aecb884 100644 --- a/@types/ol/format/Polyline.d.ts +++ b/@types/ol/format/Polyline.d.ts @@ -1,6 +1,5 @@ import Feature from '../Feature'; -import Geometry from '../geom/Geometry'; -import GeometryLayout from '../geom/GeometryLayout'; +import Geometry, { GeometryLayout } from '../geom/Geometry'; import LineString from '../geom/LineString'; import { ReadOptions, WriteOptions } from './Feature'; import TextFeature from './TextFeature'; @@ -10,22 +9,22 @@ export interface Options { geometryLayout?: GeometryLayout | undefined; } export default class Polyline extends TextFeature { - constructor(opt_options?: Options); - protected readFeatureFromText(text: string, opt_options?: ReadOptions): Feature; - protected readFeaturesFromText(text: string, opt_options?: ReadOptions): Feature[]; - protected readGeometryFromText(text: string, opt_options?: ReadOptions): Geometry; - protected writeFeaturesText(features: Feature[], opt_options?: WriteOptions): string; - protected writeFeatureText(feature: Feature, opt_options?: WriteOptions): string; - protected writeGeometryText(geometry: LineString, opt_options?: WriteOptions): string; + constructor(options?: Options); + protected readFeatureFromText(text: string, options?: ReadOptions): Feature; + protected readFeaturesFromText(text: string, options?: ReadOptions): Feature[]; + protected readGeometryFromText(text: string, options?: ReadOptions): Geometry; + protected writeFeaturesText(features: Feature[], options?: WriteOptions): string; + protected writeFeatureText(feature: Feature, options?: WriteOptions): string; + protected writeGeometryText(geometry: LineString, options?: WriteOptions): string; } /** * Decode a list of n-dimensional points from an encoded string */ -export function decodeDeltas(encoded: string, stride: number, opt_factor?: number): number[]; +export function decodeDeltas(encoded: string, stride: number, factor?: number): number[]; /** * Decode a list of floating point numbers from an encoded string */ -export function decodeFloats(encoded: string, opt_factor?: number): number[]; +export function decodeFloats(encoded: string, factor?: number): number[]; /** * Decode a list of signed integers from an encoded string */ @@ -38,12 +37,12 @@ export function decodeUnsignedIntegers(encoded: string): number[]; * Encode a list of n-dimensional points and return an encoded string * Attention: This function will modify the passed array! */ -export function encodeDeltas(numbers: number[], stride: number, opt_factor?: number): string; +export function encodeDeltas(numbers: number[], stride: number, factor?: number): string; /** * Encode a list of floating point numbers and return an encoded string * Attention: This function will modify the passed array! */ -export function encodeFloats(numbers: number[], opt_factor?: number): string; +export function encodeFloats(numbers: number[], factor?: number): string; /** * Encode a list of signed integers and return an encoded string * Attention: This function will modify the passed array! diff --git a/@types/ol/format/TextFeature.d.ts b/@types/ol/format/TextFeature.d.ts index 53ede9f2..b3e856f3 100644 --- a/@types/ol/format/TextFeature.d.ts +++ b/@types/ol/format/TextFeature.d.ts @@ -5,26 +5,26 @@ import FeatureFormat, { ReadOptions, Type, WriteOptions } from './Feature'; export default abstract class TextFeature extends FeatureFormat { constructor(); - protected abstract readFeatureFromText(text: string, opt_options?: ReadOptions): Feature; - protected abstract readFeaturesFromText(text: string, opt_options?: ReadOptions): Feature[]; - protected abstract readGeometryFromText(text: string, opt_options?: ReadOptions): Geometry; + protected abstract readFeatureFromText(text: string, options?: ReadOptions): Feature; + protected abstract readFeaturesFromText(text: string, options?: ReadOptions): Feature[]; + protected abstract readGeometryFromText(text: string, options?: ReadOptions): Geometry; protected readProjectionFromText(text: string): Projection | undefined; - protected abstract writeFeaturesText(features: Feature[], opt_options?: WriteOptions): string; - protected abstract writeFeatureText(feature: Feature, opt_options?: WriteOptions): string; - protected abstract writeGeometryText(geometry: Geometry, opt_options?: WriteOptions): string; + protected abstract writeFeaturesText(features: Feature[], options?: WriteOptions): string; + protected abstract writeFeatureText(feature: Feature, options?: WriteOptions): string; + protected abstract writeGeometryText(geometry: Geometry, options?: WriteOptions): string; getType(): Type; /** * Read the feature from the source. */ - readFeature(source: Document | Element | object | string, opt_options?: ReadOptions): Feature; + readFeature(source: Document | Element | object | string, options?: ReadOptions): Feature; /** * Read the features from the source. */ - readFeatures(source: Document | Element | object | string, opt_options?: ReadOptions): Feature[]; + readFeatures(source: Document | Element | object | string, options?: ReadOptions): Feature[]; /** * Read the geometry from the source. */ - readGeometry(source: Document | Element | object | string, opt_options?: ReadOptions): Geometry; + readGeometry(source: Document | Element | object | string, options?: ReadOptions): Geometry; /** * Read the projection from the source. */ @@ -32,13 +32,13 @@ export default abstract class TextFeature extends FeatureFormat { /** * Encode a feature as a string. */ - writeFeature(feature: Feature, opt_options?: WriteOptions): string; + writeFeature(feature: Feature, options?: WriteOptions): string; /** * Encode an array of features as string. */ - writeFeatures(features: Feature[], opt_options?: WriteOptions): string; + writeFeatures(features: Feature[], options?: WriteOptions): string; /** * Write a single geometry. */ - writeGeometry(geometry: Geometry, opt_options?: WriteOptions): string; + writeGeometry(geometry: Geometry, options?: WriteOptions): string; } diff --git a/@types/ol/format/TopoJSON.d.ts b/@types/ol/format/TopoJSON.d.ts index 759b0a79..b00058f8 100644 --- a/@types/ol/format/TopoJSON.d.ts +++ b/@types/ol/format/TopoJSON.d.ts @@ -31,12 +31,12 @@ export type TopoJSONPoint = Point; export type TopoJSONPolygon = Polygon; export type TopoJSONTopology = Topology; export default class TopoJSON extends JSONFeature { - constructor(opt_options?: Options); - protected readFeatureFromObject(object: any, opt_options?: ReadOptions): Feature; - protected readFeaturesFromObject(object: any, opt_options?: ReadOptions): Feature[]; - protected readGeometryFromObject(object: any, opt_options?: ReadOptions): Geometry; + constructor(options?: Options); + protected readFeatureFromObject(object: any, options?: ReadOptions): Feature; + protected readFeaturesFromObject(object: any, options?: ReadOptions): Feature[]; + protected readGeometryFromObject(object: any, options?: ReadOptions): Geometry; protected readProjectionFromObject(object: any): Projection; - writeFeatureObject(feature: Feature, opt_options?: WriteOptions): any; - writeFeaturesObject(features: Feature[], opt_options?: WriteOptions): any; - writeGeometryObject(geometry: Geometry, opt_options?: WriteOptions): any; + writeFeatureObject(feature: Feature, options?: WriteOptions): any; + writeFeaturesObject(features: Feature[], options?: WriteOptions): any; + writeGeometryObject(geometry: Geometry, options?: WriteOptions): any; } diff --git a/@types/ol/format/WFS.d.ts b/@types/ol/format/WFS.d.ts index 7ef65366..50914663 100644 --- a/@types/ol/format/WFS.d.ts +++ b/@types/ol/format/WFS.d.ts @@ -64,12 +64,12 @@ export interface WriteTransactionOptions { version?: string | undefined; } export default class WFS extends XMLFeature { - constructor(opt_options?: Options); - protected readFeaturesFromNode(node: Element, opt_options?: ReadOptions): Feature[]; + constructor(options?: Options); + protected readFeaturesFromNode(node: Element, options?: ReadOptions): Feature[]; /** * Create a bbox filter and combine it with another optional filter. */ - combineBboxAndFilter(geometryName: string, extent: Extent, opt_srsName?: string, opt_filter?: Filter): Filter; + combineBboxAndFilter(geometryName: string, extent: Extent, srsName?: string, filter?: Filter): Filter; getFeatureType(): string[] | string | undefined; /** * Read feature collection metadata of the source. @@ -103,4 +103,4 @@ export default class WFS extends XMLFeature { /** * Encode filter as WFS Filter and return the Node. */ -export function writeFilter(filter: Filter, opt_version: string): Node; +export function writeFilter(filter: Filter, version: string): Node; diff --git a/@types/ol/format/WKB.d.ts b/@types/ol/format/WKB.d.ts index e23e938b..65cea849 100644 --- a/@types/ol/format/WKB.d.ts +++ b/@types/ol/format/WKB.d.ts @@ -1,6 +1,5 @@ import Feature from '../Feature'; -import Geometry from '../geom/Geometry'; -import GeometryLayout from '../geom/GeometryLayout'; +import Geometry, { GeometryLayout } from '../geom/Geometry'; import Projection from '../proj/Projection'; import FeatureFormat, { ReadOptions, Type, WriteOptions } from './Feature'; @@ -15,20 +14,20 @@ export interface Options { srid?: number | boolean | undefined; } export default class WKB extends FeatureFormat { - constructor(opt_options?: Options); + constructor(options?: Options); getType(): Type; /** * Read a single feature from a source. */ - readFeature(source: string | ArrayBuffer | ArrayBufferView, opt_options?: ReadOptions): Feature; + readFeature(source: string | ArrayBuffer | ArrayBufferView, options?: ReadOptions): Feature; /** * Read all features from a source. */ - readFeatures(source: string | ArrayBuffer | ArrayBufferView, opt_options?: ReadOptions): Feature[]; + readFeatures(source: string | ArrayBuffer | ArrayBufferView, options?: ReadOptions): Feature[]; /** * Read a single geometry from a source. */ - readGeometry(source: string | ArrayBuffer | ArrayBufferView, opt_options?: ReadOptions): Geometry; + readGeometry(source: string | ArrayBuffer | ArrayBufferView, options?: ReadOptions): Geometry; /** * Read the projection from a source. */ @@ -36,13 +35,13 @@ export default class WKB extends FeatureFormat { /** * Encode a feature in this format. */ - writeFeature(feature: Feature, opt_options?: WriteOptions): string | ArrayBuffer; + writeFeature(feature: Feature, options?: WriteOptions): string | ArrayBuffer; /** * Encode an array of features in this format. */ - writeFeatures(features: Feature[], opt_options?: WriteOptions): string | ArrayBuffer; + writeFeatures(features: Feature[], options?: WriteOptions): string | ArrayBuffer; /** * Write a single geometry in this format. */ - writeGeometry(geometry: Geometry, opt_options?: WriteOptions): string | ArrayBuffer; + writeGeometry(geometry: Geometry, options?: WriteOptions): string | ArrayBuffer; } diff --git a/@types/ol/format/WKT.d.ts b/@types/ol/format/WKT.d.ts index 528420b9..42276263 100644 --- a/@types/ol/format/WKT.d.ts +++ b/@types/ol/format/WKT.d.ts @@ -12,11 +12,11 @@ export interface Token { position: number; } export default class WKT extends TextFeature { - constructor(opt_options?: Options); - protected readFeatureFromText(text: string, opt_options?: ReadOptions): Feature; - protected readFeaturesFromText(text: string, opt_options?: ReadOptions): Feature[]; - protected readGeometryFromText(text: string, opt_options?: ReadOptions): Geometry; - protected writeFeaturesText(features: Feature[], opt_options?: WriteOptions): string; - protected writeFeatureText(feature: Feature, opt_options?: WriteOptions): string; - protected writeGeometryText(geometry: Geometry, opt_options?: WriteOptions): string; + constructor(options?: Options); + protected readFeatureFromText(text: string, options?: ReadOptions): Feature; + protected readFeaturesFromText(text: string, options?: ReadOptions): Feature[]; + protected readGeometryFromText(text: string, options?: ReadOptions): Geometry; + protected writeFeaturesText(features: Feature[], options?: WriteOptions): string; + protected writeFeatureText(feature: Feature, options?: WriteOptions): string; + protected writeGeometryText(geometry: Geometry, options?: WriteOptions): string; } diff --git a/@types/ol/format/WMSGetFeatureInfo.d.ts b/@types/ol/format/WMSGetFeatureInfo.d.ts index fb143e35..9230a631 100644 --- a/@types/ol/format/WMSGetFeatureInfo.d.ts +++ b/@types/ol/format/WMSGetFeatureInfo.d.ts @@ -7,8 +7,8 @@ export interface Options { layers?: string[] | undefined; } export default class WMSGetFeatureInfo extends XMLFeature { - constructor(opt_options?: Options); - protected readFeaturesFromNode(node: Element, opt_options?: ReadOptions): Feature[]; + constructor(options?: Options); + protected readFeaturesFromNode(node: Element, options?: ReadOptions): Feature[]; getLayers(): string[] | null; setLayers(layers: string[] | null): void; } diff --git a/@types/ol/format/XMLFeature.d.ts b/@types/ol/format/XMLFeature.d.ts index af3cb915..528ce150 100644 --- a/@types/ol/format/XMLFeature.d.ts +++ b/@types/ol/format/XMLFeature.d.ts @@ -5,28 +5,28 @@ import FeatureFormat, { ReadOptions, Type, WriteOptions } from './Feature'; export default abstract class XMLFeature extends FeatureFormat { constructor(); - protected readFeaturesFromDocument(doc: Document, opt_options?: ReadOptions): Feature[]; - protected abstract readFeaturesFromNode(node: Element, opt_options?: ReadOptions): Feature[]; - protected readGeometryFromDocument(doc: Document, opt_options?: ReadOptions): Geometry; - protected readGeometryFromNode(node: Element, opt_options?: ReadOptions): Geometry; + protected readFeaturesFromDocument(doc: Document, options?: ReadOptions): Feature[]; + protected abstract readFeaturesFromNode(node: Element, options?: ReadOptions): Feature[]; + protected readGeometryFromDocument(doc: Document, options?: ReadOptions): Geometry; + protected readGeometryFromNode(node: Element, options?: ReadOptions): Geometry; protected readProjectionFromDocument(doc: Document): Projection; protected readProjectionFromNode(node: Element): Projection; - protected writeFeatureNode(feature: Feature, opt_options?: WriteOptions): Node; + protected writeFeatureNode(feature: Feature, options?: WriteOptions): Node; getType(): Type; /** * Read a single feature. */ - readFeature(source: Document | Element | object | string, opt_options?: ReadOptions): Feature; - readFeatureFromDocument(doc: Document, opt_options?: ReadOptions): Feature; - readFeatureFromNode(node: Element, opt_options?: ReadOptions): Feature; + readFeature(source: Document | Element | object | string, options?: ReadOptions): Feature; + readFeatureFromDocument(doc: Document, options?: ReadOptions): Feature; + readFeatureFromNode(node: Element, options?: ReadOptions): Feature; /** * Read all features from a feature collection. */ - readFeatures(source: Document | Element | object | string, opt_options?: ReadOptions): Feature[]; + readFeatures(source: Document | Element | object | string, options?: ReadOptions): Feature[]; /** * Read a single geometry from a source. */ - readGeometry(source: Document | Element | object | string, opt_options?: ReadOptions): Geometry; + readGeometry(source: Document | Element | object | string, options?: ReadOptions): Geometry; /** * Read the projection from the source. */ @@ -34,15 +34,15 @@ export default abstract class XMLFeature extends FeatureFormat { /** * Encode a feature as string. */ - writeFeature(feature: Feature, opt_options?: WriteOptions): string; + writeFeature(feature: Feature, options?: WriteOptions): string; /** * Encode an array of features as string. */ - writeFeatures(features: Feature[], opt_options?: WriteOptions): string; - writeFeaturesNode(features: Feature[], opt_options?: WriteOptions): Node; + writeFeatures(features: Feature[], options?: WriteOptions): string; + writeFeaturesNode(features: Feature[], options?: WriteOptions): Node; /** * Encode a geometry as string. */ - writeGeometry(geometry: Geometry, opt_options?: WriteOptions): string; - writeGeometryNode(geometry: Geometry, opt_options?: WriteOptions): Node; + writeGeometry(geometry: Geometry, options?: WriteOptions): string; + writeGeometryNode(geometry: Geometry, options?: WriteOptions): Node; } diff --git a/@types/ol/format/filter.d.ts b/@types/ol/format/filter.d.ts index 9fd5ea9c..7e365ae5 100644 --- a/@types/ol/format/filter.d.ts +++ b/@types/ol/format/filter.d.ts @@ -29,7 +29,7 @@ export function and(...conditions: Filter[]): And; * Create a operator to test whether a geometry-valued property * intersects a fixed bounding box */ -export function bbox(geometryName: string, extent: Extent, opt_srsName?: string): Bbox; +export function bbox(geometryName: string, extent: Extent, srsName?: string): Bbox; /** * Creates a comparison operator to test whether an expression * value lies within a range given by a lower and upper bound (inclusive). @@ -39,12 +39,12 @@ export function between(propertyName: string, lowerBoundary: number, upperBounda * Create a operator to test whether a geometry-valued property * contains a given geometry. */ -export function contains(geometryName: string, geometry: Geometry, opt_srsName?: string): Contains; +export function contains(geometryName: string, geometry: Geometry, srsName?: string): Contains; /** * Create a operator to test whether a geometry-valued property * is disjoint to a given geometry. */ -export function disjoint(geometryName: string, geometry: Geometry, opt_srsName?: string): Disjoint; +export function disjoint(geometryName: string, geometry: Geometry, srsName?: string): Disjoint; /** * Create a temporal operator. */ @@ -58,12 +58,12 @@ export function dwithin( geometry: Geometry, distance: number, unit: string, - opt_srsName?: string, + srsName?: string, ): DWithin; /** * Creates a comparison operator. */ -export function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): EqualTo; +export function equalTo(propertyName: string, expression: string | number, matchCase?: boolean): EqualTo; /** * Creates a comparison operator. */ @@ -76,7 +76,7 @@ export function greaterThanOrEqualTo(propertyName: string, expression: number): * Create a operator to test whether a geometry-valued property * intersects a given geometry. */ -export function intersects(geometryName: string, geometry: Geometry, opt_srsName?: string): Intersects; +export function intersects(geometryName: string, geometry: Geometry, srsName?: string): Intersects; /** * Creates a comparison operator to test whether a property value * is null. @@ -97,10 +97,10 @@ export function lessThanOrEqualTo(propertyName: string, expression: number): Les export function like( propertyName: string, pattern: string, - opt_wildCard?: string, - opt_singleChar?: string, - opt_escapeChar?: string, - opt_matchCase?: boolean, + wildCard?: string, + singleChar?: string, + escapeChar?: string, + matchCase?: boolean, ): IsLike; /** * Represents a logical operator for a filter condition. @@ -109,7 +109,7 @@ export function not(condition: Filter): Not; /** * Creates a comparison operator. */ -export function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): NotEqualTo; +export function notEqualTo(propertyName: string, expression: string | number, matchCase?: boolean): NotEqualTo; /** * Create a logical operator between two or more filter conditions. */ @@ -118,4 +118,4 @@ export function or(...conditions: Filter[]): Or; * Create a operator to test whether a geometry-valued property * is within a given geometry. */ -export function within(geometryName: string, geometry: Geometry, opt_srsName?: string): Within; +export function within(geometryName: string, geometry: Geometry, srsName?: string): Within; diff --git a/@types/ol/format/filter/Bbox.d.ts b/@types/ol/format/filter/Bbox.d.ts index e169325f..d21d01cd 100644 --- a/@types/ol/format/filter/Bbox.d.ts +++ b/@types/ol/format/filter/Bbox.d.ts @@ -2,5 +2,5 @@ import { Extent } from '../../extent'; import Filter from './Filter'; export default class Bbox extends Filter { - constructor(geometryName: string, extent: Extent, opt_srsName?: string); + constructor(geometryName: string, extent: Extent, srsName?: string); } diff --git a/@types/ol/format/filter/ComparisonBinary.d.ts b/@types/ol/format/filter/ComparisonBinary.d.ts index a04bae53..2134b882 100644 --- a/@types/ol/format/filter/ComparisonBinary.d.ts +++ b/@types/ol/format/filter/ComparisonBinary.d.ts @@ -1,5 +1,5 @@ import Comparison from './Comparison'; export default abstract class ComparisonBinary extends Comparison { - constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean); + constructor(tagName: string, propertyName: string, expression: string | number, matchCase?: boolean); } diff --git a/@types/ol/format/filter/Contains.d.ts b/@types/ol/format/filter/Contains.d.ts index dc7e9a38..b7ab6e0f 100644 --- a/@types/ol/format/filter/Contains.d.ts +++ b/@types/ol/format/filter/Contains.d.ts @@ -2,5 +2,5 @@ import Geometry from '../../geom/Geometry'; import Spatial from './Spatial'; export default class Contains extends Spatial { - constructor(geometryName: string, geometry: Geometry, opt_srsName?: string); + constructor(geometryName: string, geometry: Geometry, srsName?: string); } diff --git a/@types/ol/format/filter/DWithin.d.ts b/@types/ol/format/filter/DWithin.d.ts index 7da0d366..f985db5c 100644 --- a/@types/ol/format/filter/DWithin.d.ts +++ b/@types/ol/format/filter/DWithin.d.ts @@ -2,5 +2,5 @@ import Geometry from '../../geom/Geometry'; import Spatial from './Spatial'; export default class DWithin extends Spatial { - constructor(geometryName: string, geometry: Geometry, distance: number, unit: string, opt_srsName?: string); + constructor(geometryName: string, geometry: Geometry, distance: number, unit: string, srsName?: string); } diff --git a/@types/ol/format/filter/Disjoint.d.ts b/@types/ol/format/filter/Disjoint.d.ts index 8aa9f37c..2cc9a39c 100644 --- a/@types/ol/format/filter/Disjoint.d.ts +++ b/@types/ol/format/filter/Disjoint.d.ts @@ -2,5 +2,5 @@ import Geometry from '../../geom/Geometry'; import Spatial from './Spatial'; export default class Disjoint extends Spatial { - constructor(geometryName: string, geometry: Geometry, opt_srsName?: string); + constructor(geometryName: string, geometry: Geometry, srsName?: string); } diff --git a/@types/ol/format/filter/EqualTo.d.ts b/@types/ol/format/filter/EqualTo.d.ts index 5a6766a4..4768cb00 100644 --- a/@types/ol/format/filter/EqualTo.d.ts +++ b/@types/ol/format/filter/EqualTo.d.ts @@ -1,5 +1,5 @@ import ComparisonBinary from './ComparisonBinary'; export default class EqualTo extends ComparisonBinary { - constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean); + constructor(propertyName: string, expression: string | number, matchCase?: boolean); } diff --git a/@types/ol/format/filter/Intersects.d.ts b/@types/ol/format/filter/Intersects.d.ts index 3060c1a4..b046bf82 100644 --- a/@types/ol/format/filter/Intersects.d.ts +++ b/@types/ol/format/filter/Intersects.d.ts @@ -2,5 +2,5 @@ import Geometry from '../../geom/Geometry'; import Spatial from './Spatial'; export default class Intersects extends Spatial { - constructor(geometryName: string, geometry: Geometry, opt_srsName?: string); + constructor(geometryName: string, geometry: Geometry, srsName?: string); } diff --git a/@types/ol/format/filter/IsLike.d.ts b/@types/ol/format/filter/IsLike.d.ts index f0575b49..49834212 100644 --- a/@types/ol/format/filter/IsLike.d.ts +++ b/@types/ol/format/filter/IsLike.d.ts @@ -7,9 +7,9 @@ export default class IsLike extends Comparison { constructor( propertyName: string, pattern: string, - opt_wildCard?: string, - opt_singleChar?: string, - opt_escapeChar?: string, - opt_matchCase?: boolean, + wildCard?: string, + singleChar?: string, + escapeChar?: string, + matchCase?: boolean, ); } diff --git a/@types/ol/format/filter/NotEqualTo.d.ts b/@types/ol/format/filter/NotEqualTo.d.ts index b0229875..924f5528 100644 --- a/@types/ol/format/filter/NotEqualTo.d.ts +++ b/@types/ol/format/filter/NotEqualTo.d.ts @@ -1,5 +1,5 @@ import ComparisonBinary from './ComparisonBinary'; export default class NotEqualTo extends ComparisonBinary { - constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean); + constructor(propertyName: string, expression: string | number, matchCase?: boolean); } diff --git a/@types/ol/format/filter/Spatial.d.ts b/@types/ol/format/filter/Spatial.d.ts index a0b5173a..307996ab 100644 --- a/@types/ol/format/filter/Spatial.d.ts +++ b/@types/ol/format/filter/Spatial.d.ts @@ -2,5 +2,5 @@ import Geometry from '../../geom/Geometry'; import Filter from './Filter'; export default abstract class Spatial extends Filter { - constructor(tagName: string, geometryName: string, geometry: Geometry, opt_srsName?: string); + constructor(tagName: string, geometryName: string, geometry: Geometry, srsName?: string); } diff --git a/@types/ol/format/filter/Within.d.ts b/@types/ol/format/filter/Within.d.ts index 35fdbf72..d494b1e4 100644 --- a/@types/ol/format/filter/Within.d.ts +++ b/@types/ol/format/filter/Within.d.ts @@ -2,5 +2,5 @@ import Geometry from '../../geom/Geometry'; import Spatial from './Spatial'; export default class Within extends Spatial { - constructor(geometryName: string, geometry: Geometry, opt_srsName?: string); + constructor(geometryName: string, geometry: Geometry, srsName?: string); } diff --git a/@types/ol/geom/Circle.d.ts b/@types/ol/geom/Circle.d.ts index a8a7dfe4..c6c6b517 100644 --- a/@types/ol/geom/Circle.d.ts +++ b/@types/ol/geom/Circle.d.ts @@ -4,14 +4,13 @@ import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; import { ProjectionLike } from '../proj'; -import { Type } from './Geometry'; -import GeometryLayout from './GeometryLayout'; +import { GeometryLayout, Type } from './Geometry'; import SimpleGeometry from './SimpleGeometry'; export type TCircleBaseEventTypes = 'change' | 'error'; export type TCircleObjectEventTypes = 'propertychange'; export default class Circle extends SimpleGeometry { - constructor(center: Coordinate, opt_radius?: number, opt_layout?: GeometryLayout); + constructor(center: Coordinate, radius?: number, layout?: GeometryLayout); protected computeExtent(extent: Extent): Extent; /** * Make a complete copy of the geometry. @@ -49,8 +48,8 @@ export default class Circle extends SimpleGeometry { * Set the center (as {@link module:ol/coordinate~Coordinate coordinate}) and the radius (as * number) of the circle. */ - setCenterAndRadius(center: Coordinate, radius: number, opt_layout?: GeometryLayout): void; - setCoordinates(coordinates: any[], opt_layout?: GeometryLayout): void; + setCenterAndRadius(center: Coordinate, radius: number, layout?: GeometryLayout): void; + setCoordinates(coordinates: any[], layout?: GeometryLayout): void; /** * Set the radius of the circle. The radius is in the units of the projection. */ diff --git a/@types/ol/geom/Geometry.d.ts b/@types/ol/geom/Geometry.d.ts index 631bd81b..c4a1f2d8 100644 --- a/@types/ol/geom/Geometry.d.ts +++ b/@types/ol/geom/Geometry.d.ts @@ -7,6 +7,11 @@ import { ProjectionLike, TransformFunction } from '../proj'; export type TGeometryBaseEventTypes = 'change' | 'error'; export type TGeometryObjectEventTypes = 'propertychange'; +/** + * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z') + * or measure ('M') coordinate is available. + */ +export type GeometryLayout = 'XY' | 'XYZ' | 'XYM' | 'XYZM'; /** * The geometry type. One of 'Point', 'LineString', 'LinearRing', * 'Polygon', 'MultiPoint', 'MultiLineString', 'MultiPolygon', @@ -44,11 +49,11 @@ export default abstract class Geometry extends BaseObject { * Return the closest point of the geometry to the passed point as * {@link module:ol/coordinate~Coordinate coordinate}. */ - getClosestPoint(point: Coordinate, opt_closestPoint?: Coordinate): Coordinate; + getClosestPoint(point: Coordinate, closestPoint?: Coordinate): Coordinate; /** * Get the extent of the geometry. */ - getExtent(opt_extent?: Extent): Extent; + getExtent(extent?: Extent): Extent; /** * Create a simplified version of this geometry using the Douglas Peucker * algorithm. @@ -77,7 +82,7 @@ export default abstract class Geometry extends BaseObject { * Scale the geometry (with an optional origin). This modifies the geometry * coordinates in place. */ - abstract scale(sx: number, opt_sy?: number, opt_anchor?: Coordinate): void; + abstract scale(sx: number, sy?: number, anchor?: Coordinate): void; /** * Create a simplified version of this geometry. For linestrings, this uses * the Douglas Peucker @@ -88,7 +93,7 @@ export default abstract class Geometry extends BaseObject { /** * Get a transformed and simplified version of the geometry. */ - abstract simplifyTransformed(squaredTolerance: number, opt_transform?: TransformFunction): Geometry; + abstract simplifyTransformed(squaredTolerance: number, transform?: TransformFunction): Geometry; /** * Transform each coordinate of the geometry from one coordinate reference * system to another. The geometry is modified in place. diff --git a/@types/ol/geom/GeometryCollection.d.ts b/@types/ol/geom/GeometryCollection.d.ts index fd17809c..0e483dc9 100644 --- a/@types/ol/geom/GeometryCollection.d.ts +++ b/@types/ol/geom/GeometryCollection.d.ts @@ -9,7 +9,7 @@ import Geometry, { Type } from './Geometry'; export type TGeometryCollectionBaseEventTypes = 'change' | 'error'; export type TGeometryCollectionObjectEventTypes = 'propertychange'; export default class GeometryCollection extends Geometry { - constructor(opt_geometries?: Geometry[]); + constructor(geometries?: Geometry[]); protected computeExtent(extent: Extent): Extent; /** * Apply a transform function to the coordinates of the geometry. @@ -56,7 +56,7 @@ export default class GeometryCollection extends Geometry { * Scale the geometry (with an optional origin). This modifies the geometry * coordinates in place. */ - scale(sx: number, opt_sy?: number, opt_anchor?: Coordinate): void; + scale(sx: number, sy?: number, anchor?: Coordinate): void; /** * Set the geometries that make up this geometry collection. */ @@ -65,7 +65,7 @@ export default class GeometryCollection extends Geometry { /** * Get a transformed and simplified version of the geometry. */ - simplifyTransformed(squaredTolerance: number, opt_transform?: TransformFunction): Geometry; + simplifyTransformed(squaredTolerance: number, transform?: TransformFunction): Geometry; /** * Translate the geometry. This modifies the geometry coordinates in place. If * instead you want a new geometry, first clone() this geometry. diff --git a/@types/ol/geom/GeometryLayout.d.ts b/@types/ol/geom/GeometryLayout.d.ts deleted file mode 100644 index 58aab5eb..00000000 --- a/@types/ol/geom/GeometryLayout.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z') - * or measure ('M') coordinate is available. Supported values are 'XY', - * 'XYZ', 'XYM', 'XYZM'. - */ -declare enum GeometryLayout { - XY = 'XY', - XYZ = 'XYZ', - XYM = 'XYM', - XYZM = 'XYZM', -} - -export default GeometryLayout; diff --git a/@types/ol/geom/LineString.d.ts b/@types/ol/geom/LineString.d.ts index 0576fda2..d87b3d9d 100644 --- a/@types/ol/geom/LineString.d.ts +++ b/@types/ol/geom/LineString.d.ts @@ -3,14 +3,13 @@ import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; -import { Type } from './Geometry'; -import GeometryLayout from './GeometryLayout'; +import { GeometryLayout, Type } from './Geometry'; import SimpleGeometry from './SimpleGeometry'; export type TLineStringBaseEventTypes = 'change' | 'error'; export type TLineStringObjectEventTypes = 'propertychange'; export default class LineString extends SimpleGeometry { - constructor(coordinates: Coordinate[] | number[], opt_layout?: GeometryLayout); + constructor(coordinates: Coordinate[] | number[], layout?: GeometryLayout); protected getSimplifiedGeometryInternal(squaredTolerance: number): LineString; /** * Append the passed coordinate to the coordinates of the linestring. @@ -32,16 +31,16 @@ export default class LineString extends SimpleGeometry { * The fraction is a number between 0 and 1, where 0 is the start of the * linestring and 1 is the end. */ - getCoordinateAt(fraction: number, opt_dest?: Coordinate): Coordinate; + getCoordinateAt(fraction: number, dest?: Coordinate): Coordinate; /** * Returns the coordinate at m using linear interpolation, or null if no * such coordinate exists. - * opt_extrapolate controls extrapolation beyond the range of Ms in the - * MultiLineString. If opt_extrapolate is true then Ms less than the first + * extrapolate controls extrapolation beyond the range of Ms in the + * MultiLineString. If extrapolate is true then Ms less than the first * M will return the first coordinate and Ms greater than the last M will * return the last coordinate. */ - getCoordinateAtM(m: number, opt_extrapolate?: boolean): Coordinate | null; + getCoordinateAtM(m: number, extrapolate?: boolean): Coordinate | null; /** * Return the coordinates of the linestring. */ @@ -62,7 +61,7 @@ export default class LineString extends SimpleGeometry { /** * Set the coordinates of the linestring. */ - setCoordinates(coordinates: Coordinate[], opt_layout?: GeometryLayout): void; + setCoordinates(coordinates: Coordinate[], layout?: GeometryLayout): void; on(type: TLineStringBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TLineStringBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TLineStringBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/geom/LinearRing.d.ts b/@types/ol/geom/LinearRing.d.ts index b25e44a1..8f045d32 100644 --- a/@types/ol/geom/LinearRing.d.ts +++ b/@types/ol/geom/LinearRing.d.ts @@ -3,14 +3,13 @@ import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; -import { Type } from './Geometry'; -import GeometryLayout from './GeometryLayout'; +import { GeometryLayout, Type } from './Geometry'; import SimpleGeometry from './SimpleGeometry'; export type TLinearRingBaseEventTypes = 'change' | 'error'; export type TLinearRingObjectEventTypes = 'propertychange'; export default class LinearRing extends SimpleGeometry { - constructor(coordinates: Coordinate[] | number[], opt_layout?: GeometryLayout); + constructor(coordinates: Coordinate[] | number[], layout?: GeometryLayout); protected getSimplifiedGeometryInternal(squaredTolerance: number): LinearRing; /** * Make a complete copy of the geometry. @@ -36,7 +35,7 @@ export default class LinearRing extends SimpleGeometry { /** * Set the coordinates of the linear ring. */ - setCoordinates(coordinates: Coordinate[], opt_layout?: GeometryLayout): void; + setCoordinates(coordinates: Coordinate[], layout?: GeometryLayout): void; on(type: TLinearRingBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TLinearRingBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TLinearRingBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/geom/MultiLineString.d.ts b/@types/ol/geom/MultiLineString.d.ts index 593b2af5..283b645c 100644 --- a/@types/ol/geom/MultiLineString.d.ts +++ b/@types/ol/geom/MultiLineString.d.ts @@ -3,19 +3,14 @@ import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; -import { Type } from './Geometry'; -import GeometryLayout from './GeometryLayout'; +import { GeometryLayout, Type } from './Geometry'; import LineString from './LineString'; import SimpleGeometry from './SimpleGeometry'; export type TMultiLineStringBaseEventTypes = 'change' | 'error'; export type TMultiLineStringObjectEventTypes = 'propertychange'; export default class MultiLineString extends SimpleGeometry { - constructor( - coordinates: (Coordinate[] | LineString)[] | number[], - opt_layout?: GeometryLayout, - opt_ends?: number[], - ); + constructor(coordinates: (Coordinate[] | LineString)[] | number[], layout?: GeometryLayout, ends?: number[]); protected getSimplifiedGeometryInternal(squaredTolerance: number): MultiLineString; /** * Append the passed linestring to the multilinestring. @@ -29,18 +24,18 @@ export default class MultiLineString extends SimpleGeometry { /** * Returns the coordinate at m using linear interpolation, or null if no * such coordinate exists. - * opt_extrapolate controls extrapolation beyond the range of Ms in the - * MultiLineString. If opt_extrapolate is true then Ms less than the first + * extrapolate controls extrapolation beyond the range of Ms in the + * MultiLineString. If extrapolate is true then Ms less than the first * M will return the first coordinate and Ms greater than the last M will * return the last coordinate. - * opt_interpolate controls interpolation between consecutive LineStrings - * within the MultiLineString. If opt_interpolate is true the coordinates + * interpolate controls interpolation between consecutive LineStrings + * within the MultiLineString. If interpolate is true the coordinates * will be linearly interpolated between the last coordinate of one LineString - * and the first coordinate of the next LineString. If opt_interpolate is + * and the first coordinate of the next LineString. If interpolate is * false then the function will return null for Ms falling between * LineStrings. */ - getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): Coordinate | null; + getCoordinateAtM(m: number, extrapolate?: boolean, interpolate?: boolean): Coordinate | null; /** * Return the coordinates of the multilinestring. */ @@ -66,7 +61,7 @@ export default class MultiLineString extends SimpleGeometry { /** * Set the coordinates of the multilinestring. */ - setCoordinates(coordinates: Coordinate[][], opt_layout?: GeometryLayout): void; + setCoordinates(coordinates: Coordinate[][], layout?: GeometryLayout): void; on(type: TMultiLineStringBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TMultiLineStringBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TMultiLineStringBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/geom/MultiPoint.d.ts b/@types/ol/geom/MultiPoint.d.ts index 95fc0771..c87aeaa0 100644 --- a/@types/ol/geom/MultiPoint.d.ts +++ b/@types/ol/geom/MultiPoint.d.ts @@ -3,15 +3,14 @@ import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; -import { Type } from './Geometry'; -import GeometryLayout from './GeometryLayout'; +import { GeometryLayout, Type } from './Geometry'; import Point from './Point'; import SimpleGeometry from './SimpleGeometry'; export type TMultiPointBaseEventTypes = 'change' | 'error'; export type TMultiPointObjectEventTypes = 'propertychange'; export default class MultiPoint extends SimpleGeometry { - constructor(coordinates: Coordinate[] | number[], opt_layout?: GeometryLayout); + constructor(coordinates: Coordinate[] | number[], layout?: GeometryLayout); /** * Append the passed point to this multipoint. */ @@ -44,7 +43,7 @@ export default class MultiPoint extends SimpleGeometry { /** * Set the coordinates of the multipoint. */ - setCoordinates(coordinates: Coordinate[], opt_layout?: GeometryLayout): void; + setCoordinates(coordinates: Coordinate[], layout?: GeometryLayout): void; on(type: TMultiPointBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TMultiPointBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TMultiPointBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/geom/MultiPolygon.d.ts b/@types/ol/geom/MultiPolygon.d.ts index 7bb460d7..f0ad50d3 100644 --- a/@types/ol/geom/MultiPolygon.d.ts +++ b/@types/ol/geom/MultiPolygon.d.ts @@ -3,8 +3,7 @@ import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; -import { Type } from './Geometry'; -import GeometryLayout from './GeometryLayout'; +import { GeometryLayout, Type } from './Geometry'; import MultiPoint from './MultiPoint'; import Polygon from './Polygon'; import SimpleGeometry from './SimpleGeometry'; @@ -12,11 +11,7 @@ import SimpleGeometry from './SimpleGeometry'; export type TMultiPolygonBaseEventTypes = 'change' | 'error'; export type TMultiPolygonObjectEventTypes = 'propertychange'; export default class MultiPolygon extends SimpleGeometry { - constructor( - coordinates: (Coordinate[][] | Polygon)[] | number[], - opt_layout?: GeometryLayout, - opt_endss?: number[][], - ); + constructor(coordinates: (Coordinate[][] | Polygon)[] | number[], layout?: GeometryLayout, endss?: number[][]); protected getSimplifiedGeometryInternal(squaredTolerance: number): MultiPolygon; /** * Append the passed polygon to this multipolygon. @@ -36,7 +31,7 @@ export default class MultiPolygon extends SimpleGeometry { * Get the coordinate array for this geometry. This array has the structure * of a GeoJSON coordinate array for multi-polygons. */ - getCoordinates(opt_right?: boolean): Coordinate[][][]; + getCoordinates(right?: boolean): Coordinate[][][]; getEndss(): number[][]; getFlatInteriorPoints(): number[]; /** @@ -63,7 +58,7 @@ export default class MultiPolygon extends SimpleGeometry { /** * Set the coordinates of the multipolygon. */ - setCoordinates(coordinates: Coordinate[][][], opt_layout?: GeometryLayout): void; + setCoordinates(coordinates: Coordinate[][][], layout?: GeometryLayout): void; on(type: TMultiPolygonBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TMultiPolygonBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TMultiPolygonBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/geom/Point.d.ts b/@types/ol/geom/Point.d.ts index 578e1d94..efb1a45f 100644 --- a/@types/ol/geom/Point.d.ts +++ b/@types/ol/geom/Point.d.ts @@ -3,14 +3,13 @@ import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; -import { Type } from './Geometry'; -import GeometryLayout from './GeometryLayout'; +import { GeometryLayout, Type } from './Geometry'; import SimpleGeometry from './SimpleGeometry'; export type TPointBaseEventTypes = 'change' | 'error'; export type TPointObjectEventTypes = 'propertychange'; export default class Point extends SimpleGeometry { - constructor(coordinates: Coordinate, opt_layout?: GeometryLayout); + constructor(coordinates: Coordinate, layout?: GeometryLayout); protected computeExtent(extent: Extent): Extent; /** * Make a complete copy of the geometry. @@ -29,7 +28,7 @@ export default class Point extends SimpleGeometry { * Test if the geometry and the passed extent intersect. */ intersectsExtent(extent: Extent): boolean; - setCoordinates(coordinates: any[], opt_layout?: GeometryLayout): void; + setCoordinates(coordinates: any[], layout?: GeometryLayout): void; on(type: TPointBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TPointBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TPointBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/geom/Polygon.d.ts b/@types/ol/geom/Polygon.d.ts index 13b1f8a9..1aac875b 100644 --- a/@types/ol/geom/Polygon.d.ts +++ b/@types/ol/geom/Polygon.d.ts @@ -4,8 +4,7 @@ import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; import Circle from './Circle'; -import { Type } from './Geometry'; -import GeometryLayout from './GeometryLayout'; +import { GeometryLayout, Type } from './Geometry'; import LinearRing from './LinearRing'; import Point from './Point'; import SimpleGeometry from './SimpleGeometry'; @@ -13,7 +12,7 @@ import SimpleGeometry from './SimpleGeometry'; export type TPolygonBaseEventTypes = 'change' | 'error'; export type TPolygonObjectEventTypes = 'propertychange'; export default class Polygon extends SimpleGeometry { - constructor(coordinates: Coordinate[][] | number[], opt_layout?: GeometryLayout, opt_ends?: number[]); + constructor(coordinates: Coordinate[][] | number[], layout?: GeometryLayout, ends?: number[]); protected getSimplifiedGeometryInternal(squaredTolerance: number): Polygon; /** * Append the passed linear ring to this polygon. @@ -33,7 +32,7 @@ export default class Polygon extends SimpleGeometry { * Get the coordinate array for this geometry. This array has the structure * of a GeoJSON coordinate array for polygons. */ - getCoordinates(opt_right?: boolean): Coordinate[][]; + getCoordinates(right?: boolean): Coordinate[][]; getEnds(): number[]; getFlatInteriorPoint(): number[]; /** @@ -68,7 +67,7 @@ export default class Polygon extends SimpleGeometry { /** * Set the coordinates of the polygon. */ - setCoordinates(coordinates: Coordinate[][], opt_layout?: GeometryLayout): void; + setCoordinates(coordinates: Coordinate[][], layout?: GeometryLayout): void; on(type: TPolygonBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TPolygonBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TPolygonBaseEventTypes, listener: ListenerFunction): EventsKey; @@ -83,11 +82,11 @@ export default class Polygon extends SimpleGeometry { /** * Create an approximation of a circle on the surface of a sphere. */ -export function circular(center: Coordinate, radius: number, opt_n?: number, opt_sphereRadius?: number): Polygon; +export function circular(center: Coordinate, radius: number, n?: number, sphereRadius?: number): Polygon; /** * Create a regular polygon from a circle. */ -export function fromCircle(circle: Circle, opt_sides?: number, opt_angle?: number): Polygon; +export function fromCircle(circle: Circle, sides?: number, angle?: number): Polygon; /** * Create a polygon from an extent. The layout used is XY. */ @@ -95,4 +94,4 @@ export function fromExtent(extent: Extent): Polygon; /** * Modify the coordinates of a polygon to make it a regular polygon. */ -export function makeRegular(polygon: Polygon, center: Coordinate, radius: number, opt_angle?: number): void; +export function makeRegular(polygon: Polygon, center: Coordinate, radius: number, angle?: number): void; diff --git a/@types/ol/geom/SimpleGeometry.d.ts b/@types/ol/geom/SimpleGeometry.d.ts index d23f3f6f..a0e6234b 100644 --- a/@types/ol/geom/SimpleGeometry.d.ts +++ b/@types/ol/geom/SimpleGeometry.d.ts @@ -5,8 +5,7 @@ import BaseEvent from '../events/Event'; import { Extent } from '../extent'; import { TransformFunction } from '../proj'; import { Transform } from '../transform'; -import Geometry, { Type } from './Geometry'; -import GeometryLayout from './GeometryLayout'; +import Geometry, { GeometryLayout, Type } from './Geometry'; export type TSimpleGeometryBaseEventTypes = 'change' | 'error'; export type TSimpleGeometryObjectEventTypes = 'propertychange'; @@ -41,7 +40,7 @@ export default abstract class SimpleGeometry extends Geometry { */ getLastCoordinate(): Coordinate; /** - * Return the {@link module:ol/geom/GeometryLayout layout} of the geometry. + * Return the {@link module:ol/geom/Geometry~GeometryLayout layout} of the geometry. */ getLayout(): GeometryLayout; /** @@ -66,13 +65,13 @@ export default abstract class SimpleGeometry extends Geometry { * Scale the geometry (with an optional origin). This modifies the geometry * coordinates in place. */ - scale(sx: number, opt_sy?: number, opt_anchor?: Coordinate): void; - abstract setCoordinates(coordinates: any[], opt_layout?: GeometryLayout): void; + scale(sx: number, sy?: number, anchor?: Coordinate): void; + abstract setCoordinates(coordinates: any[], layout?: GeometryLayout): void; setFlatCoordinates(layout: GeometryLayout, flatCoordinates: number[]): void; /** * Get a transformed and simplified version of the geometry. */ - simplifyTransformed(squaredTolerance: number, opt_transform?: TransformFunction): Geometry; + simplifyTransformed(squaredTolerance: number, transform?: TransformFunction): Geometry; /** * Translate the geometry. This modifies the geometry coordinates in place. If * instead you want a new geometry, first clone() this geometry. @@ -96,4 +95,4 @@ export default abstract class SimpleGeometry extends Geometry { ): void; } export function getStrideForLayout(layout: GeometryLayout): number; -export function transformGeom2D(simpleGeometry: SimpleGeometry, transform: Transform, opt_dest?: number[]): number[]; +export function transformGeom2D(simpleGeometry: SimpleGeometry, transform: Transform, dest?: number[]): number[]; diff --git a/@types/ol/geom/flat/closest.d.ts b/@types/ol/geom/flat/closest.d.ts index ad05b408..75745d7f 100644 --- a/@types/ol/geom/flat/closest.d.ts +++ b/@types/ol/geom/flat/closest.d.ts @@ -16,7 +16,7 @@ export function assignClosestArrayPoint( y: number, closestPoint: number[], minSquaredDistance: number, - opt_tmpPoint?: number[], + tmpPoint?: number[], ): number; export function assignClosestMultiArrayPoint( flatCoordinates: number[], @@ -29,7 +29,7 @@ export function assignClosestMultiArrayPoint( y: number, closestPoint: number[], minSquaredDistance: number, - opt_tmpPoint?: number[], + tmpPoint?: number[], ): number; export function assignClosestPoint( flatCoordinates: number[], @@ -42,7 +42,7 @@ export function assignClosestPoint( y: number, closestPoint: number[], minSquaredDistance: number, - opt_tmpPoint?: number[], + tmpPoint?: number[], ): number; /** * Return the squared of the largest distance between any pair of consecutive diff --git a/@types/ol/geom/flat/deflate.d.ts b/@types/ol/geom/flat/deflate.d.ts index b34a3e05..44c83066 100644 --- a/@types/ol/geom/flat/deflate.d.ts +++ b/@types/ol/geom/flat/deflate.d.ts @@ -17,12 +17,12 @@ export function deflateCoordinatesArray( offset: number, coordinatess: Coordinate[][], stride: number, - opt_ends?: number[], + ends?: number[], ): number[]; export function deflateMultiCoordinatesArray( flatCoordinates: number[], offset: number, coordinatesss: Coordinate[][][], stride: number, - opt_endss?: number[][], + endss?: number[][], ): number[][]; diff --git a/@types/ol/geom/flat/flip.d.ts b/@types/ol/geom/flat/flip.d.ts index 887a699c..80e7ba8f 100644 --- a/@types/ol/geom/flat/flip.d.ts +++ b/@types/ol/geom/flat/flip.d.ts @@ -3,6 +3,6 @@ export function flipXY( offset: number, end: number, stride: number, - opt_dest?: number[], - opt_destOffset?: number, + dest?: number[], + destOffset?: number, ): number[]; diff --git a/@types/ol/geom/flat/inflate.d.ts b/@types/ol/geom/flat/inflate.d.ts index 42ce5a37..6e24eabf 100644 --- a/@types/ol/geom/flat/inflate.d.ts +++ b/@types/ol/geom/flat/inflate.d.ts @@ -5,19 +5,19 @@ export function inflateCoordinates( offset: number, end: number, stride: number, - opt_coordinates?: Coordinate[], + coordinates?: Coordinate[], ): Coordinate[]; export function inflateCoordinatesArray( flatCoordinates: number[], offset: number, ends: number[], stride: number, - opt_coordinatess?: Coordinate[][], + coordinatess?: Coordinate[][], ): Coordinate[][]; export function inflateMultiCoordinatesArray( flatCoordinates: number[], offset: number, endss: number[][], stride: number, - opt_coordinatesss?: Coordinate[][][], + coordinatesss?: Coordinate[][][], ): Coordinate[][][]; diff --git a/@types/ol/geom/flat/interiorpoint.d.ts b/@types/ol/geom/flat/interiorpoint.d.ts index effb5fb2..4da4157e 100644 --- a/@types/ol/geom/flat/interiorpoint.d.ts +++ b/@types/ol/geom/flat/interiorpoint.d.ts @@ -9,7 +9,7 @@ export function getInteriorPointOfArray( stride: number, flatCenters: number[], flatCentersOffset: number, - opt_dest?: number[], + dest?: number[], ): number[]; export function getInteriorPointsOfMultiArray( flatCoordinates: number[], diff --git a/@types/ol/geom/flat/interpolate.d.ts b/@types/ol/geom/flat/interpolate.d.ts index 8d8be10d..9e75c5f4 100644 --- a/@types/ol/geom/flat/interpolate.d.ts +++ b/@types/ol/geom/flat/interpolate.d.ts @@ -6,8 +6,8 @@ export function interpolatePoint( end: number, stride: number, fraction: number, - opt_dest?: number[], - opt_dimension?: number, + dest?: number[], + dimension?: number, ): number[]; export function lineStringCoordinateAtM( flatCoordinates: number[], diff --git a/@types/ol/geom/flat/orient.d.ts b/@types/ol/geom/flat/orient.d.ts index e0d7d0c1..794030d1 100644 --- a/@types/ol/geom/flat/orient.d.ts +++ b/@types/ol/geom/flat/orient.d.ts @@ -11,50 +11,50 @@ export function linearRingIsClockwise(flatCoordinates: number[], offset: number, /** * Determines if linear rings are oriented. By default, left-hand orientation * is tested (first ring must be clockwise, remaining rings counter-clockwise). - * To test for right-hand orientation, use the opt_right argument. + * To test for right-hand orientation, use the right argument. */ export function linearRingsAreOriented( flatCoordinates: number[], offset: number, ends: number[], stride: number, - opt_right?: boolean, + right?: boolean, ): boolean; /** * Determines if linear rings are oriented. By default, left-hand orientation * is tested (first ring must be clockwise, remaining rings counter-clockwise). - * To test for right-hand orientation, use the opt_right argument. + * To test for right-hand orientation, use the right argument. */ export function linearRingssAreOriented( flatCoordinates: number[], offset: number, endss: number[][], stride: number, - opt_right?: boolean, + right?: boolean, ): boolean; /** * Orient coordinates in a flat array of linear rings. By default, rings * are oriented following the left-hand rule (clockwise for exterior and * counter-clockwise for interior rings). To orient according to the - * right-hand rule, use the opt_right argument. + * right-hand rule, use the right argument. */ export function orientLinearRings( flatCoordinates: number[], offset: number, ends: number[], stride: number, - opt_right?: boolean, + right?: boolean, ): number; /** * Orient coordinates in a flat array of linear rings. By default, rings * are oriented following the left-hand rule (clockwise for exterior and * counter-clockwise for interior rings). To orient according to the - * right-hand rule, use the opt_right argument. + * right-hand rule, use the right argument. */ export function orientLinearRingsArray( flatCoordinates: number[], offset: number, endss: number[][], stride: number, - opt_right?: boolean, + right?: boolean, ): number; diff --git a/@types/ol/geom/flat/simplify.d.ts b/@types/ol/geom/flat/simplify.d.ts index 0a746c42..787ecb02 100644 --- a/@types/ol/geom/flat/simplify.d.ts +++ b/@types/ol/geom/flat/simplify.d.ts @@ -82,6 +82,6 @@ export function simplifyLineString( stride: number, squaredTolerance: number, highQuality: boolean, - opt_simplifiedFlatCoordinates?: number[], + simplifiedFlatCoordinates?: number[], ): number[]; export function snap(value: number, tolerance: number): number; diff --git a/@types/ol/geom/flat/transform.d.ts b/@types/ol/geom/flat/transform.d.ts index d9ccbc6c..9671c320 100644 --- a/@types/ol/geom/flat/transform.d.ts +++ b/@types/ol/geom/flat/transform.d.ts @@ -7,7 +7,7 @@ export function rotate( stride: number, angle: number, anchor: number[], - opt_dest?: number[], + dest?: number[], ): number[]; /** * Scale the coordinates. @@ -20,7 +20,7 @@ export function scale( sx: number, sy: number, anchor: number[], - opt_dest?: number[], + dest?: number[], ): number[]; export function transform2D( flatCoordinates: number[], @@ -28,7 +28,7 @@ export function transform2D( end: number, stride: number, transform: Transform, - opt_dest?: number[], + dest?: number[], ): number[]; export function translate( flatCoordinates: number[], @@ -37,5 +37,5 @@ export function translate( stride: number, deltaX: number, deltaY: number, - opt_dest?: number[], + dest?: number[], ): number[]; diff --git a/@types/ol/index.d.ts b/@types/ol/index.d.ts index 01dc6cc2..2f9427d1 100644 --- a/@types/ol/index.d.ts +++ b/@types/ol/index.d.ts @@ -16,7 +16,6 @@ export { default as MapEvent } from './MapEvent'; export { default as Object } from './Object'; export { default as Observable } from './Observable'; export { default as Overlay } from './Overlay'; -export { default as PluggableMap } from './PluggableMap'; export { default as Tile } from './Tile'; export { default as TileCache } from './TileCache'; export { default as TileQueue } from './TileQueue'; diff --git a/@types/ol/interaction.d.ts b/@types/ol/interaction.d.ts index fa7963ec..36944e0b 100644 --- a/@types/ol/interaction.d.ts +++ b/@types/ol/interaction.d.ts @@ -1,6 +1,3 @@ -import Collection from './Collection'; -import Interaction from './interaction/Interaction'; - export { default as DoubleClickZoom } from './interaction/DoubleClickZoom'; export { default as DragAndDrop } from './interaction/DragAndDrop'; export { default as DragBox } from './interaction/DragBox'; @@ -13,6 +10,7 @@ export { default as Extent } from './interaction/Extent'; export { default as Interaction } from './interaction/Interaction'; export { default as KeyboardPan } from './interaction/KeyboardPan'; export { default as KeyboardZoom } from './interaction/KeyboardZoom'; +export { default as Link } from './interaction/Link'; export { default as Modify } from './interaction/Modify'; export { default as MouseWheelZoom } from './interaction/MouseWheelZoom'; export { default as PinchRotate } from './interaction/PinchRotate'; @@ -21,40 +19,4 @@ export { default as Pointer } from './interaction/Pointer'; export { default as Select } from './interaction/Select'; export { default as Snap } from './interaction/Snap'; export { default as Translate } from './interaction/Translate'; - -export interface DefaultsOptions { - altShiftDragRotate?: boolean | undefined; - onFocusOnly?: boolean | undefined; - doubleClickZoom?: boolean | undefined; - keyboard?: boolean | undefined; - mouseWheelZoom?: boolean | undefined; - shiftDragZoom?: boolean | undefined; - dragPan?: boolean | undefined; - pinchRotate?: boolean | undefined; - pinchZoom?: boolean | undefined; - zoomDelta?: number | undefined; - zoomDuration?: number | undefined; -} -/** - * Set of interactions included in maps by default. Specific interactions can be - * excluded by setting the appropriate option to false in the constructor - * options, but the order of the interactions is fixed. If you want to specify - * a different order for interactions, you will need to create your own - * {@link module:ol/interaction/Interaction~Interaction} instances and insert - * them into a {@link module:ol/Collection~Collection} in the order you want - * before creating your {@link module:ol/Map~Map} instance. Changing the order can - * be of interest if the event propagation needs to be stopped at a point. - * The default set of interactions, in sequence, is: - * - * {@link module:ol/interaction/DragRotate~DragRotate} - * {@link module:ol/interaction/DoubleClickZoom~DoubleClickZoom} - * {@link module:ol/interaction/DragPan~DragPan} - * {@link module:ol/interaction/PinchRotate~PinchRotate} - * {@link module:ol/interaction/PinchZoom~PinchZoom} - * {@link module:ol/interaction/KeyboardPan~KeyboardPan} - * {@link module:ol/interaction/KeyboardZoom~KeyboardZoom} - * {@link module:ol/interaction/MouseWheelZoom~MouseWheelZoom} - * {@link module:ol/interaction/DragZoom~DragZoom} - * - */ -export function defaults(opt_options?: DefaultsOptions): Collection; +export { defaults } from './interaction/defaults'; diff --git a/@types/ol/interaction/DoubleClickZoom.d.ts b/@types/ol/interaction/DoubleClickZoom.d.ts index 29c1f0b9..c214686b 100644 --- a/@types/ol/interaction/DoubleClickZoom.d.ts +++ b/@types/ol/interaction/DoubleClickZoom.d.ts @@ -11,7 +11,7 @@ export interface Options { delta?: number | undefined; } export default class DoubleClickZoom extends Interaction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Handles the {@link module:ol/MapBrowserEvent~MapBrowserEvent map browser event} (if it was a * doubleclick) and eventually zooms the map. diff --git a/@types/ol/interaction/DragAndDrop.d.ts b/@types/ol/interaction/DragAndDrop.d.ts index eb342e7a..b7e48e5d 100644 --- a/@types/ol/interaction/DragAndDrop.d.ts +++ b/@types/ol/interaction/DragAndDrop.d.ts @@ -1,6 +1,6 @@ import Feature, { FeatureLike } from '../Feature'; +import Map from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import FeatureFormat from '../format/Feature'; @@ -23,7 +23,7 @@ declare enum DragAndDropEventType { ADD_FEATURES = 'addfeatures', } export default class DragAndDrop extends Interaction { - constructor(opt_options?: Options); + constructor(options?: Options); handleDrop(event: DragEvent): void; handleStop(event: DragEvent): void; /** @@ -35,7 +35,7 @@ export default class DragAndDrop extends Interaction { * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap): void; + setMap(map: Map): void; on(type: TDragAndDropDragAndDropEventTypes, listener: ListenerFunction): EventsKey; on(type: TDragAndDropDragAndDropEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TDragAndDropDragAndDropEventTypes, listener: ListenerFunction): EventsKey; @@ -59,12 +59,7 @@ export default class DragAndDrop extends Interaction { ): void; } export class DragAndDropEvent extends BaseEvent { - constructor( - type: DragAndDropEventType, - file: File, - opt_features?: Feature[], - opt_projection?: Projection, - ); + constructor(type: DragAndDropEventType, file: File, features?: Feature[], projection?: Projection); /** * The features parsed from dropped data. */ diff --git a/@types/ol/interaction/DragBox.d.ts b/@types/ol/interaction/DragBox.d.ts index fba8e5b5..0f68b3d9 100644 --- a/@types/ol/interaction/DragBox.d.ts +++ b/@types/ol/interaction/DragBox.d.ts @@ -25,7 +25,7 @@ export interface Options { onBoxEnd?: ((this: DragBox, p0: MapBrowserEvent) => void) | undefined; } export default class DragBox extends PointerInteraction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * The default condition for determining whether the boxend event * should fire. diff --git a/@types/ol/interaction/DragPan.d.ts b/@types/ol/interaction/DragPan.d.ts index bdb1a21b..708ff098 100644 --- a/@types/ol/interaction/DragPan.d.ts +++ b/@types/ol/interaction/DragPan.d.ts @@ -14,7 +14,7 @@ export interface Options { kinetic?: Kinetic | undefined; } export default class DragPan extends PointerInteraction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Handle pointer down events. */ diff --git a/@types/ol/interaction/DragRotate.d.ts b/@types/ol/interaction/DragRotate.d.ts index 642072f0..07d316ce 100644 --- a/@types/ol/interaction/DragRotate.d.ts +++ b/@types/ol/interaction/DragRotate.d.ts @@ -12,7 +12,7 @@ export interface Options { duration?: number | undefined; } export default class DragRotate extends PointerInteraction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Handle pointer down events. */ diff --git a/@types/ol/interaction/DragRotateAndZoom.d.ts b/@types/ol/interaction/DragRotateAndZoom.d.ts index 1423d0f0..51620dae 100644 --- a/@types/ol/interaction/DragRotateAndZoom.d.ts +++ b/@types/ol/interaction/DragRotateAndZoom.d.ts @@ -12,7 +12,7 @@ export interface Options { duration?: number | undefined; } export default class DragRotateAndZoom extends PointerInteraction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Handle pointer down events. */ diff --git a/@types/ol/interaction/DragZoom.d.ts b/@types/ol/interaction/DragZoom.d.ts index f58081b8..81d0e694 100644 --- a/@types/ol/interaction/DragZoom.d.ts +++ b/@types/ol/interaction/DragZoom.d.ts @@ -16,7 +16,7 @@ export interface Options { minArea?: number | undefined; } export default class DragZoom extends DragBox { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Function to execute just before onboxend is fired */ diff --git a/@types/ol/interaction/Draw.d.ts b/@types/ol/interaction/Draw.d.ts index e8baf1df..7c359d3e 100644 --- a/@types/ol/interaction/Draw.d.ts +++ b/@types/ol/interaction/Draw.d.ts @@ -1,20 +1,21 @@ import Collection from '../Collection'; import Feature from '../Feature'; +import Map from '../Map'; import MapBrowserEvent from '../MapBrowserEvent'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Condition } from '../events/condition'; -import Geometry, { Type } from '../geom/Geometry'; -import GeometryLayout from '../geom/GeometryLayout'; +import Geometry, { GeometryLayout, Type } from '../geom/Geometry'; import LineString from '../geom/LineString'; import SimpleGeometry from '../geom/SimpleGeometry'; import VectorLayer from '../layer/Vector'; +import { Pixel } from '../pixel'; import Projection from '../proj/Projection'; import VectorSource from '../source/Vector'; import { StyleLike } from '../style/Style'; +import { FlatStyleLike } from '../style/flat'; import PointerInteraction from './Pointer'; export type TDrawBaseEventTypes = 'change' | 'error'; @@ -31,6 +32,11 @@ export type GeometryFunction = (p0: SketchCoordType, p1: SimpleGeometry, p2: Pro * Coordinate type when drawing lines. */ export type LineCoordType = Coordinate[]; +/** + * Draw mode. This collapses multi-part geometry types with their single-part + * cousins. + */ +export type Mode = 'Point' | 'LineString' | 'Polygon' | 'Circle'; export interface Options { type: Type; clickTolerance?: number | undefined; @@ -42,12 +48,14 @@ export interface Options { maxPoints?: number | undefined; minPoints?: number | undefined; finishCondition?: Condition | undefined; - style?: StyleLike | undefined; + style?: StyleLike | FlatStyleLike | undefined; geometryFunction?: GeometryFunction | undefined; geometryName?: string | undefined; condition?: Condition | undefined; freehand?: boolean | undefined; freehandCondition?: Condition | undefined; + trace?: boolean | Condition | undefined; + traceSource?: VectorSource | undefined; wrapX?: boolean | undefined; geometryLayout?: GeometryLayout | undefined; } @@ -55,6 +63,10 @@ export interface Options { * Coordinate type when drawing points. */ export type PointCoordType = Coordinate; +export interface PointSegmentRelationship { + along: number; + squaredDistance: number; +} /** * Coordinate type when drawing polygons. */ @@ -63,6 +75,22 @@ export type PolyCoordType = Coordinate[][]; * Types used for drawing coordinates. */ export type SketchCoordType = PointCoordType | LineCoordType | PolyCoordType; +export interface TraceState { + active: boolean; + startPx?: Pixel | undefined; + targets?: TraceTarget[] | undefined; + targetIndex?: number | undefined; +} +export interface TraceTarget { + coordinates: Coordinate[]; + ring: boolean; + startIndex: number; + endIndex: number; +} +export interface TraceTargetUpdateInfo { + index: number; + endIndex: number; +} declare enum DrawEventType { DRAWSTART = 'drawstart', DRAWEND = 'drawend', @@ -117,12 +145,17 @@ export default class Draw extends PointerInteraction { * drawing POINT or MULTI_POINT geometries. */ removeLastPoint(): void; + removeLastPoints_(n: number): void; /** * Remove the interaction from its current map and attach it to the new map. * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap): void; + setMap(map: Map): void; + /** + * Toggle tracing mode or set a tracing condition. + */ + setTrace(trace: boolean | Condition): void; on(type: TDrawBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TDrawBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TDrawBaseEventTypes, listener: ListenerFunction): EventsKey; @@ -157,4 +190,4 @@ export function createBox(): GeometryFunction; * polygon with a user specified number of sides and start angle instead of a * {@link module:ol/geom/Circle~Circle} geometry. */ -export function createRegularPolygon(opt_sides?: number, opt_angle?: number): GeometryFunction; +export function createRegularPolygon(sides?: number, angle?: number): GeometryFunction; diff --git a/@types/ol/interaction/Extent.d.ts b/@types/ol/interaction/Extent.d.ts index 6d5ce416..9fbca32b 100644 --- a/@types/ol/interaction/Extent.d.ts +++ b/@types/ol/interaction/Extent.d.ts @@ -1,6 +1,6 @@ +import Map from '../Map'; import MapBrowserEvent from '../MapBrowserEvent'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Condition } from '../events/condition'; @@ -20,7 +20,7 @@ export interface Options { wrapX?: boolean | undefined; } export default class Extent extends PointerInteraction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Returns the current drawn extent in the view projection (or user projection if set) */ @@ -51,7 +51,7 @@ export default class Extent extends PointerInteraction { * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap): void; + setMap(map: Map): void; on(type: TExtentBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TExtentBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TExtentBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/interaction/Interaction.d.ts b/@types/ol/interaction/Interaction.d.ts index b91e8d91..06f08aa1 100644 --- a/@types/ol/interaction/Interaction.d.ts +++ b/@types/ol/interaction/Interaction.d.ts @@ -1,6 +1,6 @@ +import Map from '../Map'; import MapBrowserEvent from '../MapBrowserEvent'; import BaseObject, { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import View from '../View'; import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; @@ -15,7 +15,7 @@ export interface InteractionOptions { handleEvent: (p0: MapBrowserEvent) => boolean; } export default class Interaction extends BaseObject { - constructor(opt_options?: InteractionOptions); + constructor(options?: InteractionOptions); /** * Return whether the interaction is currently active. */ @@ -23,7 +23,7 @@ export default class Interaction extends BaseObject { /** * Get the map associated with this interaction. */ - getMap(): PluggableMap | null; + getMap(): Map | null; /** * Handles the {@link module:ol/MapBrowserEvent~MapBrowserEvent map browser event}. */ @@ -37,7 +37,7 @@ export default class Interaction extends BaseObject { * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; on(type: TInteractionBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TInteractionBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TInteractionBaseEventTypes, listener: ListenerFunction): EventsKey; @@ -52,5 +52,5 @@ export default class Interaction extends BaseObject { listener: ListenerFunction, ): void; } -export function pan(view: View, delta: Coordinate, opt_duration?: number): void; -export function zoomByDelta(view: View, delta: number, opt_anchor?: Coordinate, opt_duration?: number): void; +export function pan(view: View, delta: Coordinate, duration?: number): void; +export function zoomByDelta(view: View, delta: number, anchor?: Coordinate, duration?: number): void; diff --git a/@types/ol/interaction/KeyboardPan.d.ts b/@types/ol/interaction/KeyboardPan.d.ts index e6189aab..964a34c2 100644 --- a/@types/ol/interaction/KeyboardPan.d.ts +++ b/@types/ol/interaction/KeyboardPan.d.ts @@ -13,7 +13,7 @@ export interface Options { pixelDelta?: number | undefined; } export default class KeyboardPan extends Interaction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Handles the {@link module:ol/MapBrowserEvent~MapBrowserEvent map browser event} if it was a * KeyEvent, and decides the direction to pan to (if an arrow key was diff --git a/@types/ol/interaction/KeyboardZoom.d.ts b/@types/ol/interaction/KeyboardZoom.d.ts index b2f9f490..9bc88d75 100644 --- a/@types/ol/interaction/KeyboardZoom.d.ts +++ b/@types/ol/interaction/KeyboardZoom.d.ts @@ -13,7 +13,7 @@ export interface Options { delta?: number | undefined; } export default class KeyboardZoom extends Interaction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Handles the {@link module:ol/MapBrowserEvent~MapBrowserEvent map browser event} if it was a * KeyEvent, and decides whether to zoom in or out (depending on whether the diff --git a/@types/ol/interaction/Link.d.ts b/@types/ol/interaction/Link.d.ts index 8d4d683e..de15900e 100644 --- a/@types/ol/interaction/Link.d.ts +++ b/@types/ol/interaction/Link.d.ts @@ -1,5 +1,5 @@ +import Map from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { AnimationOptions } from '../View'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; @@ -13,8 +13,8 @@ export interface Options { prefix?: string | undefined; } export default class Link extends Interaction { - constructor(opt_options?: Options); - setMap(map: PluggableMap | null): void; + constructor(options?: Options); + setMap(map: Map | null): void; on(type: TLinkBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TLinkBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TLinkBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/interaction/Modify.d.ts b/@types/ol/interaction/Modify.d.ts index 55b501c3..30c91343 100644 --- a/@types/ol/interaction/Modify.d.ts +++ b/@types/ol/interaction/Modify.d.ts @@ -1,8 +1,8 @@ import Collection from '../Collection'; import Feature, { FeatureLike } from '../Feature'; +import Map from '../Map'; import MapBrowserEvent from '../MapBrowserEvent'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Condition } from '../events/condition'; @@ -17,6 +17,7 @@ import WebGLPointsLayerRenderer from '../renderer/webgl/PointsLayer'; import VectorSource from '../source/Vector'; import VectorTile from '../source/VectorTile'; import { StyleLike } from '../style/Style'; +import { FlatStyleLike } from '../style/flat'; import PointerInteraction from './Pointer'; export type TModifyBaseEventTypes = 'change' | 'error'; @@ -27,7 +28,7 @@ export interface Options { deleteCondition?: Condition | undefined; insertVertexCondition?: Condition | undefined; pixelTolerance?: number | undefined; - style?: StyleLike | undefined; + style?: StyleLike | FlatStyleLike | undefined; source?: VectorSource | undefined; hitDetection?: | boolean @@ -90,7 +91,7 @@ export default class Modify extends PointerInteraction { * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap): void; + setMap(map: Map): void; on(type: TModifyBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TModifyBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TModifyBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/interaction/MouseWheelZoom.d.ts b/@types/ol/interaction/MouseWheelZoom.d.ts index 9f17ef67..a7deb4f4 100644 --- a/@types/ol/interaction/MouseWheelZoom.d.ts +++ b/@types/ol/interaction/MouseWheelZoom.d.ts @@ -7,6 +7,7 @@ import Interaction from './Interaction'; export type TMouseWheelZoomBaseEventTypes = 'change' | 'error'; export type TMouseWheelZoomObjectEventTypes = 'change:active' | 'propertychange'; +export type Mode = 'trackpad' | 'wheel'; export interface Options { condition?: Condition | undefined; onFocusOnly?: boolean | undefined; @@ -16,12 +17,8 @@ export interface Options { useAnchor?: boolean | undefined; constrainResolution?: boolean | undefined; } -export enum Mode { - TRACKPAD = 'trackpad', - WHEEL = 'wheel', -} export default class MouseWheelZoom extends Interaction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Handles the {@link module:ol/MapBrowserEvent~MapBrowserEvent map browser event} (if it was a mousewheel-event) and eventually * zooms the map. diff --git a/@types/ol/interaction/PinchRotate.d.ts b/@types/ol/interaction/PinchRotate.d.ts index 52b603d3..9546fdf9 100644 --- a/@types/ol/interaction/PinchRotate.d.ts +++ b/@types/ol/interaction/PinchRotate.d.ts @@ -11,7 +11,7 @@ export interface Options { threshold?: number | undefined; } export default class PinchRotate extends PointerInteraction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Handle pointer down events. */ diff --git a/@types/ol/interaction/PinchZoom.d.ts b/@types/ol/interaction/PinchZoom.d.ts index 5126af62..058de7ef 100644 --- a/@types/ol/interaction/PinchZoom.d.ts +++ b/@types/ol/interaction/PinchZoom.d.ts @@ -10,7 +10,7 @@ export interface Options { duration?: number | undefined; } export default class PinchZoom extends PointerInteraction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Handle pointer down events. */ diff --git a/@types/ol/interaction/Pointer.d.ts b/@types/ol/interaction/Pointer.d.ts index 79240e6c..6abc33f8 100644 --- a/@types/ol/interaction/Pointer.d.ts +++ b/@types/ol/interaction/Pointer.d.ts @@ -16,7 +16,7 @@ export interface Options { stopDown?: ((p0: boolean) => boolean) | undefined; } export default class PointerInteraction extends Interaction { - constructor(opt_options?: Options); + constructor(options?: Options); protected handlingDownUpSequence: boolean; protected targetPointers: PointerEvent[]; /** diff --git a/@types/ol/interaction/Select.d.ts b/@types/ol/interaction/Select.d.ts index a04538ae..023d87d3 100644 --- a/@types/ol/interaction/Select.d.ts +++ b/@types/ol/interaction/Select.d.ts @@ -1,8 +1,8 @@ import Collection from '../Collection'; -import Feature, { FeatureLike } from '../Feature'; +import Feature from '../Feature'; +import Map from '../Map'; import MapBrowserEvent from '../MapBrowserEvent'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Condition } from '../events/condition'; @@ -19,12 +19,10 @@ export type TSelectBaseEventTypes = 'change' | 'error'; export type TSelectObjectEventTypes = 'change:active' | 'propertychange'; export type TSelectSelectEventTypes = 'select'; /** - * A function that takes an {@link module:ol/Feature~Feature} or - * {@link module:ol/render/Feature~RenderFeature} and an - * {@link module:ol/layer/Layer~Layer} and returns true if the feature may be + * A function that takes an {@link module:ol/Feature~Feature} and returns true if the feature may be * selected or false otherwise. */ -export type FilterFunction = (p0: FeatureLike, p1: Layer) => boolean; +export type FilterFunction = (p0: Feature, p1: Layer) => boolean; export interface Options { addCondition?: Condition | undefined; condition?: Condition | undefined; @@ -41,7 +39,7 @@ declare enum SelectEventType { SELECT = 'select', } export default class Select extends Interaction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Get the selected features. */ @@ -54,7 +52,7 @@ export default class Select extends Interaction { * Returns the associated {@link module:ol/layer/Vector~VectorLayer vector layer} of * a selected feature. */ - getLayer(feature: FeatureLike): VectorLayer>; + getLayer(feature: Feature): VectorLayer>; getStyle(): StyleLike | null; /** * Handles the {@link module:ol/MapBrowserEvent~MapBrowserEvent map browser event} and may change the @@ -70,7 +68,7 @@ export default class Select extends Interaction { * Remove the interaction from its current map, if any, and attach it to a new * map, if any. Pass null to just remove the interaction from the current map. */ - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; on(type: TSelectBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TSelectBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TSelectBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/interaction/Snap.d.ts b/@types/ol/interaction/Snap.d.ts index 9fe80c20..79518a9c 100644 --- a/@types/ol/interaction/Snap.d.ts +++ b/@types/ol/interaction/Snap.d.ts @@ -1,8 +1,8 @@ import Collection from '../Collection'; import Feature from '../Feature'; +import Map from '../Map'; import MapBrowserEvent from '../MapBrowserEvent'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; @@ -29,11 +29,11 @@ export interface SegmentData { segment: Coordinate[]; } export default class Snap extends PointerInteraction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Add a feature to the collection of features that we may snap to. */ - addFeature(feature: Feature, opt_listen?: boolean): void; + addFeature(feature: Feature, register?: boolean): void; handleEvent(evt: MapBrowserEvent): boolean; /** * Handle pointer up events. @@ -42,14 +42,14 @@ export default class Snap extends PointerInteraction { /** * Remove a feature from the collection of features that we may snap to. */ - removeFeature(feature: Feature, opt_unlisten?: boolean): void; + removeFeature(feature: Feature, unlisten?: boolean): void; /** * Remove the interaction from its current map and attach it to the new map. * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap): void; - snapTo(pixel: Pixel, pixelCoordinate: Coordinate, map: PluggableMap): Result | null; + setMap(map: Map): void; + snapTo(pixel: Pixel, pixelCoordinate: Coordinate, map: Map): Result | null; on(type: TSnapBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TSnapBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TSnapBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/interaction/Translate.d.ts b/@types/ol/interaction/Translate.d.ts index 28e0a5bf..46cc8cad 100644 --- a/@types/ol/interaction/Translate.d.ts +++ b/@types/ol/interaction/Translate.d.ts @@ -1,8 +1,8 @@ import Collection from '../Collection'; import Feature, { FeatureLike } from '../Feature'; +import Map from '../Map'; import MapBrowserEvent from '../MapBrowserEvent'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { Coordinate } from '../coordinate'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; @@ -36,7 +36,7 @@ declare enum TranslateEventType { TRANSLATEEND = 'translateend', } export default class Translate extends PointerInteraction { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Returns the Hit-detection tolerance. */ @@ -67,7 +67,7 @@ export default class Translate extends PointerInteraction { * Subclasses may set up event handlers to get notified about changes to * the map here. */ - setMap(map: PluggableMap): void; + setMap(map: Map): void; on(type: TTranslateBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TTranslateBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TTranslateBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/interaction/defaults.d.ts b/@types/ol/interaction/defaults.d.ts new file mode 100644 index 00000000..834a9d0a --- /dev/null +++ b/@types/ol/interaction/defaults.d.ts @@ -0,0 +1,39 @@ +import Collection from '../Collection'; +import Interaction from './Interaction'; + +export interface DefaultsOptions { + altShiftDragRotate?: boolean | undefined; + onFocusOnly?: boolean | undefined; + doubleClickZoom?: boolean | undefined; + keyboard?: boolean | undefined; + mouseWheelZoom?: boolean | undefined; + shiftDragZoom?: boolean | undefined; + dragPan?: boolean | undefined; + pinchRotate?: boolean | undefined; + pinchZoom?: boolean | undefined; + zoomDelta?: number | undefined; + zoomDuration?: number | undefined; +} +/** + * Set of interactions included in maps by default. Specific interactions can be + * excluded by setting the appropriate option to false in the constructor + * options, but the order of the interactions is fixed. If you want to specify + * a different order for interactions, you will need to create your own + * {@link module:ol/interaction/Interaction~Interaction} instances and insert + * them into a {@link module:ol/Collection~Collection} in the order you want + * before creating your {@link module:ol/Map~Map} instance. Changing the order can + * be of interest if the event propagation needs to be stopped at a point. + * The default set of interactions, in sequence, is: + * + * {@link module:ol/interaction/DragRotate~DragRotate} + * {@link module:ol/interaction/DoubleClickZoom~DoubleClickZoom} + * {@link module:ol/interaction/DragPan~DragPan} + * {@link module:ol/interaction/PinchRotate~PinchRotate} + * {@link module:ol/interaction/PinchZoom~PinchZoom} + * {@link module:ol/interaction/KeyboardPan~KeyboardPan} + * {@link module:ol/interaction/KeyboardZoom~KeyboardZoom} + * {@link module:ol/interaction/MouseWheelZoom~MouseWheelZoom} + * {@link module:ol/interaction/DragZoom~DragZoom} + * + */ +export function defaults(options?: DefaultsOptions): Collection; diff --git a/@types/ol/layer/Base.d.ts b/@types/ol/layer/Base.d.ts index 507d43bc..333c374f 100644 --- a/@types/ol/layer/Base.d.ts +++ b/@types/ol/layer/Base.d.ts @@ -61,13 +61,13 @@ export default class BaseLayer extends BaseObject { * will be visible regardless of extent. */ getExtent(): Extent | undefined; - getLayersArray(opt_array?: Layer[]): Layer[]; + getLayersArray(array?: Layer[]): Layer[]; /** * This method is not meant to be called by layers or layer renderers because the state * is incorrect if the layer is included in a layer group. */ - getLayerState(opt_managed?: boolean): State; - getLayerStatesArray(opt_states?: State[]): State[]; + getLayerState(managed?: boolean): State; + getLayerStatesArray(states?: State[]): State[]; /** * Return the maximum resolution of the layer. */ @@ -101,7 +101,7 @@ export default class BaseLayer extends BaseObject { /** * Sets the background color. */ - setBackground(opt_background?: BackgroundColor): void; + setBackground(background?: BackgroundColor): void; /** * Set the extent at which the layer is visible. If undefined, the layer * will be visible at all extents. diff --git a/@types/ol/layer/BaseImage.d.ts b/@types/ol/layer/BaseImage.d.ts index b4cf240b..42cda8e4 100644 --- a/@types/ol/layer/BaseImage.d.ts +++ b/@types/ol/layer/BaseImage.d.ts @@ -1,5 +1,5 @@ +import Map from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; @@ -31,7 +31,7 @@ export interface Options { maxResolution?: number | undefined; minZoom?: number | undefined; maxZoom?: number | undefined; - map?: PluggableMap | undefined; + map?: Map | undefined; source?: ImageSourceType | undefined; properties?: Record | undefined; } @@ -39,7 +39,7 @@ export default class BaseImageLayer< ImageSourceType extends ImageSource = ImageSource, RendererType extends LayerRenderer = LayerRenderer, > extends Layer { - constructor(opt_options?: Options); + constructor(options?: Options); on(type: TBaseImageLayerBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TBaseImageLayerBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TBaseImageLayerBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/layer/BaseTile.d.ts b/@types/ol/layer/BaseTile.d.ts index ba6b05bf..c0560b53 100644 --- a/@types/ol/layer/BaseTile.d.ts +++ b/@types/ol/layer/BaseTile.d.ts @@ -1,5 +1,5 @@ +import Map from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; @@ -36,7 +36,7 @@ export interface Options { maxZoom?: number | undefined; preload?: number | undefined; source?: TileSourceType | undefined; - map?: PluggableMap | undefined; + map?: Map | undefined; useInterimTilesOnError?: boolean | undefined; properties?: Record | undefined; } @@ -44,7 +44,7 @@ export default class BaseTileLayer< TileSourceType extends TileSource = TileSource, RendererType extends LayerRenderer = LayerRenderer, > extends Layer { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Get data for a pixel location. The return type depends on the source data. For image tiles, * a four element RGBA array will be returned. For data tiles, the array length will match the diff --git a/@types/ol/layer/BaseVector.d.ts b/@types/ol/layer/BaseVector.d.ts index 142fdefb..2458f3c8 100644 --- a/@types/ol/layer/BaseVector.d.ts +++ b/@types/ol/layer/BaseVector.d.ts @@ -1,6 +1,6 @@ import Feature from '../Feature'; +import Map, { FrameState } from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap, { FrameState } from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; @@ -15,6 +15,7 @@ import WebGLPointsLayerRenderer from '../renderer/webgl/PointsLayer'; import VectorSource from '../source/Vector'; import VectorTile from '../source/VectorTile'; import { StyleFunction, StyleLike } from '../style/Style'; +import { FlatStyleLike } from '../style/flat'; import { BackgroundColor } from './Base'; import Layer from './Layer'; @@ -44,9 +45,9 @@ export interface Options extends Layer { - constructor(opt_options?: Options); + constructor(options?: Options); getDeclutter(): boolean; /** * Get the topmost feature that intersects the given pixel on the viewport. Returns a promise * that resolves with an array of features. The array will either contain the topmost feature * when a hit was detected, or it will be empty. * The hit detection algorithm used for this method is optimized for performance, but is less - * accurate than the one used in {@link module:ol/PluggableMap~PluggableMap#getFeaturesAtPixel}: Text - * is not considered, and icons are only represented by their bounding box instead of the exact + * accurate than the one used in [map.getFeaturesAtPixel()]{@link module:ol/Map~Map#getFeaturesAtPixel}. + * Text is not considered, and icons are only represented by their bounding box instead of the exact * image. */ getFeatures(pixel: Pixel): Promise[]>; @@ -100,9 +101,12 @@ export default class BaseVectorLayer< * an array of styles. If set to null, the layer has no style (a null style), * so only features that have their own styles will be rendered in the layer. Call * setStyle() without arguments to reset to the default style. See - * {@link module:ol/style/Style~Style} for information on the default style. + * [the ol/style/Style module]{@link module:ol/style/Style~Style} for information on the default style. + * If your layer has a static style, you can use "flat" style object literals instead of + * using the Style and symbolizer constructors (Fill, Stroke, etc.). See the documentation + * for the [flat style types]{@link module:ol/style/flat~FlatStyle} to see what properties are supported. */ - setStyle(opt_style?: StyleLike | null): void; + setStyle(style?: StyleLike | FlatStyleLike | null): void; on(type: TBaseVectorLayerBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TBaseVectorLayerBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TBaseVectorLayerBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/layer/Graticule.d.ts b/@types/ol/layer/Graticule.d.ts index f53c7776..ddbe1c29 100644 --- a/@types/ol/layer/Graticule.d.ts +++ b/@types/ol/layer/Graticule.d.ts @@ -53,7 +53,7 @@ export interface Options { properties?: Record | undefined; } export default class Graticule extends VectorLayer { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Get the list of meridians. Meridians are lines of equal longitude. */ diff --git a/@types/ol/layer/Group.d.ts b/@types/ol/layer/Group.d.ts index 9ae957b9..e81e52f8 100644 --- a/@types/ol/layer/Group.d.ts +++ b/@types/ol/layer/Group.d.ts @@ -41,20 +41,20 @@ export class GroupEvent extends BaseEvent { layer: BaseLayer; } export default class LayerGroup extends BaseLayer { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Returns the {@link module:ol/Collection~Collection collection} of {@link module:ol/layer/Layer~Layer layers} * in this group. */ getLayers(): Collection; - getLayersArray(opt_array?: Layer[]): Layer[]; + getLayersArray(array?: Layer[]): Layer[]; /** * Get the layer states list and use this groups z-index as the default * for all layers in this and nested groups, if it is unset at this point. - * If opt_states is not provided and this group's z-index is undefined + * If dest is not provided and this group's z-index is undefined * 0 is used a the default z-index. */ - getLayerStatesArray(opt_states?: State[]): State[]; + getLayerStatesArray(dest?: State[]): State[]; getSourceState(): State_1; handleLayerGroupAdd_(event: GroupEvent): void; handleLayerGroupRemove_(event: GroupEvent): void; diff --git a/@types/ol/layer/Heatmap.d.ts b/@types/ol/layer/Heatmap.d.ts index 04bf3ac1..97ae708e 100644 --- a/@types/ol/layer/Heatmap.d.ts +++ b/@types/ol/layer/Heatmap.d.ts @@ -44,7 +44,7 @@ export interface Options { properties?: Record | undefined; } export default class Heatmap extends BaseVectorLayer { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Return the blur size in pixels. */ diff --git a/@types/ol/layer/Image.d.ts b/@types/ol/layer/Image.d.ts index 0e55f5d9..1a471e6e 100644 --- a/@types/ol/layer/Image.d.ts +++ b/@types/ol/layer/Image.d.ts @@ -24,7 +24,7 @@ export default class ImageLayer { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Get data for a pixel location. A four element RGBA array will be returned. For requests outside the * layer extent, null will be returned. Data for an image can only be retrieved if the diff --git a/@types/ol/layer/Layer.d.ts b/@types/ol/layer/Layer.d.ts index 6c3468a3..b14a799a 100644 --- a/@types/ol/layer/Layer.d.ts +++ b/@types/ol/layer/Layer.d.ts @@ -1,6 +1,6 @@ import Feature from '../Feature'; +import Map, { FrameState } from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap, { FrameState } from '../PluggableMap'; import { State as State_2 } from '../View'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; @@ -36,7 +36,7 @@ export interface Options { minZoom?: number | undefined; maxZoom?: number | undefined; source?: SourceType | undefined; - map?: PluggableMap | null | undefined; + map?: Map | null | undefined; render?: RenderFunction | undefined; properties?: Record | undefined; } @@ -69,12 +69,12 @@ export default class Layer< disposeInternal(): void; getData(pixel: Pixel): Uint8ClampedArray | Uint8Array | Float32Array | DataView | null; getFeatures(pixel: Pixel): Promise[]>; - getLayersArray(opt_array?: Layer[]): Layer[]; - getLayerStatesArray(opt_states?: State[]): State[]; + getLayersArray(array?: Layer[]): Layer[]; + getLayerStatesArray(states?: State[]): State[]; /** * For use inside the library only. */ - getMapInternal(): PluggableMap | null; + getMapInternal(): Map | null; /** * Get the renderer for this layer. */ @@ -93,18 +93,17 @@ export default class Layer< render(frameState: FrameState, target: HTMLElement): HTMLElement; /** * Sets the layer to be rendered on top of other layers on a map. The map will - * not manage this layer in its layers collection, and the callback in - * {@link module:ol/Map~Map#forEachLayerAtPixel} will receive null as layer. This + * not manage this layer in its layers collection. This * is useful for temporary layers. To remove an unmanaged layer from the map, * use #setMap(null). * To add the layer to a map and have it managed by the map, use * {@link module:ol/Map~Map#addLayer} instead. */ - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; /** * For use inside the library only. */ - setMapInternal(map: PluggableMap | null): void; + setMapInternal(map: Map | null): void; /** * Set the layer source. */ diff --git a/@types/ol/layer/MapboxVector.d.ts b/@types/ol/layer/MapboxVector.d.ts index 3e433322..7b8434b6 100644 --- a/@types/ol/layer/MapboxVector.d.ts +++ b/@types/ol/layer/MapboxVector.d.ts @@ -1,13 +1,12 @@ +import Map from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; import { OrderFunction } from '../render'; import RenderEvent from '../render/Event'; import { BackgroundColor } from './Base'; -import VectorTileLayer from './VectorTile'; -import VectorTileRenderType from './VectorTileRenderType'; +import VectorTileLayer, { VectorTileRenderType } from './VectorTile'; export type TMapboxVectorLayerBaseEventTypes = 'change' | 'error'; export type TMapboxVectorLayerObjectEventTypes = @@ -42,8 +41,8 @@ export interface Options { maxZoom?: number | undefined; renderOrder?: OrderFunction | undefined; renderBuffer?: number | undefined; - renderMode?: VectorTileRenderType | string | undefined; - map?: PluggableMap | undefined; + renderMode?: VectorTileRenderType | undefined; + map?: Map | undefined; updateWhileAnimating?: boolean | undefined; updateWhileInteracting?: boolean | undefined; preload?: number | undefined; diff --git a/@types/ol/layer/Tile.d.ts b/@types/ol/layer/Tile.d.ts index be84850d..7569c913 100644 --- a/@types/ol/layer/Tile.d.ts +++ b/@types/ol/layer/Tile.d.ts @@ -25,7 +25,7 @@ export default class TileLayer e TileSourceType, CanvasTileLayerRenderer > { - constructor(opt_options?: Options); + constructor(options?: Options); on(type: TTileLayerBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TTileLayerBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TTileLayerBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/layer/Vector.d.ts b/@types/ol/layer/Vector.d.ts index 15203394..883051fe 100644 --- a/@types/ol/layer/Vector.d.ts +++ b/@types/ol/layer/Vector.d.ts @@ -23,7 +23,7 @@ export default class VectorLayer { - constructor(opt_options?: Options); + constructor(options?: Options); on(type: TVectorLayerBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TVectorLayerBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TVectorLayerBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/layer/VectorImage.d.ts b/@types/ol/layer/VectorImage.d.ts index 8dd2a4a9..f0ba440d 100644 --- a/@types/ol/layer/VectorImage.d.ts +++ b/@types/ol/layer/VectorImage.d.ts @@ -1,5 +1,5 @@ +import Map from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; @@ -36,7 +36,7 @@ export interface Options { renderOrder?: OrderFunction | undefined; renderBuffer?: number | undefined; source?: VectorSourceType | undefined; - map?: PluggableMap | undefined; + map?: Map | undefined; declutter?: boolean | undefined; style?: StyleLike | null | undefined; imageRatio?: number | undefined; @@ -46,7 +46,7 @@ export default class VectorImageLayer { - constructor(opt_options?: Options); + constructor(options?: Options); getImageRatio(): number; on(type: TVectorImageLayerBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TVectorImageLayerBaseEventTypes[], listener: ListenerFunction): EventsKey[]; diff --git a/@types/ol/layer/VectorTile.d.ts b/@types/ol/layer/VectorTile.d.ts index 72683050..f909b07d 100644 --- a/@types/ol/layer/VectorTile.d.ts +++ b/@types/ol/layer/VectorTile.d.ts @@ -1,6 +1,6 @@ import Feature from '../Feature'; +import Map from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; @@ -13,7 +13,6 @@ import VectorTile from '../source/VectorTile'; import { StyleLike } from '../style/Style'; import { BackgroundColor } from './Base'; import BaseVectorLayer from './BaseVector'; -import VectorTileRenderType from './VectorTileRenderType'; export type TVectorTileLayerBaseEventTypes = 'change' | 'error'; export type TVectorTileLayerObjectEventTypes = @@ -42,9 +41,9 @@ export interface Options { maxZoom?: number | undefined; renderOrder?: OrderFunction | undefined; renderBuffer?: number | undefined; - renderMode?: VectorTileRenderType | string | undefined; + renderMode?: VectorTileRenderType | undefined; source?: VectorTile | undefined; - map?: PluggableMap | undefined; + map?: Map | undefined; declutter?: boolean | undefined; style?: StyleLike | null | undefined; background?: BackgroundColor | false | undefined; @@ -54,16 +53,17 @@ export interface Options { useInterimTilesOnError?: boolean | undefined; properties?: Record | undefined; } +export type VectorTileRenderType = 'hybrid' | 'vector'; export default class VectorTileLayer extends BaseVectorLayer { - constructor(opt_options?: Options); + constructor(options?: Options); getBackground(): BackgroundColor; /** * Get the topmost feature that intersects the given pixel on the viewport. Returns a promise * that resolves with an array of features. The array will either contain the topmost feature * when a hit was detected, or it will be empty. * The hit detection algorithm used for this method is optimized for performance, but is less - * accurate than the one used in {@link module:ol/PluggableMap~PluggableMap#getFeaturesAtPixel map.getFeaturesAtPixel()}: Text - * is not considered, and icons are only represented by their bounding box instead of the exact + * accurate than the one used in [map.getFeaturesAtPixel()]{@link module:ol/Map~Map#getFeaturesAtPixel}. + * Text is not considered, and icons are only represented by their bounding box instead of the exact * image. */ getFeatures(pixel: Pixel): Promise[]>; diff --git a/@types/ol/layer/VectorTileRenderType.d.ts b/@types/ol/layer/VectorTileRenderType.d.ts deleted file mode 100644 index f0c5d59d..00000000 --- a/@types/ol/layer/VectorTileRenderType.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Render mode for vector tiles: - */ -declare enum VectorTileRenderType { - IMAGE = 'image', - HYBRID = 'hybrid', - VECTOR = 'vector', -} - -export default VectorTileRenderType; diff --git a/@types/ol/layer/WebGLTile.d.ts b/@types/ol/layer/WebGLTile.d.ts index 06329ce6..7530fb26 100644 --- a/@types/ol/layer/WebGLTile.d.ts +++ b/@types/ol/layer/WebGLTile.d.ts @@ -1,5 +1,5 @@ +import Map, { FrameState } from '../Map'; import { ObjectEvent } from '../Object'; -import PluggableMap, { FrameState } from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; @@ -47,7 +47,7 @@ export interface Options { preload?: number | undefined; source?: SourceType | undefined; sources?: SourceType[] | ((p0: Extent, p1: number) => SourceType[]) | undefined; - map?: PluggableMap | undefined; + map?: Map | undefined; useInterimTilesOnError?: boolean | undefined; cacheSize?: number | undefined; } @@ -71,7 +71,7 @@ export interface Style { gamma?: ExpressionValue | undefined; } export default class WebGLTileLayer extends BaseTileLayer { - constructor(opt_options: Options); + constructor(options: Options); /** * Clean up underlying WebGL resources. */ diff --git a/@types/ol/math.d.ts b/@types/ol/math.d.ts index 4ecd729d..4da7dd38 100644 --- a/@types/ol/math.d.ts +++ b/@types/ol/math.d.ts @@ -1,17 +1,3 @@ -/** - * Return the hyperbolic cosine of a given number. The method will use the - * native Math.cosh function if it is available, otherwise the hyperbolic - * cosine will be calculated via the reference implementation of the Mozilla - * developer network. - */ -export const cosh: (x: number) => number; -/** - * Return the base 2 logarithm of a given number. The method will use the - * native Math.log2 function if it is available, otherwise the base 2 - * logarithm will be calculated via the reference implementation of the - * Mozilla developer network. - */ -export const log2: (x: number) => number; /** * Rounds a number to the next bigger integer considering only the given number * of decimal digits (with rounding on the final digit). diff --git a/@types/ol/net.d.ts b/@types/ol/net.d.ts index 01abf4b4..460498f0 100644 --- a/@types/ol/net.d.ts +++ b/@types/ol/net.d.ts @@ -9,5 +9,5 @@ export function getJSON(url: string): Promise; * Simple JSONP helper. Supports error callbacks and a custom callback param. * The error callback will be called when no JSONP is executed after 10 seconds. */ -export function jsonp(url: string, callback: () => void, opt_errback?: () => void, opt_callbackParam?: string): void; +export function jsonp(url: string, callback: () => void, errback?: () => void, callbackParam?: string): void; export function resolveUrl(base: string, url: string): string; diff --git a/@types/ol/obj.d.ts b/@types/ol/obj.d.ts index a0b69564..253605b2 100644 --- a/@types/ol/obj.d.ts +++ b/@types/ol/obj.d.ts @@ -1,14 +1,3 @@ -/** - * Polyfill for Object.assign(). Assigns enumerable and own properties from - * one or more source objects to a target object. - * See https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Object/assign. - */ -export const assign: (target: any, ...var_sources: any[]) => any; -/** - * Polyfill for Object.values(). Get an array of property values from an object. - * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/values - */ -export const getValues: (object: Record) => V[]; /** * Removes all properties from an object. */ diff --git a/@types/ol/proj.d.ts b/@types/ol/proj.d.ts index 433e6893..7a90dbbb 100644 --- a/@types/ol/proj.d.ts +++ b/@types/ol/proj.d.ts @@ -1,7 +1,7 @@ import { Coordinate } from './coordinate'; import { Extent } from './extent'; import Projection from './proj/Projection'; -import Units, { METERS_PER_UNIT } from './proj/Units'; +import { METERS_PER_UNIT, Units } from './proj/Units'; export { METERS_PER_UNIT }; export { Projection }; @@ -66,7 +66,7 @@ export function clearAllProjections(): void; * Clear the user projection if set. */ export function clearUserProjection(): void; -export function cloneTransform(input: number[], opt_output?: number[], opt_dimension?: number): number[]; +export function cloneTransform(input: number[], output?: number[], dimension?: number): number[]; export function createProjection(projection: Projection | string | undefined, defaultCode: string): Projection; /** * Creates a safe coordinate transform function from a coordinate transform function. @@ -86,7 +86,7 @@ export function createSafeCoordinateTransform( export function createTransformFromCoordinateTransform( coordTransform: (p0: Coordinate) => Coordinate, ): TransformFunction; -export function disableCoordinateWarning(opt_disable?: boolean): void; +export function disableCoordinateWarning(disable?: boolean): void; /** * Checks if two projections are the same, that is every coordinate in one * projection does represent the same geographic point as the same coordinate in @@ -96,7 +96,7 @@ export function equivalent(projection1: Projection, projection2: Projection): bo /** * Transforms a coordinate from longitude/latitude to a different projection. */ -export function fromLonLat(coordinate: Coordinate, opt_projection?: ProjectionLike): Coordinate; +export function fromLonLat(coordinate: Coordinate, projection?: ProjectionLike): Coordinate; /** * Return a coordinate transformed from the user projection. If no user projection * is set, the original coordinate is returned. @@ -134,7 +134,7 @@ export function getPointResolution( projection: ProjectionLike, resolution: number, point: Coordinate, - opt_units?: Units, + units?: Units, ): number; /** * Given the projection-like objects, searches for a transformation @@ -156,7 +156,7 @@ export function getTransformFromProjections( * projections is not yet complete and should be considered experimental. */ export function getUserProjection(): Projection | null; -export function identityTransform(input: number[], opt_output?: number[], opt_dimension?: number): number[]; +export function identityTransform(input: number[], output?: number[], dimension?: number): number[]; /** * Set the projection for coordinates supplied from and returned by API methods. * This includes all API methods except for those interacting with tile grids. @@ -165,7 +165,7 @@ export function setUserProjection(projection: ProjectionLike): void; /** * Transforms a coordinate to longitude/latitude. */ -export function toLonLat(coordinate: Coordinate, opt_projection?: ProjectionLike): Coordinate; +export function toLonLat(coordinate: Coordinate, projection?: ProjectionLike): Coordinate; /** * Return a coordinate transformed into the user projection. If no user projection * is set, the original coordinate is returned. @@ -198,7 +198,7 @@ export function transformExtent( extent: Extent, source: ProjectionLike, destination: ProjectionLike, - opt_stops?: number, + stops?: number, ): Extent; /** * Transforms the given point to the destination projection. diff --git a/@types/ol/proj/Projection.d.ts b/@types/ol/proj/Projection.d.ts index 2f81ee3c..bbb93ea2 100644 --- a/@types/ol/proj/Projection.d.ts +++ b/@types/ol/proj/Projection.d.ts @@ -1,11 +1,11 @@ import { Coordinate } from '../coordinate'; import { Extent } from '../extent'; import TileGrid from '../tilegrid/TileGrid'; -import Units from './Units'; +import { Units } from './Units'; export interface Options { code: string; - units?: Units | string | undefined; + units?: Units | undefined; extent?: Extent | undefined; axisOrientation?: string | undefined; global?: boolean | undefined; diff --git a/@types/ol/proj/Units.d.ts b/@types/ol/proj/Units.d.ts index 2cefc351..22f02d6b 100644 --- a/@types/ol/proj/Units.d.ts +++ b/@types/ol/proj/Units.d.ts @@ -1,20 +1,16 @@ +export interface MetersPerUnitLookup { + radians: number; + degrees: number; + ft: number; + m: number; + 'us-ft': number; +} /** - * Meters per unit lookup table. + * Projection units. */ -export const METERS_PER_UNIT: Record; +export type Units = 'radians' | 'degrees' | 'ft' | 'm' | 'pixels' | 'tile-pixels' | 'us-ft'; /** - * Projection units: 'degrees', 'ft', 'm', 'pixels', 'tile-pixels' or - * 'us-ft'. + * Meters per unit lookup table. */ -declare enum Units { - RADIANS = 'radians', - DEGREES = 'degrees', - FEET = 'ft', - METERS = 'm', - PIXELS = 'pixels', - TILE_PIXELS = 'tile-pixels', - USFEET = 'us-ft', -} - -export default Units; +export const METERS_PER_UNIT: MetersPerUnitLookup; export function fromCode(code: number): Units; diff --git a/@types/ol/proj/epsg3857.d.ts b/@types/ol/proj/epsg3857.d.ts index 3a2521f1..c01cf4cd 100644 --- a/@types/ol/proj/epsg3857.d.ts +++ b/@types/ol/proj/epsg3857.d.ts @@ -19,8 +19,8 @@ export const WORLD_EXTENT: Extent; /** * Transformation from EPSG:4326 to EPSG:3857. */ -export function fromEPSG4326(input: number[], opt_output?: number[], opt_dimension?: number): number[]; +export function fromEPSG4326(input: number[], output?: number[], dimension?: number): number[]; /** * Transformation from EPSG:3857 to EPSG:4326. */ -export function toEPSG4326(input: number[], opt_output?: number[], opt_dimension?: number): number[]; +export function toEPSG4326(input: number[], output?: number[], dimension?: number): number[]; diff --git a/@types/ol/proj/proj4.d.ts b/@types/ol/proj/proj4.d.ts index a6c9e062..8d6efcf5 100644 --- a/@types/ol/proj/proj4.d.ts +++ b/@types/ol/proj/proj4.d.ts @@ -1,6 +1,6 @@ /** * Make projections defined in proj4 (with proj4.defs()) available in - * OpenLayers. + * OpenLayers. Requires proj4 >= 2.8.0. * This function should be called whenever changes are made to the proj4 * registry, e.g. after calling proj4.defs(). Existing transforms will not be * modified by this function. diff --git a/@types/ol/render.d.ts b/@types/ol/render.d.ts index 59d646ca..a0565525 100644 --- a/@types/ol/render.d.ts +++ b/@types/ol/render.d.ts @@ -40,11 +40,14 @@ export function getVectorContext(event: RenderEvent): CanvasImmediateRenderer; * import Fill from 'ol/style/Fill'; * import Polygon from 'ol/geom/Polygon'; * - * var canvas = document.createElement('canvas'); - * var render = toContext(canvas.getContext('2d'), - * { size: [100, 100] }); + * const canvas = document.createElement('canvas'); + * const render = toContext( + * canvas.getContext('2d'), + * {size: [100, 100]} + * ); * render.setFillStrokeStyle(new Fill({ color: blue })); * render.drawPolygon( - * new Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]])); + * new Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]) + * ); */ -export function toContext(context: CanvasRenderingContext2D, opt_options?: ToContextOptions): CanvasImmediateRenderer; +export function toContext(context: CanvasRenderingContext2D, options?: ToContextOptions): CanvasImmediateRenderer; diff --git a/@types/ol/render/Box.d.ts b/@types/ol/render/Box.d.ts index 4cc13488..62d8782f 100644 --- a/@types/ol/render/Box.d.ts +++ b/@types/ol/render/Box.d.ts @@ -1,5 +1,5 @@ import Disposable from '../Disposable'; -import PluggableMap from '../PluggableMap'; +import Map from '../Map'; import Polygon from '../geom/Polygon'; import { Pixel } from '../pixel'; @@ -14,6 +14,6 @@ export default class RenderBox extends Disposable { */ disposeInternal(): void; getGeometry(): Polygon; - setMap(map: PluggableMap | null): void; + setMap(map: Map | null): void; setPixels(startPixel: Pixel, endPixel: Pixel): void; } diff --git a/@types/ol/render/Event.d.ts b/@types/ol/render/Event.d.ts index 1cde1dbe..80cbbd18 100644 --- a/@types/ol/render/Event.d.ts +++ b/@types/ol/render/Event.d.ts @@ -1,4 +1,4 @@ -import { FrameState } from '../PluggableMap'; +import { FrameState } from '../Map'; import BaseEvent from '../events/Event'; import { Transform } from '../transform'; import EventType from './EventType'; @@ -6,9 +6,9 @@ import EventType from './EventType'; export default class RenderEvent extends BaseEvent { constructor( type: EventType, - opt_inversePixelTransform?: Transform, - opt_frameState?: FrameState, - opt_context?: CanvasRenderingContext2D | WebGLRenderingContext, + inversePixelTransform?: Transform, + frameState?: FrameState, + context?: CanvasRenderingContext2D | WebGLRenderingContext, ); /** * Canvas context. Not available when the event is dispatched by the map. For Canvas 2D layers, diff --git a/@types/ol/render/Feature.d.ts b/@types/ol/render/Feature.d.ts index f19f85e3..c98c8848 100644 --- a/@types/ol/render/Feature.d.ts +++ b/@types/ol/render/Feature.d.ts @@ -51,7 +51,7 @@ export default class RenderFeature { /** * Get a transformed and simplified version of the geometry. */ - simplifyTransformed(squaredTolerance: number, opt_transform?: TransformFunction): RenderFeature; + simplifyTransformed(squaredTolerance: number, transform?: TransformFunction): RenderFeature; /** * Transform geometry coordinates from tile pixel space to projected. */ @@ -60,7 +60,7 @@ export default class RenderFeature { /** * Create an ol/Feature from an ol/render/Feature */ -export function toFeature(renderFeature: RenderFeature, opt_geometryName?: string): Feature; +export function toFeature(renderFeature: RenderFeature, geometryName?: string): Feature; /** * Create a geometry from an ol/render/Feature */ diff --git a/@types/ol/render/VectorContext.d.ts b/@types/ol/render/VectorContext.d.ts index 6338d3c5..7fc85dea 100644 --- a/@types/ol/render/VectorContext.d.ts +++ b/@types/ol/render/VectorContext.d.ts @@ -43,10 +43,10 @@ export default class VectorContext { drawPolygon(polygonGeometry: Polygon | RenderFeature, feature: FeatureLike): void; drawText(geometry: SimpleGeometry | RenderFeature, feature: FeatureLike): void; setFillStrokeStyle(fillStyle: Fill, strokeStyle: Stroke): void; - setImageStyle(imageStyle: ImageStyle, opt_declutterImageWithText?: DeclutterImageWithText): void; + setImageStyle(imageStyle: ImageStyle, declutterImageWithText?: DeclutterImageWithText): void; /** * Set the rendering style. */ setStyle(style: Style): void; - setTextStyle(textStyle: Text, opt_declutterImageWithText?: DeclutterImageWithText): void; + setTextStyle(textStyle: Text, declutterImageWithText?: DeclutterImageWithText): void; } diff --git a/@types/ol/render/canvas.d.ts b/@types/ol/render/canvas.d.ts index 21260709..cfbb2cad 100644 --- a/@types/ol/render/canvas.d.ts +++ b/@types/ol/render/canvas.d.ts @@ -3,6 +3,7 @@ import { ColorLike } from '../colorlike'; import { Size } from '../size'; import Fill from '../style/Fill'; import Stroke from '../style/Stroke'; +import { TextJustify, TextPlacement } from '../style/Text'; import { Transform } from '../transform'; import { ReplayImageOrLabelArgs } from './canvas/Executor'; @@ -54,10 +55,10 @@ export interface StrokeState { } export interface TextState { font: string; - textAlign?: string | undefined; - justify?: string | undefined; - textBaseline: string; - placement?: string | undefined; + textAlign?: CanvasTextAlign | undefined; + justify?: TextJustify | undefined; + textBaseline: CanvasTextBaseline; + placement?: TextPlacement | undefined; maxAngle?: number | undefined; overflow?: boolean | undefined; backgroundFill?: Fill | undefined; @@ -76,14 +77,8 @@ export const defaultLineWidth: number; export const defaultMiterLimit: number; export const defaultPadding: number[]; export const defaultStrokeStyle: ColorLike; -export const defaultTextAlign: string; -export const defaultTextBaseline: string; -/** - * The label cache for text rendering. To change the default cache size of 2048 - * entries, use {@link module:ol/structs/LRUCache~LRUCache#setSize cache.setSize()}. - * Deprecated - there is no label cache any more. - */ -export const labelCache: any; +export const defaultTextAlign: CanvasTextAlign; +export const defaultTextBaseline: CanvasTextBaseline; /** * Clears the label cache when a font becomes available. */ diff --git a/@types/ol/render/canvas/Executor.d.ts b/@types/ol/render/canvas/Executor.d.ts index 71fb9b65..fa397757 100644 --- a/@types/ol/render/canvas/Executor.d.ts +++ b/@types/ol/render/canvas/Executor.d.ts @@ -41,14 +41,14 @@ export default class Executor { transform: Transform, viewRotation: number, snapToPixel: boolean, - opt_declutterTree?: RBush, + declutterTree?: RBush, ): void; executeHitDetection( context: CanvasRenderingContext2D, transform: Transform, viewRotation: number, - opt_featureCallback?: FeatureCallback, - opt_hitExtent?: Extent, + featureCallback?: FeatureCallback, + hitExtent?: Extent, ): T | undefined; replayTextBackground_( context: CanvasRenderingContext2D, diff --git a/@types/ol/render/canvas/ExecutorGroup.d.ts b/@types/ol/render/canvas/ExecutorGroup.d.ts index 24b459a5..d860cff2 100644 --- a/@types/ol/render/canvas/ExecutorGroup.d.ts +++ b/@types/ol/render/canvas/ExecutorGroup.d.ts @@ -13,7 +13,7 @@ export default class ExecutorGroup { pixelRatio: number, overlaps: boolean, allInstructions: Record>, - opt_renderBuffer?: number, + renderBuffer?: number, ); clip(context: CanvasRenderingContext2D, transform: Transform): void; execute( @@ -22,8 +22,8 @@ export default class ExecutorGroup { transform: Transform, viewRotation: number, snapToPixel: boolean, - opt_builderTypes?: BuilderType[], - opt_declutterTree?: RBush, + builderTypes?: BuilderType[], + declutterTree?: RBush, ): void; forEachFeatureAtCoordinate( coordinate: Coordinate, diff --git a/@types/ol/render/canvas/ImageBuilder.d.ts b/@types/ol/render/canvas/ImageBuilder.d.ts index b90cfe13..6c60e64e 100644 --- a/@types/ol/render/canvas/ImageBuilder.d.ts +++ b/@types/ol/render/canvas/ImageBuilder.d.ts @@ -12,5 +12,5 @@ export default class CanvasImageBuilder extends CanvasBuilder { drawMultiPoint(multiPointGeometry: MultiPoint | RenderFeature, feature: FeatureLike): void; drawPoint(pointGeometry: Point | RenderFeature, feature: FeatureLike): void; finish(): SerializableInstructions; - setImageStyle(imageStyle: ImageStyle, opt_sharedData?: any): void; + setImageStyle(imageStyle: ImageStyle, sharedData?: any): void; } diff --git a/@types/ol/render/canvas/Immediate.d.ts b/@types/ol/render/canvas/Immediate.d.ts index d63edf47..8aa1f972 100644 --- a/@types/ol/render/canvas/Immediate.d.ts +++ b/@types/ol/render/canvas/Immediate.d.ts @@ -26,8 +26,8 @@ export default class CanvasImmediateRenderer extends VectorContext { extent: Extent, transform: Transform, viewRotation: number, - opt_squaredTolerance?: number, - opt_userTransform?: TransformFunction, + squaredTolerance?: number, + userTransform?: TransformFunction, ); /** * Render a circle geometry into the canvas. Rendering is immediate and uses @@ -38,7 +38,7 @@ export default class CanvasImmediateRenderer extends VectorContext { * Render a feature into the canvas. Note that any zIndex on the provided * style will be ignored - features are rendered immediately in the order that * this method is called. If you need zIndex support, you should be using an - * {@link module:ol/layer/Vector~VectorLayer VectorLayer} instead. + * {@link module:ol/layer/Vector~VectorLayer} instead. */ drawFeature(feature: Feature, style: Style): void; /** diff --git a/@types/ol/render/canvas/TextBuilder.d.ts b/@types/ol/render/canvas/TextBuilder.d.ts index 57c630bb..01311347 100644 --- a/@types/ol/render/canvas/TextBuilder.d.ts +++ b/@types/ol/render/canvas/TextBuilder.d.ts @@ -23,5 +23,5 @@ export default class CanvasTextBuilder extends CanvasBuilder { constructor(tolerance: number, maxExtent: Extent, resolution: number, pixelRatio: number); drawText(geometry: SimpleGeometry | RenderFeature, feature: FeatureLike): void; finish(): SerializableInstructions; - setTextStyle(textStyle: Text, opt_sharedData?: any): void; + setTextStyle(textStyle: Text, sharedData?: any): void; } diff --git a/@types/ol/render/webgl/BatchRenderer.d.ts b/@types/ol/render/webgl/BatchRenderer.d.ts new file mode 100644 index 00000000..79a02b83 --- /dev/null +++ b/@types/ol/render/webgl/BatchRenderer.d.ts @@ -0,0 +1,44 @@ +import Feature from '../../Feature'; +import { FrameState } from '../../Map'; +import Geometry, { Type } from '../../geom/Geometry'; +import { Transform } from '../../transform'; +import WebGLHelper, { AttributeDescription } from '../../webgl/Helper'; +import { GeometryBatch } from './MixedGeometryBatch'; + +/** + * A description of a custom attribute to be passed on to the GPU, with a value different + * for each feature. + */ +export interface CustomAttribute { + name: string; + callback: (p0: Feature) => number; +} +export default class AbstractBatchRenderer { + constructor( + helper: WebGLHelper, + worker: Worker, + vertexShader: string, + fragmentShader: string, + customAttributes: CustomAttribute[], + ); + /** + * A list of attributes used by the renderer. + */ + protected attributes: AttributeDescription[]; + protected customAttributes: CustomAttribute[]; + /** + * Rebuild rendering instructions based on the provided frame state + * This is specific to the geometry type and has to be implemented by subclasses. + */ + protected generateRenderInstructions(batch: GeometryBatch): void; + /** + * Rebuild rendering instructions and webgl buffers based on the provided frame state + * Note: this is a costly operation. + */ + rebuild(batch: GeometryBatch, frameState: FrameState, geometryType: Type, callback: () => void): void; + /** + * Render the geometries in the batch. This will also update the current transform used for rendering according to + * the invert transform of the webgl buffers + */ + render(batch: GeometryBatch, currentTransform: Transform, frameState: FrameState, offsetX: number): void; +} diff --git a/@types/ol/render/webgl/LineStringBatchRenderer.d.ts b/@types/ol/render/webgl/LineStringBatchRenderer.d.ts new file mode 100644 index 00000000..040c70e4 --- /dev/null +++ b/@types/ol/render/webgl/LineStringBatchRenderer.d.ts @@ -0,0 +1,21 @@ +import WebGLHelper from '../../webgl/Helper'; +import AbstractBatchRenderer, { CustomAttribute } from './BatchRenderer'; + +/** + * Names of attributes made available to the vertex shader. + * Please note: changing these will break custom shaders! + */ +export enum Attributes { + SEGMENT_START = 'a_segmentStart', + SEGMENT_END = 'a_segmentEnd', + PARAMETERS = 'a_parameters', +} +export default class LineStringBatchRenderer extends AbstractBatchRenderer { + constructor( + helper: WebGLHelper, + worker: Worker, + vertexShader: string, + fragmentShader: string, + customAttributes: CustomAttribute[], + ); +} diff --git a/@types/ol/render/webgl/MixedGeometryBatch.d.ts b/@types/ol/render/webgl/MixedGeometryBatch.d.ts new file mode 100644 index 00000000..c18f4b21 --- /dev/null +++ b/@types/ol/render/webgl/MixedGeometryBatch.d.ts @@ -0,0 +1,65 @@ +import Feature from '../../Feature'; +import Geometry from '../../geom/Geometry'; +import { Transform } from '../../transform'; +import WebGLArrayBuffer from '../../webgl/Buffer'; + +export type GeometryBatch = PointGeometryBatch | LineStringGeometryBatch | PolygonGeometryBatch; +/** + * Object that holds a reference to a feature as well as the raw coordinates of its various geometries + */ +export interface GeometryBatchItem { + feature: Feature; + flatCoordss: number[][]; + verticesCount?: number | undefined; + ringsCount?: number | undefined; + ringsVerticesCounts?: number[][] | undefined; +} +/** + * A geometry batch specific to lines + */ +export interface LineStringGeometryBatch { + entries: Record; + geometriesCount: number; + renderInstructions: Float32Array; + verticesBuffer: WebGLArrayBuffer; + indicesBuffer: WebGLArrayBuffer; + renderInstructionsTransform: Transform; + verticesBufferTransform: Transform; + invertVerticesBufferTransform: Transform; + verticesCount: number; +} +/** + * A geometry batch specific to points + */ +export interface PointGeometryBatch { + entries: Record; + geometriesCount: number; + renderInstructions: Float32Array; + verticesBuffer: WebGLArrayBuffer; + indicesBuffer: WebGLArrayBuffer; + renderInstructionsTransform: Transform; + verticesBufferTransform: Transform; + invertVerticesBufferTransform: Transform; +} +/** + * A geometry batch specific to polygons + */ +export interface PolygonGeometryBatch { + entries: Record; + geometriesCount: number; + renderInstructions: Float32Array; + verticesBuffer: WebGLArrayBuffer; + indicesBuffer: WebGLArrayBuffer; + renderInstructionsTransform: Transform; + verticesBufferTransform: Transform; + invertVerticesBufferTransform: Transform; + verticesCount: number; + ringsCount: number; +} +export default class MixedGeometryBatch { + constructor(); + addFeature(feature: Feature): void; + addFeatures(features: Feature[]): void; + changeFeature(feature: Feature): void; + removeFeature(feature: Feature): void; +} diff --git a/@types/ol/render/webgl/PointBatchRenderer.d.ts b/@types/ol/render/webgl/PointBatchRenderer.d.ts new file mode 100644 index 00000000..a43304c2 --- /dev/null +++ b/@types/ol/render/webgl/PointBatchRenderer.d.ts @@ -0,0 +1,20 @@ +import WebGLHelper from '../../webgl/Helper'; +import AbstractBatchRenderer, { CustomAttribute } from './BatchRenderer'; + +/** + * Names of attributes made available to the vertex shader. + * Please note: changing these will break custom shaders! + */ +export enum Attributes { + POSITION = 'a_position', + INDEX = 'a_index', +} +export default class PointBatchRenderer extends AbstractBatchRenderer { + constructor( + helper: WebGLHelper, + worker: Worker, + vertexShader: string, + fragmentShader: string, + customAttributes: CustomAttribute[], + ); +} diff --git a/@types/ol/render/webgl/PolygonBatchRenderer.d.ts b/@types/ol/render/webgl/PolygonBatchRenderer.d.ts new file mode 100644 index 00000000..19b7fe40 --- /dev/null +++ b/@types/ol/render/webgl/PolygonBatchRenderer.d.ts @@ -0,0 +1,19 @@ +import WebGLHelper from '../../webgl/Helper'; +import AbstractBatchRenderer, { CustomAttribute } from './BatchRenderer'; + +/** + * Names of attributes made available to the vertex shader. + * Please note: changing these will break custom shaders! + */ +export enum Attributes { + POSITION = 'a_position', +} +export default class PolygonBatchRenderer extends AbstractBatchRenderer { + constructor( + helper: WebGLHelper, + worker: Worker, + vertexShader: string, + fragmentShader: string, + customAttributes: CustomAttribute[], + ); +} diff --git a/@types/ol/render/webgl/constants.d.ts b/@types/ol/render/webgl/constants.d.ts new file mode 100644 index 00000000..f7d2c61b --- /dev/null +++ b/@types/ol/render/webgl/constants.d.ts @@ -0,0 +1,22 @@ +import { Transform } from '../../transform'; + +/** + * This message will trigger the generation of a vertex and an index buffer based on the given render instructions. + * When the buffers are generated, the worked will send a message of the same type to the main thread, with + * the generated buffers in it. + * Note that any addition properties present in the message will be sent back to the main thread. + */ +export interface WebGLWorkerGenerateBuffersMessage { + id: number; + type: WebGLWorkerMessageType; + renderInstructions: ArrayBuffer; + customAttributesCount?: number | undefined; + vertexBuffer?: ArrayBuffer | undefined; + indexBuffer?: ArrayBuffer | undefined; + renderInstructionsTransform?: Transform | undefined; +} +export enum WebGLWorkerMessageType { + GENERATE_POLYGON_BUFFERS = 'GENERATE_POLYGON_BUFFERS', + GENERATE_POINT_BUFFERS = 'GENERATE_POINT_BUFFERS', + GENERATE_LINE_STRING_BUFFERS = 'GENERATE_LINE_STRING_BUFFERS', +} diff --git a/@types/ol/render/webgl/utils.d.ts b/@types/ol/render/webgl/utils.d.ts new file mode 100644 index 00000000..0e78a5ec --- /dev/null +++ b/@types/ol/render/webgl/utils.d.ts @@ -0,0 +1,17 @@ +/** + * An object holding positions both in an index and a vertex buffer. + */ +export interface BufferPositions { + vertexPosition: number; + indexPosition: number; +} +/** + * Reads an id from a color-encoded array + * Note: the expected range for each component is 0 to 1 with 256 steps. + */ +export function colorDecodeId(color: number[]): number; +/** + * Generates a color array based on a numerical id + * Note: the range for each component is 0 to 1 with 256 steps + */ +export function colorEncodeId(id: number, array?: number[]): number[]; diff --git a/@types/ol/renderer/Composite.d.ts b/@types/ol/renderer/Composite.d.ts index c5b9ba8d..bdf37b71 100644 --- a/@types/ol/renderer/Composite.d.ts +++ b/@types/ol/renderer/Composite.d.ts @@ -1,20 +1,10 @@ -import PluggableMap, { FrameState } from '../PluggableMap'; -import Layer from '../layer/Layer'; -import { Pixel } from '../pixel'; +import Map, { FrameState } from '../Map'; import EventType from '../render/EventType'; -import Source from '../source/Source'; import MapRenderer from './Map'; export default class CompositeMapRenderer extends MapRenderer { - constructor(map: PluggableMap); + constructor(map: Map); dispatchRenderEvent(type: EventType, frameState: FrameState): void; - forEachLayerAtPixel( - pixel: Pixel, - frameState: FrameState, - hitTolerance: number, - callback: (p0: Layer, p1: Uint8ClampedArray | Uint8Array) => T, - layerFilter: (p0: Layer) => boolean, - ): T | undefined; /** * Render. */ diff --git a/@types/ol/renderer/Layer.d.ts b/@types/ol/renderer/Layer.d.ts index fbeccc66..cc2a606f 100644 --- a/@types/ol/renderer/Layer.d.ts +++ b/@types/ol/renderer/Layer.d.ts @@ -1,7 +1,7 @@ import Feature from '../Feature'; import ImageBase from '../ImageBase'; +import { FrameState } from '../Map'; import Observable from '../Observable'; -import { FrameState } from '../PluggableMap'; import Tile from '../Tile'; import TileRange from '../TileRange'; import { Coordinate } from '../coordinate'; @@ -45,7 +45,6 @@ export default class LayerRenderer extends Observ matches: HitMatch[], ): T | undefined; getData(pixel: Pixel): Uint8ClampedArray | Uint8Array | Float32Array | DataView | null; - getDataAtPixel(pixel: Pixel, frameState: FrameState, hitTolerance: number): Uint8ClampedArray | Uint8Array; /** * Asynchronous layer level hit detection. */ diff --git a/@types/ol/renderer/Map.d.ts b/@types/ol/renderer/Map.d.ts index 197ac3ce..4abbcc14 100644 --- a/@types/ol/renderer/Map.d.ts +++ b/@types/ol/renderer/Map.d.ts @@ -1,10 +1,9 @@ import Disposable from '../Disposable'; import { FeatureLike } from '../Feature'; -import PluggableMap, { FrameState } from '../PluggableMap'; +import Map, { FrameState } from '../Map'; import { Coordinate } from '../coordinate'; import SimpleGeometry from '../geom/SimpleGeometry'; import Layer from '../layer/Layer'; -import { Pixel } from '../pixel'; import EventType from '../render/EventType'; import Source from '../source/Source'; import LayerRenderer from './Layer'; @@ -18,7 +17,7 @@ export interface HitMatch { callback: FeatureCallback; } export default abstract class MapRenderer extends Disposable { - constructor(map: PluggableMap); + constructor(map: Map); protected calculateMatrices2D(frameState: FrameState): void; protected scheduleExpireIconCache(frameState: FrameState): void; abstract dispatchRenderEvent(type: EventType, frameState: FrameState): void; @@ -32,14 +31,7 @@ export default abstract class MapRenderer extends Disposable { layerFilter: (this: U, p0: Layer) => boolean, thisArg2: U, ): T | undefined; - abstract forEachLayerAtPixel( - pixel: Pixel, - frameState: FrameState, - hitTolerance: number, - callback: (p0: Layer, p1: Uint8ClampedArray | Uint8Array) => T, - layerFilter: (p0: Layer) => boolean, - ): T | undefined; - getMap(): PluggableMap; + getMap(): Map; hasFeatureAtCoordinate( coordinate: Coordinate, frameState: FrameState, diff --git a/@types/ol/renderer/canvas/ImageLayer.d.ts b/@types/ol/renderer/canvas/ImageLayer.d.ts index a26d3092..8b2c073c 100644 --- a/@types/ol/renderer/canvas/ImageLayer.d.ts +++ b/@types/ol/renderer/canvas/ImageLayer.d.ts @@ -1,5 +1,5 @@ import ImageBase from '../../ImageBase'; -import { FrameState } from '../../PluggableMap'; +import { FrameState } from '../../Map'; import { Coordinate } from '../../coordinate'; import { EventsKey, ListenerFunction } from '../../events'; import BaseEvent from '../../events/Event'; diff --git a/@types/ol/renderer/canvas/Layer.d.ts b/@types/ol/renderer/canvas/Layer.d.ts index e9eb9700..76b0d336 100644 --- a/@types/ol/renderer/canvas/Layer.d.ts +++ b/@types/ol/renderer/canvas/Layer.d.ts @@ -1,10 +1,9 @@ -import { FrameState } from '../../PluggableMap'; +import { FrameState } from '../../Map'; import { Coordinate } from '../../coordinate'; import { EventsKey, ListenerFunction } from '../../events'; import BaseEvent from '../../events/Event'; import { Extent } from '../../extent'; import Layer from '../../layer/Layer'; -import { Pixel } from '../../pixel'; import { Transform } from '../../transform'; import LayerRenderer from '../Layer'; import { HitMatch } from '../Map'; @@ -59,7 +58,6 @@ export default abstract class CanvasLayerRenderer[], ): T | undefined; getBackground(frameState: FrameState): string; - getDataAtPixel(pixel: Pixel, frameState: FrameState, hitTolerance: number): Uint8ClampedArray | Uint8Array; getImageData( image: HTMLCanvasElement | HTMLImageElement | HTMLVideoElement, col: number, @@ -80,7 +78,7 @@ export default abstract class CanvasLayerRenderer): EventsKey; on(type: TCanvasLayerRendererBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TCanvasLayerRendererBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/renderer/canvas/TileLayer.d.ts b/@types/ol/renderer/canvas/TileLayer.d.ts index a85cb70d..658bd7d8 100644 --- a/@types/ol/renderer/canvas/TileLayer.d.ts +++ b/@types/ol/renderer/canvas/TileLayer.d.ts @@ -1,5 +1,5 @@ import ImageTile from '../../ImageTile'; -import { FrameState } from '../../PluggableMap'; +import { FrameState } from '../../Map'; import Tile from '../../Tile'; import { Coordinate } from '../../coordinate'; import { EventsKey, ListenerFunction } from '../../events'; @@ -49,7 +49,7 @@ export default class CanvasTileLayerRenderer< extent: Extent, currentZ: number, preload: number, - opt_tileCallback?: (p0: Tile) => void, + tileCallback?: (p0: Tile) => void, ): void; protected scheduleExpireCache(frameState: FrameState, tileSource: TileSource): void; protected updateUsedTiles( diff --git a/@types/ol/renderer/canvas/VectorImageLayer.d.ts b/@types/ol/renderer/canvas/VectorImageLayer.d.ts index 8aee4ea0..f399c702 100644 --- a/@types/ol/renderer/canvas/VectorImageLayer.d.ts +++ b/@types/ol/renderer/canvas/VectorImageLayer.d.ts @@ -1,5 +1,5 @@ import Feature from '../../Feature'; -import { FrameState } from '../../PluggableMap'; +import { FrameState } from '../../Map'; import { Coordinate } from '../../coordinate'; import { EventsKey, ListenerFunction } from '../../events'; import BaseEvent from '../../events/Event'; diff --git a/@types/ol/renderer/canvas/VectorLayer.d.ts b/@types/ol/renderer/canvas/VectorLayer.d.ts index 6ab40f64..2624b9e1 100644 --- a/@types/ol/renderer/canvas/VectorLayer.d.ts +++ b/@types/ol/renderer/canvas/VectorLayer.d.ts @@ -1,5 +1,5 @@ import Feature from '../../Feature'; -import { FrameState } from '../../PluggableMap'; +import { FrameState } from '../../Map'; import { Coordinate } from '../../coordinate'; import { EventsKey, ListenerFunction } from '../../events'; import BaseEvent from '../../events/Event'; @@ -59,14 +59,14 @@ export default class CanvasVectorLayerRenderer extends CanvasLayerRenderer { squaredTolerance: number, styles: Style | Style[], builderGroup: BuilderGroup, - opt_transform?: TransformFunction, - opt_declutterBuilderGroup?: BuilderGroup, + transform?: TransformFunction, + declutterBuilderGroup?: BuilderGroup, ): boolean; /** * Render the layer. */ renderFrame(frameState: FrameState, target: HTMLElement): HTMLElement; - renderWorlds(executorGroup: ExecutorGroup, frameState: FrameState, opt_declutterTree?: RBush): void; + renderWorlds(executorGroup: ExecutorGroup, frameState: FrameState, declutterTree?: RBush): void; on(type: TCanvasVectorLayerRendererBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TCanvasVectorLayerRendererBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TCanvasVectorLayerRendererBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/renderer/canvas/VectorTileLayer.d.ts b/@types/ol/renderer/canvas/VectorTileLayer.d.ts index c2a27bac..73815319 100644 --- a/@types/ol/renderer/canvas/VectorTileLayer.d.ts +++ b/@types/ol/renderer/canvas/VectorTileLayer.d.ts @@ -1,5 +1,5 @@ import Feature, { FeatureLike } from '../../Feature'; -import { FrameState } from '../../PluggableMap'; +import { FrameState } from '../../Map'; import Tile from '../../Tile'; import VectorRenderTile from '../../VectorRenderTile'; import { Coordinate } from '../../coordinate'; @@ -35,6 +35,10 @@ export default class CanvasVectorTileLayerRenderer extends CanvasTileLayerRender */ handleFontsChanged(): void; isDrawableTile(tile: VectorRenderTile): boolean; + /** + * Render the vectors for this layer. + */ + postRender(context: CanvasRenderingContext2D, frameState: FrameState): void; /** * Determine whether render should be called. */ @@ -49,12 +53,8 @@ export default class CanvasVectorTileLayerRenderer extends CanvasTileLayerRender squaredTolerance: number, styles: Style | Style[], builderGroup: BuilderGroup, - opt_declutterBuilderGroup?: BuilderGroup, + declutterBuilderGroup?: BuilderGroup, ): boolean; - /** - * Render the layer. - */ - renderFrame(frameState: FrameState, target: HTMLElement): HTMLElement; on(type: TCanvasVectorTileLayerRendererBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TCanvasVectorTileLayerRendererBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TCanvasVectorTileLayerRendererBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/renderer/canvas/common.d.ts b/@types/ol/renderer/canvas/common.d.ts deleted file mode 100644 index 69e82da9..00000000 --- a/@types/ol/renderer/canvas/common.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -export interface ImageSmoothingContext { - imageSmoothingEnabled: boolean; - msImageSmoothingEnabled: boolean; -} -/** - * Context options to disable image smoothing. - */ -export const IMAGE_SMOOTHING_DISABLED: ImageSmoothingContext; -/** - * Context options to enable image smoothing. - */ -export const IMAGE_SMOOTHING_ENABLED: ImageSmoothingContext; diff --git a/@types/ol/renderer/vector.d.ts b/@types/ol/renderer/vector.d.ts index 7074f790..6e0b7075 100644 --- a/@types/ol/renderer/vector.d.ts +++ b/@types/ol/renderer/vector.d.ts @@ -24,6 +24,6 @@ export function renderFeature( style: Style, squaredTolerance: number, listener: (p0: BaseEvent) => void, - opt_transform?: TransformFunction, - opt_declutterBuilderGroup?: BuilderGroup, + transform?: TransformFunction, + declutterBuilderGroup?: BuilderGroup, ): boolean; diff --git a/@types/ol/renderer/webgl/Layer.d.ts b/@types/ol/renderer/webgl/Layer.d.ts index a81872fd..0f622e47 100644 --- a/@types/ol/renderer/webgl/Layer.d.ts +++ b/@types/ol/renderer/webgl/Layer.d.ts @@ -1,22 +1,14 @@ -import { FrameState } from '../../PluggableMap'; +import { FrameState } from '../../Map'; import { Coordinate } from '../../coordinate'; import { EventsKey, ListenerFunction } from '../../events'; import BaseEvent from '../../events/Event'; import Layer from '../../layer/Layer'; -import { Pixel } from '../../pixel'; import WebGLHelper, { UniformValue } from '../../webgl/Helper'; import LayerRenderer from '../Layer'; import { HitMatch } from '../Map'; import { FeatureCallback } from '../vector'; export type TWebGLLayerRendererBaseEventTypes = 'change' | 'error'; -/** - * An object holding positions both in an index and a vertex buffer. - */ -export interface BufferPositions { - vertexPosition: number; - indexPosition: number; -} export interface Options { uniforms?: Record | undefined; postProcesses?: PostProcessesOptions[] | undefined; @@ -27,24 +19,8 @@ export interface PostProcessesOptions { fragmentShader?: string | undefined; uniforms?: Record | undefined; } -/** - * This message will trigger the generation of a vertex and an index buffer based on the given render instructions. - * When the buffers are generated, the worked will send a message of the same type to the main thread, with - * the generated buffers in it. - * Note that any addition properties present in the message will be sent back to the main thread. - */ -export interface WebGLWorkerGenerateBuffersMessage { - type: WebGLWorkerMessageType; - renderInstructions: ArrayBuffer; - vertexBuffer?: ArrayBuffer | undefined; - indexBuffer?: ArrayBuffer | undefined; - customAttributesCount?: number | undefined; -} -export enum WebGLWorkerMessageType { - GENERATE_BUFFERS = 'GENERATE_BUFFERS', -} export default class WebGLLayerRenderer extends LayerRenderer { - constructor(layer: LayerType, opt_options?: Options); + constructor(layer: LayerType, options?: Options); protected helper: WebGLHelper; protected afterHelperCreated(): void; protected dispatchPostComposeEvent(context: WebGLRenderingContext, frameState: FrameState): void; @@ -67,7 +43,6 @@ export default class WebGLLayerRenderer extends callback: FeatureCallback, matches: HitMatch[], ): T | undefined; - getDataAtPixel(pixel: Pixel, frameState: FrameState, hitTolerance: number): Uint8ClampedArray | Uint8Array; /** * Perform action necessary to get the layer rendered after new fonts have loaded */ @@ -93,13 +68,3 @@ export default class WebGLLayerRenderer extends listener: ListenerFunction, ): void; } -/** - * Reads an id from a color-encoded array - * Note: the expected range for each component is 0 to 1 with 256 steps. - */ -export function colorDecodeId(color: number[]): number; -/** - * Generates a color array based on a numerical id - * Note: the range for each component is 0 to 1 with 256 steps - */ -export function colorEncodeId(id: number, opt_array?: number[]): number[]; diff --git a/@types/ol/renderer/webgl/PointsLayer.d.ts b/@types/ol/renderer/webgl/PointsLayer.d.ts index 71e9c4ff..b1ec975b 100644 --- a/@types/ol/renderer/webgl/PointsLayer.d.ts +++ b/@types/ol/renderer/webgl/PointsLayer.d.ts @@ -1,5 +1,5 @@ import Feature from '../../Feature'; -import { FrameState } from '../../PluggableMap'; +import { FrameState } from '../../Map'; import { Coordinate } from '../../coordinate'; import { EventsKey, ListenerFunction } from '../../events'; import BaseEvent from '../../events/Event'; diff --git a/@types/ol/renderer/webgl/TileLayer.d.ts b/@types/ol/renderer/webgl/TileLayer.d.ts index 9637163c..884d996e 100644 --- a/@types/ol/renderer/webgl/TileLayer.d.ts +++ b/@types/ol/renderer/webgl/TileLayer.d.ts @@ -1,4 +1,4 @@ -import { FrameState } from '../../PluggableMap'; +import { FrameState } from '../../Map'; import { Coordinate } from '../../coordinate'; import { EventsKey, ListenerFunction } from '../../events'; import BaseEvent from '../../events/Event'; @@ -32,6 +32,7 @@ export default class WebGLTileLayerRenderer extends WebGLLayerRenderer { extent: Extent, initialZ: number, tileTexturesByZ: Record, + preload: number, ): void; forEachFeatureAtCoordinate( coordinate: Coordinate, diff --git a/@types/ol/renderer/webgl/VectorLayer.d.ts b/@types/ol/renderer/webgl/VectorLayer.d.ts new file mode 100644 index 00000000..6c3872ce --- /dev/null +++ b/@types/ol/renderer/webgl/VectorLayer.d.ts @@ -0,0 +1,72 @@ +import Feature from '../../Feature'; +import { FrameState } from '../../Map'; +import { Coordinate } from '../../coordinate'; +import { EventsKey, ListenerFunction } from '../../events'; +import BaseEvent from '../../events/Event'; +import Geometry from '../../geom/Geometry'; +import Layer from '../../layer/Layer'; +import Source from '../../source/Source'; +import { UniformValue } from '../../webgl/Helper'; +import LayerRenderer from '../Layer'; +import { HitMatch } from '../Map'; +import { FeatureCallback } from '../vector'; +import WebGLLayerRenderer, { PostProcessesOptions } from './Layer'; +import { DefaultAttributes } from './shaders'; + +export type TWebGLVectorLayerRendererBaseEventTypes = 'change' | 'error'; +/** + * A callback computing + * the value of a custom attribute (different for each feature) to be passed on to the GPU. + * Properties are available as 2nd arg for quicker access. + */ +export type CustomAttributeCallback = (p0: Feature, p1: Record) => number; +export interface Options { + className?: string | undefined; + fill?: ShaderProgram | undefined; + stroke?: ShaderProgram | undefined; + point?: ShaderProgram | undefined; + uniforms?: Record | undefined; + postProcesses?: PostProcessesOptions[] | undefined; +} +/** + * An object containing both shaders (vertex and fragment) as well as the required attributes + */ +export interface ShaderProgram { + vertexShader?: string | undefined; + fragmentShader?: string | undefined; + attributes: Record; +} +export default class WebGLVectorLayerRenderer extends WebGLLayerRenderer { + constructor(layer: Layer, options: Options); + /** + * Clean up. + */ + disposeInternal(): void; + forEachFeatureAtCoordinate( + coordinate: Coordinate, + frameState: FrameState, + hitTolerance: number, + callback: FeatureCallback, + matches: HitMatch[], + ): T | undefined; + /** + * Perform action necessary to get the layer rendered after new fonts have loaded + */ + handleFontsChanged(): void; + /** + * Determine whether renderFrame should be called. + */ + prepareFrameInternal(frameState: FrameState): boolean; + /** + * Render the layer. + */ + renderFrame(frameState: FrameState): HTMLElement; + on(type: TWebGLVectorLayerRendererBaseEventTypes, listener: ListenerFunction): EventsKey; + on(type: TWebGLVectorLayerRendererBaseEventTypes[], listener: ListenerFunction): EventsKey[]; + once(type: TWebGLVectorLayerRendererBaseEventTypes, listener: ListenerFunction): EventsKey; + once(type: TWebGLVectorLayerRendererBaseEventTypes[], listener: ListenerFunction): EventsKey[]; + un( + type: TWebGLVectorLayerRendererBaseEventTypes | TWebGLVectorLayerRendererBaseEventTypes[], + listener: ListenerFunction, + ): void; +} diff --git a/@types/ol/renderer/webgl/shaders.d.ts b/@types/ol/renderer/webgl/shaders.d.ts new file mode 100644 index 00000000..dc9989ab --- /dev/null +++ b/@types/ol/renderer/webgl/shaders.d.ts @@ -0,0 +1,35 @@ +import { Color } from '../../color'; + +export type DefaultAttributes = 'color' | 'opacity' | 'width'; +/** + * Default polygon fragment shader. + */ +export const FILL_FRAGMENT_SHADER: string; +/** + * Default polygon vertex shader. + * Relies on the color and opacity attributes. + */ +export const FILL_VERTEX_SHADER: string; +/** + * Default point fragment shader. + */ +export const POINT_FRAGMENT_SHADER: string; +/** + * Default point vertex shader. + * Relies on color and opacity attributes. + */ +export const POINT_VERTEX_SHADER: string; +/** + * Default linestring fragment shader. + */ +export const STROKE_FRAGMENT_SHADER: string; +/** + * Default linestring vertex shader. + * Relies on color, opacity and width attributes. + */ +export const STROKE_VERTEX_SHADER: string; +/** + * Packs red/green/blue channels of a color into a single float value; alpha is ignored. + * This is how the color is expected to be computed. + */ +export function packColor(color: Color | string): number; diff --git a/@types/ol/reproj.d.ts b/@types/ol/reproj.d.ts index bfedeb45..60e7ab1d 100644 --- a/@types/ol/reproj.d.ts +++ b/@types/ol/reproj.d.ts @@ -46,6 +46,6 @@ export function render( triangulation: Triangulation, sources: ImageExtent[], gutter: number, - opt_renderEdges?: boolean, - opt_interpolate?: boolean, + renderEdges?: boolean, + interpolate?: boolean, ): HTMLCanvasElement; diff --git a/@types/ol/reproj/Tile.d.ts b/@types/ol/reproj/Tile.d.ts index 5c8b6b83..ad4fd9e6 100644 --- a/@types/ol/reproj/Tile.d.ts +++ b/@types/ol/reproj/Tile.d.ts @@ -15,9 +15,9 @@ export default class ReprojTile extends Tile { pixelRatio: number, gutter: number, getTileFunction: FunctionType, - opt_errorThreshold?: number, - opt_renderEdges?: boolean, - opt_interpolate?: boolean, + errorThreshold?: number, + renderEdges?: boolean, + interpolate?: boolean, ); /** * Get the HTML Canvas element for this tile. diff --git a/@types/ol/reproj/Triangulation.d.ts b/@types/ol/reproj/Triangulation.d.ts index 59fbda32..bec0029b 100644 --- a/@types/ol/reproj/Triangulation.d.ts +++ b/@types/ol/reproj/Triangulation.d.ts @@ -16,7 +16,7 @@ export default class Triangulation { targetExtent: Extent, maxSourceExtent: Extent, errorThreshold: number, - opt_destinationResolution: number, + destinationResolution: number, ); /** * Calculates extent of the source coordinates from all the triangles. diff --git a/@types/ol/reproj/common.d.ts b/@types/ol/reproj/common.d.ts index de2bc9ac..beecc1e0 100644 --- a/@types/ol/reproj/common.d.ts +++ b/@types/ol/reproj/common.d.ts @@ -1,8 +1,3 @@ -/** - * Enable automatic reprojection of raster sources. Default is true. - * TODO: decide if we want to expose this as a build flag or remove it - */ -export const ENABLE_RASTER_REPROJECTION: boolean; /** * Default maximum allowed threshold (in pixels) for reprojection * triangulation. diff --git a/@types/ol/resolutionconstraint.d.ts b/@types/ol/resolutionconstraint.d.ts index d4b3f72e..453f44d0 100644 --- a/@types/ol/resolutionconstraint.d.ts +++ b/@types/ol/resolutionconstraint.d.ts @@ -5,21 +5,21 @@ export type Type = (p0: number | undefined, p1: number, p2: Size, p3?: boolean) export function createMinMaxResolution( maxResolution: number, minResolution: number, - opt_smooth?: boolean, - opt_maxExtent?: Extent, - opt_showFullExtent?: boolean, + smooth?: boolean, + maxExtent?: Extent, + showFullExtent?: boolean, ): Type; export function createSnapToPower( power: number, maxResolution: number, - opt_minResolution?: number, - opt_smooth?: boolean, - opt_maxExtent?: Extent, - opt_showFullExtent?: boolean, + minResolution?: number, + smooth?: boolean, + maxExtent?: Extent, + showFullExtent?: boolean, ): Type; export function createSnapToResolutions( resolutions: number[], - opt_smooth?: boolean, - opt_maxExtent?: Extent, - opt_showFullExtent?: boolean, + smooth?: boolean, + maxExtent?: Extent, + showFullExtent?: boolean, ): Type; diff --git a/@types/ol/rotationconstraint.d.ts b/@types/ol/rotationconstraint.d.ts index a6a8c7b5..254ef5e0 100644 --- a/@types/ol/rotationconstraint.d.ts +++ b/@types/ol/rotationconstraint.d.ts @@ -1,5 +1,5 @@ export type Type = (p0: number | undefined, p1?: boolean) => number | undefined; export function createSnapToN(n: number): Type; -export function createSnapToZero(opt_tolerance?: number): Type; +export function createSnapToZero(tolerance?: number): Type; export function disable(rotation: number | undefined): number | undefined; export function none(rotation: number | undefined): number | undefined; diff --git a/@types/ol/size.d.ts b/@types/ol/size.d.ts index a5cee0f1..027009da 100644 --- a/@types/ol/size.d.ts +++ b/@types/ol/size.d.ts @@ -5,7 +5,7 @@ export type Size = [number, number]; /** * Returns a buffered size. */ -export function buffer(size: Size, num: number, opt_size?: Size): Size; +export function buffer(size: Size, num: number, dest?: Size): Size; /** * Determines if a size has a positive area. */ @@ -13,10 +13,10 @@ export function hasArea(size: Size): boolean; /** * Returns a size scaled by a ratio. The result will be an array of integers. */ -export function scale(size: Size, ratio: number, opt_size?: Size): Size; +export function scale(size: Size, ratio: number, dest?: Size): Size; /** * Returns an Size array for the passed in number (meaning: square) or * Size array. * (meaning: non-square), */ -export function toSize(size: number | Size, opt_size?: Size): Size; +export function toSize(size: number | Size, dest?: Size): Size; diff --git a/@types/ol/source/BingMaps.d.ts b/@types/ol/source/BingMaps.d.ts index bbca104f..694b3269 100644 --- a/@types/ol/source/BingMaps.d.ts +++ b/@types/ol/source/BingMaps.d.ts @@ -31,7 +31,6 @@ export interface Options { culture?: string | undefined; key: string; imagerySet: string; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; maxZoom?: number | undefined; reprojectionErrorThreshold?: number | undefined; diff --git a/@types/ol/source/Cluster.d.ts b/@types/ol/source/Cluster.d.ts index 183da822..b4ea1022 100644 --- a/@types/ol/source/Cluster.d.ts +++ b/@types/ol/source/Cluster.d.ts @@ -42,7 +42,7 @@ export default class Cluster extends VectorSource { /** * Remove all features from the source. */ - clear(opt_fast?: boolean): void; + clear(fast?: boolean): void; /** * Get the distance in pixels between clusters. */ diff --git a/@types/ol/source/DataTile.d.ts b/@types/ol/source/DataTile.d.ts index b463c600..2f38b01d 100644 --- a/@types/ol/source/DataTile.d.ts +++ b/@types/ol/source/DataTile.d.ts @@ -30,7 +30,6 @@ export interface Options { tileGrid?: TileGrid | undefined; opaque?: boolean | undefined; state?: State | undefined; - tilePixelRatio?: number | undefined; wrapX?: boolean | undefined; transition?: number | undefined; bandCount?: number | undefined; diff --git a/@types/ol/source/GeoTIFF.d.ts b/@types/ol/source/GeoTIFF.d.ts index 4ff5349f..d84add58 100644 --- a/@types/ol/source/GeoTIFF.d.ts +++ b/@types/ol/source/GeoTIFF.d.ts @@ -39,7 +39,7 @@ export type MultiGeoTIFF = MultiGeoTIFF_1; export interface Options { sources: SourceInfo[]; sourceOptions?: GeoTIFFSourceOptions | undefined; - convertToRGB?: boolean | undefined; + convertToRGB?: true | false | 'auto' | undefined; normalize?: boolean | undefined; opaque?: boolean | undefined; transition?: number | undefined; diff --git a/@types/ol/source/IIIF.d.ts b/@types/ol/source/IIIF.d.ts index 989f1866..a9a433e7 100644 --- a/@types/ol/source/IIIF.d.ts +++ b/@types/ol/source/IIIF.d.ts @@ -20,7 +20,6 @@ export interface Options { crossOrigin?: null | string | undefined; extent?: Extent | undefined; format?: string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; projection?: ProjectionLike | undefined; quality?: string | undefined; @@ -38,7 +37,7 @@ export interface Options { zDirection?: number | NearestDirectionFunction | undefined; } export default class IIIF extends TileImage { - constructor(opt_options?: Options); + constructor(options?: Options); on(type: TIIIFBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TIIIFBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TIIIFBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/source/Image.d.ts b/@types/ol/source/Image.d.ts index 9876b70f..f84daea2 100644 --- a/@types/ol/source/Image.d.ts +++ b/@types/ol/source/Image.d.ts @@ -14,7 +14,6 @@ export type TImageSourceObjectEventTypes = 'propertychange'; export type ImageSourceEventTypes = 'imageloadend' | 'imageloaderror' | 'imageloadstart'; export interface Options { attributions?: AttributionLike | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; projection?: ProjectionLike | undefined; resolutions?: number[] | undefined; diff --git a/@types/ol/source/ImageArcGISRest.d.ts b/@types/ol/source/ImageArcGISRest.d.ts index 6286f04a..7f9e7fae 100644 --- a/@types/ol/source/ImageArcGISRest.d.ts +++ b/@types/ol/source/ImageArcGISRest.d.ts @@ -16,7 +16,6 @@ export interface Options { crossOrigin?: null | string | undefined; hidpi?: boolean | undefined; imageLoadFunction?: LoadFunction | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; params?: Record | undefined; projection?: ProjectionLike | undefined; @@ -25,7 +24,7 @@ export interface Options { url?: string | undefined; } export default class ImageArcGISRest extends ImageSource { - constructor(opt_options?: Options); + constructor(options?: Options); getImageInternal(extent: Extent, resolution: number, pixelRatio: number, projection: Projection): ImageWrapper; /** * Return the image load function of the source. diff --git a/@types/ol/source/ImageCanvas.d.ts b/@types/ol/source/ImageCanvas.d.ts index 75d32e2d..915c8ed4 100644 --- a/@types/ol/source/ImageCanvas.d.ts +++ b/@types/ol/source/ImageCanvas.d.ts @@ -32,7 +32,6 @@ export type FunctionType = ( export interface Options { attributions?: AttributionLike | undefined; canvasFunction?: FunctionType | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; projection?: ProjectionLike | undefined; ratio?: number | undefined; @@ -40,7 +39,7 @@ export interface Options { state?: State | undefined; } export default class ImageCanvasSource extends ImageSource { - constructor(opt_options?: Options); + constructor(options?: Options); getImageInternal(extent: Extent, resolution: number, pixelRatio: number, projection: Projection): ImageCanvas; on(type: TImageCanvasSourceBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TImageCanvasSourceBaseEventTypes[], listener: ListenerFunction): EventsKey[]; diff --git a/@types/ol/source/ImageMapGuide.d.ts b/@types/ol/source/ImageMapGuide.d.ts index b4a42514..515ff026 100644 --- a/@types/ol/source/ImageMapGuide.d.ts +++ b/@types/ol/source/ImageMapGuide.d.ts @@ -22,7 +22,6 @@ export interface Options { ratio?: number | undefined; resolutions?: number[] | undefined; imageLoadFunction?: LoadFunction | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; params?: any; } diff --git a/@types/ol/source/ImageStatic.d.ts b/@types/ol/source/ImageStatic.d.ts index 0b74ed39..df243fd4 100644 --- a/@types/ol/source/ImageStatic.d.ts +++ b/@types/ol/source/ImageStatic.d.ts @@ -17,7 +17,6 @@ export interface Options { crossOrigin?: null | string | undefined; imageExtent?: Extent | undefined; imageLoadFunction?: LoadFunction | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; projection?: ProjectionLike | undefined; imageSize?: Size | undefined; diff --git a/@types/ol/source/ImageWMS.d.ts b/@types/ol/source/ImageWMS.d.ts index 2fadc675..cafa400d 100644 --- a/@types/ol/source/ImageWMS.d.ts +++ b/@types/ol/source/ImageWMS.d.ts @@ -19,16 +19,15 @@ export interface Options { hidpi?: boolean | undefined; serverType?: ServerType | undefined; imageLoadFunction?: LoadFunction | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; - params: Record; + params?: Record | undefined; projection?: ProjectionLike | undefined; ratio?: number | undefined; resolutions?: number[] | undefined; - url: string; + url?: string | undefined; } export default class ImageWMS extends ImageSource { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Return the GetFeatureInfo URL for the passed coordinate, resolution, and * projection. Return undefined if the GetFeatureInfo URL cannot be diff --git a/@types/ol/source/OGCMapTile.d.ts b/@types/ol/source/OGCMapTile.d.ts index cb4051dc..acf68efb 100644 --- a/@types/ol/source/OGCMapTile.d.ts +++ b/@types/ol/source/OGCMapTile.d.ts @@ -18,7 +18,6 @@ export interface Options { attributions?: AttributionLike | undefined; cacheSize?: number | undefined; crossOrigin?: null | string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; reprojectionErrorThreshold?: number | undefined; tileLoadFunction?: LoadFunction | undefined; diff --git a/@types/ol/source/OSM.d.ts b/@types/ol/source/OSM.d.ts index 5d3aecf8..b1c03701 100644 --- a/@types/ol/source/OSM.d.ts +++ b/@types/ol/source/OSM.d.ts @@ -14,7 +14,6 @@ export interface Options { attributions?: AttributionLike | undefined; cacheSize?: number | undefined; crossOrigin?: null | string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; maxZoom?: number | undefined; opaque?: boolean | undefined; @@ -31,7 +30,7 @@ export interface Options { */ export const ATTRIBUTION: string; export default class OSM extends XYZ { - constructor(opt_options?: Options); + constructor(options?: Options); on(type: TOSMBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TOSMBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TOSMBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/source/Raster.d.ts b/@types/ol/source/Raster.d.ts index f60604c6..d3b65f8b 100644 --- a/@types/ol/source/Raster.d.ts +++ b/@types/ol/source/Raster.d.ts @@ -1,8 +1,8 @@ import Disposable from '../Disposable'; import ImageBase from '../ImageBase'; import ImageCanvas from '../ImageCanvas'; +import { FrameState } from '../Map'; import { ObjectEvent } from '../Object'; -import { FrameState } from '../PluggableMap'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; @@ -62,14 +62,11 @@ export interface ProcessorOptions { queue: number; imageOps?: boolean | undefined; } -export type RasterSourceEventTypes = ImageSourceEventTypes | 'beforeoperations' | 'afteroperations'; /** * Raster operation type. Supported values are 'pixel' and 'image'. */ -declare enum RasterOperationType { - PIXEL = 'pixel', - IMAGE = 'image', -} +export type RasterOperationType = 'pixel' | 'image'; +export type RasterSourceEventTypes = ImageSourceEventTypes | 'beforeoperations' | 'afteroperations'; export class Processor extends Disposable { constructor(config: ProcessorOptions); /** @@ -114,7 +111,7 @@ export default class RasterSource extends ImageSource { /** * Set the operation. */ - setOperation(operation: Operation, opt_lib?: any): void; + setOperation(operation: Operation, lib?: any): void; on(type: TRasterSourceRasterSourceEventTypes, listener: ListenerFunction): EventsKey; on(type: TRasterSourceRasterSourceEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TRasterSourceRasterSourceEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/source/Source.d.ts b/@types/ol/source/Source.d.ts index c6adb35f..c7c81dec 100644 --- a/@types/ol/source/Source.d.ts +++ b/@types/ol/source/Source.d.ts @@ -1,5 +1,5 @@ +import { FrameState } from '../Map'; import BaseObject, { ObjectEvent } from '../Object'; -import { FrameState } from '../PluggableMap'; import { ViewOptions } from '../View'; import { EventsKey, ListenerFunction } from '../events'; import BaseEvent from '../events/Event'; @@ -9,7 +9,7 @@ import Projection from '../proj/Projection'; export type TSourceBaseEventTypes = 'change' | 'error'; export type TSourceObjectEventTypes = 'propertychange'; /** - * A function that takes a {@link module:ol/PluggableMap~FrameState} and returns a string or + * A function that takes a {@link module:ol/Map~FrameState} and returns a string or * an array of strings representing source attributions. */ export type Attribution = (p0: FrameState) => string | string[]; diff --git a/@types/ol/source/Stamen.d.ts b/@types/ol/source/Stamen.d.ts index acc11534..29cac156 100644 --- a/@types/ol/source/Stamen.d.ts +++ b/@types/ol/source/Stamen.d.ts @@ -11,7 +11,6 @@ export type TStamenObjectEventTypes = 'propertychange'; export type TStamenTileSourceEventTypes = 'tileloadend' | 'tileloaderror' | 'tileloadstart'; export interface Options { cacheSize?: number | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; layer: string; minZoom?: number | undefined; diff --git a/@types/ol/source/Tile.d.ts b/@types/ol/source/Tile.d.ts index e4a84c84..d81b9526 100644 --- a/@types/ol/source/Tile.d.ts +++ b/@types/ol/source/Tile.d.ts @@ -64,7 +64,7 @@ export default abstract class TileSource extends Source { * is outside the resolution and extent range of the tile grid, null will be * returned. */ - getTileCoordForTileUrlFunction(tileCoord: TileCoord, opt_projection?: Projection): TileCoord; + getTileCoordForTileUrlFunction(tileCoord: TileCoord, projection?: Projection): TileCoord; /** * Return the tile grid of the tile source. */ diff --git a/@types/ol/source/TileArcGISRest.d.ts b/@types/ol/source/TileArcGISRest.d.ts index 50883b16..c6278acb 100644 --- a/@types/ol/source/TileArcGISRest.d.ts +++ b/@types/ol/source/TileArcGISRest.d.ts @@ -16,7 +16,6 @@ export interface Options { attributions?: AttributionLike | undefined; cacheSize?: number | undefined; crossOrigin?: null | string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; params?: Record | undefined; hidpi?: boolean | undefined; @@ -31,7 +30,7 @@ export interface Options { zDirection?: number | NearestDirectionFunction | undefined; } export default class TileArcGISRest extends TileImage { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Get the user-provided params, i.e. those passed to the constructor through * the "params" option, and possibly updated using the updateParams method. diff --git a/@types/ol/source/TileDebug.d.ts b/@types/ol/source/TileDebug.d.ts index 0f80b894..f8c96211 100644 --- a/@types/ol/source/TileDebug.d.ts +++ b/@types/ol/source/TileDebug.d.ts @@ -18,7 +18,7 @@ export interface Options { template?: string | undefined; } export default class TileDebug extends XYZ { - constructor(opt_options?: Options); + constructor(options?: Options); on(type: TTileDebugBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TTileDebugBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TTileDebugBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/source/TileImage.d.ts b/@types/ol/source/TileImage.d.ts index 043ed639..9bfefbc1 100644 --- a/@types/ol/source/TileImage.d.ts +++ b/@types/ol/source/TileImage.d.ts @@ -21,7 +21,6 @@ export interface Options { attributionsCollapsible?: boolean | undefined; cacheSize?: number | undefined; crossOrigin?: null | string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; opaque?: boolean | undefined; projection?: ProjectionLike | undefined; diff --git a/@types/ol/source/TileJSON.d.ts b/@types/ol/source/TileJSON.d.ts index 95c611b9..82eab9a9 100644 --- a/@types/ol/source/TileJSON.d.ts +++ b/@types/ol/source/TileJSON.d.ts @@ -30,7 +30,6 @@ export interface Options { attributions?: AttributionLike | undefined; cacheSize?: number | undefined; crossOrigin?: null | string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; jsonp?: boolean | undefined; reprojectionErrorThreshold?: number | undefined; diff --git a/@types/ol/source/TileWMS.d.ts b/@types/ol/source/TileWMS.d.ts index 148fef60..7621af33 100644 --- a/@types/ol/source/TileWMS.d.ts +++ b/@types/ol/source/TileWMS.d.ts @@ -20,7 +20,6 @@ export interface Options { attributionsCollapsible?: boolean | undefined; cacheSize?: number | undefined; crossOrigin?: null | string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; params: Record; gutter?: number | undefined; @@ -38,7 +37,7 @@ export interface Options { zDirection?: number | NearestDirectionFunction | undefined; } export default class TileWMS extends TileImage { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Return the GetFeatureInfo URL for the passed coordinate, resolution, and * projection. Return undefined if the GetFeatureInfo URL cannot be diff --git a/@types/ol/source/UTFGrid.d.ts b/@types/ol/source/UTFGrid.d.ts index a000dfe3..1d319bb3 100644 --- a/@types/ol/source/UTFGrid.d.ts +++ b/@types/ol/source/UTFGrid.d.ts @@ -38,7 +38,7 @@ export class CustomTile extends Tile { * Calls the callback (synchronously by default) with the available data * for given coordinate (or null if not yet loaded). */ - forDataAtCoordinate(coordinate: Coordinate, callback: (p0: any) => void, opt_request?: boolean): void; + forDataAtCoordinate(coordinate: Coordinate, callback: (p0: any) => void, request?: boolean): void; /** * Synchronously returns data at given coordinate (if available). */ @@ -69,7 +69,7 @@ export default class UTFGrid extends TileSource { coordinate: Coordinate, resolution: number, callback: (p0: any) => void, - opt_request?: boolean, + request?: boolean, ): void; /** * Return the template from TileJSON. diff --git a/@types/ol/source/Vector.d.ts b/@types/ol/source/Vector.d.ts index 0b16e96d..a9f3aba1 100644 --- a/@types/ol/source/Vector.d.ts +++ b/@types/ol/source/Vector.d.ts @@ -27,9 +27,9 @@ export type TVectorSourceObjectEventTypes = 'propertychange'; * is one of the standard {@link module:ol/loadingstrategy} strategies. */ export type LoadingStrategy = (p0: Extent, p1: number, p2: Projection) => Extent[]; -export interface Options { +export interface Options { attributions?: AttributionLike | undefined; - features?: Feature[] | Collection> | undefined; + features?: Feature[] | Collection> | undefined; format?: FeatureFormat | undefined; loader?: FeatureLoader | undefined; overlaps?: boolean | undefined; @@ -39,7 +39,7 @@ export interface Options { wrapX?: boolean | undefined; } export default class VectorSource extends Source { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Add a feature without firing a change event. */ @@ -70,7 +70,7 @@ export default class VectorSource exte /** * Remove all features from the source. */ - clear(opt_fast?: boolean): void; + clear(fast?: boolean): void; /** * Iterate through all features on the source, calling the provided callback * with each one. If the callback returns any "truthy" value, iteration will @@ -111,14 +111,14 @@ export default class VectorSource exte */ getClosestFeatureToCoordinate( coordinate: Coordinate, - opt_filter?: (p0: Feature) => boolean, + filter?: (p0: Feature) => boolean, ): Feature; /** * Get the extent of the features currently in the source. * This method is not available when the source is configured with * useSpatialIndex set to false. */ - getExtent(opt_extent?: Extent): Extent; + getExtent(extent?: Extent): Extent; /** * Get a feature by its identifier (the value returned by feature.getId()). * Note that the index treats string and numeric identifiers as the same. So @@ -151,7 +151,7 @@ export default class VectorSource exte * When useSpatialIndex is set to false, this method will return all * features. */ - getFeaturesInExtent(extent: Extent, opt_projection?: Projection): Feature[]; + getFeaturesInExtent(extent: Extent, projection?: Projection): Feature[]; /** * Get the format associated with this source. */ @@ -219,7 +219,7 @@ export default class VectorSource exte ): void; } export class VectorSourceEvent extends BaseEvent { - constructor(type: string, opt_feature?: Feature, opt_features?: Feature[]); + constructor(type: string, feature?: Feature, features?: Feature[]); /** * The added or removed feature for the ADDFEATURE and REMOVEFEATURE events, undefined otherwise. */ diff --git a/@types/ol/source/WMTS.d.ts b/@types/ol/source/WMTS.d.ts index 36d83bc0..f17ec921 100644 --- a/@types/ol/source/WMTS.d.ts +++ b/@types/ol/source/WMTS.d.ts @@ -18,7 +18,6 @@ export interface Options { attributionsCollapsible?: boolean | undefined; cacheSize?: number | undefined; crossOrigin?: null | string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; tileGrid: WMTSTileGrid; projection?: ProjectionLike | undefined; diff --git a/@types/ol/source/XYZ.d.ts b/@types/ol/source/XYZ.d.ts index 498d4677..ed96adf7 100644 --- a/@types/ol/source/XYZ.d.ts +++ b/@types/ol/source/XYZ.d.ts @@ -18,7 +18,6 @@ export interface Options { attributionsCollapsible?: boolean | undefined; cacheSize?: number | undefined; crossOrigin?: null | string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; opaque?: boolean | undefined; projection?: ProjectionLike | undefined; @@ -39,7 +38,7 @@ export interface Options { zDirection?: number | NearestDirectionFunction | undefined; } export default class XYZ extends TileImage { - constructor(opt_options?: Options); + constructor(options?: Options); getGutter(): number; on(type: TXYZBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TXYZBaseEventTypes[], listener: ListenerFunction): EventsKey[]; diff --git a/@types/ol/source/Zoomify.d.ts b/@types/ol/source/Zoomify.d.ts index 2ece7e76..16e8f8c8 100644 --- a/@types/ol/source/Zoomify.d.ts +++ b/@types/ol/source/Zoomify.d.ts @@ -20,19 +20,19 @@ export interface Options { attributions?: AttributionLike | undefined; cacheSize?: number | undefined; crossOrigin?: null | string | undefined; - imageSmoothing?: boolean | undefined; interpolate?: boolean | undefined; projection?: ProjectionLike | undefined; tilePixelRatio?: number | undefined; reprojectionErrorThreshold?: number | undefined; url: string; - tierSizeCalculation?: string | undefined; + tierSizeCalculation?: TierSizeCalculation | undefined; size: Size; extent?: Extent | undefined; transition?: number | undefined; tileSize?: number | undefined; zDirection?: number | NearestDirectionFunction | undefined; } +export type TierSizeCalculation = 'default' | 'truncated'; export class CustomTile extends ImageTile { constructor( tileSize: Size, @@ -41,7 +41,7 @@ export class CustomTile extends ImageTile { src: string, crossOrigin: string, tileLoadFunction: LoadFunction, - opt_options?: Options_1, + options?: Options_1, ); /** * Get the image element for this tile. @@ -49,7 +49,7 @@ export class CustomTile extends ImageTile { getImage(): HTMLCanvasElement | HTMLImageElement | HTMLVideoElement; } export default class Zoomify extends TileImage { - constructor(opt_options: Options); + constructor(options: Options); on(type: TZoomifyBaseEventTypes, listener: ListenerFunction): EventsKey; on(type: TZoomifyBaseEventTypes[], listener: ListenerFunction): EventsKey[]; once(type: TZoomifyBaseEventTypes, listener: ListenerFunction): EventsKey; diff --git a/@types/ol/sphere.d.ts b/@types/ol/sphere.d.ts index 67786ba8..1920fca8 100644 --- a/@types/ol/sphere.d.ts +++ b/@types/ol/sphere.d.ts @@ -19,19 +19,19 @@ export const DEFAULT_RADIUS: number; * Get the spherical area of a geometry. This is the area (in meters) assuming * that polygon edges are segments of great circles on a sphere. */ -export function getArea(geometry: Geometry, opt_options?: SphereMetricOptions): number; +export function getArea(geometry: Geometry, options?: SphereMetricOptions): number; /** * Get the great circle distance (in meters) between two geographic coordinates. */ -export function getDistance(c1: any[], c2: any[], opt_radius?: number): number; +export function getDistance(c1: any[], c2: any[], radius?: number): number; /** * Get the spherical length of a geometry. This length is the sum of the * great circle distances between coordinates. For polygons, the length is * the sum of all rings. For points, the length is zero. For multi-part * geometries, the length is the sum of the length of each part. */ -export function getLength(geometry: Geometry, opt_options?: SphereMetricOptions): number; +export function getLength(geometry: Geometry, options?: SphereMetricOptions): number; /** * Returns the coordinate at the given distance and bearing from c1. */ -export function offset(c1: Coordinate, distance: number, bearing: number, opt_radius?: number): Coordinate; +export function offset(c1: Coordinate, distance: number, bearing: number, radius?: number): Coordinate; diff --git a/@types/ol/string.d.ts b/@types/ol/string.d.ts index eb62c11e..b8850ce6 100644 --- a/@types/ol/string.d.ts +++ b/@types/ol/string.d.ts @@ -2,4 +2,4 @@ * Adapted from https://github.com/omichelsen/compare-versions/blob/master/index.js */ export function compareVersions(v1: string | number, v2: string | number): number; -export function padNumber(number: number, width: number, opt_precision?: number): string; +export function padNumber(number: number, width: number, precision?: number): string; diff --git a/@types/ol/structs/LRUCache.d.ts b/@types/ol/structs/LRUCache.d.ts index ee3fdddf..04e3d82b 100644 --- a/@types/ol/structs/LRUCache.d.ts +++ b/@types/ol/structs/LRUCache.d.ts @@ -9,7 +9,7 @@ export interface Entry { value_: any; } export default class LRUCache { - constructor(opt_highWaterMark?: number); + constructor(highWaterMark?: number); canExpireCache(): boolean; /** * FIXME empty description for jsdoc @@ -21,7 +21,7 @@ export default class LRUCache { */ expireCache(keep?: Record): void; forEach(f: (p0: T, p1: string, p2: LRUCache) => any): void; - get(key: string, opt_options?: any): T; + get(key: string, options?: any): T; getCount(): number; getKeys(): string[]; getValues(): T[]; diff --git a/@types/ol/structs/LinkedList.d.ts b/@types/ol/structs/LinkedList.d.ts index 4c674370..8886aa58 100644 --- a/@types/ol/structs/LinkedList.d.ts +++ b/@types/ol/structs/LinkedList.d.ts @@ -4,7 +4,7 @@ export interface Item { data: any; } export default class LinkedList { - constructor(opt_circular?: boolean); + constructor(circular?: boolean); /** * Concatenates two lists. */ diff --git a/@types/ol/structs/RBush.d.ts b/@types/ol/structs/RBush.d.ts index 40ebb996..6b4eb66d 100644 --- a/@types/ol/structs/RBush.d.ts +++ b/@types/ol/structs/RBush.d.ts @@ -8,7 +8,7 @@ export interface Entry { value?: any; } export default class RBush { - constructor(opt_maxEntries?: number); + constructor(maxEntries?: number); /** * Remove all values from the RBush. */ @@ -28,7 +28,7 @@ export default class RBush { * Return all values in the RBush. */ getAll(): T[]; - getExtent(opt_extent?: Extent): Extent; + getExtent(extent?: Extent): Extent; /** * Return all values in the given extent. */ diff --git a/@types/ol/style/Circle.d.ts b/@types/ol/style/Circle.d.ts index 30ca2d02..7f547dba 100644 --- a/@types/ol/style/Circle.d.ts +++ b/@types/ol/style/Circle.d.ts @@ -14,7 +14,7 @@ export interface Options { declutterMode?: 'declutter' | 'obstacle' | 'none' | undefined; } export default class CircleStyle extends RegularShape { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Clones the style. */ diff --git a/@types/ol/style/Fill.d.ts b/@types/ol/style/Fill.d.ts index 19505b35..1d8a5949 100644 --- a/@types/ol/style/Fill.d.ts +++ b/@types/ol/style/Fill.d.ts @@ -5,7 +5,7 @@ export interface Options { color?: Color | ColorLike | null | undefined; } export default class Fill { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Clones the style. The color is not cloned if it is an {@link module:ol/colorlike~ColorLike}. */ diff --git a/@types/ol/style/Icon.d.ts b/@types/ol/style/Icon.d.ts index c13a3ed9..cc9be3aa 100644 --- a/@types/ol/style/Icon.d.ts +++ b/@types/ol/style/Icon.d.ts @@ -2,10 +2,16 @@ import ImageState from '../ImageState'; import { Color } from '../color'; import BaseEvent from '../events/Event'; import { Size } from '../size'; -import IconAnchorUnits from './IconAnchorUnits'; -import IconOrigin from './IconOrigin'; import ImageStyle from './Image'; +/** + * Anchor unit can be either a fraction of the icon size or in pixels. + */ +export type IconAnchorUnits = 'fraction' | 'pixels'; +/** + * Icon origin. One of 'bottom-left', 'bottom-right', 'top-left', 'top-right'. + */ +export type IconOrigin = 'bottom-left' | 'bottom-right' | 'top-left' | 'top-right'; export interface Options { anchor?: number[] | undefined; anchorOrigin?: IconOrigin | undefined; @@ -14,20 +20,20 @@ export interface Options { color?: Color | string | undefined; crossOrigin?: null | string | undefined; img?: HTMLImageElement | HTMLCanvasElement | undefined; - offset?: number[] | undefined; + imgSize?: Size | undefined; displacement?: number[] | undefined; - offsetOrigin?: IconOrigin | undefined; opacity?: number | undefined; scale?: number | Size | undefined; rotateWithView?: boolean | undefined; rotation?: number | undefined; + offset?: number[] | undefined; + offsetOrigin?: IconOrigin | undefined; size?: Size | undefined; - imgSize?: Size | undefined; src?: string | undefined; declutterMode?: 'declutter' | 'obstacle' | 'none' | undefined; } export default class Icon extends ImageStyle { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Clones the style. The underlying Image/HTMLCanvasElement is not cloned. */ diff --git a/@types/ol/style/IconAnchorUnits.d.ts b/@types/ol/style/IconAnchorUnits.d.ts deleted file mode 100644 index 28c4b678..00000000 --- a/@types/ol/style/IconAnchorUnits.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Icon anchor units. One of 'fraction', 'pixels'. - */ -declare enum IconAnchorUnits { - FRACTION = 'fraction', - PIXELS = 'pixels', -} - -export default IconAnchorUnits; diff --git a/@types/ol/style/IconOrigin.d.ts b/@types/ol/style/IconOrigin.d.ts deleted file mode 100644 index fa12439d..00000000 --- a/@types/ol/style/IconOrigin.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Icon origin. One of 'bottom-left', 'bottom-right', 'top-left', 'top-right'. - */ -declare enum IconOrigin { - BOTTOM_LEFT = 'bottom-left', - BOTTOM_RIGHT = 'bottom-right', - TOP_LEFT = 'top-left', - TOP_RIGHT = 'top-right', -} - -export default IconOrigin; diff --git a/@types/ol/style/RegularShape.d.ts b/@types/ol/style/RegularShape.d.ts index ed5bab92..180b704e 100644 --- a/@types/ol/style/RegularShape.d.ts +++ b/@types/ol/style/RegularShape.d.ts @@ -27,7 +27,7 @@ export interface RenderOptions { strokeStyle?: ColorLike | undefined; strokeWidth: number; size: number; - lineDash: number[]; + lineDash: number[] | null; lineDashOffset: number; lineJoin: CanvasLineJoin; miterLimit: number; diff --git a/@types/ol/style/Stroke.d.ts b/@types/ol/style/Stroke.d.ts index 1dbdeee0..a5016ec5 100644 --- a/@types/ol/style/Stroke.d.ts +++ b/@types/ol/style/Stroke.d.ts @@ -11,7 +11,7 @@ export interface Options { width?: number | undefined; } export default class Stroke { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Clones the style. */ @@ -27,7 +27,7 @@ export default class Stroke { /** * Get the line dash style for the stroke. */ - getLineDash(): number[]; + getLineDash(): number[] | null; /** * Get the line dash offset for the stroke. */ @@ -54,11 +54,8 @@ export default class Stroke { setLineCap(lineCap: CanvasLineCap | undefined): void; /** * Set the line dash. - * Please note that Internet Explorer 10 and lower do not support the - * setLineDash method on the CanvasRenderingContext2D and therefore this - * property will have no visual effect in these browsers. */ - setLineDash(lineDash: number[]): void; + setLineDash(lineDash: number[] | null): void; /** * Set the line dash offset. */ diff --git a/@types/ol/style/Style.d.ts b/@types/ol/style/Style.d.ts index 5e16e801..cc6fd129 100644 --- a/@types/ol/style/Style.d.ts +++ b/@types/ol/style/Style.d.ts @@ -44,7 +44,7 @@ export type StyleFunction = (p0: FeatureLike, p1: number) => Style | Style[] | v */ export type StyleLike = Style | Style[] | StyleFunction; export default class Style { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Clones the style. */ diff --git a/@types/ol/style/Text.d.ts b/@types/ol/style/Text.d.ts index fff74739..e710014c 100644 --- a/@types/ol/style/Text.d.ts +++ b/@types/ol/style/Text.d.ts @@ -1,7 +1,6 @@ import { Size } from '../size'; import Fill from './Fill'; import Stroke from './Stroke'; -import TextPlacement from './TextPlacement'; export interface Options { font?: string | undefined; @@ -9,22 +8,30 @@ export interface Options { offsetX?: number | undefined; offsetY?: number | undefined; overflow?: boolean | undefined; - placement?: TextPlacement | string | undefined; + placement?: TextPlacement | undefined; scale?: number | Size | undefined; rotateWithView?: boolean | undefined; rotation?: number | undefined; text?: string | string[] | undefined; - textAlign?: string | undefined; - justify?: string | undefined; - textBaseline?: string | undefined; + textAlign?: CanvasTextAlign | undefined; + justify?: TextJustify | undefined; + textBaseline?: CanvasTextBaseline | undefined; fill?: Fill | undefined; stroke?: Stroke | undefined; backgroundFill?: Fill | undefined; backgroundStroke?: Stroke | undefined; padding?: number[] | undefined; } +export type TextJustify = 'left' | 'center' | 'right'; +/** + * Default text placement is 'point'. Note that + * 'line' requires the underlying geometry to be a {@link module:ol/geom/LineString~LineString}, + * {@link module:ol/geom/Polygon~Polygon}, {@link module:ol/geom/MultiLineString~MultiLineString} or + * {@link module:ol/geom/MultiPolygon~MultiPolygon}. + */ +export type TextPlacement = 'point' | 'line'; export default class Text { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Clones the style. */ @@ -48,7 +55,7 @@ export default class Text { /** * Get the justification. */ - getJustify(): string | undefined; + getJustify(): TextJustify | undefined; /** * Get the maximum angle between adjacent characters. */ @@ -72,7 +79,7 @@ export default class Text { /** * Get the label placement. */ - getPlacement(): TextPlacement | string; + getPlacement(): TextPlacement; /** * Determine whether the text rotates with the map. */ @@ -100,11 +107,11 @@ export default class Text { /** * Get the text alignment. */ - getTextAlign(): string | undefined; + getTextAlign(): CanvasTextAlign | undefined; /** * Get the text baseline. */ - getTextBaseline(): string | undefined; + getTextBaseline(): CanvasTextBaseline | undefined; /** * Set the background fill. */ @@ -124,7 +131,7 @@ export default class Text { /** * Set the justification. */ - setJustify(justify: string | undefined): void; + setJustify(justify: TextJustify | undefined): void; /** * Set the maximum angle between adjacent characters. */ @@ -148,7 +155,7 @@ export default class Text { /** * Set the text placement. */ - setPlacement(placement: TextPlacement | string): void; + setPlacement(placement: TextPlacement): void; /** * Set whether to rotate the text with the view. */ @@ -172,9 +179,9 @@ export default class Text { /** * Set the text alignment. */ - setTextAlign(textAlign: string | undefined): void; + setTextAlign(textAlign: CanvasTextAlign | undefined): void; /** * Set the text baseline. */ - setTextBaseline(textBaseline: string | undefined): void; + setTextBaseline(textBaseline: CanvasTextBaseline | undefined): void; } diff --git a/@types/ol/style/TextPlacement.d.ts b/@types/ol/style/TextPlacement.d.ts deleted file mode 100644 index 43b7f0f1..00000000 --- a/@types/ol/style/TextPlacement.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Text placement. One of 'point', 'line'. Default is 'point'. Note that - * 'line' requires the underlying geometry to be a {@link module:ol/geom/LineString~LineString}, - * {@link module:ol/geom/Polygon~Polygon}, {@link module:ol/geom/MultiLineString~MultiLineString} or - * {@link module:ol/geom/MultiPolygon~MultiPolygon}. - */ -declare enum TextPlacement { - POINT = 'point', - LINE = 'line', -} - -export default TextPlacement; diff --git a/@types/ol/style/flat.d.ts b/@types/ol/style/flat.d.ts new file mode 100644 index 00000000..3660f1da --- /dev/null +++ b/@types/ol/style/flat.d.ts @@ -0,0 +1,137 @@ +import { Color } from '../color'; +import { ColorLike } from '../colorlike'; +import { Size } from '../size'; +import { IconAnchorUnits, IconOrigin } from './Icon'; +import Style from './Style'; +import { TextJustify, TextPlacement } from './Text'; + +/** + * Circle style properties for rendering point features. At least circle-radius must be provided. + */ +export interface FlatCircle { + 'circle-radius'?: number | undefined; + 'circle-fill-color'?: Color | ColorLike | undefined; + 'circle-stroke-color'?: Color | ColorLike | undefined; + 'circle-stroke-width'?: number | undefined; + 'circle-stroke-line-cap'?: CanvasLineCap | undefined; + 'circle-stroke-line-join'?: CanvasLineJoin | undefined; + 'circle-stroke-line-dash'?: number[] | undefined; + 'circle-stroke-line-dash-offset'?: number | undefined; + 'circle-stroke-miter-limit'?: number | undefined; + 'circle-displacement'?: number[] | undefined; + 'circle-scale'?: number | Size | undefined; + 'circle-rotation'?: number | undefined; + 'circle-rotate-with-view'?: boolean | undefined; + 'circle-declutter-mode'?: 'declutter' | 'obstacle' | 'none' | undefined; +} +/** + * Fill style properties applied to polygon features. + */ +export interface FlatFill { + 'fill-color'?: Color | ColorLike | undefined; +} +/** + * Icon style properties applied to point features. One of icon-src or icon-img must be provided to render + * points with an icon. + */ +export interface FlatIcon { + 'icon-src'?: string | undefined; + 'icon-img'?: HTMLImageElement | HTMLCanvasElement | undefined; + 'icon-img-size'?: Size | undefined; + 'icon-anchor'?: number[] | undefined; + 'icon-anchor-origin'?: IconOrigin | undefined; + 'icon-anchor-x-units'?: IconAnchorUnits | undefined; + 'icon-anchor-y-units'?: IconAnchorUnits | undefined; + 'icon-color'?: Color | string | undefined; + 'icon-cross-origin'?: null | string | undefined; + 'icon-offset'?: number[] | undefined; + 'icon-displacement'?: number[] | undefined; + 'icon-offset-origin'?: IconOrigin | undefined; + 'icon-opacity'?: number | undefined; + 'icon-scale'?: number | Size | undefined; + 'icon-rotation'?: number | undefined; + 'icon-rotate-with-view'?: boolean | undefined; + 'icon-size'?: Size | undefined; + 'icon-declutter-mode'?: 'declutter' | 'obstacle' | 'none' | undefined; +} +/** + * Regular shape style properties for rendering point features. At least shape-points must be provided. + */ +export interface FlatShape { + 'shape-points'?: number | undefined; + 'shape-fill-color'?: Color | ColorLike | undefined; + 'shape-stroke-color'?: Color | ColorLike | undefined; + 'shape-stroke-width'?: number | undefined; + 'shape-stroke-line-cap'?: CanvasLineCap | undefined; + 'shape-stroke-line-join'?: CanvasLineJoin | undefined; + 'shape-stroke-line-dash'?: number[] | undefined; + 'shape-stroke-line-dash-offset'?: number | undefined; + 'shape-stroke-miter-limit'?: number | undefined; + 'shape-radius'?: number | undefined; + 'shape-radius1'?: number | undefined; + 'shape-radius2'?: number | undefined; + 'shape-angle'?: number | undefined; + 'shape-displacement'?: number[] | undefined; + 'shape-rotation'?: number | undefined; + 'shape-rotate-with-view'?: boolean | undefined; + 'shape-scale'?: number | Size | undefined; + 'shape-declutter-mode'?: 'declutter' | 'obstacle' | 'none' | undefined; +} +/** + * Stroke style properties applied to line strings and polygon boundaries. To apply a stroke, at least one of + * stroke-color or stroke-width must be provided. + */ +export interface FlatStroke { + 'stroke-color'?: Color | ColorLike | undefined; + 'stroke-width'?: number | undefined; + 'stroke-line-cap'?: CanvasLineCap | undefined; + 'stroke-line-join'?: CanvasLineJoin | undefined; + 'stroke-line-dash'?: number[] | undefined; + 'stroke-line-dash-offset'?: number | undefined; + 'stroke-miter-limit'?: number | undefined; +} +/** + * For static styling, the [layer.setStyle()]{@link module:ol/layer/Vector~VectorLayer#setStyle} method + * can be called with an object literal that has fill, stroke, text, icon, regular shape, and/or circle properties. + */ +export type FlatStyle = FlatFill | FlatStroke | FlatText | FlatIcon | FlatShape | FlatCircle; +/** + * A flat style literal or an array of the same. + */ +export type FlatStyleLike = FlatStyle | FlatStyle[]; +/** + * Label style properties applied to all features. At a minimum, a text-value must be provided. + */ +export interface FlatText { + 'text-value'?: string | string[] | undefined; + 'text-font'?: string | undefined; + 'text-max-angle'?: number | undefined; + 'text-offset-x'?: number | undefined; + 'text-offset-y'?: number | undefined; + 'text-overflow'?: boolean | undefined; + 'text-placement'?: TextPlacement | undefined; + 'text-scale'?: number | Size | undefined; + 'text-rotate-with-view'?: boolean | undefined; + 'text-rotation'?: number | undefined; + 'text-align'?: CanvasTextAlign | undefined; + 'text-justify'?: TextJustify | undefined; + 'text-baseline'?: CanvasTextBaseline | undefined; + 'text-padding'?: number[] | undefined; + 'text-fill-color'?: Color | ColorLike | undefined; + 'text-background-fill-color'?: Color | ColorLike | undefined; + 'text-stroke-color'?: Color | ColorLike | undefined; + 'text-stroke-line-cap'?: CanvasLineCap | undefined; + 'text-stroke-line-join'?: CanvasLineJoin | undefined; + 'text-stroke-line-dash'?: number[] | undefined; + 'text-stroke-line-dash-offset'?: number | undefined; + 'text-stroke-miter-limit'?: number | undefined; + 'text-stroke-width'?: number | undefined; + 'text-background-stroke-color'?: Color | ColorLike | undefined; + 'text-background-stroke-line-cap'?: CanvasLineCap | undefined; + 'text-background-stroke-line-join'?: CanvasLineJoin | undefined; + 'text-background-stroke-line-dash'?: number[] | undefined; + 'text-background-stroke-line-dash-offset'?: number | undefined; + 'text-background-stroke-miter-limit'?: number | undefined; + 'text-background-stroke-width'?: number | undefined; +} +export function toStyle(flatStyle: FlatStyle): Style; diff --git a/@types/ol/tilecoord.d.ts b/@types/ol/tilecoord.d.ts index ec453410..244c39f5 100644 --- a/@types/ol/tilecoord.d.ts +++ b/@types/ol/tilecoord.d.ts @@ -5,7 +5,7 @@ import TileGrid from './tilegrid/TileGrid'; * grid. The order is z (zoom level), x (column), and y (row). */ export type TileCoord = number[]; -export function createOrUpdate(z: number, x: number, y: number, opt_tileCoord?: TileCoord): TileCoord; +export function createOrUpdate(z: number, x: number, y: number, tileCoord?: TileCoord): TileCoord; /** * Get a tile coord given a key. */ diff --git a/@types/ol/tilegrid.d.ts b/@types/ol/tilegrid.d.ts index ae344534..2f73830a 100644 --- a/@types/ol/tilegrid.d.ts +++ b/@types/ol/tilegrid.d.ts @@ -12,22 +12,17 @@ export interface XYZOptions { minZoom?: number | undefined; tileSize?: number | Size | undefined; } -export function createForExtent( - extent: Extent, - opt_maxZoom?: number, - opt_tileSize?: number | Size, - opt_corner?: Corner, -): TileGrid; +export function createForExtent(extent: Extent, maxZoom?: number, tileSize?: number | Size, corner?: Corner): TileGrid; export function createForProjection( projection: ProjectionLike, - opt_maxZoom?: number, - opt_tileSize?: number | Size, - opt_corner?: Corner, + maxZoom?: number, + tileSize?: number | Size, + corner?: Corner, ): TileGrid; /** * Creates a tile grid with a standard XYZ tiling scheme. */ -export function createXYZ(opt_options?: XYZOptions): TileGrid; +export function createXYZ(options?: XYZOptions): TileGrid; /** * Generate a tile grid extent from a projection. If the projection has an * extent, it is used. If not, a global extent is assumed. diff --git a/@types/ol/tilegrid/TileGrid.d.ts b/@types/ol/tilegrid/TileGrid.d.ts index e454c6b6..f10848ec 100644 --- a/@types/ol/tilegrid/TileGrid.d.ts +++ b/@types/ol/tilegrid/TileGrid.d.ts @@ -26,8 +26,8 @@ export default class TileGrid { forEachTileCoordParentTileRange( tileCoord: TileCoord, callback: (p0: number, p1: TileRange) => boolean, - opt_tileRange?: TileRange, - opt_extent?: Extent, + tempTileRange?: TileRange, + tempExtent?: Extent, ): boolean; /** * Get the extent for this tile grid, if it was configured. @@ -55,11 +55,11 @@ export default class TileGrid { */ getResolutions(): number[]; getTileCoordCenter(tileCoord: TileCoord): Coordinate; - getTileCoordChildTileRange(tileCoord: TileCoord, opt_tileRange?: TileRange, opt_extent?: Extent): TileRange | null; + getTileCoordChildTileRange(tileCoord: TileCoord, tempTileRange?: TileRange, tempExtent?: Extent): TileRange | null; /** * Get the extent of a tile coordinate. */ - getTileCoordExtent(tileCoord: TileCoord, opt_extent?: Extent): Extent; + getTileCoordExtent(tileCoord: TileCoord, tempExtent?: Extent): Extent; /** * Get the tile coordinate for the given map coordinate and resolution. This * method considers that coordinates that intersect tile boundaries should be @@ -74,12 +74,12 @@ export default class TileGrid { /** * Get the extent for a tile range. */ - getTileRangeExtent(z: number, tileRange: TileRange, opt_extent?: Extent): Extent; + getTileRangeExtent(z: number, tileRange: TileRange, tempExtent?: Extent): Extent; /** * Get a tile range for the given extent and integer zoom level. */ - getTileRangeForExtentAndZ(extent: Extent, z: number, opt_tileRange?: TileRange): TileRange; - getTileRangeForTileCoordAndZ(tileCoord: TileCoord, z: number, opt_tileRange?: TileRange): TileRange | null; + getTileRangeForExtentAndZ(extent: Extent, z: number, tempTileRange?: TileRange): TileRange; + getTileRangeForTileCoordAndZ(tileCoord: TileCoord, z: number, tempTileRange?: TileRange): TileRange | null; /** * Get the tile size for a zoom level. The type of the return value matches the * tileSize or tileSizes that the tile grid was configured with. To always diff --git a/@types/ol/tilegrid/WMTS.d.ts b/@types/ol/tilegrid/WMTS.d.ts index b4c5bcd4..fad20e89 100644 --- a/@types/ol/tilegrid/WMTS.d.ts +++ b/@types/ol/tilegrid/WMTS.d.ts @@ -25,8 +25,4 @@ export default class WMTSTileGrid extends TileGrid { * Create a tile grid from a WMTS capabilities matrix set and an * optional TileMatrixSetLimits. */ -export function createFromCapabilitiesMatrixSet( - matrixSet: any, - opt_extent?: Extent, - opt_matrixLimits?: object[], -): WMTSTileGrid; +export function createFromCapabilitiesMatrixSet(matrixSet: any, extent?: Extent, matrixLimits?: object[]): WMTSTileGrid; diff --git a/@types/ol/util.d.ts b/@types/ol/util.d.ts index 9030e7c6..7fb3e937 100644 --- a/@types/ol/util.d.ts +++ b/@types/ol/util.d.ts @@ -2,7 +2,7 @@ * OpenLayers version. */ export const VERSION: string; -export function abstract(): any; +export function abstract(): never; /** * Gets a unique ID for an object. This mutates the object so that further calls * with the same object as a parameter returns the same value. Unique IDs are generated diff --git a/@types/ol/webgl.d.ts b/@types/ol/webgl.d.ts index 33e6fd75..579bf9c5 100644 --- a/@types/ol/webgl.d.ts +++ b/@types/ol/webgl.d.ts @@ -26,5 +26,5 @@ export const STREAM_DRAW: number; export const UNSIGNED_BYTE: number; export const UNSIGNED_INT: number; export const UNSIGNED_SHORT: number; -export function getContext(canvas: HTMLCanvasElement, opt_attributes?: any): WebGLRenderingContext; +export function getContext(canvas: HTMLCanvasElement, attributes?: any): WebGLRenderingContext; export function getSupportedExtensions(): string[]; diff --git a/@types/ol/webgl/Buffer.d.ts b/@types/ol/webgl/Buffer.d.ts index 823b7b07..bf62056f 100644 --- a/@types/ol/webgl/Buffer.d.ts +++ b/@types/ol/webgl/Buffer.d.ts @@ -8,9 +8,9 @@ export enum BufferUsage { DYNAMIC_DRAW = 35048, } export default class WebGLArrayBuffer { - constructor(type: number, opt_usage?: number); + constructor(type: number, usage?: number); /** - * Populates the buffer with an array of the given size (all values will be zeroes). + * Populates the buffer with an array of the given size. */ fromArray(array: number[]): void; /** diff --git a/@types/ol/webgl/Helper.d.ts b/@types/ol/webgl/Helper.d.ts index 6588d05f..fb674990 100644 --- a/@types/ol/webgl/Helper.d.ts +++ b/@types/ol/webgl/Helper.d.ts @@ -1,5 +1,5 @@ import Disposable from '../Disposable'; -import { FrameState } from '../PluggableMap'; +import { FrameState } from '../Map'; import { Transform } from '../transform'; import WebGLArrayBuffer from './Buffer'; import WebGLRenderTarget from './RenderTarget'; @@ -48,8 +48,8 @@ export enum AttributeType { FLOAT = 5126, } /** - * Uniform names used in the default shaders: PROJECTION_MATRIX, OFFSET_SCALE_MATRIX. - * and OFFSET_ROTATION_MATRIX. + * Names of uniforms made available to all shaders. + * Please note: changing these will break custom shaders! */ export enum DefaultUniform { PROJECTION_MATRIX = 'u_projectionMatrix', @@ -58,6 +58,8 @@ export enum DefaultUniform { TIME = 'u_time', ZOOM = 'u_zoom', RESOLUTION = 'u_resolution', + SIZE_PX = 'u_sizePx', + PIXEL_RATIO = 'u_pixelRatio', } /** * Shader types, either FRAGMENT_SHADER or VERTEX_SHADER. @@ -67,7 +69,7 @@ export enum ShaderType { VERTEX_SHADER = 35633, } export default class WebGLHelper extends Disposable { - constructor(opt_options?: Options); + constructor(options?: Options); /** * Sets the default matrix uniforms for a given frame state. This is called internally in prepareDraw. */ @@ -98,8 +100,8 @@ export default class WebGLHelper extends Disposable { */ createTexture( size: number[], - opt_data?: ImageData | HTMLImageElement | HTMLCanvasElement, - opt_texture?: WebGLTexture, + data?: ImageData | HTMLImageElement | HTMLCanvasElement, + texture?: WebGLTexture, ): WebGLTexture; deleteBuffer(buf: WebGLArrayBuffer): void; /** @@ -161,7 +163,7 @@ export default class WebGLHelper extends Disposable { * Post process passes will be initialized here, the first one being bound as a render target for * subsequent draw calls. */ - prepareDraw(frameState: FrameState, opt_disableAlphaBlend?: boolean): void; + prepareDraw(frameState: FrameState, disableAlphaBlend?: boolean): void; /** * Clear the render target & bind it for future draw operations. * This is similar to prepareDraw, only post processes will not be applied. @@ -170,12 +172,16 @@ export default class WebGLHelper extends Disposable { prepareDrawToRenderTarget( frameState: FrameState, renderTarget: WebGLRenderTarget, - opt_disableAlphaBlend?: boolean, + disableAlphaBlend?: boolean, ): void; /** * Give a value for a standard float uniform */ setUniformFloatValue(uniform: string, value: number): void; + /** + * Give a value for a vec2 uniform + */ + setUniformFloatVec2(uniform: string, value: number[]): void; /** * Give a value for a vec4 uniform */ @@ -186,9 +192,10 @@ export default class WebGLHelper extends Disposable { setUniformMatrixValue(uniform: string, value: number[]): void; setUniforms(uniforms: Record): void; /** - * Use a program. If the program is already in use, this will return false. + * Set up a program for use. The program will be set as the current one. Then, the uniforms used + * in the program will be set based on the current frame state and the helper configuration. */ - useProgram(program: WebGLProgram): boolean; + useProgram(program: WebGLProgram, frameState: FrameState): void; } /** * Compute a stride in bytes based on a list of attributes diff --git a/@types/ol/webgl/PostProcessingPass.d.ts b/@types/ol/webgl/PostProcessingPass.d.ts index ff4b2a5b..cfe05e34 100644 --- a/@types/ol/webgl/PostProcessingPass.d.ts +++ b/@types/ol/webgl/PostProcessingPass.d.ts @@ -1,4 +1,4 @@ -import { FrameState } from '../PluggableMap'; +import { FrameState } from '../Map'; import { UniformValue } from './Helper'; export interface Options { diff --git a/@types/ol/webgl/RenderTarget.d.ts b/@types/ol/webgl/RenderTarget.d.ts index e86af52f..6228bf11 100644 --- a/@types/ol/webgl/RenderTarget.d.ts +++ b/@types/ol/webgl/RenderTarget.d.ts @@ -1,7 +1,7 @@ import WebGLHelper from './Helper'; export default class WebGLRenderTarget { - constructor(helper: WebGLHelper, opt_size?: number[]); + constructor(helper: WebGLHelper, size?: number[]); /** * This will cause following calls to #readAll or #readPixel to download the content of the * render target into memory, which is an expensive operation. diff --git a/@types/ol/worker/version.d.ts b/@types/ol/worker/version.d.ts deleted file mode 100644 index 89aa5c05..00000000 --- a/@types/ol/worker/version.d.ts +++ /dev/null @@ -1 +0,0 @@ -export function create(): Worker; diff --git a/@types/ol/xml.d.ts b/@types/ol/xml.d.ts index f6c846da..067f47d6 100644 --- a/@types/ol/xml.d.ts +++ b/@types/ol/xml.d.ts @@ -33,13 +33,13 @@ export function isDocument(object: any): boolean; */ export function makeArrayExtender( valueReader: (this: T, p0: Node, p1: any[]) => any[] | undefined, - opt_this?: T, + thisArg?: T, ): Parser; /** * Make an array pusher function for pushing to the array at the top of the * object stack. */ -export function makeArrayPusher(valueReader: (this: T, p0: Element, p1: any[]) => any, opt_this?: T): Parser; +export function makeArrayPusher(valueReader: (this: T, p0: Element, p1: any[]) => any, thisArg?: T): Parser; /** * Create a serializer that calls the provided nodeWriter from * {@link module:ol/xml.serialize}. This can be used by the parent writer to have the @@ -50,7 +50,7 @@ export function makeArrayPusher(valueReader: (this: T, p0: Element, p1: any[] */ export function makeArraySerializer( nodeWriter: (this: T, p0: Element, p1: V, p2: any[]) => void, - opt_this?: T, + thisArg?: T, ): Serializer; /** * Create a serializer that appends nodes written by its nodeWriter to its @@ -59,7 +59,7 @@ export function makeArraySerializer( */ export function makeChildAppender( nodeWriter: (this: T, p0: Node, p1: V, p2: any[]) => void, - opt_this?: T, + thisArg?: T, ): Serializer; /** * Make an object property pusher function for adding a property to the @@ -67,37 +67,37 @@ export function makeChildAppender( */ export function makeObjectPropertyPusher( valueReader: (this: T, p0: Element, p1: any[]) => any, - opt_property?: string, - opt_this?: T, + property?: string, + thisArg?: T, ): Parser; /** * Make an object property setter function. */ export function makeObjectPropertySetter( valueReader: (this: T, p0: Element, p1: any[]) => any, - opt_property?: string, - opt_this?: T, + property?: string, + thisArg?: T, ): Parser; /** * Make an object stack replacer function for replacing the object at the * top of the stack. */ -export function makeReplacer(valueReader: (this: T, p0: Node, p1: any[]) => any, opt_this?: T): Parser; +export function makeReplacer(valueReader: (this: T, p0: Node, p1: any[]) => any, thisArg?: T): Parser; /** * Create an array of values to be used with {@link module:ol/xml.serialize} or * {@link module:ol/xml.pushSerializeAndPop}, where orderedKeys has to be provided as - * opt_key argument. + * key argument. */ export function makeSequence(object: Record, orderedKeys: string[]): any[]; /** - * Create a node factory which can use the opt_keys passed to + * Create a node factory which can use the keys passed to * {@link module:ol/xml.serialize} or {@link module:ol/xml.pushSerializeAndPop} as node names, * or a fixed node name. The namespace of the created nodes can either be fixed, * or the parent namespace will be used. */ export function makeSimpleNodeFactory( - opt_nodeName?: string, - opt_namespaceURI?: string, + fixedNodeName?: string, + fixedNamespaceURI?: string, ): (p0: any, p1: any[], p2?: string) => Node | undefined; /** * Create a namespaced structure, using the same values for each namespace. @@ -107,7 +107,7 @@ export function makeSimpleNodeFactory( export function makeStructureNS( namespaceURIs: string[], structure: T, - opt_structureNS?: Record, + structureNS?: Record, ): Record; /** * Parse an XML string to an XML Document. @@ -120,7 +120,7 @@ export function parseNode( parsersNS: Record>, node: Element, objectStack: any[], - opt_this?: any, + thisArg?: any, ): void; /** * Push an object on top of the stack, parse and return the popped object. @@ -130,7 +130,7 @@ export function pushParseAndPop( parsersNS: Record>, node: Element, objectStack: any[], - opt_this?: any, + thisArg?: any, ): T; export function pushSerializeAndPop( object: O, @@ -138,8 +138,8 @@ export function pushSerializeAndPop( nodeFactory: (this: T, p0: any, p1: any[], p2: string | undefined) => Node | undefined, values: any[], objectStack: any[], - opt_keys?: string[], - opt_this?: T, + keys?: string[], + thisArg?: T, ): O | undefined; /** * Register a Document to use when creating nodes for XML serializations. Can be used @@ -159,6 +159,6 @@ export function serialize( nodeFactory: (this: T, p0: any, p1: any[], p2: string | undefined) => Node | undefined, values: any[], objectStack: any[], - opt_keys?: string[], - opt_this?: T, + keys?: string[], + thisArg?: T, ): void; diff --git a/jsdoc/conf.json b/jsdoc/conf.json index e9a4d8f0..699502b2 100644 --- a/jsdoc/conf.json +++ b/jsdoc/conf.json @@ -12,6 +12,7 @@ "include": ["openlayers/src/ol"] }, "plugins": [ + "jsdoc-plugin-intersection", "jsdoc/plugins/markdown", "jsdoc-plugin-typescript", "jsdoc/plugins/inline-options", diff --git a/jsdoc/template/publish.js b/jsdoc/template/publish.js index ed717236..8d31c206 100644 --- a/jsdoc/template/publish.js +++ b/jsdoc/template/publish.js @@ -742,6 +742,7 @@ const PROCESSORS = { if (doclet.properties) { doclet.properties.forEach(prop => { let name = prop.name; + if (name.includes('-')) name = `'${name}'`; // Prevent duplicate property if (addedProps.includes(name)) return; diff --git a/package.json b/package.json index b487a00e..632b45b4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@hanreev/types-ol", - "version": "6.15.0", - "description": "OpenLayers 6+ TypeScript definition", + "version": "7.1.0", + "description": "OpenLayers TypeScript definition", "author": "Rifa'i M. Hanif ", "repository": { "type": "git", @@ -37,41 +37,42 @@ }, "dependencies": { "@types/arcgis-rest-api": "^10.4.5", - "@types/geojson": "^7946.0.8", + "@types/geojson": "^7946.0.10", "@types/pbf": "^3.0.2", "@types/rbush": "^3.0.0", "@types/topojson-specification": "^1.0.2", - "geotiff": "^2.0.4" + "geotiff": "2.0.4" }, "devDependencies": { - "@definitelytyped/definitions-parser": "latest", - "@definitelytyped/dtslint": "latest", - "@definitelytyped/utils": "latest", - "@trivago/prettier-plugin-sort-imports": "^3.1.1", + "@definitelytyped/definitions-parser": "0.0.139", + "@definitelytyped/dtslint": "0.0.139", + "@definitelytyped/utils": "0.0.139", + "@trivago/prettier-plugin-sort-imports": "3.2.0", "@types/fs-extra": "^9.0.13", - "@types/glob": "^7.2.0", - "@types/node": "^16.11.10", + "@types/glob": "^8.0.0", + "@types/node": "^18.11.9", "@types/proj4": "^2.5.2", - "@typescript-eslint/eslint-plugin": "^5.12.1", - "@typescript-eslint/parser": "^5.12.1", - "eslint": "^8.10.0", + "@typescript-eslint/eslint-plugin": "^5.43.0", + "@typescript-eslint/parser": "^5.43.0", + "eslint": "^8.27.0", "eslint-plugin-unused-imports": "^2.0.0", "fs-extra": "^10.0.1", "husky": "latest", - "jsdoc": "3.6.10", - "jsdoc-plugin-typescript": "2.0.7", + "jsdoc": "3.6.11", + "jsdoc-plugin-intersection": "^1.0.4", + "jsdoc-plugin-typescript": "^2.1.1", "no-emit-webpack-plugin": "^4.0.1", - "node-html-parser": "^5.1.0", - "ol": "6.15.1", + "node-html-parser": "^6.1.4", + "ol": "7.1.0", "pinst": "^3.0.0", "prettier": "latest", "pretty-quick": "latest", "proj4": "^2.7.5", - "ts-loader": "^9.2.6", + "ts-loader": "^9.4.1", "tslint": "^6.1.3", - "typescript": "^4.5.2", - "webpack": "^5.69.1", - "webpack-cli": "^4.9.1" + "typescript": "4.8.2", + "webpack": "^5.75.0", + "webpack-cli": "^4.10.0" }, "files": [ "ol" diff --git a/patches/ol-Collection.patch b/patches/ol-Collection.patch deleted file mode 100644 index 16131c5e..00000000 --- a/patches/ol-Collection.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/ol/Collection.js b/src/ol/Collection.js -index 286f17d1c..7de6106eb 100644 ---- a/src/ol/Collection.js -+++ b/src/ol/Collection.js -@@ -18,11 +18,13 @@ const Property = { - * @classdesc - * Events emitted by {@link module:ol/Collection~Collection} instances are instances of this - * type. -+ * -+ * @template T - */ - export class CollectionEvent extends Event { - /** - * @param {import("./CollectionEventType.js").default} type Type. -- * @param {*} [opt_element] Element. -+ * @param {T} [opt_element] Element. - * @param {number} [opt_index] The index of the added or removed element. - */ - constructor(type, opt_element, opt_index) { -@@ -30,7 +32,7 @@ export class CollectionEvent extends Event { - - /** - * The element that is added to or removed from the collection. -- * @type {*} -+ * @type {T} - * @api - */ - this.element = opt_element; diff --git a/patches/ol-layer-generic-type.patch b/patches/ol-layer-generic-type.patch index 360b101d..0fb71963 100644 --- a/patches/ol-layer-generic-type.patch +++ b/patches/ol-layer-generic-type.patch @@ -1,5 +1,5 @@ diff --git a/src/ol/layer/BaseImage.js b/src/ol/layer/BaseImage.js -index e2eeec168..129204ed0 100644 +index e6ddfcc0c..880b8c38e 100644 --- a/src/ol/layer/BaseImage.js +++ b/src/ol/layer/BaseImage.js @@ -41,7 +41,7 @@ import Layer from './Layer.js'; @@ -12,10 +12,10 @@ index e2eeec168..129204ed0 100644 */ class BaseImageLayer extends Layer { diff --git a/src/ol/layer/BaseTile.js b/src/ol/layer/BaseTile.js -index b41f3c9be..2c80281c3 100644 +index d0d68cafd..2e7d1ac34 100644 --- a/src/ol/layer/BaseTile.js +++ b/src/ol/layer/BaseTile.js -@@ -56,7 +56,7 @@ import {assign} from '../obj.js'; +@@ -55,7 +55,7 @@ import TileProperty from './TileProperty.js'; * * @template {import("../source/Tile.js").default} TileSourceType * @template {import("../renderer/Layer.js").default} RendererType @@ -25,7 +25,7 @@ index b41f3c9be..2c80281c3 100644 */ class BaseTileLayer extends Layer { diff --git a/src/ol/layer/BaseVector.js b/src/ol/layer/BaseVector.js -index 682fc2dfd..0a1a293fc 100644 +index 375bde86e..346206fed 100644 --- a/src/ol/layer/BaseVector.js +++ b/src/ol/layer/BaseVector.js @@ -81,7 +81,7 @@ const Property = { @@ -38,10 +38,10 @@ index 682fc2dfd..0a1a293fc 100644 */ class BaseVectorLayer extends Layer { diff --git a/src/ol/layer/Graticule.js b/src/ol/layer/Graticule.js -index d22c51851..fe86054ea 100644 +index 57b2cd023..a190ca5ab 100644 --- a/src/ol/layer/Graticule.js +++ b/src/ol/layer/Graticule.js -@@ -161,7 +161,7 @@ const INTERVALS = [ +@@ -178,7 +178,7 @@ const INTERVALS = [ * Note that the view projection must define both extent and worldExtent. * * @fires import("../render/Event.js").RenderEvent @@ -51,10 +51,10 @@ index d22c51851..fe86054ea 100644 */ class Graticule extends VectorLayer { diff --git a/src/ol/layer/Heatmap.js b/src/ol/layer/Heatmap.js -index 5d2fb598c..2df12e2a8 100644 +index 03a6f125e..c79071c80 100644 --- a/src/ol/layer/Heatmap.js +++ b/src/ol/layer/Heatmap.js -@@ -61,7 +61,7 @@ const DEFAULT_GRADIENT = ['#00f', '#0ff', '#0f0', '#ff0', '#f00']; +@@ -60,7 +60,7 @@ const DEFAULT_GRADIENT = ['#00f', '#0ff', '#0f0', '#ff0', '#f00']; * options means that `title` is observable, and has get/set accessors. * * @fires import("../render/Event.js").RenderEvent @@ -64,7 +64,7 @@ index 5d2fb598c..2df12e2a8 100644 */ class Heatmap extends BaseVector { diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js -index 5b0828e9a..9a6194e7c 100644 +index 3f7bf2499..83e0fc3af 100644 --- a/src/ol/layer/Image.js +++ b/src/ol/layer/Image.js @@ -13,7 +13,7 @@ import CanvasImageLayerRenderer from '../renderer/canvas/ImageLayer.js'; @@ -77,11 +77,11 @@ index 5b0828e9a..9a6194e7c 100644 */ class ImageLayer extends BaseImageLayer { diff --git a/src/ol/layer/MapboxVector.js b/src/ol/layer/MapboxVector.js -index 324d2c079..48ff5f92d 100644 +index 5c1d26d4d..67e0e33d2 100644 --- a/src/ol/layer/MapboxVector.js +++ b/src/ol/layer/MapboxVector.js -@@ -267,7 +267,7 @@ const SourceType = { - * will receive an object with an `error` property that can be used to diagnose the problem. +@@ -134,7 +134,7 @@ class ErrorEvent extends BaseEvent { + * [ol-mapbox-style](https://github.com/openlayers/ol-mapbox-style) library to be loaded as well. * * @param {Options} options Options. - * @extends {VectorTileLayer} @@ -90,7 +90,7 @@ index 324d2c079..48ff5f92d 100644 * @api */ diff --git a/src/ol/layer/Tile.js b/src/ol/layer/Tile.js -index e6460349e..29bee44d6 100644 +index da459d6a1..502d71853 100644 --- a/src/ol/layer/Tile.js +++ b/src/ol/layer/Tile.js @@ -13,7 +13,7 @@ import CanvasTileLayerRenderer from '../renderer/canvas/TileLayer.js'; @@ -103,7 +103,7 @@ index e6460349e..29bee44d6 100644 */ class TileLayer extends BaseTileLayer { diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js -index c2c2001eb..ca5b881a6 100644 +index 557362074..13084d52b 100644 --- a/src/ol/layer/Vector.js +++ b/src/ol/layer/Vector.js @@ -16,7 +16,7 @@ import CanvasVectorLayerRenderer from '../renderer/canvas/VectorLayer.js'; @@ -116,10 +116,10 @@ index c2c2001eb..ca5b881a6 100644 */ class VectorLayer extends BaseVectorLayer { diff --git a/src/ol/layer/VectorImage.js b/src/ol/layer/VectorImage.js -index 3487562c5..0dedcd28a 100644 +index c69564b66..466da655a 100644 --- a/src/ol/layer/VectorImage.js +++ b/src/ol/layer/VectorImage.js -@@ -59,7 +59,7 @@ import {assign} from '../obj.js'; +@@ -58,7 +58,7 @@ import CanvasVectorImageLayerRenderer from '../renderer/canvas/VectorImageLayer. * options means that `title` is observable, and has get/set accessors. * * @template {import("../source/Vector.js").default} VectorSourceType @@ -129,23 +129,23 @@ index 3487562c5..0dedcd28a 100644 */ class VectorImageLayer extends BaseVectorLayer { diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js -index 71ef266ad..5370d9697 100644 +index f98efc039..42855c202 100644 --- a/src/ol/layer/VectorTile.js +++ b/src/ol/layer/VectorTile.js -@@ -92,7 +92,7 @@ import {assign} from '../obj.js'; +@@ -94,7 +94,7 @@ import {assert} from '../asserts.js'; * options means that `title` is observable, and has get/set accessors. * - * @param {Options} [opt_options] Options. + * @param {Options} [options] Options. - * @extends {BaseVectorLayer} + * @augments BaseVectorLayer * @api */ class VectorTileLayer extends BaseVectorLayer { diff --git a/src/ol/layer/WebGLPoints.js b/src/ol/layer/WebGLPoints.js -index 662ec3f6e..ace38ded0 100644 +index 721d761bc..6db1ea007 100644 --- a/src/ol/layer/WebGLPoints.js +++ b/src/ol/layer/WebGLPoints.js -@@ -69,7 +69,7 @@ import {parseLiteralStyle} from '../webgl/ShaderBuilder.js'; +@@ -68,7 +68,7 @@ import {parseLiteralStyle} from '../webgl/ShaderBuilder.js'; * options means that `title` is observable, and has get/set accessors. * * @template {import("../source/Vector.js").default} VectorSourceType @@ -155,10 +155,10 @@ index 662ec3f6e..ace38ded0 100644 */ class WebGLPointsLayer extends Layer { diff --git a/src/ol/layer/WebGLTile.js b/src/ol/layer/WebGLTile.js -index 4e2f04223..a3e86b88f 100644 +index 2cf948e0e..efb30c619 100644 --- a/src/ol/layer/WebGLTile.js +++ b/src/ol/layer/WebGLTile.js -@@ -300,7 +300,7 @@ function parseStyle(style, bandCount) { +@@ -298,7 +298,7 @@ function parseStyle(style, bandCount) { * property on the layer object; for example, setting `title: 'My Title'` in the * options means that `title` is observable, and has get/set accessors. * diff --git a/patches/ol-obj.patch b/patches/ol-obj.patch deleted file mode 100644 index 08dfff58..00000000 --- a/patches/ol-obj.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ol/obj.js b/src/ol/obj.js -index 428fbf09a..e2d66c8c9 100644 ---- a/src/ol/obj.js -+++ b/src/ol/obj.js -@@ -49,7 +49,8 @@ export function clear(object) { - * - * @param {!Object} object The object from which to get the values. - * @return {!Array} The property values. -- * @template K,V -+ * @template {string|number|symbol} K -+ * @template {*} V - */ - export const getValues = - typeof Object.values === 'function' diff --git a/patches/ol-render-canvas.patch b/patches/ol-render-canvas.patch index 775a7900..4981bde3 100644 --- a/patches/ol-render-canvas.patch +++ b/patches/ol-render-canvas.patch @@ -1,8 +1,8 @@ diff --git a/src/ol/render/canvas.js b/src/ol/render/canvas.js -index 230af74a6..6d6f9ed87 100644 +index 01025e5d7..e2dccc86d 100644 --- a/src/ol/render/canvas.js +++ b/src/ol/render/canvas.js -@@ -286,8 +286,9 @@ export const registerFont = (function () { +@@ -272,8 +272,9 @@ export const registerFont = (function () { })(); /** diff --git a/patches/ol-renderer-canvas-common.patch b/patches/ol-renderer-canvas-common.patch deleted file mode 100644 index 36451a4f..00000000 --- a/patches/ol-renderer-canvas-common.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/ol/renderer/canvas/common.js b/src/ol/renderer/canvas/common.js -index 81d185bef..2eb4827c7 100644 ---- a/src/ol/renderer/canvas/common.js -+++ b/src/ol/renderer/canvas/common.js -@@ -2,9 +2,15 @@ - * @module ol/renderer/canvas/common - */ - -+/** -+ * @typedef ImageSmoothingContext -+ * @property {boolean} imageSmoothingEnabled -+ * @property {boolean} msImageSmoothingEnabled -+ */ -+ - /** - * Context options to disable image smoothing. -- * @type {Object} -+ * @type {ImageSmoothingContext} - */ - export const IMAGE_SMOOTHING_DISABLED = { - imageSmoothingEnabled: false, -@@ -13,7 +19,7 @@ export const IMAGE_SMOOTHING_DISABLED = { - - /** - * Context options to enable image smoothing. -- * @type {Object} -+ * @type {ImageSmoothingContext} - */ - export const IMAGE_SMOOTHING_ENABLED = { - imageSmoothingEnabled: true, diff --git a/patches/ol-worker.patch b/patches/ol-worker.patch index 279d20a4..9a794cbd 100644 --- a/patches/ol-worker.patch +++ b/patches/ol-worker.patch @@ -1,97 +1,14 @@ -diff --git a/src/ol/worker/version.js b/src/ol/worker/version.js -index 6b99149cf..0ba3ed2c4 100644 ---- a/src/ol/worker/version.js -+++ b/src/ol/worker/version.js -@@ -2,14 +2,10 @@ - * A worker that responds to messages by posting a message with the version identifier. - * @module ol/worker/version - */ --import {VERSION} from '../util.js'; - --/** @type {any} */ --const worker = self; -- --worker.onmessage = (event) => { -- console.log('version worker received message:', event.data); // eslint-disable-line -- worker.postMessage(`version: ${VERSION}`); --}; -- --export let create; -+/** -+ * @function -+ * @returns {Worker} -+ * @api -+ */ -+export const create = () => {} diff --git a/src/ol/worker/webgl.js b/src/ol/worker/webgl.js -index b4c5a9a6b..3d80d9b38 100644 +index cee529e6a..ab95b87ef 100644 --- a/src/ol/worker/webgl.js +++ b/src/ol/worker/webgl.js -@@ -2,61 +2,10 @@ - * A worker that does cpu-heavy tasks related to webgl rendering. - * @module ol/worker/webgl - */ --import { -- WebGLWorkerMessageType, -- writePointFeatureToBuffers, --} from '../renderer/webgl/Layer.js'; --import {assign} from '../obj.js'; +@@ -174,4 +174,9 @@ worker.onmessage = (event) => { + } + }; --/** @type {any} */ --const worker = self; -- --worker.onmessage = (event) => { -- const received = event.data; -- if (received.type === WebGLWorkerMessageType.GENERATE_BUFFERS) { -- // This is specific to point features (x, y, index) -- const baseVertexAttrsCount = 3; -- const baseInstructionsCount = 2; -- -- const customAttrsCount = received.customAttributesCount; -- const instructionsCount = baseInstructionsCount + customAttrsCount; -- const renderInstructions = new Float32Array(received.renderInstructions); -- -- const elementsCount = renderInstructions.length / instructionsCount; -- const indicesCount = elementsCount * 6; -- const verticesCount = -- elementsCount * 4 * (customAttrsCount + baseVertexAttrsCount); -- const indexBuffer = new Uint32Array(indicesCount); -- const vertexBuffer = new Float32Array(verticesCount); -- -- let bufferPositions; -- for (let i = 0; i < renderInstructions.length; i += instructionsCount) { -- bufferPositions = writePointFeatureToBuffers( -- renderInstructions, -- i, -- vertexBuffer, -- indexBuffer, -- customAttrsCount, -- bufferPositions -- ); -- } -- -- /** @type {import('../renderer/webgl/Layer').WebGLWorkerGenerateBuffersMessage} */ -- const message = assign( -- { -- vertexBuffer: vertexBuffer.buffer, -- indexBuffer: indexBuffer.buffer, -- renderInstructions: renderInstructions.buffer, -- }, -- received -- ); -- -- worker.postMessage(message, [ -- vertexBuffer.buffer, -- indexBuffer.buffer, -- renderInstructions.buffer, -- ]); -- } --}; -- --export let create; +/** + * @function + * @returns {Worker} + * @api + */ -+export const create = () => {} + export let create; diff --git a/patches/ol-xml.patch b/patches/ol-xml.patch index 9063e4ef..e4fa3de5 100644 --- a/patches/ol-xml.patch +++ b/patches/ol-xml.patch @@ -1,34 +1,31 @@ diff --git a/src/ol/xml.js b/src/ol/xml.js -index fe4b6884e..b002a2700 100644 +index d589db53d..21089e850 100644 --- a/src/ol/xml.js +++ b/src/ol/xml.js -@@ -268,7 +268,8 @@ export function makeObjectPropertySetter(valueReader, opt_property, opt_this) { +@@ -266,7 +266,7 @@ export function makeObjectPropertySetter(valueReader, property, thisArg) { * @param {function(this: T, Node, V, Array<*>): void} nodeWriter Node writer. - * @param {T} [opt_this] The object to use as `this` in `nodeWriter`. + * @param {T} [thisArg] The object to use as `this` in `nodeWriter`. * @return {Serializer} Serializer. - * @template T, V -+ * @template T -+ * @template V ++ * @template T,V */ - export function makeChildAppender(nodeWriter, opt_this) { + export function makeChildAppender(nodeWriter, thisArg) { return function (node, value, objectStack) { -@@ -296,7 +297,8 @@ export function makeChildAppender(nodeWriter, opt_this) { +@@ -294,7 +294,7 @@ export function makeChildAppender(nodeWriter, thisArg) { * @param {function(this: T, Element, V, Array<*>): void} nodeWriter Node writer. - * @param {T} [opt_this] The object to use as `this` in `nodeWriter`. + * @param {T} [thisArg] The object to use as `this` in `nodeWriter`. * @return {Serializer} Serializer. - * @template T, V -+ * @template T -+ * @template V ++ * @template T,V */ - export function makeArraySerializer(nodeWriter, opt_this) { + export function makeArraySerializer(nodeWriter, thisArg) { let serializersNS, nodeFactory; -@@ -520,7 +522,8 @@ export function serialize( - * @param {T} [opt_this] The object to use as `this` for the node factory and +@@ -508,7 +508,7 @@ export function serialize( + * @param {T} [thisArg] The object to use as `this` for the node factory and * serializers. * @return {O|undefined} Object. - * @template O, T -+ * @template O -+ * @template T ++ * @template O,T */ export function pushSerializeAndPop( object, diff --git a/scripts/applyPatches.js b/scripts/applyPatches.js index a36ad67f..1bf9eebd 100644 --- a/scripts/applyPatches.js +++ b/scripts/applyPatches.js @@ -4,7 +4,7 @@ const glob = require('glob'); const childProcess = require('child_process'); const BASE_DIR = process.cwd(); -const OL_VERSION = 'v6.15.1'; +const OL_VERSION = 'v7.1.0'; const jsdocConfigPath = path.resolve(BASE_DIR, 'jsdoc', 'conf.json'); const jsdocConfig = require(jsdocConfigPath); diff --git a/test/custom-interactions.ts b/test/custom-interactions.ts index 2e283b4b..499ed7e6 100644 --- a/test/custom-interactions.ts +++ b/test/custom-interactions.ts @@ -2,13 +2,12 @@ import { MapBrowserEvent } from 'ol'; import Feature from 'ol/Feature'; import Map from 'ol/Map'; import View from 'ol/View'; -import { LineString, Point, Polygon } from 'ol/geom'; +import { Geometry, LineString, Point, Polygon } from 'ol/geom'; import { Pointer as PointerInteraction, defaults as defaultInteractions } from 'ol/interaction'; import { Tile as TileLayer, Vector as VectorLayer } from 'ol/layer'; import { Pixel } from 'ol/pixel'; import { TileJSON, Vector as VectorSource } from 'ol/source'; import { Fill, Icon, Stroke, Style } from 'ol/style'; -import IconAnchorUnits from 'ol/style/IconAnchorUnits'; class Drag extends PointerInteraction { private coordinate_: Pixel; @@ -125,14 +124,14 @@ const map = new Map({ }), }), new VectorLayer({ - source: new VectorSource({ + source: new VectorSource({ features: [pointFeature, lineFeature, polygonFeature], }), style: new Style({ image: new Icon({ anchor: [0.5, 46], - anchorXUnits: IconAnchorUnits.FRACTION, - anchorYUnits: IconAnchorUnits.PIXELS, + anchorXUnits: 'fraction', + anchorYUnits: 'pixels', opacity: 0.95, src: 'data/icon.png', }), diff --git a/test/geolocation-orientation.ts b/test/geolocation-orientation.ts index d2b0bcf4..55d1bb98 100644 --- a/test/geolocation-orientation.ts +++ b/test/geolocation-orientation.ts @@ -2,7 +2,6 @@ import Geolocation from 'ol/Geolocation'; import Map from 'ol/Map'; import Overlay from 'ol/Overlay'; import View from 'ol/View'; -import GeometryLayout from 'ol/geom/GeometryLayout'; import LineString from 'ol/geom/LineString'; import TileLayer from 'ol/layer/Tile'; import { fromLonLat } from 'ol/proj'; @@ -37,7 +36,7 @@ map.addOverlay(marker); // LineString to store the different geolocation positions. This LineString // is time aware. // The Z dimension is actually used to store the rotation (heading). -const positions = new LineString([], GeometryLayout.XYZM); +const positions = new LineString([], 'XYZM'); // Geolocation Control const geolocation = new Geolocation({ diff --git a/test/getfeatureinfo-image.ts b/test/getfeatureinfo-image.ts index 66ab208e..91a256a6 100644 --- a/test/getfeatureinfo-image.ts +++ b/test/getfeatureinfo-image.ts @@ -38,7 +38,7 @@ map.on('pointermove', evt => { if (evt.dragging) return; const pixel = map.getEventPixel(evt.originalEvent); - const hit = map.forEachLayerAtPixel(pixel, () => { + const hit = map.forEachFeatureAtPixel(pixel, () => { return true; }); map.getTargetElement().style.cursor = hit ? 'pointer' : ''; diff --git a/test/getfeatureinfo-tile.ts b/test/getfeatureinfo-tile.ts index 0ab0c6d5..fa5460cf 100644 --- a/test/getfeatureinfo-tile.ts +++ b/test/getfeatureinfo-tile.ts @@ -38,7 +38,7 @@ map.on('pointermove', evt => { if (evt.dragging) return; const pixel = map.getEventPixel(evt.originalEvent); - const hit = map.forEachLayerAtPixel(pixel, () => { + const hit = map.forEachFeatureAtPixel(pixel, () => { return true; }); map.getTargetElement().style.cursor = hit ? 'pointer' : ''; diff --git a/test/icon.ts b/test/icon.ts index 0378e940..27ab1757 100644 --- a/test/icon.ts +++ b/test/icon.ts @@ -8,7 +8,6 @@ import { Tile as TileLayer, Vector as VectorLayer } from 'ol/layer'; import TileJSON from 'ol/source/TileJSON'; import VectorSource from 'ol/source/Vector'; import { Icon, Style } from 'ol/style'; -import IconAnchorUnits from 'ol/style/IconAnchorUnits'; declare let $: any; @@ -22,8 +21,8 @@ const iconFeature = new Feature({ const iconStyle = new Style({ image: new Icon({ anchor: [0.5, 46], - anchorXUnits: IconAnchorUnits.FRACTION, - anchorYUnits: IconAnchorUnits.PIXELS, + anchorXUnits: 'fraction', + anchorYUnits: 'pixels', src: 'data/icon.png', }), }); diff --git a/test/mouse-position.ts b/test/mouse-position.ts index 040c1958..f24245ed 100644 --- a/test/mouse-position.ts +++ b/test/mouse-position.ts @@ -13,7 +13,7 @@ const mousePositionControl = new MousePosition({ // be placed within the map. className: 'custom-mouse-position', target: document.getElementById('mouse-position') as HTMLElement, - undefinedHTML: ' ', + placeholder: ' ', }); const map = new Map({ diff --git a/test/ol-tests.ts b/test/ol-tests.ts index ec815610..64b0f5eb 100644 --- a/test/ol-tests.ts +++ b/test/ol-tests.ts @@ -1,4 +1,4 @@ -import { Collection, Map, MapBrowserEvent, Overlay, PluggableMap, View } from 'ol'; +import { Collection, Map, MapBrowserEvent, Overlay, View } from 'ol'; import { unByKey } from 'ol/Observable'; import { stableSort } from 'ol/array'; import { @@ -287,7 +287,7 @@ const controls = defaultControls().extend([ new FullScreen(), new MousePosition({ coordinateFormat: coord => toStringXY(coord!, 8), - undefinedHTML: '', + placeholder: '', }), new OverviewMap({ layers, @@ -412,7 +412,7 @@ class CustomControl extends Control { } // Override - setMap(map: PluggableMap) { + setMap(map: Map) { super.setMap(map); unByKey(this._eventKeys); this._eventKeys.splice(0); diff --git a/test/popup.ts b/test/popup.ts index 50be086e..b0dd9a43 100644 --- a/test/popup.ts +++ b/test/popup.ts @@ -12,9 +12,10 @@ const closer = document.getElementById('popup-closer') as HTMLElement; const overlay = new Overlay({ element: container as HTMLElement, - autoPan: true, - autoPanAnimation: { - duration: 250, + autoPan: { + animation: { + duration: 250, + }, }, }); diff --git a/test/region-growing.ts b/test/region-growing.ts index 9f648107..647a5217 100644 --- a/test/region-growing.ts +++ b/test/region-growing.ts @@ -3,7 +3,7 @@ import View from 'ol/View'; import { Image as ImageLayer, Tile as TileLayer } from 'ol/layer'; import { fromLonLat } from 'ol/proj'; import BingMaps from 'ol/source/BingMaps'; -import RasterSource, { RasterOperationType } from 'ol/source/Raster'; +import RasterSource from 'ol/source/Raster'; function growRegion(inputs: number[][] | ImageData[], data: any): ImageData { const image = inputs[0] as ImageData; @@ -76,7 +76,7 @@ const imagery = new TileLayer({ const raster = new RasterSource({ sources: [imagery.getSource()!], - operationType: RasterOperationType.IMAGE, + operationType: 'image', operation: growRegion, // Functions in the `lib` object will be available to the operation run in // the web worker. diff --git a/test/shaded-relief.ts b/test/shaded-relief.ts index 800aa646..07a4a161 100644 --- a/test/shaded-relief.ts +++ b/test/shaded-relief.ts @@ -2,7 +2,7 @@ import Map from 'ol/Map'; import View from 'ol/View'; import { Image as ImageLayer, Tile as TileLayer } from 'ol/layer'; import { OSM, Raster, XYZ } from 'ol/source'; -import { Operation, RasterOperationType } from 'ol/source/Raster'; +import { Operation } from 'ol/source/Raster'; const shade: Operation = (inputs: number[][] | ImageData[], data: any): ImageData => { const elevationImage = inputs[0] as ImageData; @@ -108,7 +108,7 @@ const elevation = new XYZ({ const raster = new Raster({ sources: [elevation], - operationType: RasterOperationType.IMAGE, + operationType: 'image', operation: shade, }); diff --git a/test/zoomslider.ts b/test/zoomslider.ts index 1be277fb..12e3beb1 100644 --- a/test/zoomslider.ts +++ b/test/zoomslider.ts @@ -1,11 +1,10 @@ -import { PluggableMap } from 'ol'; import Map from 'ol/Map'; import View from 'ol/View'; import { ZoomSlider } from 'ol/control'; import TileLayer from 'ol/layer/Tile'; import OSM from 'ol/source/OSM'; -function createMap(divId: string): PluggableMap { +function createMap(divId: string): Map { const source = new OSM(); const layer = new TileLayer({ source, diff --git a/yarn.lock b/yarn.lock index 0b793aa2..7ca75682 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,17 +2,24 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7": +"@babel/code-frame@^7.0.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== dependencies: "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.17.10": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab" - integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw== +"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" + integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== + dependencies: + "@babel/highlight" "^7.18.6" + +"@babel/compat-data@^7.20.0": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30" + integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ== "@babel/core@7.13.10": version "7.13.10" @@ -45,98 +52,108 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/generator@^7.13.0", "@babel/generator@^7.13.9", "@babel/generator@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d" - integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw== +"@babel/generator@^7.13.0", "@babel/generator@^7.13.9", "@babel/generator@^7.20.1": + version "7.20.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.4.tgz#4d9f8f0c30be75fd90a0562099a26e5839602ab8" + integrity sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA== dependencies: - "@babel/types" "^7.18.2" - "@jridgewell/gen-mapping" "^0.3.0" + "@babel/types" "^7.20.2" + "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" "@babel/helper-compilation-targets@^7.13.10": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b" - integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ== + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a" + integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ== dependencies: - "@babel/compat-data" "^7.17.10" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.20.2" + "@babel/compat-data" "^7.20.0" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.21.3" semver "^6.3.0" -"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd" - integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ== +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== -"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12" - integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== +"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== dependencies: - "@babel/template" "^7.16.7" - "@babel/types" "^7.17.0" + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" -"@babel/helper-hoist-variables@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" - integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== +"@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-module-imports@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" - integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== +"@babel/helper-module-imports@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" + integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" "@babel/helper-module-transforms@^7.13.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd" - integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA== - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.17.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.18.0" - "@babel/types" "^7.18.0" - -"@babel/helper-simple-access@^7.17.7": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9" - integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ== - dependencies: - "@babel/types" "^7.18.2" - -"@babel/helper-split-export-declaration@^7.12.13", "@babel/helper-split-export-declaration@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" - integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.16.7": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712" + integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.20.1" + "@babel/types" "^7.20.2" + +"@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== + dependencies: + "@babel/types" "^7.20.2" + +"@babel/helper-split-export-declaration@^7.12.13", "@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== + +"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== + +"@babel/helper-validator-identifier@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== -"@babel/helper-validator-option@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" - integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== +"@babel/helper-validator-option@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" + integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== "@babel/helpers@^7.13.10": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384" - integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg== + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.1.tgz#2ab7a0fcb0a03b5bf76629196ed63c2d7311f4c9" + integrity sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg== dependencies: - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.18.2" - "@babel/types" "^7.18.2" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.20.1" + "@babel/types" "^7.20.0" "@babel/highlight@^7.16.7": version "7.17.12" @@ -147,24 +164,38 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== + dependencies: + "@babel/helper-validator-identifier" "^7.18.6" + chalk "^2.0.0" + js-tokens "^4.0.0" + "@babel/parser@7.14.6": version "7.14.6" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2" integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ== -"@babel/parser@^7.13.0", "@babel/parser@^7.13.10", "@babel/parser@^7.16.7", "@babel/parser@^7.18.0", "@babel/parser@^7.9.4": +"@babel/parser@^7.13.0", "@babel/parser@^7.13.10", "@babel/parser@^7.18.10", "@babel/parser@^7.20.1": + version "7.20.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2" + integrity sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg== + +"@babel/parser@^7.9.4": version "7.18.4" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef" integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== -"@babel/template@^7.12.13", "@babel/template@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" - integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== +"@babel/template@^7.12.13", "@babel/template@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" + integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.18.10" + "@babel/types" "^7.18.10" "@babel/traverse@7.13.0": version "7.13.0" @@ -181,19 +212,19 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8" - integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.18.2" - "@babel/helper-environment-visitor" "^7.18.2" - "@babel/helper-function-name" "^7.17.9" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.18.0" - "@babel/types" "^7.18.2" +"@babel/traverse@^7.13.0", "@babel/traverse@^7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8" + integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.1" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.20.1" + "@babel/types" "^7.20.0" debug "^4.1.0" globals "^11.1.0" @@ -206,73 +237,79 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" -"@babel/types@^7.13.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.18.2": - version "7.18.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354" - integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw== +"@babel/types@^7.13.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842" + integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog== dependencies: - "@babel/helper-validator-identifier" "^7.16.7" + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" -"@definitelytyped/definitions-parser@latest": - version "0.0.115" - resolved "https://registry.yarnpkg.com/@definitelytyped/definitions-parser/-/definitions-parser-0.0.115.tgz#fe775ba5f4eeb319dc39010e1e718c7642dbe47d" - integrity sha512-ZZsRcCfDDQmy3m5j07diHhmhGevmWKEk1TPDQoVjF+GxEqes5dWGEyUGsmb+UhmB2aKoGK/OyA/fiXB7pzUJ4g== +"@definitelytyped/definitions-parser@0.0.139": + version "0.0.139" + resolved "https://registry.yarnpkg.com/@definitelytyped/definitions-parser/-/definitions-parser-0.0.139.tgz#e34b1d2cd7dc9b561203bdf71740f718322bd857" + integrity sha512-rBFrQh9cjOJ0fuxt7/OfIfrxUsJx16fEUyen8m/Y3kKGfgnn9keRmSgX70YV/TkjKQsgx5BPAI9gvb8oVP17Dw== dependencies: - "@definitelytyped/header-parser" "^0.0.115" - "@definitelytyped/typescript-versions" "^0.0.115" - "@definitelytyped/utils" "^0.0.115" + "@definitelytyped/header-parser" "^0.0.139" + "@definitelytyped/typescript-versions" "^0.0.139" + "@definitelytyped/utils" "^0.0.139" "@types/node" "^14.14.35" fs-extra "^9.1.0" + pacote "^13.6.1" semver "^7.3.7" -"@definitelytyped/dts-critic@^0.0.115": - version "0.0.115" - resolved "https://registry.yarnpkg.com/@definitelytyped/dts-critic/-/dts-critic-0.0.115.tgz#d1d80032e219d332bf58335aba3969fca9517197" - integrity sha512-Gq1s6D4VNiw4yKVBa0YXhyZXHgvVjBTVcsxKTmYAHOhlWsY8s9NSXbCGGOM23eAPjIojUcJUWZ1CW82U9/uzrA== +"@definitelytyped/dts-critic@^0.0.139": + version "0.0.139" + resolved "https://registry.yarnpkg.com/@definitelytyped/dts-critic/-/dts-critic-0.0.139.tgz#8f668494632568401b25dcdea1edf07fd006bb6c" + integrity sha512-LqFKFiNY8bArC556m9+Awib3RO8rZUP+7/NbKVQPTkI/RALcdb9nhPY0eg2NeX2LvOpLdMHVNPYLqpCIy5mhyA== dependencies: - "@definitelytyped/header-parser" "^0.0.115" + "@definitelytyped/header-parser" "^0.0.139" command-exists "^1.2.8" rimraf "^3.0.2" semver "^6.2.0" tmp "^0.2.1" yargs "^15.3.1" -"@definitelytyped/dtslint@latest": - version "0.0.115" - resolved "https://registry.yarnpkg.com/@definitelytyped/dtslint/-/dtslint-0.0.115.tgz#9e0365e68c3bd6257de16011a03dd1174b4aea9a" - integrity sha512-dXs5JMoFBPBCeDBuwe68WZDjSjFeW84FvGms01qqedAbMhDEQSDravYYtnur7+FnLvcw4cF2CCzDqyTFJm45YQ== - dependencies: - "@definitelytyped/dts-critic" "^0.0.115" - "@definitelytyped/header-parser" "^0.0.115" - "@definitelytyped/typescript-versions" "^0.0.115" - "@definitelytyped/utils" "^0.0.115" +"@definitelytyped/dtslint@0.0.139": + version "0.0.139" + resolved "https://registry.yarnpkg.com/@definitelytyped/dtslint/-/dtslint-0.0.139.tgz#19d9173a9e01c83871b4ce36099a955227199f87" + integrity sha512-O8QLc+vjctELcw3AgS/MbrAf0uXYpIV5+BWMF7ny5h5ed5KtK+YjSHFDYv//92iXxNOr5Bs3tK1VdKFxI7BeaQ== + dependencies: + "@definitelytyped/dts-critic" "^0.0.139" + "@definitelytyped/header-parser" "^0.0.139" + "@definitelytyped/typescript-versions" "^0.0.139" + "@definitelytyped/utils" "^0.0.139" + "@typescript-eslint/eslint-plugin" "^5.30.0" + "@typescript-eslint/parser" "^5.30.0" + "@typescript-eslint/utils" "^5.30.0" + eslint "^8.17.0" fs-extra "^6.0.1" json-stable-stringify "^1.0.1" strip-json-comments "^2.0.1" tslint "5.14.0" yargs "^15.1.0" -"@definitelytyped/header-parser@^0.0.115": - version "0.0.115" - resolved "https://registry.yarnpkg.com/@definitelytyped/header-parser/-/header-parser-0.0.115.tgz#398b697d51467eafd615e66dded38ff30e9733d4" - integrity sha512-74YaIWLSST0IjqkP75VRJMMX0A6yysXrLIcO6JcuOYadxzv0mFXdL7n0jXvI00GMEpvFAKcyzAggznQIjup7pw== +"@definitelytyped/header-parser@^0.0.139": + version "0.0.139" + resolved "https://registry.yarnpkg.com/@definitelytyped/header-parser/-/header-parser-0.0.139.tgz#5bc6bd961d3b2677fd584e8f52429c56a5faeb1c" + integrity sha512-AwFhZLziDc4HaeyInk6uar+zp9q/+HSQO4tAOkEDWiCLzqQOInSIakAs8OsuDOmjll+LU6C0MiDRHQWyFgWFtg== dependencies: - "@definitelytyped/typescript-versions" "^0.0.115" + "@definitelytyped/typescript-versions" "^0.0.139" "@types/parsimmon" "^1.10.1" parsimmon "^1.13.0" -"@definitelytyped/typescript-versions@^0.0.115": - version "0.0.115" - resolved "https://registry.yarnpkg.com/@definitelytyped/typescript-versions/-/typescript-versions-0.0.115.tgz#e446a350438e6c83df0c2e72004ba586f052f782" - integrity sha512-BgktLglKQEphkf+Zhgrpn9upTuTkWILA2md2B/OQMRFleHgJfkKq+efa+/NK0ZwjWrkpzfFd3OhAvA9rtDyfFw== +"@definitelytyped/typescript-versions@^0.0.139": + version "0.0.139" + resolved "https://registry.yarnpkg.com/@definitelytyped/typescript-versions/-/typescript-versions-0.0.139.tgz#832f78b48821cbd407f6009928d2b7ca894a6c01" + integrity sha512-9vhAc/3MhsMawbMMkhlPuvXOtqbxqC9kN88G9JAIujfrKGOnWWRzofo02fadDUMPZfoo4B54EEox9nepNCi5RQ== -"@definitelytyped/utils@^0.0.115", "@definitelytyped/utils@latest": - version "0.0.115" - resolved "https://registry.yarnpkg.com/@definitelytyped/utils/-/utils-0.0.115.tgz#5cbbdc15e6aceb925f753c67ac4149ec648dac5a" - integrity sha512-4rH4HGU4c2Q+7LAxpzQ3jA8+hzjSahuwoVSa/D45CBayBdndrSDpUk95yPhShJkoFRrGZ4QXzMKc0n1LIx96dg== +"@definitelytyped/utils@0.0.139", "@definitelytyped/utils@^0.0.139": + version "0.0.139" + resolved "https://registry.yarnpkg.com/@definitelytyped/utils/-/utils-0.0.139.tgz#8973caddfe406921b5a1ee70a596f344e8fe02a6" + integrity sha512-A1sgPeA6mXpCzjByleGeeah1coT6BPL948wINSSWXDoQ3MrAgHasxc/1R9F4yXDafCwhgOKBfXpT5lE1upZBNw== dependencies: - "@definitelytyped/typescript-versions" "^0.0.115" + "@definitelytyped/typescript-versions" "^0.0.139" "@qiwi/npm-registry-client" "^8.9.1" "@types/node" "^14.14.35" charm "^1.0.2" @@ -286,14 +323,14 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@eslint/eslintrc@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" - integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw== +"@eslint/eslintrc@^1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95" + integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.3.2" + espree "^9.4.0" globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -301,14 +338,24 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@humanwhocodes/config-array@^0.9.2": - version "0.9.5" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7" - integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw== +"@gar/promisify@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" + integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== + +"@humanwhocodes/config-array@^0.11.6": + version "0.11.7" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz#38aec044c6c828f6ed51d5d7ae3d9b9faf6dbb0f" + integrity sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" - minimatch "^3.0.4" + minimatch "^3.0.5" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" @@ -316,6 +363,15 @@ integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== "@jridgewell/gen-mapping@^0.3.0": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" + integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/gen-mapping@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== @@ -325,9 +381,14 @@ "@jridgewell/trace-mapping" "^0.3.9" "@jridgewell/resolve-uri@^3.0.3": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== + version "3.0.7" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe" + integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA== + +"@jridgewell/set-array@^1.0.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" + integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== "@jridgewell/set-array@^1.0.1": version "1.1.2" @@ -343,11 +404,11 @@ "@jridgewell/trace-mapping" "^0.3.9" "@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== + version "1.4.13" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" + integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== -"@jridgewell/trace-mapping@^0.3.7": +"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9": version "0.3.13" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea" integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w== @@ -355,30 +416,22 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.9": - version "0.3.14" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" - integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@mapbox/jsonlint-lines-primitives@~2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234" integrity sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ== "@mapbox/mapbox-gl-style-spec@^13.23.1": - version "13.27.0" - resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.27.0.tgz#90c47b449c86967c9a28f54110d98dbe3c3b2e43" - integrity sha512-wQSJCGRyf7pWknQgeGBArHEk8898UcI1BnAam7IRa3AGmHRFzlJ6DzoU24Hld9zJ0tgkNQ7OP5sJT/9hKHzavg== + version "13.24.0" + resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.24.0.tgz#38e6dbf64eeb934c148cb76b251710d00c0c124f" + integrity sha512-9yhRSqnKX+59MrG647x2pACfR2Ewk8Ii5X75Ag8oToEKZU+PSY0+r10EirIVCTDwuHPzp/VuuN3j6n+Hv/gGpQ== dependencies: "@mapbox/jsonlint-lines-primitives" "~2.0.2" "@mapbox/point-geometry" "^0.1.0" "@mapbox/unitbezier" "^0.0.0" csscolorparser "~1.0.2" json-stringify-pretty-compact "^2.0.0" - minimist "^1.2.6" + minimist "^1.2.5" rw "^1.3.3" sort-object "^0.3.2" @@ -405,7 +458,7 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== -"@nodelib/fs.walk@^1.2.3": +"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -413,6 +466,68 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@npmcli/fs@^2.1.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" + integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== + dependencies: + "@gar/promisify" "^1.1.3" + semver "^7.3.5" + +"@npmcli/git@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.2.tgz#5c5de6b4d70474cf2d09af149ce42e4e1dacb931" + integrity sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w== + dependencies: + "@npmcli/promise-spawn" "^3.0.0" + lru-cache "^7.4.4" + mkdirp "^1.0.4" + npm-pick-manifest "^7.0.0" + proc-log "^2.0.0" + promise-inflight "^1.0.1" + promise-retry "^2.0.1" + semver "^7.3.5" + which "^2.0.2" + +"@npmcli/installed-package-contents@^1.0.7": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa" + integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw== + dependencies: + npm-bundled "^1.1.1" + npm-normalize-package-bin "^1.0.1" + +"@npmcli/move-file@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" + integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + +"@npmcli/node-gyp@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35" + integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A== + +"@npmcli/promise-spawn@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573" + integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g== + dependencies: + infer-owner "^1.0.4" + +"@npmcli/run-script@^4.1.0": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.2.1.tgz#c07c5c71bc1c70a5f2a06b0d4da976641609b946" + integrity sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg== + dependencies: + "@npmcli/node-gyp" "^2.0.0" + "@npmcli/promise-spawn" "^3.0.0" + node-gyp "^9.0.0" + read-package-json-fast "^2.0.3" + which "^2.0.2" + "@petamoriken/float16@^3.4.7": version "3.6.3" resolved "https://registry.yarnpkg.com/@petamoriken/float16/-/float16-3.6.3.tgz#7ed8f2ae05ea4096f0ccdf2c2655d04aca545d33" @@ -437,7 +552,12 @@ optionalDependencies: npmlog "2 || ^3.1.0 || ^4.0.0" -"@trivago/prettier-plugin-sort-imports@^3.1.1": +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + +"@trivago/prettier-plugin-sort-imports@3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-3.2.0.tgz#7a32b6b3085c436eda0143b2710c440a4a56db90" integrity sha512-DnwLe+z8t/dZX5xBbYZV1+C5STkyK/P6SSq3Nk6NXlJZsgvDZX2eN4ND7bMFgGV/NL/YChWzcNf6ziGba1ktQQ== @@ -483,15 +603,20 @@ dependencies: "@types/node" "*" -"@types/geojson@*", "@types/geojson@^7946.0.8": +"@types/geojson@*": version "7946.0.8" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== -"@types/glob@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" - integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== +"@types/geojson@^7946.0.10": + version "7946.0.10" + resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249" + integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA== + +"@types/glob@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.0.0.tgz#321607e9cbaec54f687a0792b2d1d370739455d2" + integrity sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA== dependencies: "@types/minimatch" "*" "@types/node" "*" @@ -534,10 +659,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.21.tgz#0155ee46f6be28b2ff0342ca1a9b9fd4468bef41" integrity sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q== -"@types/node@^16.11.10": - version "16.11.39" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.39.tgz#07223cd2bc332ad9d92135e3a522eebdee3b060e" - integrity sha512-K0MsdV42vPwm9L6UwhIxMAOmcvH/1OoVkZyCgEtVu4Wx7sElGloy/W7kMBNe/oJ7V/jW9BVt1F6RahH6e7tPXw== +"@types/node@^18.11.9": + version "18.11.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4" + integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== "@types/parsimmon@^1.10.1": version "1.10.6" @@ -559,6 +684,11 @@ resolved "https://registry.yarnpkg.com/@types/rbush/-/rbush-3.0.0.tgz#b6887d99b159e87ae23cd14eceff34f139842aa6" integrity sha512-W3ue/GYWXBOpkRm0VSoifrP3HV0Ni47aVJWvXyWMcbtpBy/l/K/smBRiJ+fI8f7shXRjZBiux+iJzYbh7VmcZg== +"@types/semver@^7.3.12": + version "7.3.13" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" + integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== + "@types/topojson-specification@^1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@types/topojson-specification/-/topojson-specification-1.0.2.tgz#e20df2c5a611e31f51d606473dbaccc1d90461c8" @@ -566,84 +696,87 @@ dependencies: "@types/geojson" "*" -"@typescript-eslint/eslint-plugin@^5.12.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.1.tgz#fdf59c905354139046b41b3ed95d1609913d0758" - integrity sha512-6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw== +"@typescript-eslint/eslint-plugin@^5.30.0", "@typescript-eslint/eslint-plugin@^5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.43.0.tgz#4a5248eb31b454715ddfbf8cfbf497529a0a78bc" + integrity sha512-wNPzG+eDR6+hhW4yobEmpR36jrqqQv1vxBq5LJO3fBAktjkvekfr4BRl+3Fn1CM/A+s8/EiGUbOMDoYqWdbtXA== dependencies: - "@typescript-eslint/scope-manager" "5.27.1" - "@typescript-eslint/type-utils" "5.27.1" - "@typescript-eslint/utils" "5.27.1" + "@typescript-eslint/scope-manager" "5.43.0" + "@typescript-eslint/type-utils" "5.43.0" + "@typescript-eslint/utils" "5.43.0" debug "^4.3.4" - functional-red-black-tree "^1.0.1" ignore "^5.2.0" + natural-compare-lite "^1.4.0" regexpp "^3.2.0" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.12.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.27.1.tgz#3a4dcaa67e45e0427b6ca7bb7165122c8b569639" - integrity sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ== +"@typescript-eslint/parser@^5.30.0", "@typescript-eslint/parser@^5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.43.0.tgz#9c86581234b88f2ba406f0b99a274a91c11630fd" + integrity sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug== dependencies: - "@typescript-eslint/scope-manager" "5.27.1" - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/typescript-estree" "5.27.1" + "@typescript-eslint/scope-manager" "5.43.0" + "@typescript-eslint/types" "5.43.0" + "@typescript-eslint/typescript-estree" "5.43.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.27.1.tgz#4d1504392d01fe5f76f4a5825991ec78b7b7894d" - integrity sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg== +"@typescript-eslint/scope-manager@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.43.0.tgz#566e46303392014d5d163704724872e1f2dd3c15" + integrity sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw== dependencies: - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/visitor-keys" "5.27.1" + "@typescript-eslint/types" "5.43.0" + "@typescript-eslint/visitor-keys" "5.43.0" -"@typescript-eslint/type-utils@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.27.1.tgz#369f695199f74c1876e395ebea202582eb1d4166" - integrity sha512-+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw== +"@typescript-eslint/type-utils@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.43.0.tgz#91110fb827df5161209ecca06f70d19a96030be6" + integrity sha512-K21f+KY2/VvYggLf5Pk4tgBOPs2otTaIHy2zjclo7UZGLyFH86VfUOm5iq+OtDtxq/Zwu2I3ujDBykVW4Xtmtg== dependencies: - "@typescript-eslint/utils" "5.27.1" + "@typescript-eslint/typescript-estree" "5.43.0" + "@typescript-eslint/utils" "5.43.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.27.1.tgz#34e3e629501349d38be6ae97841298c03a6ffbf1" - integrity sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg== +"@typescript-eslint/types@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.43.0.tgz#e4ddd7846fcbc074325293515fa98e844d8d2578" + integrity sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg== -"@typescript-eslint/typescript-estree@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.1.tgz#7621ee78607331821c16fffc21fc7a452d7bc808" - integrity sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw== +"@typescript-eslint/typescript-estree@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.43.0.tgz#b6883e58ba236a602c334be116bfc00b58b3b9f2" + integrity sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg== dependencies: - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/visitor-keys" "5.27.1" + "@typescript-eslint/types" "5.43.0" + "@typescript-eslint/visitor-keys" "5.43.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.27.1.tgz#b4678b68a94bc3b85bf08f243812a6868ac5128f" - integrity sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w== +"@typescript-eslint/utils@5.43.0", "@typescript-eslint/utils@^5.30.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.43.0.tgz#00fdeea07811dbdf68774a6f6eacfee17fcc669f" + integrity sha512-8nVpA6yX0sCjf7v/NDfeaOlyaIIqL7OaIGOWSPFqUKK59Gnumd3Wa+2l8oAaYO2lk0sO+SbWFWRSvhu8gLGv4A== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.27.1" - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/typescript-estree" "5.27.1" + "@types/semver" "^7.3.12" + "@typescript-eslint/scope-manager" "5.43.0" + "@typescript-eslint/types" "5.43.0" + "@typescript-eslint/typescript-estree" "5.43.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" + semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.1.tgz#05a62666f2a89769dac2e6baa48f74e8472983af" - integrity sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ== +"@typescript-eslint/visitor-keys@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.43.0.tgz#cbbdadfdfea385310a20a962afda728ea106befa" + integrity sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg== dependencies: - "@typescript-eslint/types" "5.27.1" + "@typescript-eslint/types" "5.43.0" eslint-visitor-keys "^3.3.0" "@webassemblyjs/ast@1.11.1": @@ -767,22 +900,22 @@ "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" - integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== +"@webpack-cli/configtest@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" + integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== -"@webpack-cli/info@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" - integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== +"@webpack-cli/info@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" + integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" - integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== +"@webpack-cli/serve@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" + integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -794,6 +927,11 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +abbrev@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + acorn-import-assertions@^1.7.6: version "1.8.0" resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" @@ -804,11 +942,40 @@ acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1: +acorn@^8.5.0, acorn@^8.7.1: version "8.7.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== +acorn@^8.8.0: + version "8.8.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" + integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== + +agent-base@6, agent-base@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +agentkeepalive@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" + integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -858,6 +1025,19 @@ aproba@^1.0.3: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + are-we-there-yet@~1.1.2: version "1.1.7" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" @@ -978,6 +1158,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -985,7 +1172,7 @@ braces@^3.0.2: dependencies: fill-range "^7.0.1" -browserslist@^4.14.5, browserslist@^4.20.2: +browserslist@^4.14.5: version "4.20.4" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.4.tgz#98096c9042af689ee1e0271333dbc564b8ce4477" integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw== @@ -996,6 +1183,16 @@ browserslist@^4.14.5, browserslist@^4.20.2: node-releases "^2.0.5" picocolors "^1.0.0" +browserslist@^4.21.3: + version "4.21.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" + integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== + dependencies: + caniuse-lite "^1.0.30001400" + electron-to-chromium "^1.4.251" + node-releases "^2.0.6" + update-browserslist-db "^1.0.9" + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" @@ -1019,6 +1216,37 @@ builtins@^1.0.3: resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ== +builtins@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" + integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== + dependencies: + semver "^7.0.0" + +cacache@^16.0.0, cacache@^16.1.0: + version "16.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" + integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== + dependencies: + "@npmcli/fs" "^2.1.0" + "@npmcli/move-file" "^2.0.0" + chownr "^2.0.0" + fs-minipass "^2.1.0" + glob "^8.0.1" + infer-owner "^1.0.4" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + mkdirp "^1.0.4" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^9.0.0" + tar "^6.1.11" + unique-filename "^2.0.0" + call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -1042,6 +1270,11 @@ caniuse-lite@^1.0.30001349: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz#cc6f5da3f983979ad1e2cdbae0505dccaa7c6a12" integrity sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA== +caniuse-lite@^1.0.30001400: + version "1.0.30001431" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz#e7c59bd1bc518fae03a4656be442ce6c4887a795" + integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -1107,6 +1340,11 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + cliui@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -1154,6 +1392,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + colorette@^2.0.14: version "2.0.17" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.17.tgz#5dd4c0d15e2984b7433cb4a9f2ead45063b80c47" @@ -1196,7 +1439,7 @@ concat-stream@^2.0.0: readable-stream "^3.0.2" typedarray "^0.0.6" -console-control-strings@^1.0.0, console-control-strings@~1.1.0: +console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== @@ -1227,18 +1470,18 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -css-select@^4.2.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" - integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== +css-select@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" + integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg== dependencies: boolbase "^1.0.0" - css-what "^6.0.1" - domhandler "^4.3.1" - domutils "^2.8.0" + css-what "^6.1.0" + domhandler "^5.0.2" + domutils "^3.0.1" nth-check "^2.0.1" -css-what@^6.0.1: +css-what@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== @@ -1255,7 +1498,7 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1290,6 +1533,11 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== +depd@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + diff@^3.2.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -1314,35 +1562,40 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-serializer@^1.0.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" - integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" -domelementtype@^2.0.1, domelementtype@^2.2.0: +domelementtype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== -domhandler@^4.2.0, domhandler@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" - integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== +domhandler@^5.0.1, domhandler@^5.0.2: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== dependencies: - domelementtype "^2.2.0" + domelementtype "^2.3.0" -domutils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== +domutils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" + integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.1" + +earcut@^2.2.3: + version "2.2.4" + resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" + integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== ecc-jsbn@~0.1.1: version "0.1.2" @@ -1357,11 +1610,23 @@ electron-to-chromium@^1.4.147: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.152.tgz#7dedbe8f3dc1c597088982a203f392e60f7ee90a" integrity sha512-jk4Ju5SGZAQQJ1iI4Rgru7dDlvkQPLpNPWH9gIZmwCD4YteA5Bbk1xPcPDUf5jUYs3e1e80RXdi8XgKQZaigeg== +electron-to-chromium@^1.4.251: + version "1.4.284" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" + integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== + emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -1369,7 +1634,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@^5.0.0, enhanced-resolve@^5.9.3: +enhanced-resolve@^5.0.0: version "5.9.3" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88" integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow== @@ -1377,21 +1642,39 @@ enhanced-resolve@^5.0.0, enhanced-resolve@^5.9.3: graceful-fs "^4.2.4" tapable "^2.2.0" -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== +enhanced-resolve@^5.10.0: + version "5.10.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" + integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +entities@^4.2.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== entities@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + envinfo@^7.7.3: version "7.8.1" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5: version "1.20.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814" @@ -1500,13 +1783,15 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.10.0: - version "8.17.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.17.0.tgz#1cfc4b6b6912f77d24b874ca1506b0fe09328c21" - integrity sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw== +eslint@^8.17.0, eslint@^8.27.0: + version "8.27.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.27.0.tgz#d547e2f7239994ad1faa4bb5d84e5d809db7cf64" + integrity sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ== dependencies: - "@eslint/eslintrc" "^1.3.0" - "@humanwhocodes/config-array" "^0.9.2" + "@eslint/eslintrc" "^1.3.3" + "@humanwhocodes/config-array" "^0.11.6" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -1516,18 +1801,21 @@ eslint@^8.10.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.2" + espree "^9.4.0" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^6.0.1" + find-up "^5.0.0" + glob-parent "^6.0.2" globals "^13.15.0" + grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-sdsl "^4.1.4" js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" @@ -1539,14 +1827,13 @@ eslint@^8.10.0: strip-ansi "^6.0.1" strip-json-comments "^3.1.0" text-table "^0.2.0" - v8-compile-cache "^2.0.3" -espree@^9.3.2: - version "9.3.2" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596" - integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA== +espree@^9.4.0: + version "9.4.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" + integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== dependencies: - acorn "^8.7.1" + acorn "^8.8.0" acorn-jsx "^5.3.2" eslint-visitor-keys "^3.3.0" @@ -1604,21 +1891,6 @@ execa@^4.0.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" @@ -1694,6 +1966,14 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -1763,7 +2043,7 @@ fs-extra@^9.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^2.0.0: +fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -1800,16 +2080,25 @@ function.prototype.name@^1.1.5: es-abstract "^1.19.0" functions-have-names "^1.2.2" -functional-red-black-tree@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== - functions-have-names@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" + gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -1842,19 +2131,6 @@ geotiff@2.0.4: web-worker "^1.2.0" xml-utils "^1.0.2" -geotiff@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/geotiff/-/geotiff-2.0.5.tgz#ef94227aba5c1b64167b49c44304b1fea5b01c95" - integrity sha512-U5kVYm118YAmw2swiLu8rhfrYnDKOFI7VaMjuQwcq6Intuuid9Pyb4jjxYUxxkq8kOu2r7Am0Rmb52PObGp4pQ== - dependencies: - "@petamoriken/float16" "^3.4.7" - lerc "^3.0.0" - pako "^2.0.4" - parse-headers "^2.0.2" - quick-lru "^6.1.0" - web-worker "^1.2.0" - xml-utils "^1.0.2" - get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -1876,11 +2152,6 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" @@ -1903,7 +2174,7 @@ glob-parent@^5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^6.0.1: +glob-parent@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== @@ -1915,7 +2186,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.1.1, glob@^7.1.3: +glob@^7.1.1, glob@^7.1.3, glob@^7.1.4: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -1927,6 +2198,17 @@ glob@^7.1.1, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.1: + version "8.0.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -1951,11 +2233,16 @@ globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== +grapheme-splitter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -2010,7 +2297,7 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -has-unicode@^2.0.0: +has-unicode@^2.0.0, has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== @@ -2034,6 +2321,27 @@ hosted-git-info@^4.0.1: dependencies: lru-cache "^6.0.0" +hosted-git-info@^5.0.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.2.1.tgz#0ba1c97178ef91f3ab30842ae63d6a272341156f" + integrity sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw== + dependencies: + lru-cache "^7.5.1" + +http-cache-semantics@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + http-signature@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" @@ -2043,26 +2351,50 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +https-proxy-agent@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== + dependencies: + ms "^2.0.0" husky@latest: - version "8.0.1" - resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9" - integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw== + version "8.0.2" + resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.2.tgz#5816a60db02650f1f22c8b69b928fd6bcd77a236" + integrity sha512-Tkv80jtvbnkK3mYWxPZePGFpQ/tT3HNSs/sasF9P2YfkMezDl3ON37YN6jUUI4eTg5LcyVynlb6r4eyvOmspvg== + +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" ieee754@^1.1.12, ieee754@^1.1.13: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== +ignore-walk@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776" + integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw== + dependencies: + minimatch "^5.0.1" + ignore@^5.1.4, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" @@ -2089,6 +2421,16 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +infer-owner@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -2116,6 +2458,11 @@ interpret@^2.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + is-bigint@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" @@ -2174,6 +2521,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: dependencies: is-extglob "^2.1.1" +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== + is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" @@ -2191,6 +2543,11 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +is-path-inside@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -2278,6 +2635,11 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" +js-sdsl@^4.1.4: + version "4.1.5" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a" + integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q== + js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -2315,17 +2677,22 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== -jsdoc-plugin-typescript@2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/jsdoc-plugin-typescript/-/jsdoc-plugin-typescript-2.0.7.tgz#0b04bb4d2b77543240c220085af0bd7cecc0e110" - integrity sha512-xIZW+c+W5BUEeSWFphXcf5Pppvs/MxZDrDAcQod/vYh3BLZNPSqJjCJihjK061x1YRLU7fQjJw/GZ4KGb2fmTw== +jsdoc-plugin-intersection@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/jsdoc-plugin-intersection/-/jsdoc-plugin-intersection-1.0.4.tgz#32ffe7f74df30ed1e86272c272856e0fd9aa9451" + integrity sha512-5OGv+aWpp0pYRMnhaUeqijesIi/xD2z8IIwIlK+JsQ0sXzMjiWT2YgNSvxcd476pRdh70Xmby/l7GD3NkWcKcQ== + +jsdoc-plugin-typescript@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/jsdoc-plugin-typescript/-/jsdoc-plugin-typescript-2.2.0.tgz#4c9b4020f591527aa9f1dfcf8973ca5e5a3cab66" + integrity sha512-lYkuHBitTWDjvzBENiPUzpUM6i9aqfxUvg5H7pS2F1eYAMgxsSEBc6W9TN8I10eXD66tdkHbCU2qkKZV9f5wvA== dependencies: string.prototype.matchall "^4.0.0" -jsdoc@3.6.10: - version "3.6.10" - resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.6.10.tgz#dc903c44763b78afa7d94d63da475d20bc224cc4" - integrity sha512-IdQ8ppSo5LKZ9o3M+LKIIK8i00DIe5msDvG3G81Km+1dhy0XrOWD0Ji8H61ElgyEj/O9KRLokgKbAM9XX9CJAg== +jsdoc@3.6.11: + version "3.6.11" + resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.6.11.tgz#8bbb5747e6f579f141a5238cbad4e95e004458ce" + integrity sha512-8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg== dependencies: "@babel/parser" "^7.9.4" "@types/markdown-it" "^12.2.3" @@ -2333,7 +2700,7 @@ jsdoc@3.6.10: catharsis "^0.9.0" escape-string-regexp "^2.0.0" js2xmlparser "^4.0.2" - klaw "^4.0.1" + klaw "^3.0.0" markdown-it "^12.3.2" markdown-it-anchor "^8.4.1" marked "^4.0.10" @@ -2348,7 +2715,7 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -json-parse-even-better-errors@^2.3.1: +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -2411,6 +2778,11 @@ jsonify@~0.0.0: resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA== +jsonparse@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== + jsprim@^1.2.2: version "1.4.2" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb" @@ -2426,10 +2798,12 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-4.0.1.tgz#8dc6f5723f05894e8e931b516a8ff15c2976d368" - integrity sha512-pgsE40/SvC7st04AHiISNewaIMUbY5V/K8b21ekiPiFoYs/EYSdsGa+FJArB1d441uq4Q8zZyIxvAzkGNlBdRw== +klaw@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146" + integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g== + dependencies: + graceful-fs "^4.1.9" lerc@^3.0.0: version "3.0.0" @@ -2463,6 +2837,13 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -2480,6 +2861,33 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: + version "7.14.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea" + integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA== + +make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6: + version "10.2.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" + integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== + dependencies: + agentkeepalive "^4.2.1" + cacache "^16.1.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-fetch "^2.0.3" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + promise-retry "^2.0.1" + socks-proxy-agent "^7.0.0" + ssri "^9.0.0" + mapbox-to-css-font@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/mapbox-to-css-font/-/mapbox-to-css-font-2.4.1.tgz#41bf38faed36b7dab069828aa3654e4bd91a1eda" @@ -2551,18 +2959,72 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimist@^1.2.6: +minimatch@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" + integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + dependencies: + brace-expansion "^2.0.1" + +minimist@^1.2.5, minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-fetch@^2.0.3: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" + integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== + dependencies: + minipass "^3.1.6" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-json-stream@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7" + integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg== + dependencies: + jsonparse "^1.3.1" + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + minipass@^3.0.0, minipass@^3.1.1: version "3.1.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" @@ -2570,7 +3032,14 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" -minizlib@^2.1.1: +minipass@^3.1.6: + version "3.3.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" + integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== + dependencies: + yallist "^4.0.0" + +minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -2600,6 +3069,11 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.0.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + multimatch@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3" @@ -2611,11 +3085,21 @@ multimatch@^4.0.0: arrify "^2.0.1" minimatch "^3.0.4" +natural-compare-lite@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" + integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== +negotiator@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -2628,12 +3112,28 @@ no-emit-webpack-plugin@^4.0.1: dependencies: schema-utils "^3.0.0" -node-html-parser@^5.1.0: - version "5.3.3" - resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-5.3.3.tgz#2845704f3a7331a610e0e551bf5fa02b266341b6" - integrity sha512-ncg1033CaX9UexbyA7e1N0aAoAYRDiV8jkTvzEnfd1GDvzFdrsXLzR4p4ik8mwLgnaKP/jyUFWDy9q3jvRT2Jw== +node-gyp@^9.0.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.0.tgz#f8eefe77f0ad8edb3b3b898409b53e697642b319" + integrity sha512-A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^10.0.3" + nopt "^6.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + +node-html-parser@^6.1.4: + version "6.1.4" + resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-6.1.4.tgz#763cd362497e427d51fc73dda3dcd8ac52ba85a3" + integrity sha512-3muP9Uy/Pz7bQa9TNYVQzWJhNZMqyCx7xJle8kz2/y1UgzAUyXXShc1IcPaJy6u07CE3K5rQcRwlvHzmlySRjg== dependencies: - css-select "^4.2.1" + css-select "^5.1.0" he "1.2.0" node-releases@^2.0.5: @@ -2641,6 +3141,28 @@ node-releases@^2.0.5: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666" integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q== +node-releases@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" + integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== + +nopt@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" + integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== + dependencies: + abbrev "^1.0.0" + +normalize-package-data@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c" + integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg== + dependencies: + hosted-git-info "^5.0.0" + is-core-module "^2.8.1" + semver "^7.3.5" + validate-npm-package-license "^3.0.4" + "normalize-package-data@~1.0.1 || ^2.0.0 || ^3.0.0": version "3.0.3" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" @@ -2651,6 +3173,37 @@ node-releases@^2.0.5: semver "^7.3.4" validate-npm-package-license "^3.0.1" +npm-bundled@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" + integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-bundled@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-2.0.1.tgz#94113f7eb342cd7a67de1e789f896b04d2c600f4" + integrity sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw== + dependencies: + npm-normalize-package-bin "^2.0.0" + +npm-install-checks@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234" + integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA== + dependencies: + semver "^7.1.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-normalize-package-bin@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff" + integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ== + "npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^8.0.0": version "8.1.5" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44" @@ -2660,7 +3213,50 @@ node-releases@^2.0.5: semver "^7.3.4" validate-npm-package-name "^3.0.0" -npm-run-path@^4.0.0, npm-run-path@^4.0.1: +npm-package-arg@^9.0.0, npm-package-arg@^9.0.1: + version "9.1.2" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.2.tgz#fc8acecb00235f42270dda446f36926ddd9ac2bc" + integrity sha512-pzd9rLEx4TfNJkovvlBSLGhq31gGu2QDexFPWT19yCDh0JgnRhlBLNo5759N0AJmBk+kQ9Y/hXoLnlgFD+ukmg== + dependencies: + hosted-git-info "^5.0.0" + proc-log "^2.0.1" + semver "^7.3.5" + validate-npm-package-name "^4.0.0" + +npm-packlist@^5.1.0: + version "5.1.3" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.3.tgz#69d253e6fd664b9058b85005905012e00e69274b" + integrity sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg== + dependencies: + glob "^8.0.1" + ignore-walk "^5.0.1" + npm-bundled "^2.0.0" + npm-normalize-package-bin "^2.0.0" + +npm-pick-manifest@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.2.tgz#1d372b4e7ea7c6712316c0e99388a73ed3496e84" + integrity sha512-gk37SyRmlIjvTfcYl6RzDbSmS9Y4TOBXfsPnoYqTHARNgWbyDiCSMLUpmALDj4jjcTZpURiEfsSHJj9k7EV4Rw== + dependencies: + npm-install-checks "^5.0.0" + npm-normalize-package-bin "^2.0.0" + npm-package-arg "^9.0.0" + semver "^7.3.5" + +npm-registry-fetch@^13.0.1: + version "13.3.1" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e" + integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw== + dependencies: + make-fetch-happen "^10.0.6" + minipass "^3.1.6" + minipass-fetch "^2.0.3" + minipass-json-stream "^1.0.1" + minizlib "^2.1.2" + npm-package-arg "^9.0.1" + proc-log "^2.0.0" + +npm-run-path@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -2677,6 +3273,16 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: gauge "~2.7.3" set-blocking "~2.0.0" +npmlog@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + nth-check@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" @@ -2719,21 +3325,22 @@ object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -ol-mapbox-style@^8.0.5: - version "8.2.1" - resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-8.2.1.tgz#0f0c252b6495853a137d7e4dd3f915fab664b356" - integrity sha512-3kBBuZC627vDL8vnUdfVbCbfkhkcZj2kXPHQcuLhC4JJEA+XkEVEtEde8x8+AZctRbHwBkSiubTPaRukgLxIRw== +ol-mapbox-style@9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-9.1.0.tgz#1504b1a2c3cc23482c3c95cd55a1cf1d2ac8a451" + integrity sha512-R/XE6FdviaXNdnSw6ItHSEreMtQU68cwQCGv4Kl8yG0V1dZhnI5JWr8IOphJwffPVxfWTCnJb5aALGSB89MvhA== dependencies: "@mapbox/mapbox-gl-style-spec" "^13.23.1" mapbox-to-css-font "^2.4.1" -ol@6.15.1: - version "6.15.1" - resolved "https://registry.yarnpkg.com/ol/-/ol-6.15.1.tgz#364f459939ef71f970b2376a821a896529f65e3a" - integrity sha512-ZG2CKTpJ8Q+tPywYysVwPk+yevwJzlbwjRKhoCvd7kLVWMbfBl1O/+Kg/yrZZrhG9FNXbFH4GeOZ5yVRqo3P4w== +ol@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/ol/-/ol-7.1.0.tgz#aab69a0539e59d6a4361cbc0f69f8b00c7298c9c" + integrity sha512-mAeV5Ca4mFhYaJoGWNZnIMN5VNnFTf63FgZjBiYu/DjQDGKNsD5QyvvqVziioVdOOgl6b8rPB/ypj2XNBinPwA== dependencies: + earcut "^2.2.3" geotiff "2.0.4" - ol-mapbox-style "^8.0.5" + ol-mapbox-style "9.1.0" pbf "3.2.1" rbush "^3.0.1" @@ -2744,7 +3351,7 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.0, onetime@^5.1.2: +onetime@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -2770,6 +3377,13 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -2777,11 +3391,52 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +pacote@^13.6.1: + version "13.6.2" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a" + integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg== + dependencies: + "@npmcli/git" "^3.0.0" + "@npmcli/installed-package-contents" "^1.0.7" + "@npmcli/promise-spawn" "^3.0.0" + "@npmcli/run-script" "^4.1.0" + cacache "^16.0.0" + chownr "^2.0.0" + fs-minipass "^2.1.0" + infer-owner "^1.0.4" + minipass "^3.1.6" + mkdirp "^1.0.4" + npm-package-arg "^9.0.0" + npm-packlist "^5.1.0" + npm-pick-manifest "^7.0.0" + npm-registry-fetch "^13.0.1" + proc-log "^2.0.0" + promise-retry "^2.0.1" + read-package-json "^5.0.0" + read-package-json-fast "^2.0.3" + rimraf "^3.0.2" + ssri "^9.0.0" + tar "^6.1.11" + pako@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.4.tgz#6cebc4bbb0b6c73b0d5b8d7e8476e2b2fbea576d" @@ -2870,9 +3525,9 @@ prelude-ls@^1.2.1: integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== prettier@latest: - version "2.6.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" - integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== + version "2.7.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" + integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== pretty-quick@latest: version "3.1.3" @@ -2886,6 +3541,11 @@ pretty-quick@latest: mri "^1.1.5" multimatch "^4.0.0" +proc-log@^2.0.0, proc-log@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685" + integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw== + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -2899,6 +3559,19 @@ proj4@^2.7.5: mgrs "1.0.0" wkt-parser "^1.3.1" +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + protocol-buffers-schema@^3.3.1: version "3.6.0" resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03" @@ -2932,11 +3605,6 @@ queue-microtask@^1.2.2: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== -quick-lru@^6.1.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-6.1.1.tgz#f8e5bf9010376c126c80c1a62827a526c0e60adf" - integrity sha512-S27GBT+F0NTRiehtbrgaSE1idUAJ5bX8dPAQTdylEyNlrdcH5X4Lz7Edz3DYzecbsCluD5zO8ZNEe04z3D3u6Q== - quickselect@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-2.0.0.tgz#f19680a486a5eefb581303e023e98faaf25dd018" @@ -2956,6 +3624,24 @@ rbush@^3.0.1: dependencies: quickselect "^2.0.0" +read-package-json-fast@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83" + integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ== + dependencies: + json-parse-even-better-errors "^2.3.0" + npm-normalize-package-bin "^1.0.1" + +read-package-json@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.2.tgz#b8779ccfd169f523b67208a89cc912e3f663f3fa" + integrity sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q== + dependencies: + glob "^8.0.1" + json-parse-even-better-errors "^2.3.1" + normalize-package-data "^4.0.0" + npm-normalize-package-bin "^2.0.0" + readable-stream@^2.0.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" @@ -2969,7 +3655,7 @@ readable-stream@^2.0.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0: +readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -3121,7 +3807,7 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -3152,6 +3838,13 @@ semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.0.0, semver@^7.1.1, semver@^7.3.5: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + dependencies: + lru-cache "^6.0.0" + serialize-javascript@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" @@ -3192,7 +3885,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -3207,6 +3900,28 @@ slide@^1.1.6: resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw== +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + +socks@^2.6.2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + sort-asc@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/sort-asc/-/sort-asc-0.1.0.tgz#ab799df61fc73ea0956c79c4b531ed1e9e7727e9" @@ -3296,6 +4011,13 @@ ssri@^8.0.0: dependencies: minipass "^3.1.1" +ssri@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" + integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== + dependencies: + minipass "^3.1.1" + string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -3305,7 +4027,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3453,6 +4175,18 @@ tar@^6.1.11: mkdirp "^1.0.3" yallist "^4.0.0" +tar@^6.1.2: + version "6.1.12" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6" + integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + terser-webpack-plugin@^5.1.3: version "5.3.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz#8033db876dd5875487213e87c627bca323e5ed90" @@ -3465,9 +4199,9 @@ terser-webpack-plugin@^5.1.3: terser "^5.7.2" terser@^5.7.2: - version "5.14.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" - integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== + version "5.14.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.1.tgz#7c95eec36436cb11cf1902cc79ac564741d19eca" + integrity sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ== dependencies: "@jridgewell/source-map" "^0.3.2" acorn "^8.5.0" @@ -3506,10 +4240,10 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -ts-loader@^9.2.6: - version "9.3.0" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.3.0.tgz#980f4dbfb60e517179e15e10ed98e454b132159f" - integrity sha512-2kLLAdAD+FCKijvGKi9sS0OzoqxLCF3CxHpok7rVgCZ5UldRzH0TkbwG9XECKjBzHsAewntC5oDaI/FwKzEUog== +ts-loader@^9.4.1: + version "9.4.1" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.1.tgz#b6f3d82db0eac5a8295994f8cb5e4940ff6b1060" + integrity sha512-384TYAqGs70rn9F0VBnh6BPTfhga7yFNdC5gXbQpDrBj9/KsT4iRkGqKXhziofHOlE2j6YEaiTYVGKKvPhGWvw== dependencies: chalk "^4.1.0" enhanced-resolve "^5.0.0" @@ -3602,10 +4336,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@^4.5.2: - version "4.7.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" - integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== +typescript@4.8.2: + version "4.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" + integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" @@ -3627,6 +4361,20 @@ underscore@~1.13.2: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee" integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ== +unique-filename@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" + integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== + dependencies: + unique-slug "^3.0.0" + +unique-slug@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" + integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== + dependencies: + imurmurhash "^0.1.4" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -3637,6 +4385,14 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== +update-browserslist-db@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -3654,12 +4410,7 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -v8-compile-cache@^2.0.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" - integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== - -validate-npm-package-license@^3.0.1: +validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== @@ -3674,6 +4425,13 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" +validate-npm-package-name@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747" + integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q== + dependencies: + builtins "^5.0.0" + verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" @@ -3683,7 +4441,7 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -watchpack@^2.3.1: +watchpack@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== @@ -3696,18 +4454,18 @@ web-worker@^1.2.0: resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.2.0.tgz#5d85a04a7fbc1e7db58f66595d7a3ac7c9c180da" integrity sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA== -webpack-cli@^4.9.1: - version "4.9.2" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" - integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== +webpack-cli@^4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" + integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.1" - "@webpack-cli/info" "^1.4.1" - "@webpack-cli/serve" "^1.6.1" + "@webpack-cli/configtest" "^1.2.0" + "@webpack-cli/info" "^1.5.0" + "@webpack-cli/serve" "^1.7.0" colorette "^2.0.14" commander "^7.0.0" - execa "^5.0.0" + cross-spawn "^7.0.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" interpret "^2.2.0" @@ -3727,21 +4485,21 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.69.1: - version "5.73.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38" - integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA== +webpack@^5.75.0: + version "5.75.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152" + integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.4.1" + acorn "^8.7.1" acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.9.3" + enhanced-resolve "^5.10.0" es-module-lexer "^0.9.0" eslint-scope "5.1.1" events "^3.2.0" @@ -3754,7 +4512,7 @@ webpack@^5.69.1: schema-utils "^3.1.0" tapable "^2.1.1" terser-webpack-plugin "^5.1.3" - watchpack "^2.3.1" + watchpack "^2.4.0" webpack-sources "^3.2.3" which-boxed-primitive@^1.0.2: @@ -3773,14 +4531,14 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^2.0.1: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -wide-align@^1.1.0: +wide-align@^1.1.0, wide-align@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== @@ -3860,3 +4618,8 @@ yargs@^15.1.0, yargs@^15.3.1: which-module "^2.0.0" y18n "^4.0.0" yargs-parser "^18.1.2" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==