From 0e7421f1c77ecd2a06630f5ba6bfda96328538bc Mon Sep 17 00:00:00 2001 From: "Rifa'i M. Hanif" <38851178+hanreev@users.noreply.github.com> Date: Tue, 6 Aug 2019 23:51:34 +0700 Subject: [PATCH] [ol] Add unified undefined parameter type (#37406) --- types/ol/Collection.d.ts | 8 +- types/ol/Feature.d.ts | 10 +- types/ol/Geolocation.d.ts | 6 +- types/ol/Graticule.d.ts | 4 +- types/ol/Image.d.ts | 11 +- types/ol/ImageBase.d.ts | 2 +- types/ol/ImageCanvas.d.ts | 2 +- types/ol/ImageTile.d.ts | 9 +- types/ol/Map.d.ts | 6 +- types/ol/MapBrowserEvent.d.ts | 8 +- types/ol/MapBrowserPointerEvent.d.ts | 8 +- types/ol/Object.d.ts | 6 +- types/ol/Observable.d.ts | 6 +- types/ol/Overlay.d.ts | 18 +- types/ol/PluggableMap.d.ts | 26 +- types/ol/Tile.d.ts | 4 +- types/ol/TileCache.d.ts | 6 +- types/ol/TileQueue.d.ts | 4 +- types/ol/TileRange.d.ts | 8 +- types/ol/VectorImageTile.d.ts | 18 +- types/ol/VectorTile.d.ts | 9 +- types/ol/View.d.ts | 30 +- types/ol/WebGLMap.d.ts | 6 +- types/ol/array.d.ts | 10 +- types/ol/centerconstraint.d.ts | 2 +- types/ol/control.d.ts | 5 +- types/ol/control/Attribution.d.ts | 8 +- types/ol/control/Control.d.ts | 8 +- types/ol/control/FullScreen.d.ts | 6 +- types/ol/control/MousePosition.d.ts | 8 +- types/ol/control/OverviewMap.d.ts | 8 +- types/ol/control/Rotate.d.ts | 10 +- types/ol/control/ScaleLine.d.ts | 8 +- types/ol/control/Zoom.d.ts | 6 +- types/ol/control/ZoomSlider.d.ts | 8 +- types/ol/control/ZoomToExtent.d.ts | 6 +- types/ol/control/util.d.ts | 3 + types/ol/coordinate.d.ts | 2 +- types/ol/css.d.ts | 2 +- types/ol/events.d.ts | 24 +- types/ol/events/condition.d.ts | 2 +- types/ol/extent.d.ts | 30 +- types/ol/featureloader.d.ts | 11 +- types/ol/format/EsriJSON.d.ts | 2 +- types/ol/format/Feature.d.ts | 8 +- types/ol/format/GPX.d.ts | 2 +- types/ol/format/GeoJSON.d.ts | 2 +- types/ol/format/TopoJSON.d.ts | 2 +- types/ol/format/WFS.d.ts | 9 +- types/ol/format/filter.d.ts | 9 +- types/ol/format/filter/IsLike.d.ts | 9 +- types/ol/geom/Circle.d.ts | 6 +- types/ol/geom/Geometry.d.ts | 6 +- types/ol/geom/GeometryCollection.d.ts | 6 +- types/ol/geom/LineString.d.ts | 8 +- types/ol/geom/LinearRing.d.ts | 6 +- types/ol/geom/MultiLineString.d.ts | 12 +- types/ol/geom/MultiPoint.d.ts | 6 +- types/ol/geom/MultiPolygon.d.ts | 12 +- types/ol/geom/Point.d.ts | 6 +- types/ol/geom/Polygon.d.ts | 6 +- types/ol/geom/SimpleGeometry.d.ts | 8 +- types/ol/geom/flat/closest.d.ts | 66 +++- types/ol/geom/flat/contains.d.ts | 35 +- types/ol/geom/flat/deflate.d.ts | 30 +- types/ol/geom/flat/flip.d.ts | 9 +- types/ol/geom/flat/geodesic.d.ts | 25 +- types/ol/geom/flat/inflate.d.ts | 24 +- types/ol/geom/flat/interiorpoint.d.ts | 18 +- types/ol/geom/flat/interpolate.d.ts | 28 +- types/ol/geom/flat/intersectsextent.d.ts | 40 ++- types/ol/geom/flat/orient.d.ts | 32 +- types/ol/geom/flat/segments.d.ts | 9 +- types/ol/geom/flat/simplify.d.ts | 84 ++++- types/ol/geom/flat/straightchunk.d.ts | 8 +- types/ol/geom/flat/textpath.d.ts | 11 +- types/ol/geom/flat/transform.d.ts | 40 ++- types/ol/index.d.ts | 5 +- types/ol/interaction/DoubleClickZoom.d.ts | 6 +- types/ol/interaction/DragAndDrop.d.ts | 6 +- types/ol/interaction/DragBox.d.ts | 10 +- types/ol/interaction/DragPan.d.ts | 6 +- types/ol/interaction/DragRotate.d.ts | 6 +- types/ol/interaction/DragRotateAndZoom.d.ts | 6 +- types/ol/interaction/DragZoom.d.ts | 6 +- types/ol/interaction/Draw.d.ts | 8 +- types/ol/interaction/Extent.d.ts | 6 +- types/ol/interaction/Interaction.d.ts | 32 +- types/ol/interaction/KeyboardPan.d.ts | 6 +- types/ol/interaction/KeyboardZoom.d.ts | 6 +- types/ol/interaction/Modify.d.ts | 6 +- types/ol/interaction/MouseWheelZoom.d.ts | 6 +- types/ol/interaction/PinchRotate.d.ts | 6 +- types/ol/interaction/PinchZoom.d.ts | 6 +- types/ol/interaction/Pointer.d.ts | 18 +- types/ol/interaction/Select.d.ts | 8 +- types/ol/interaction/Snap.d.ts | 6 +- types/ol/interaction/Translate.d.ts | 6 +- types/ol/layer/Base.d.ts | 8 +- types/ol/layer/Group.d.ts | 6 +- types/ol/layer/Heatmap.d.ts | 6 +- types/ol/layer/Image.d.ts | 6 +- types/ol/layer/Layer.d.ts | 6 +- types/ol/layer/Tile.d.ts | 6 +- types/ol/layer/Vector.d.ts | 12 +- types/ol/layer/VectorTile.d.ts | 6 +- types/ol/loadingstrategy.d.ts | 2 +- types/ol/net.d.ts | 2 +- types/ol/ol-tests.ts | 340 +++++++++--------- types/ol/pointer/EventSource.d.ts | 2 +- types/ol/proj.d.ts | 40 ++- types/ol/proj/Projection.d.ts | 6 +- types/ol/render.d.ts | 2 +- types/ol/render/Event.d.ts | 8 +- types/ol/render/Feature.d.ts | 8 +- types/ol/render/ReplayGroup.d.ts | 2 +- types/ol/render/VectorContext.d.ts | 7 +- types/ol/render/canvas.d.ts | 21 +- types/ol/render/canvas/ImageReplay.d.ts | 9 +- types/ol/render/canvas/Immediate.d.ts | 8 +- types/ol/render/canvas/LineStringReplay.d.ts | 9 +- types/ol/render/canvas/PolygonReplay.d.ts | 9 +- types/ol/render/canvas/Replay.d.ts | 84 ++++- types/ol/render/canvas/ReplayGroup.d.ts | 37 +- types/ol/render/canvas/TextReplay.d.ts | 9 +- types/ol/render/webgl.d.ts | 9 +- types/ol/render/webgl/Immediate.d.ts | 10 +- types/ol/render/webgl/Replay.d.ts | 59 ++- types/ol/render/webgl/ReplayGroup.d.ts | 38 +- types/ol/render/webgl/TextureReplay.d.ts | 15 +- types/ol/renderer/Layer.d.ts | 39 +- types/ol/renderer/Map.d.ts | 28 +- types/ol/renderer/canvas/ImageLayer.d.ts | 6 +- .../renderer/canvas/IntermediateCanvas.d.ts | 6 +- types/ol/renderer/canvas/Layer.d.ts | 27 +- types/ol/renderer/canvas/TileLayer.d.ts | 18 +- types/ol/renderer/canvas/VectorLayer.d.ts | 14 +- types/ol/renderer/canvas/VectorTileLayer.d.ts | 13 +- types/ol/renderer/vector.d.ts | 9 +- types/ol/renderer/webgl/ImageLayer.d.ts | 6 +- types/ol/renderer/webgl/Layer.d.ts | 13 +- types/ol/renderer/webgl/TileLayer.d.ts | 6 +- types/ol/renderer/webgl/VectorLayer.d.ts | 14 +- types/ol/reproj.d.ts | 21 +- types/ol/reproj/Image.d.ts | 11 +- types/ol/reproj/Tile.d.ts | 16 +- types/ol/reproj/Triangulation.d.ts | 8 +- types/ol/resolutionconstraint.d.ts | 2 +- types/ol/rotationconstraint.d.ts | 6 +- types/ol/source/BingMaps.d.ts | 6 +- types/ol/source/CartoDB.d.ts | 6 +- types/ol/source/Cluster.d.ts | 10 +- types/ol/source/Image.d.ts | 13 +- types/ol/source/ImageArcGISRest.d.ts | 8 +- types/ol/source/ImageCanvas.d.ts | 15 +- types/ol/source/ImageMapGuide.d.ts | 14 +- types/ol/source/ImageStatic.d.ts | 6 +- types/ol/source/ImageWMS.d.ts | 8 +- types/ol/source/OSM.d.ts | 6 +- types/ol/source/Raster.d.ts | 8 +- types/ol/source/Source.d.ts | 10 +- types/ol/source/Stamen.d.ts | 6 +- types/ol/source/Tile.d.ts | 13 +- types/ol/source/TileArcGISRest.d.ts | 6 +- types/ol/source/TileDebug.d.ts | 6 +- types/ol/source/TileImage.d.ts | 6 +- types/ol/source/TileJSON.d.ts | 6 +- types/ol/source/TileWMS.d.ts | 6 +- types/ol/source/UTFGrid.d.ts | 29 +- types/ol/source/UrlTile.d.ts | 6 +- types/ol/source/Vector.d.ts | 18 +- types/ol/source/VectorTile.d.ts | 6 +- types/ol/source/WMTS.d.ts | 6 +- types/ol/source/XYZ.d.ts | 6 +- types/ol/source/Zoomify.d.ts | 16 +- types/ol/structs/LRUCache.d.ts | 8 +- types/ol/structs/PriorityQueue.d.ts | 2 +- types/ol/structs/RBush.d.ts | 4 +- types/ol/style/Atlas.d.ts | 8 +- types/ol/style/AtlasManager.d.ts | 9 +- types/ol/style/IconImage.d.ts | 18 +- types/ol/style/Image.d.ts | 4 +- types/ol/style/RegularShape.d.ts | 2 +- types/ol/style/Stroke.d.ts | 10 +- types/ol/style/Style.d.ts | 10 +- types/ol/style/Text.d.ts | 12 +- types/ol/tilegrid.d.ts | 14 +- types/ol/tilegrid/TileGrid.d.ts | 10 +- types/ol/tilegrid/WMTS.d.ts | 6 +- types/ol/transform.d.ts | 11 +- types/ol/util.d.ts | 2 + types/ol/webgl/Context.d.ts | 15 +- types/ol/xml.d.ts | 77 +++- 193 files changed, 1885 insertions(+), 775 deletions(-) diff --git a/types/ol/Collection.d.ts b/types/ol/Collection.d.ts index 887bf70aee..8943e42da7 100644 --- a/types/ol/Collection.d.ts +++ b/types/ol/Collection.d.ts @@ -9,7 +9,7 @@ export default class Collection extends BaseObject { constructor(opt_array?: T[], opt_options?: Options); clear(): void; extend(arr: T[]): Collection; - forEach(f: ((p0: T, p1: number, p2: T[]) => void)): void; + forEach(f: (p0: T, p1: number, p2: T[]) => any): void; getArray(): T[]; getLength(): number; insertAt(index: number, elem: T): void; @@ -19,9 +19,9 @@ export default class Collection extends BaseObject { remove(elem: T): T; removeAt(index: number): T; setAt(index: number, elem: T): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'add', listener: (evt: CollectionEvent) => void): EventsKey; once(type: 'add', listener: (evt: CollectionEvent) => void): EventsKey; un(type: 'add', listener: (evt: CollectionEvent) => void): void; diff --git a/types/ol/Feature.d.ts b/types/ol/Feature.d.ts index ce6bd92275..fda2649fec 100644 --- a/types/ol/Feature.d.ts +++ b/types/ol/Feature.d.ts @@ -15,13 +15,13 @@ export default class Feature extends BaseObject { getId(): number | string; getStyle(): StyleLike; getStyleFunction(): StyleFunction; - setGeometry(geometry: Geometry): void; + setGeometry(geometry: Geometry | undefined): void; setGeometryName(name: string): void; - setId(id: number | string): void; + setId(id: number | string | undefined): void; setStyle(style: StyleLike): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/Geolocation.d.ts b/types/ol/Geolocation.d.ts index 65cf1755a2..68f21f9140 100644 --- a/types/ol/Geolocation.d.ts +++ b/types/ol/Geolocation.d.ts @@ -26,9 +26,9 @@ export default class Geolocation extends BaseObject { setProjection(projection: ProjectionLike): void; setTracking(tracking: boolean): void; setTrackingOptions(options: PositionOptions): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/Graticule.d.ts b/types/ol/Graticule.d.ts index f0711fc596..76ed5cabd4 100644 --- a/types/ol/Graticule.d.ts +++ b/types/ol/Graticule.d.ts @@ -14,8 +14,8 @@ export interface Options { strokeStyle?: Stroke; targetSize?: number; showLabels?: boolean; - lonLabelFormatter?: ((p0: number) => string); - latLabelFormatter?: ((p0: number) => string); + lonLabelFormatter?: (p0: number) => string; + latLabelFormatter?: (p0: number) => string; lonLabelPosition?: number; latLabelPosition?: number; lonLabelStyle?: Text; diff --git a/types/ol/Image.d.ts b/types/ol/Image.d.ts index a2ebf34658..76f14f0c60 100644 --- a/types/ol/Image.d.ts +++ b/types/ol/Image.d.ts @@ -2,9 +2,16 @@ import { Extent } from './extent'; import ImageBase from './ImageBase'; import ImageState from './ImageState'; -export type LoadFunction = ((p0: ImageWrapper, p1: string) => void); +export type LoadFunction = (p0: ImageWrapper, p1: string) => void; export default class ImageWrapper extends ImageBase { - constructor(extent: Extent, resolution: number, pixelRatio: number, src: string, crossOrigin: string, imageLoadFunction: LoadFunction); + constructor( + extent: Extent, + resolution: number | undefined, + pixelRatio: number, + src: string, + crossOrigin: string, + imageLoadFunction: LoadFunction + ); protected state: ImageState; setImage(image: HTMLCanvasElement | HTMLImageElement | HTMLVideoElement): void; } diff --git a/types/ol/ImageBase.d.ts b/types/ol/ImageBase.d.ts index 9db740217f..997e2062c7 100644 --- a/types/ol/ImageBase.d.ts +++ b/types/ol/ImageBase.d.ts @@ -3,7 +3,7 @@ import { Extent } from './extent'; import ImageState from './ImageState'; export default class ImageBase extends Target { - constructor(extent: Extent, resolution: number, pixelRatio: number, state: ImageState); + constructor(extent: Extent, resolution: number | undefined, pixelRatio: number, state: ImageState); protected extent: Extent; protected resolution: number; protected state: ImageState; diff --git a/types/ol/ImageCanvas.d.ts b/types/ol/ImageCanvas.d.ts index 6f451e6ba5..584c024efb 100644 --- a/types/ol/ImageCanvas.d.ts +++ b/types/ol/ImageCanvas.d.ts @@ -1,7 +1,7 @@ import { Extent } from './extent'; import ImageBase from './ImageBase'; -export type Loader = ((p0: (p0?: Error) => void) => void); +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); getError(): Error; diff --git a/types/ol/ImageTile.d.ts b/types/ol/ImageTile.d.ts index 6708ec0992..3db5f959e6 100644 --- a/types/ol/ImageTile.d.ts +++ b/types/ol/ImageTile.d.ts @@ -3,6 +3,13 @@ import { TileCoord } from './tilecoord'; import TileState from './TileState'; export default class ImageTile extends Tile { - constructor(tileCoord: TileCoord, state: TileState, src: string, crossOrigin: string, tileLoadFunction: LoadFunction, opt_options?: Options); + constructor( + tileCoord: TileCoord, + state: TileState, + src: string, + crossOrigin: string, + tileLoadFunction: LoadFunction, + opt_options?: Options + ); getImage(): HTMLCanvasElement | HTMLImageElement | HTMLVideoElement; } diff --git a/types/ol/Map.d.ts b/types/ol/Map.d.ts index 65f829ba79..223f0205ad 100644 --- a/types/ol/Map.d.ts +++ b/types/ol/Map.d.ts @@ -8,9 +8,9 @@ import RenderEvent from './render/Event'; export default class Map extends PluggableMap { constructor(options: MapOptions); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/MapBrowserEvent.d.ts b/types/ol/MapBrowserEvent.d.ts index b9fab2384c..3255074ce4 100644 --- a/types/ol/MapBrowserEvent.d.ts +++ b/types/ol/MapBrowserEvent.d.ts @@ -4,7 +4,13 @@ import { Pixel } from './pixel'; import PluggableMap, { FrameState } from './PluggableMap'; export default class MapBrowserEvent extends MapEvent { - constructor(type: string, map: PluggableMap, browserEvent: Event, opt_dragging?: boolean, opt_frameState?: FrameState); + constructor( + type: string, + map: PluggableMap, + browserEvent: Event, + opt_dragging?: boolean, + opt_frameState?: FrameState + ); coordinate: Coordinate; dragging: boolean; pixel: Pixel; diff --git a/types/ol/MapBrowserPointerEvent.d.ts b/types/ol/MapBrowserPointerEvent.d.ts index 86a9937719..ee660140df 100644 --- a/types/ol/MapBrowserPointerEvent.d.ts +++ b/types/ol/MapBrowserPointerEvent.d.ts @@ -3,5 +3,11 @@ import PluggableMap, { FrameState } from './PluggableMap'; import PointerEvent from './pointer/PointerEvent'; export default class MapBrowserPointerEvent extends MapBrowserEvent { - constructor(type: string, map: PluggableMap, pointerEvent: PointerEvent, opt_dragging?: boolean, opt_frameState?: FrameState); + constructor( + type: string, + map: PluggableMap, + pointerEvent: PointerEvent, + opt_dragging?: boolean, + opt_frameState?: FrameState + ); } diff --git a/types/ol/Object.d.ts b/types/ol/Object.d.ts index 4c4ac39417..28739221c8 100644 --- a/types/ol/Object.d.ts +++ b/types/ol/Object.d.ts @@ -11,9 +11,9 @@ export default class BaseObject extends Observable { set(key: string, value: any, opt_silent?: boolean): void; setProperties(values: { [key: string]: any }, opt_silent?: boolean): void; unset(key: string, opt_silent?: boolean): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/Observable.d.ts b/types/ol/Observable.d.ts index d04d99dd5d..8129735dc3 100644 --- a/types/ol/Observable.d.ts +++ b/types/ol/Observable.d.ts @@ -6,9 +6,9 @@ export default class Observable extends Target { constructor(); changed(): void; getRevision(): number; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/Overlay.d.ts b/types/ol/Overlay.d.ts index a019a58e90..526b045b66 100644 --- a/types/ol/Overlay.d.ts +++ b/types/ol/Overlay.d.ts @@ -23,7 +23,7 @@ export interface Options { } export interface PanOptions { duration?: number; - easing?: ((p0: number) => number); + easing?: (p0: number) => number; } export default class Overlay extends BaseObject { constructor(options: Options); @@ -37,7 +37,7 @@ export default class Overlay extends BaseObject { protected options: Options; protected rendered: any; protected stopEvent: boolean; - protected getRect(element: HTMLElement, size: Size): Extent; + protected getRect(element: HTMLElement | undefined, size: Size | undefined): Extent; protected handleElementChanged(): void; protected handleMapChanged(): void; protected handleOffsetChanged(): void; @@ -47,7 +47,7 @@ export default class Overlay extends BaseObject { protected render(): void; protected setVisible(visible: boolean): void; protected updatePixelPosition(): void; - protected updateRenderedPosition(pixel: Pixel, mapSize: Size): void; + protected updateRenderedPosition(pixel: Pixel, mapSize: Size | undefined): void; getElement(): HTMLElement; getId(): number | string; getMap(): PluggableMap; @@ -55,14 +55,14 @@ export default class Overlay extends BaseObject { getOptions(): Options; getPosition(): Coordinate; getPositioning(): OverlayPositioning; - setElement(element: HTMLElement): void; - setMap(map: PluggableMap): void; + setElement(element: HTMLElement | undefined): void; + setMap(map: PluggableMap | undefined): void; setOffset(offset: number[]): void; - setPosition(position: Coordinate): void; + setPosition(position: Coordinate | undefined): void; setPositioning(positioning: OverlayPositioning): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/PluggableMap.d.ts b/types/ol/PluggableMap.d.ts index 231c385c8d..629807ca64 100644 --- a/types/ol/PluggableMap.d.ts +++ b/types/ol/PluggableMap.d.ts @@ -24,7 +24,7 @@ import { Transform } from './transform'; import View, { State } from './View'; export interface AtPixelOptions { - layerFilter: ((p0: Layer) => boolean); + layerFilter: (p0: Layer) => boolean; hitTolerance?: number; } export interface FrameState { @@ -68,7 +68,7 @@ export interface MapOptionsInternal { overlays: Collection; values: { [key: string]: any }; } -export type PostRenderFunction = ((p0: PluggableMap, p1: FrameState) => boolean); +export type PostRenderFunction = (p0: PluggableMap, p1: FrameState) => boolean; export default class PluggableMap extends BaseObject { constructor(options: MapOptions); protected controls: Collection; @@ -79,8 +79,16 @@ export default class PluggableMap extends BaseObject { addLayer(layer: BaseLayer): void; addOverlay(overlay: Overlay): void; createRenderer(): MapRenderer; - forEachFeatureAtPixel(pixel: Pixel, callback: ((this: S, p0: FeatureLike, p1: Layer) => T), opt_options?: AtPixelOptions): T; - forEachLayerAtPixel(pixel: Pixel, callback: ((this: S, p0: Layer, p1: (Uint8ClampedArray | Uint8Array)) => T), opt_options?: AtPixelOptions): T; + forEachFeatureAtPixel( + pixel: Pixel, + callback: (this: S, p0: FeatureLike, p1: Layer) => T, + opt_options?: AtPixelOptions + ): T; + forEachLayerAtPixel( + pixel: Pixel, + callback: (this: S, p0: Layer, p1: Uint8ClampedArray | Uint8Array) => T, + opt_options?: AtPixelOptions + ): T; getControls(): Collection; getCoordinateFromPixel(pixel: Pixel): Coordinate; getEventCoordinate(event: Event): Coordinate; @@ -112,15 +120,15 @@ export default class PluggableMap extends BaseObject { render(): void; renderSync(): void; setLayerGroup(layerGroup: LayerGroup): void; - setSize(size: Size): void; - setTarget(target: HTMLElement | string): void; + setSize(size: Size | undefined): void; + setTarget(target: HTMLElement | string | undefined): void; setView(view: View): void; skipFeature(feature: Feature): void; unskipFeature(feature: Feature): void; updateSize(): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/Tile.d.ts b/types/ol/Tile.d.ts index 035cd66af5..08eb82802a 100644 --- a/types/ol/Tile.d.ts +++ b/types/ol/Tile.d.ts @@ -3,11 +3,11 @@ import Projection from './proj/Projection'; import { TileCoord } from './tilecoord'; import TileState from './TileState'; -export type LoadFunction = ((p0: Tile, p1: string) => void); +export type LoadFunction = (p0: Tile, p1: string) => void; export interface Options { transition?: number; } -export type UrlFunction = ((p0: TileCoord, p1: number, p2: Projection) => string); +export type UrlFunction = (p0: TileCoord, p1: number, p2: Projection) => string; export default class Tile extends Target { constructor(tileCoord: TileCoord, state: TileState, opt_options?: Options); protected state: TileState; diff --git a/types/ol/TileCache.d.ts b/types/ol/TileCache.d.ts index 3f836887c4..df870cadfe 100644 --- a/types/ol/TileCache.d.ts +++ b/types/ol/TileCache.d.ts @@ -7,9 +7,9 @@ export default class TileCache extends LRUCache { constructor(opt_highWaterMark?: number); expireCache(usedTiles: { [key: string]: TileRange }): void; pruneExceptNewestZ(): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/TileQueue.d.ts b/types/ol/TileQueue.d.ts index 12ff7aee32..5303ac3353 100644 --- a/types/ol/TileQueue.d.ts +++ b/types/ol/TileQueue.d.ts @@ -3,9 +3,9 @@ import Event from './events/Event'; import PriorityQueue from './structs/PriorityQueue'; import Tile from './Tile'; -export type PriorityFunction = ((p0: Tile, p1: string, p2: Coordinate, p3: number) => number); +export type PriorityFunction = (p0: Tile, p1: string, p2: Coordinate, p3: number) => number; export default class TileQueue extends PriorityQueue { - constructor(tilePriorityFunction: PriorityFunction, tileChangeCallback: (() => void)); + constructor(tilePriorityFunction: PriorityFunction, tileChangeCallback: () => any); protected handleTileChange(event: Event): void; getTilesLoading(): number; loadMoreTiles(maxTotalLoading: number, maxNewLoads: number): void; diff --git a/types/ol/TileRange.d.ts b/types/ol/TileRange.d.ts index eb378281ef..6f66efb00b 100644 --- a/types/ol/TileRange.d.ts +++ b/types/ol/TileRange.d.ts @@ -13,4 +13,10 @@ export default class TileRange { getWidth(): number; intersects(tileRange: TileRange): boolean; } -export function createOrUpdate(minX: number, maxX: number, minY: number, maxY: number, tileRange?: TileRange): TileRange; +export function createOrUpdate( + minX: number, + maxX: number, + minY: number, + maxY: number, + tileRange?: TileRange +): TileRange; diff --git a/types/ol/VectorImageTile.d.ts b/types/ol/VectorImageTile.d.ts index 68c6240077..e2c50e9938 100644 --- a/types/ol/VectorImageTile.d.ts +++ b/types/ol/VectorImageTile.d.ts @@ -17,7 +17,23 @@ export interface ReplayState { renderedRevision: number; } export default class VectorImageTile extends Tile { - constructor(tileCoord: TileCoord, state: TileState, sourceRevision: number, format: FeatureFormat, tileLoadFunction: LoadFunction, urlTileCoord: TileCoord, tileUrlFunction: UrlFunction, sourceTileGrid: TileGrid, tileGrid: TileGrid, sourceTiles: { [key: string]: VectorTile }, pixelRatio: number, projection: Projection, tileClass: VectorTile, handleTileChange: ((this: VectorTile_1, p0: Event) => void), zoom: number); + constructor( + tileCoord: TileCoord, + state: TileState, + sourceRevision: number, + format: FeatureFormat, + tileLoadFunction: LoadFunction, + urlTileCoord: TileCoord, + tileUrlFunction: UrlFunction, + sourceTileGrid: TileGrid, + tileGrid: TileGrid, + sourceTiles: { [key: string]: VectorTile }, + pixelRatio: number, + projection: Projection, + tileClass: VectorTile, + handleTileChange: (this: VectorTile_1, p0: Event) => void, + zoom: number + ); getContext(layer: Layer): CanvasRenderingContext2D; getImage(layer: Layer): HTMLCanvasElement; getReplayState(layer: Layer): ReplayState; diff --git a/types/ol/VectorTile.d.ts b/types/ol/VectorTile.d.ts index 88d94417d6..4c975b6164 100644 --- a/types/ol/VectorTile.d.ts +++ b/types/ol/VectorTile.d.ts @@ -10,7 +10,14 @@ import { TileCoord } from './tilecoord'; import TileState from './TileState'; export default class VectorTile extends Tile { - constructor(tileCoord: TileCoord, state: TileState, src: string, format: FeatureFormat, tileLoadFunction: LoadFunction, opt_options?: Options); + constructor( + tileCoord: TileCoord, + state: TileState, + src: string, + format: FeatureFormat, + tileLoadFunction: LoadFunction, + opt_options?: Options + ); getExtent(): Extent; getFeatures(): FeatureLike[]; getFormat(): FeatureFormat; diff --git a/types/ol/View.d.ts b/types/ol/View.d.ts index 5fb5b1fe58..646cf7c918 100644 --- a/types/ol/View.d.ts +++ b/types/ol/View.d.ts @@ -24,8 +24,8 @@ export interface Animation { start: number; duration: number; complete: boolean; - easing: ((p0: number) => number); - callback: ((p0: boolean) => void); + easing: (p0: number) => number; + callback: (p0: boolean) => void; } export interface AnimationOptions { center?: Coordinate; @@ -34,7 +34,7 @@ export interface AnimationOptions { rotation?: number; anchor?: Coordinate; duration?: number; - easing?: ((p0: number) => number); + easing?: (p0: number) => number; } export interface Constraints { center: Type; @@ -49,8 +49,8 @@ export interface FitOptions { minResolution?: number; maxZoom?: number; duration?: number; - easing?: ((p0: number) => number); - callback?: ((p0: boolean) => void); + easing?: (p0: number) => number; + callback?: (p0: boolean) => void; } export interface State { center: Coordinate; @@ -84,9 +84,9 @@ export default class View extends BaseObject { calculateExtent(opt_size?: Size): Extent; cancelAnimations(): void; centerOn(coordinate: Coordinate, size: Size, position: Pixel): void; - constrainCenter(center: Coordinate): Coordinate; - constrainResolution(resolution: number, opt_delta?: number, opt_direction?: number): number; - constrainRotation(rotation: number, opt_delta?: number): number; + constrainCenter(center: Coordinate | undefined): Coordinate; + constrainResolution(resolution: number | undefined, opt_delta?: number, opt_direction?: number): number; + constrainRotation(rotation: number | undefined, opt_delta?: number): number; fit(geometryOrExtent: SimpleGeometry | Extent, opt_options?: FitOptions): void; getAnimating(): boolean; getCenter(): Coordinate; @@ -100,28 +100,28 @@ export default class View extends BaseObject { getProjection(): Projection; getResolution(): number; getResolutionForExtent(extent: Extent, opt_size?: Size): number; - getResolutionForValueFunction(opt_power?: number): ((p0: number) => number); + getResolutionForValueFunction(opt_power?: number): (p0: number) => number; getResolutionForZoom(zoom: number): number; getResolutions(): number[]; getRotation(): number; getState(pixelRatio: number): State; getUpdatedOptions_(newOptions: ViewOptions): ViewOptions; - getValueForResolutionFunction(opt_power?: number): ((p0: number) => number); + getValueForResolutionFunction(opt_power?: number): (p0: number) => number; getZoom(): number; getZoomForResolution(resolution: number): number; isDef(): boolean; rotate(rotation: number, opt_anchor?: Coordinate): void; - setCenter(center: Coordinate): void; + setCenter(center: Coordinate | undefined): void; setHint(hint: ViewHint, delta: number): number; setMaxZoom(zoom: number): void; setMinZoom(zoom: number): void; - setResolution(resolution: number): void; + setResolution(resolution: number | undefined): void; setRotation(rotation: number): void; setZoom(zoom: number): void; updateAnimations_(): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/WebGLMap.d.ts b/types/ol/WebGLMap.d.ts index ef95d51d62..35362cbd95 100644 --- a/types/ol/WebGLMap.d.ts +++ b/types/ol/WebGLMap.d.ts @@ -8,9 +8,9 @@ import RenderEvent from './render/Event'; export default class WebGLMap extends PluggableMap { constructor(options: MapOptions); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/array.d.ts b/types/ol/array.d.ts index 42c07789cc..1305fe7831 100644 --- a/types/ol/array.d.ts +++ b/types/ol/array.d.ts @@ -1,12 +1,12 @@ -export function binarySearch(haystack: any[], needle: any, opt_comparator?: (() => void)): number; +export function binarySearch(haystack: any[], needle: any, opt_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; -export function findIndex(arr: any[], func: (() => void)): number; +export function find(arr: VALUE[], func: (p0: VALUE, p1: number, p2: any) => boolean): VALUE; +export function findIndex(arr: any[], func: () => void): number; 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[], opt_func?: () => void, opt_strict?: boolean): boolean; export function linearFindNearest(arr: number[], target: number, direction: number): number; export function numberSafeCompareFunction(a: any, b: any): number; export function remove(arr: VALUE[], obj: VALUE): boolean; export function reverseSubArray(arr: any[], begin: number, end: number): void; -export function stableSort(arr: any[], compareFnc: (() => void)): void; +export function stableSort(arr: any[], compareFnc: () => void): void; diff --git a/types/ol/centerconstraint.d.ts b/types/ol/centerconstraint.d.ts index c5598abbc5..83e9be748c 100644 --- a/types/ol/centerconstraint.d.ts +++ b/types/ol/centerconstraint.d.ts @@ -1,6 +1,6 @@ import { Coordinate } from './coordinate'; import { Extent } from './extent'; -export type Type = ((p0: Coordinate) => Coordinate); +export type Type = (p0: Coordinate) => Coordinate; export function createExtent(extent: Extent): Type; export function none(center?: Coordinate): Coordinate; diff --git a/types/ol/control.d.ts b/types/ol/control.d.ts index df64513a28..36c042c14d 100644 --- a/types/ol/control.d.ts +++ b/types/ol/control.d.ts @@ -1,5 +1,3 @@ -import Collection from './Collection'; -import Control from './control/Control'; import { DefaultsOptions } from './control/util'; export { default as Attribution } from './control/Attribution'; @@ -12,5 +10,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 function defaults(opt_options?: DefaultsOptions): Collection; +export { defaults } from './control/util'; diff --git a/types/ol/control/Attribution.d.ts b/types/ol/control/Attribution.d.ts index db1adef4ce..7012e6afc1 100644 --- a/types/ol/control/Attribution.d.ts +++ b/types/ol/control/Attribution.d.ts @@ -12,7 +12,7 @@ export interface Options { tipLabel?: string; label?: string | HTMLElement; collapseLabel?: string | HTMLElement; - render?: ((p0: MapEvent) => void); + render?: (p0: MapEvent) => void; } export default class Attribution extends Control { constructor(opt_options?: Options); @@ -20,9 +20,9 @@ export default class Attribution extends Control { getCollapsible(): boolean; setCollapsed(collapsed: boolean): void; setCollapsible(collapsible: boolean): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/Control.d.ts b/types/ol/control/Control.d.ts index 4fc10a3e16..e40262eaa3 100644 --- a/types/ol/control/Control.d.ts +++ b/types/ol/control/Control.d.ts @@ -6,7 +6,7 @@ import PluggableMap from '../PluggableMap'; export interface Options { element?: HTMLElement; - render?: ((p0: MapEvent) => void); + render?: (p0: MapEvent) => void; target?: HTMLElement | string; } export default class Control extends BaseObject { @@ -16,9 +16,9 @@ export default class Control extends BaseObject { getMap(): PluggableMap; setMap(map: PluggableMap): void; setTarget(target: HTMLElement | string): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/FullScreen.d.ts b/types/ol/control/FullScreen.d.ts index bd7a55c4d5..d9027d5fda 100644 --- a/types/ol/control/FullScreen.d.ts +++ b/types/ol/control/FullScreen.d.ts @@ -14,9 +14,9 @@ export interface Options { } export default class FullScreen extends Control { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/MousePosition.d.ts b/types/ol/control/MousePosition.d.ts index b4570b86f1..9e0791d868 100644 --- a/types/ol/control/MousePosition.d.ts +++ b/types/ol/control/MousePosition.d.ts @@ -11,7 +11,7 @@ export interface Options { className?: string; coordinateFormat?: CoordinateFormat; projection?: ProjectionLike; - render?: ((p0: MapEvent) => void); + render?: (p0: MapEvent) => void; target?: HTMLElement | string; undefinedHTML?: string; } @@ -23,9 +23,9 @@ export default class MousePosition extends Control { getProjection(): Projection; setCoordinateFormat(format: CoordinateFormat): void; setProjection(projection: ProjectionLike): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/OverviewMap.d.ts b/types/ol/control/OverviewMap.d.ts index c0c251d0bd..220600748e 100644 --- a/types/ol/control/OverviewMap.d.ts +++ b/types/ol/control/OverviewMap.d.ts @@ -15,7 +15,7 @@ export interface Options { collapsible?: boolean; label?: string | HTMLElement; layers?: Layer[] | Collection; - render?: ((p0: MapEvent) => void); + render?: (p0: MapEvent) => void; target?: HTMLElement | string; tipLabel?: string; view?: View; @@ -27,9 +27,9 @@ export default class OverviewMap extends Control { getOverviewMap(): PluggableMap; setCollapsed(collapsed: boolean): void; setCollapsible(collapsible: boolean): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/Rotate.d.ts b/types/ol/control/Rotate.d.ts index d55148c90d..047bd9ef6f 100644 --- a/types/ol/control/Rotate.d.ts +++ b/types/ol/control/Rotate.d.ts @@ -10,15 +10,15 @@ export interface Options { tipLabel?: string; duration?: number; autoHide?: boolean; - render?: ((p0: MapEvent) => void); - resetNorth?: (() => void); + render?: (p0: MapEvent) => void; + resetNorth?: () => void; target?: HTMLElement | string; } export default class Rotate extends Control { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/ScaleLine.d.ts b/types/ol/control/ScaleLine.d.ts index 990858b454..f83f4ca7ae 100644 --- a/types/ol/control/ScaleLine.d.ts +++ b/types/ol/control/ScaleLine.d.ts @@ -7,7 +7,7 @@ import Control from './Control'; export interface Options { className?: string; minWidth?: number; - render?: ((p0: MapEvent) => void); + render?: (p0: MapEvent) => void; target?: HTMLElement | string; units?: Units | string; } @@ -22,9 +22,9 @@ export default class ScaleLine extends Control { constructor(opt_options?: Options); getUnits(): Units; setUnits(units: Units): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/Zoom.d.ts b/types/ol/control/Zoom.d.ts index 6ca5ece273..e883a2402c 100644 --- a/types/ol/control/Zoom.d.ts +++ b/types/ol/control/Zoom.d.ts @@ -15,9 +15,9 @@ export interface Options { } export default class Zoom extends Control { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/ZoomSlider.d.ts b/types/ol/control/ZoomSlider.d.ts index 3d4ada09d9..1621a0f9b3 100644 --- a/types/ol/control/ZoomSlider.d.ts +++ b/types/ol/control/ZoomSlider.d.ts @@ -7,13 +7,13 @@ import Control from './Control'; export interface Options { className?: string; duration?: number; - render?: ((p0: MapEvent) => void); + render?: (p0: MapEvent) => void; } export default class ZoomSlider extends Control { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/ZoomToExtent.d.ts b/types/ol/control/ZoomToExtent.d.ts index bd300ddfd9..7bd21f3355 100644 --- a/types/ol/control/ZoomToExtent.d.ts +++ b/types/ol/control/ZoomToExtent.d.ts @@ -15,9 +15,9 @@ export default class ZoomToExtent extends Control { constructor(opt_options?: Options); protected extent: Extent; protected handleZoomToExtent(): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/control/util.d.ts b/types/ol/control/util.d.ts index a0c9713dd2..62aa23b276 100644 --- a/types/ol/control/util.d.ts +++ b/types/ol/control/util.d.ts @@ -1,4 +1,6 @@ +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'; @@ -10,3 +12,4 @@ export interface DefaultsOptions { zoom?: boolean; zoomOptions?: Options_2; } +export function defaults(opt_options?: DefaultsOptions): Collection; diff --git a/types/ol/coordinate.d.ts b/types/ol/coordinate.d.ts index ea8eb2a67a..6e501012dd 100644 --- a/types/ol/coordinate.d.ts +++ b/types/ol/coordinate.d.ts @@ -1,7 +1,7 @@ import Circle from './geom/Circle'; export type Coordinate = number[]; -export type CoordinateFormat = ((p0: Coordinate) => string); +export type CoordinateFormat = (p0: Coordinate) => string; export function add(coordinate: Coordinate, delta: Coordinate): Coordinate; export function closestOnCircle(coordinate: Coordinate, circle: Circle): Coordinate; export function closestOnSegment(coordinate: Coordinate, segment: Coordinate[]): Coordinate; diff --git a/types/ol/css.d.ts b/types/ol/css.d.ts index 6e8d4118e7..94c98243c3 100644 --- a/types/ol/css.d.ts +++ b/types/ol/css.d.ts @@ -4,4 +4,4 @@ export const CLASS_HIDDEN: string; export const CLASS_SELECTABLE: string; export const CLASS_UNSELECTABLE: string; export const CLASS_UNSUPPORTED: string; -export const getFontFamilies: ((p0: string) => string[]); +export function getFontFamilies(font: string): string[]; diff --git a/types/ol/events.d.ts b/types/ol/events.d.ts index a9fb89da30..81c562e4a7 100644 --- a/types/ol/events.d.ts +++ b/types/ol/events.d.ts @@ -10,12 +10,28 @@ export interface EventsKey { target: EventTargetLike; type: string; } -export type ListenerFunction = ((p0: (Event | Event)) => boolean); +export type ListenerFunction = (p0: Event | Event) => boolean; export function bindListener(listenerObj: EventsKey): ListenerFunction; -export function findListener(listeners: EventsKey[], listener: (() => void), opt_this?: any, opt_setDeleteIndex?: boolean): EventsKey; +export function findListener( + listeners: EventsKey[], + listener: () => void, + opt_this?: any, + opt_setDeleteIndex?: boolean +): EventsKey; export function getListeners(target: EventTargetLike, type: string): EventsKey[]; -export function listen(target: EventTargetLike, type: string, listener: ListenerFunction, opt_this?: any, opt_once?: boolean): EventsKey; -export function listenOnce(target: EventTargetLike, type: string, listener: ListenerFunction, opt_this?: any): EventsKey; +export function listen( + target: EventTargetLike, + type: string, + listener: ListenerFunction, + opt_this?: any, + opt_once?: boolean +): EventsKey; +export function listenOnce( + target: EventTargetLike, + type: string, + listener: ListenerFunction, + opt_this?: any +): EventsKey; export function unlisten(target: EventTargetLike, type: string, listener: ListenerFunction, opt_this?: any): void; export function unlistenAll(target: EventTargetLike): void; export function unlistenByKey(key: EventsKey): void; diff --git a/types/ol/events/condition.d.ts b/types/ol/events/condition.d.ts index 79fdb5b6c6..1a522fa4ad 100644 --- a/types/ol/events/condition.d.ts +++ b/types/ol/events/condition.d.ts @@ -1,7 +1,7 @@ import { FALSE, TRUE } from '../functions'; import MapBrowserEvent from '../MapBrowserEvent'; -export type Condition = ((this: any, p0: MapBrowserEvent) => boolean); +export type Condition = (this: any, p0: MapBrowserEvent) => boolean; export const always: typeof TRUE; export const never: typeof FALSE; export function altKeyOnly(mapBrowserEvent: MapBrowserEvent): boolean; diff --git a/types/ol/extent.d.ts b/types/ol/extent.d.ts index b0eb259f28..c7c8e75404 100644 --- a/types/ol/extent.d.ts +++ b/types/ol/extent.d.ts @@ -19,23 +19,45 @@ export function createOrUpdate(minX: number, minY: number, maxX: number, maxY: n 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 createOrUpdateFromFlatCoordinates(flatCoordinates: number[], offset: number, end: number, stride: number, opt_extent?: Extent): Extent; +export function createOrUpdateFromFlatCoordinates( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + opt_extent?: Extent +): Extent; export function createOrUpdateFromRings(rings: Coordinate[][], opt_extent?: Extent): Extent; export function equals(extent1: Extent, extent2: Extent): boolean; export function extend(extent1: Extent, extent2: Extent): Extent; export function extendCoordinate(extent: Extent, coordinate: Coordinate): void; export function extendCoordinates(extent: Extent, coordinates: Coordinate[]): Extent; -export function extendFlatCoordinates(extent: Extent, flatCoordinates: number[], offset: number, end: number, stride: number): Extent; +export function extendFlatCoordinates( + extent: Extent, + flatCoordinates: number[], + offset: number, + end: number, + stride: number +): Extent; export function extendRings(extent: Extent, rings: Coordinate[][]): Extent; export function extendXY(extent: Extent, x: number, y: number): void; -export function forEachCorner(extent: Extent, callback: ((this: T, p0: Coordinate) => S), opt_this?: T): S | boolean; +export function forEachCorner( + extent: Extent, + callback: (this: T, p0: Coordinate) => S, + opt_this?: T +): S | boolean; export function getArea(extent: Extent): number; export function getBottomLeft(extent: Extent): Coordinate; export function getBottomRight(extent: Extent): Coordinate; export function getCenter(extent: Extent): Coordinate; export function getCorner(extent: Extent, corner: Corner): Coordinate; export function getEnlargedArea(extent1: Extent, extent2: Extent): number; -export function getForViewAndSize(center: Coordinate, resolution: number, rotation: number, size: Size, opt_extent?: Extent): Extent; +export function getForViewAndSize( + center: Coordinate, + resolution: number, + rotation: number, + size: Size, + opt_extent?: Extent +): Extent; export function getHeight(extent: Extent): number; export function getIntersection(extent1: Extent, extent2: Extent, opt_extent?: Extent): Extent; export function getIntersectionArea(extent1: Extent, extent2: Extent): number; diff --git a/types/ol/featureloader.d.ts b/types/ol/featureloader.d.ts index a707ba5225..fef0164ca5 100644 --- a/types/ol/featureloader.d.ts +++ b/types/ol/featureloader.d.ts @@ -4,7 +4,12 @@ import Projection from './proj/Projection'; import VectorSource from './source/Vector'; import VectorTile from './VectorTile'; -export type FeatureLoader = ((this: (VectorSource | VectorTile), p0: Extent, p1: number, p2: Projection) => void); -export type FeatureUrlFunction = ((p0: Extent, p1: number, p2: Projection) => string); -export function loadFeaturesXhr(url: string | FeatureUrlFunction, format: FeatureFormat, success: (() => void) | (() => void), failure: ((this: VectorSource) => void) | (() => void)): FeatureLoader; +export type FeatureLoader = (this: VectorSource | VectorTile, p0: Extent, p1: number, p2: Projection) => void; +export type FeatureUrlFunction = (p0: Extent, p1: number, p2: Projection) => string; +export function loadFeaturesXhr( + url: string | FeatureUrlFunction, + format: FeatureFormat, + success: (() => void) | (() => void), + failure: ((this: VectorSource) => void) | (() => void) +): FeatureLoader; export function xhr(url: string | FeatureUrlFunction, format: FeatureFormat): FeatureLoader; diff --git a/types/ol/format/EsriJSON.d.ts b/types/ol/format/EsriJSON.d.ts index ecc083d1f4..3e6367af8e 100644 --- a/types/ol/format/EsriJSON.d.ts +++ b/types/ol/format/EsriJSON.d.ts @@ -8,7 +8,7 @@ import { Polygon, Polyline, Position, - SpatialReferenceWkid + SpatialReferenceWkid, } from 'arcgis-rest-api'; import Geometry_1 from '../geom/Geometry'; import GeometryLayout from '../geom/GeometryLayout'; diff --git a/types/ol/format/Feature.d.ts b/types/ol/format/Feature.d.ts index e832c61e87..dbde078f75 100644 --- a/types/ol/format/Feature.d.ts +++ b/types/ol/format/Feature.d.ts @@ -20,7 +20,7 @@ export default class FeatureFormat { constructor(); protected dataProjection: Projection; protected defaultFeatureProjection: Projection; - protected adaptOptions(options: WriteOptions | ReadOptions): WriteOptions | ReadOptions; + protected adaptOptions(options: WriteOptions | ReadOptions | undefined): WriteOptions | ReadOptions; protected getReadOptions(source: Document | Node | object | string, opt_options?: ReadOptions): ReadOptions; getLastExtent(): Extent; getType(): FormatType; @@ -32,4 +32,8 @@ export default class FeatureFormat { writeFeatures(features: Feature[], opt_options?: WriteOptions): string; writeGeometry(geometry: Geometry, opt_options?: WriteOptions): string; } -export function transformWithOptions(geometry: Geometry | Extent, write: boolean, opt_options?: WriteOptions | ReadOptions): Geometry | Extent; +export function transformWithOptions( + geometry: Geometry | Extent, + write: boolean, + opt_options?: WriteOptions | ReadOptions +): Geometry | Extent; diff --git a/types/ol/format/GPX.d.ts b/types/ol/format/GPX.d.ts index 032db184ab..15a5063889 100644 --- a/types/ol/format/GPX.d.ts +++ b/types/ol/format/GPX.d.ts @@ -9,7 +9,7 @@ export interface LayoutOptions { hasM?: boolean; } export interface Options { - readExtensions?: ((p0: Feature, p1: Node) => void); + readExtensions?: (p0: Feature, p1: Node) => void; } export default class GPX extends XMLFeature { constructor(opt_options?: Options); diff --git a/types/ol/format/GeoJSON.d.ts b/types/ol/format/GeoJSON.d.ts index 3ffa52c6da..8db1bee85b 100644 --- a/types/ol/format/GeoJSON.d.ts +++ b/types/ol/format/GeoJSON.d.ts @@ -9,7 +9,7 @@ import { MultiPoint, MultiPolygon, Point, - Polygon + Polygon, } from 'geojson'; import Geometry_1 from '../geom/Geometry'; import GeometryCollection_1 from '../geom/GeometryCollection'; diff --git a/types/ol/format/TopoJSON.d.ts b/types/ol/format/TopoJSON.d.ts index fa9f50dd52..a00e8c247e 100644 --- a/types/ol/format/TopoJSON.d.ts +++ b/types/ol/format/TopoJSON.d.ts @@ -7,7 +7,7 @@ import { MultiPolygon, Point, Polygon, - Topology + Topology, } from 'topojson-specification'; import { Coordinate } from '../coordinate'; import Feature from '../Feature'; diff --git a/types/ol/format/WFS.d.ts b/types/ol/format/WFS.d.ts index 953844b781..0f6210d0b4 100644 --- a/types/ol/format/WFS.d.ts +++ b/types/ol/format/WFS.d.ts @@ -68,8 +68,13 @@ export default class WFS extends XMLFeature { readTransactionResponse(source: Document | Element | object | string): TransactionResponse; readTransactionResponseFromDocument(doc: Document): TransactionResponse; readTransactionResponseFromNode(node: Element): TransactionResponse; - setFeatureType(featureType: string[] | string): void; + setFeatureType(featureType: string[] | string | undefined): void; writeGetFeature(options: WriteGetFeatureOptions): Node; - writeTransaction(inserts: Feature[], updates: Feature[], deletes: Feature[], options: WriteTransactionOptions): Node; + writeTransaction( + inserts: Feature[], + updates: Feature[], + deletes: Feature[], + options: WriteTransactionOptions + ): Node; } export function writeFilter(filter: Filter): Node; diff --git a/types/ol/format/filter.d.ts b/types/ol/format/filter.d.ts index 3888a29e33..fd0d07261a 100644 --- a/types/ol/format/filter.d.ts +++ b/types/ol/format/filter.d.ts @@ -31,7 +31,14 @@ export function intersects(geometryName: string, geometry: Geometry, opt_srsName export function isNull(propertyName: string): IsNull; export function lessThan(propertyName: string, expression: number): LessThan; export function lessThanOrEqualTo(propertyName: string, expression: number): LessThanOrEqualTo; -export function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): IsLike; +export function like( + propertyName: string, + pattern: string, + opt_wildCard?: string, + opt_singleChar?: string, + opt_escapeChar?: string, + opt_matchCase?: boolean +): IsLike; export function not(condition: Filter): Not; export function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): NotEqualTo; export function or(...conditions: Filter[]): Or; diff --git a/types/ol/format/filter/IsLike.d.ts b/types/ol/format/filter/IsLike.d.ts index d5eef8d9ea..491b959ebd 100644 --- a/types/ol/format/filter/IsLike.d.ts +++ b/types/ol/format/filter/IsLike.d.ts @@ -1,5 +1,12 @@ import Comparison from './Comparison'; export default class IsLike extends Comparison { - constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean); + constructor( + propertyName: string, + pattern: string, + opt_wildCard?: string, + opt_singleChar?: string, + opt_escapeChar?: string, + opt_matchCase?: boolean + ); } diff --git a/types/ol/geom/Circle.d.ts b/types/ol/geom/Circle.d.ts index b84c136f97..76abe8fd53 100644 --- a/types/ol/geom/Circle.d.ts +++ b/types/ol/geom/Circle.d.ts @@ -16,9 +16,9 @@ export default class Circle extends SimpleGeometry { setRadius(radius: number): void; transform(source: ProjectionLike, destination: ProjectionLike): Circle; transform(source: ProjectionLike, destination: ProjectionLike): Geometry; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/Geometry.d.ts b/types/ol/geom/Geometry.d.ts index b694173c9e..23ddfa3844 100644 --- a/types/ol/geom/Geometry.d.ts +++ b/types/ol/geom/Geometry.d.ts @@ -27,9 +27,9 @@ export default class Geometry extends BaseObject { simplify(tolerance: number): Geometry; transform(source: ProjectionLike, destination: ProjectionLike): Geometry; translate(deltaX: number, deltaY: number): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/GeometryCollection.d.ts b/types/ol/geom/GeometryCollection.d.ts index 277c728a7a..6255b59ae4 100644 --- a/types/ol/geom/GeometryCollection.d.ts +++ b/types/ol/geom/GeometryCollection.d.ts @@ -10,9 +10,9 @@ export default class GeometryCollection extends Geometry { isEmpty(): boolean; setGeometries(geometries: Geometry[]): void; setGeometriesArray(geometries: Geometry[]): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/LineString.d.ts b/types/ol/geom/LineString.d.ts index 3a6abd8d95..71d77afeb0 100644 --- a/types/ol/geom/LineString.d.ts +++ b/types/ol/geom/LineString.d.ts @@ -8,14 +8,14 @@ import SimpleGeometry from './SimpleGeometry'; export default class LineString extends SimpleGeometry { constructor(coordinates: Coordinate[] | number[], opt_layout?: GeometryLayout); appendCoordinate(coordinate: Coordinate): void; - forEachSegment(callback: ((this: S, p0: Coordinate, p1: Coordinate) => T)): T | boolean; + forEachSegment(callback: (this: S, p0: Coordinate, p1: Coordinate) => T): T | boolean; getCoordinateAt(fraction: number, opt_dest?: Coordinate): Coordinate; getCoordinateAtM(m: number, opt_extrapolate?: boolean): Coordinate; getFlatMidpoint(): number[]; getLength(): number; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/LinearRing.d.ts b/types/ol/geom/LinearRing.d.ts index 72d09ea19e..61c881167c 100644 --- a/types/ol/geom/LinearRing.d.ts +++ b/types/ol/geom/LinearRing.d.ts @@ -8,9 +8,9 @@ import SimpleGeometry from './SimpleGeometry'; export default class LinearRing extends SimpleGeometry { constructor(coordinates: Coordinate[] | number[], opt_layout?: GeometryLayout); getArea(): number; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/MultiLineString.d.ts b/types/ol/geom/MultiLineString.d.ts index c926d640eb..0f26f684aa 100644 --- a/types/ol/geom/MultiLineString.d.ts +++ b/types/ol/geom/MultiLineString.d.ts @@ -7,16 +7,20 @@ import LineString from './LineString'; import SimpleGeometry from './SimpleGeometry'; export default class MultiLineString extends SimpleGeometry { - constructor(coordinates: (Coordinate[] | LineString)[] | number[], opt_layout?: GeometryLayout, opt_ends?: number[]); + constructor( + coordinates: (Coordinate[] | LineString)[] | number[], + opt_layout?: GeometryLayout, + opt_ends?: number[] + ); appendLineString(lineString: LineString): void; getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): Coordinate; getEnds(): number[]; getFlatMidpoints(): number[]; getLineString(index: number): LineString; getLineStrings(): LineString[]; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/MultiPoint.d.ts b/types/ol/geom/MultiPoint.d.ts index a59b9a0bd5..464eb3f83c 100644 --- a/types/ol/geom/MultiPoint.d.ts +++ b/types/ol/geom/MultiPoint.d.ts @@ -11,9 +11,9 @@ export default class MultiPoint extends SimpleGeometry { appendPoint(point: Point): void; getPoint(index: number): Point; getPoints(): Point[]; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/MultiPolygon.d.ts b/types/ol/geom/MultiPolygon.d.ts index 90c49b8822..d049286c72 100644 --- a/types/ol/geom/MultiPolygon.d.ts +++ b/types/ol/geom/MultiPolygon.d.ts @@ -8,7 +8,11 @@ import Polygon from './Polygon'; import SimpleGeometry from './SimpleGeometry'; export default class MultiPolygon extends SimpleGeometry { - constructor(coordinates: (Coordinate[][] | Polygon)[] | number[], opt_layout?: GeometryLayout, opt_endss?: number[][]); + constructor( + coordinates: (Coordinate[][] | Polygon)[] | number[], + opt_layout?: GeometryLayout, + opt_endss?: number[][] + ); appendPolygon(polygon: Polygon): void; getArea(): number; getEndss(): number[][]; @@ -17,9 +21,9 @@ export default class MultiPolygon extends SimpleGeometry { getOrientedFlatCoordinates(): number[]; getPolygon(index: number): Polygon; getPolygons(): Polygon[]; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/Point.d.ts b/types/ol/geom/Point.d.ts index 88e59bf512..23523b42ce 100644 --- a/types/ol/geom/Point.d.ts +++ b/types/ol/geom/Point.d.ts @@ -7,9 +7,9 @@ import SimpleGeometry from './SimpleGeometry'; export default class Point extends SimpleGeometry { constructor(coordinates: Coordinate, opt_layout?: GeometryLayout); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/Polygon.d.ts b/types/ol/geom/Polygon.d.ts index dd568ffc9e..2465b9e8d6 100644 --- a/types/ol/geom/Polygon.d.ts +++ b/types/ol/geom/Polygon.d.ts @@ -20,9 +20,9 @@ export default class Polygon extends SimpleGeometry { getLinearRingCount(): number; getLinearRings(): LinearRing[]; getOrientedFlatCoordinates(): number[]; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/SimpleGeometry.d.ts b/types/ol/geom/SimpleGeometry.d.ts index 90892c48d3..86ee9dc3b0 100644 --- a/types/ol/geom/SimpleGeometry.d.ts +++ b/types/ol/geom/SimpleGeometry.d.ts @@ -12,7 +12,7 @@ export default class SimpleGeometry extends Geometry { protected layout: GeometryLayout; protected stride: number; protected getSimplifiedGeometryInternal(squaredTolerance: number): SimpleGeometry; - protected setLayout(layout: GeometryLayout, coordinates: any[], nesting: number): void; + protected setLayout(layout: GeometryLayout | undefined, coordinates: any[], nesting: number): void; getCoordinates(): any[]; getFirstCoordinate(): Coordinate; getFlatCoordinates(): number[]; @@ -21,9 +21,9 @@ export default class SimpleGeometry extends Geometry { getStride(): number; setCoordinates(coordinates: any[], opt_layout?: GeometryLayout): void; setFlatCoordinates(layout: GeometryLayout, flatCoordinates: number[]): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/geom/flat/closest.d.ts b/types/ol/geom/flat/closest.d.ts index e4d021e5a6..e506db7b05 100644 --- a/types/ol/geom/flat/closest.d.ts +++ b/types/ol/geom/flat/closest.d.ts @@ -1,6 +1,60 @@ -export function arrayMaxSquaredDelta(flatCoordinates: number[], offset: number, ends: number[], stride: number, max: number): number; -export function assignClosestArrayPoint(flatCoordinates: number[], offset: number, ends: number[], stride: number, maxDelta: number, isRing: boolean, x: number, y: number, closestPoint: number[], minSquaredDistance: number, opt_tmpPoint?: number[]): number; -export function assignClosestMultiArrayPoint(flatCoordinates: number[], offset: number, endss: number[][], stride: number, maxDelta: number, isRing: boolean, x: number, y: number, closestPoint: number[], minSquaredDistance: number, opt_tmpPoint?: number[]): number; -export function assignClosestPoint(flatCoordinates: number[], offset: number, end: number, stride: number, maxDelta: number, isRing: boolean, x: number, y: number, closestPoint: number[], minSquaredDistance: number, opt_tmpPoint?: number[]): number; -export function maxSquaredDelta(flatCoordinates: number[], offset: number, end: number, stride: number, max: number): number; -export function multiArrayMaxSquaredDelta(flatCoordinates: number[], offset: number, endss: number[][], stride: number, max: number): number; +export function arrayMaxSquaredDelta( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + max: number +): number; +export function assignClosestArrayPoint( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + maxDelta: number, + isRing: boolean, + x: number, + y: number, + closestPoint: number[], + minSquaredDistance: number, + opt_tmpPoint?: number[] +): number; +export function assignClosestMultiArrayPoint( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + maxDelta: number, + isRing: boolean, + x: number, + y: number, + closestPoint: number[], + minSquaredDistance: number, + opt_tmpPoint?: number[] +): number; +export function assignClosestPoint( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + maxDelta: number, + isRing: boolean, + x: number, + y: number, + closestPoint: number[], + minSquaredDistance: number, + opt_tmpPoint?: number[] +): number; +export function maxSquaredDelta( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + max: number +): number; +export function multiArrayMaxSquaredDelta( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + max: number +): number; diff --git a/types/ol/geom/flat/contains.d.ts b/types/ol/geom/flat/contains.d.ts index b7caadc3c4..97b627beff 100644 --- a/types/ol/geom/flat/contains.d.ts +++ b/types/ol/geom/flat/contains.d.ts @@ -1,6 +1,33 @@ import { Extent } from '../../extent'; -export function linearRingContainsExtent(flatCoordinates: number[], offset: number, end: number, stride: number, extent: Extent): boolean; -export function linearRingContainsXY(flatCoordinates: number[], offset: number, end: number, stride: number, x: number, y: number): boolean; -export function linearRingsContainsXY(flatCoordinates: number[], offset: number, ends: number[], stride: number, x: number, y: number): boolean; -export function linearRingssContainsXY(flatCoordinates: number[], offset: number, endss: number[][], stride: number, x: number, y: number): boolean; +export function linearRingContainsExtent( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + extent: Extent +): boolean; +export function linearRingContainsXY( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + x: number, + y: number +): boolean; +export function linearRingsContainsXY( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + x: number, + y: number +): boolean; +export function linearRingssContainsXY( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + x: number, + y: number +): boolean; diff --git a/types/ol/geom/flat/deflate.d.ts b/types/ol/geom/flat/deflate.d.ts index 620c8e3453..1676b345ff 100644 --- a/types/ol/geom/flat/deflate.d.ts +++ b/types/ol/geom/flat/deflate.d.ts @@ -1,6 +1,28 @@ import { Coordinate } from '../../coordinate'; -export function deflateCoordinate(flatCoordinates: number[], offset: number, coordinate: Coordinate, stride: number): number; -export function deflateCoordinates(flatCoordinates: number[], offset: number, coordinates: Coordinate[], stride: number): number; -export function deflateCoordinatesArray(flatCoordinates: number[], offset: number, coordinatess: Coordinate[][], stride: number, opt_ends?: number[]): number[]; -export function deflateMultiCoordinatesArray(flatCoordinates: number[], offset: number, coordinatesss: Coordinate[][][], stride: number, opt_endss?: number[][]): number[][]; +export function deflateCoordinate( + flatCoordinates: number[], + offset: number, + coordinate: Coordinate, + stride: number +): number; +export function deflateCoordinates( + flatCoordinates: number[], + offset: number, + coordinates: Coordinate[], + stride: number +): number; +export function deflateCoordinatesArray( + flatCoordinates: number[], + offset: number, + coordinatess: Coordinate[][], + stride: number, + opt_ends?: number[] +): number[]; +export function deflateMultiCoordinatesArray( + flatCoordinates: number[], + offset: number, + coordinatesss: Coordinate[][][], + stride: number, + opt_endss?: number[][] +): number[][]; diff --git a/types/ol/geom/flat/flip.d.ts b/types/ol/geom/flat/flip.d.ts index 20291a9082..8b6bb42404 100644 --- a/types/ol/geom/flat/flip.d.ts +++ b/types/ol/geom/flat/flip.d.ts @@ -1 +1,8 @@ -export function flipXY(flatCoordinates: number[], offset: number, end: number, stride: number, opt_dest?: number[], opt_destOffset?: number): number[]; +export function flipXY( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + opt_dest?: number[], + opt_destOffset?: number +): number[]; diff --git a/types/ol/geom/flat/geodesic.d.ts b/types/ol/geom/flat/geodesic.d.ts index 08b7c8824e..5ba100440b 100644 --- a/types/ol/geom/flat/geodesic.d.ts +++ b/types/ol/geom/flat/geodesic.d.ts @@ -2,6 +2,25 @@ import { Coordinate } from '../../coordinate'; import { TransformFunction } from '../../proj'; import Projection from '../../proj/Projection'; -export function greatCircleArc(lon1: number, lat1: number, lon2: number, lat2: number, projection: Projection, squaredTolerance: number): number[]; -export function meridian(lon: number, lat1: number, lat2: number, projection: Projection, squaredTolerance: number): number[]; -export function parallel(lat: number, lon1: number, lon2: number, projection: Projection, squaredTolerance: number): number[]; +export function greatCircleArc( + lon1: number, + lat1: number, + lon2: number, + lat2: number, + projection: Projection, + squaredTolerance: number +): number[]; +export function meridian( + lon: number, + lat1: number, + lat2: number, + projection: Projection, + squaredTolerance: number +): number[]; +export function parallel( + lat: number, + lon1: number, + lon2: number, + projection: Projection, + squaredTolerance: number +): number[]; diff --git a/types/ol/geom/flat/inflate.d.ts b/types/ol/geom/flat/inflate.d.ts index 03c3468bf5..e48820583f 100644 --- a/types/ol/geom/flat/inflate.d.ts +++ b/types/ol/geom/flat/inflate.d.ts @@ -1,5 +1,23 @@ import { Coordinate } from '../../coordinate'; -export function inflateCoordinates(flatCoordinates: number[], offset: number, end: number, stride: number, opt_coordinates?: Coordinate[]): Coordinate[]; -export function inflateCoordinatesArray(flatCoordinates: number[], offset: number, ends: number[], stride: number, opt_coordinatess?: Coordinate[][]): Coordinate[][]; -export function inflateMultiCoordinatesArray(flatCoordinates: number[], offset: number, endss: number[][], stride: number, opt_coordinatesss?: Coordinate[][][]): Coordinate[][][]; +export function inflateCoordinates( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + opt_coordinates?: Coordinate[] +): Coordinate[]; +export function inflateCoordinatesArray( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + opt_coordinatess?: Coordinate[][] +): Coordinate[][]; +export function inflateMultiCoordinatesArray( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + opt_coordinatesss?: Coordinate[][][] +): Coordinate[][][]; diff --git a/types/ol/geom/flat/interiorpoint.d.ts b/types/ol/geom/flat/interiorpoint.d.ts index df48c64b46..cdc976e45e 100644 --- a/types/ol/geom/flat/interiorpoint.d.ts +++ b/types/ol/geom/flat/interiorpoint.d.ts @@ -1,2 +1,16 @@ -export function getInteriorPointOfArray(flatCoordinates: number[], offset: number, ends: number[], stride: number, flatCenters: number[], flatCentersOffset: number, opt_dest?: number[]): number[]; -export function getInteriorPointsOfMultiArray(flatCoordinates: number[], offset: number, endss: number[][], stride: number, flatCenters: number[]): number[]; +export function getInteriorPointOfArray( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + flatCenters: number[], + flatCentersOffset: number, + opt_dest?: number[] +): number[]; +export function getInteriorPointsOfMultiArray( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + flatCenters: number[] +): number[]; diff --git a/types/ol/geom/flat/interpolate.d.ts b/types/ol/geom/flat/interpolate.d.ts index 09ce9f0953..3f0d83e0d6 100644 --- a/types/ol/geom/flat/interpolate.d.ts +++ b/types/ol/geom/flat/interpolate.d.ts @@ -1,5 +1,27 @@ import { Coordinate } from '../../coordinate'; -export function interpolatePoint(flatCoordinates: number[], offset: number, end: number, stride: number, fraction: number, opt_dest?: number[]): number[]; -export function lineStringCoordinateAtM(flatCoordinates: number[], offset: number, end: number, stride: number, m: number, extrapolate: boolean): Coordinate; -export function lineStringsCoordinateAtM(flatCoordinates: number[], offset: number, ends: number[], stride: number, m: number, extrapolate: boolean, interpolate: boolean): Coordinate; +export function interpolatePoint( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + fraction: number, + opt_dest?: number[] +): number[]; +export function lineStringCoordinateAtM( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + m: number, + extrapolate: boolean +): Coordinate; +export function lineStringsCoordinateAtM( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + m: number, + extrapolate: boolean, + interpolate: boolean +): Coordinate; diff --git a/types/ol/geom/flat/intersectsextent.d.ts b/types/ol/geom/flat/intersectsextent.d.ts index 2a19d72221..92e4c5a047 100644 --- a/types/ol/geom/flat/intersectsextent.d.ts +++ b/types/ol/geom/flat/intersectsextent.d.ts @@ -1,7 +1,37 @@ import { Extent } from '../../extent'; -export function intersectsLineString(flatCoordinates: number[], offset: number, end: number, stride: number, extent: Extent): boolean; -export function intersectsLineStringArray(flatCoordinates: number[], offset: number, ends: number[], stride: number, extent: Extent): boolean; -export function intersectsLinearRing(flatCoordinates: number[], offset: number, end: number, stride: number, extent: Extent): boolean; -export function intersectsLinearRingArray(flatCoordinates: number[], offset: number, ends: number[], stride: number, extent: Extent): boolean; -export function intersectsLinearRingMultiArray(flatCoordinates: number[], offset: number, endss: number[][], stride: number, extent: Extent): boolean; +export function intersectsLineString( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + extent: Extent +): boolean; +export function intersectsLineStringArray( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + extent: Extent +): boolean; +export function intersectsLinearRing( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + extent: Extent +): boolean; +export function intersectsLinearRingArray( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + extent: Extent +): boolean; +export function intersectsLinearRingMultiArray( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + extent: Extent +): boolean; diff --git a/types/ol/geom/flat/orient.d.ts b/types/ol/geom/flat/orient.d.ts index 507f979469..2afcc64866 100644 --- a/types/ol/geom/flat/orient.d.ts +++ b/types/ol/geom/flat/orient.d.ts @@ -1,5 +1,29 @@ export function linearRingIsClockwise(flatCoordinates: number[], offset: number, end: number, stride: number): boolean; -export function linearRingIsOriented(flatCoordinates: number[], offset: number, ends: number[], stride: number, opt_right?: boolean): boolean; -export function linearRingsAreOriented(flatCoordinates: number[], offset: number, endss: number[][], stride: number, opt_right?: boolean): boolean; -export function orientLinearRings(flatCoordinates: number[], offset: number, ends: number[], stride: number, opt_right?: boolean): number; -export function orientLinearRingsArray(flatCoordinates: number[], offset: number, endss: number[][], stride: number, opt_right?: boolean): number; +export function linearRingIsOriented( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + opt_right?: boolean +): boolean; +export function linearRingsAreOriented( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + opt_right?: boolean +): boolean; +export function orientLinearRings( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + opt_right?: boolean +): number; +export function orientLinearRingsArray( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + opt_right?: boolean +): number; diff --git a/types/ol/geom/flat/segments.d.ts b/types/ol/geom/flat/segments.d.ts index 5c636baea4..f0ac753bbe 100644 --- a/types/ol/geom/flat/segments.d.ts +++ b/types/ol/geom/flat/segments.d.ts @@ -1,3 +1,10 @@ import { Coordinate } from '../../coordinate'; -export function forEach(flatCoordinates: number[], offset: number, end: number, stride: number, callback: ((this: S, p0: Coordinate, p1: Coordinate) => T), opt_this?: S): T | boolean; +export function forEach( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + callback: (this: S, p0: Coordinate, p1: Coordinate) => T, + opt_this?: S +): T | boolean; diff --git a/types/ol/geom/flat/simplify.d.ts b/types/ol/geom/flat/simplify.d.ts index 88ed94d79e..9adf6ee655 100644 --- a/types/ol/geom/flat/simplify.d.ts +++ b/types/ol/geom/flat/simplify.d.ts @@ -1,9 +1,77 @@ -export function douglasPeucker(flatCoordinates: number[], offset: number, end: number, stride: number, squaredTolerance: number, simplifiedFlatCoordinates: number[], simplifiedOffset: number): number; -export function douglasPeuckerArray(flatCoordinates: number[], offset: number, ends: number[], stride: number, squaredTolerance: number, simplifiedFlatCoordinates: number[], simplifiedOffset: number, simplifiedEnds: number[]): number; -export function douglasPeuckerMultiArray(flatCoordinates: number[], offset: number, endss: number[][], stride: number, squaredTolerance: number, simplifiedFlatCoordinates: number[], simplifiedOffset: number, simplifiedEndss: number[][]): number; -export function quantize(flatCoordinates: number[], offset: number, end: number, stride: number, tolerance: number, simplifiedFlatCoordinates: number[], simplifiedOffset: number): number; -export function quantizeArray(flatCoordinates: number[], offset: number, ends: number[], stride: number, tolerance: number, simplifiedFlatCoordinates: number[], simplifiedOffset: number, simplifiedEnds: number[]): number; -export function quantizeMultiArray(flatCoordinates: number[], offset: number, endss: number[][], stride: number, tolerance: number, simplifiedFlatCoordinates: number[], simplifiedOffset: number, simplifiedEndss: number[][]): number; -export function radialDistance(flatCoordinates: number[], offset: number, end: number, stride: number, squaredTolerance: number, simplifiedFlatCoordinates: number[], simplifiedOffset: number): number; -export function simplifyLineString(flatCoordinates: number[], offset: number, end: number, stride: number, squaredTolerance: number, highQuality: boolean, opt_simplifiedFlatCoordinates?: number[]): number[]; +export function douglasPeucker( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + squaredTolerance: number, + simplifiedFlatCoordinates: number[], + simplifiedOffset: number +): number; +export function douglasPeuckerArray( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + squaredTolerance: number, + simplifiedFlatCoordinates: number[], + simplifiedOffset: number, + simplifiedEnds: number[] +): number; +export function douglasPeuckerMultiArray( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + squaredTolerance: number, + simplifiedFlatCoordinates: number[], + simplifiedOffset: number, + simplifiedEndss: number[][] +): number; +export function quantize( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + tolerance: number, + simplifiedFlatCoordinates: number[], + simplifiedOffset: number +): number; +export function quantizeArray( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + tolerance: number, + simplifiedFlatCoordinates: number[], + simplifiedOffset: number, + simplifiedEnds: number[] +): number; +export function quantizeMultiArray( + flatCoordinates: number[], + offset: number, + endss: number[][], + stride: number, + tolerance: number, + simplifiedFlatCoordinates: number[], + simplifiedOffset: number, + simplifiedEndss: number[][] +): number; +export function radialDistance( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + squaredTolerance: number, + simplifiedFlatCoordinates: number[], + simplifiedOffset: number +): number; +export function simplifyLineString( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + squaredTolerance: number, + highQuality: boolean, + opt_simplifiedFlatCoordinates?: number[] +): number[]; export function snap(value: number, tolerance: number): number; diff --git a/types/ol/geom/flat/straightchunk.d.ts b/types/ol/geom/flat/straightchunk.d.ts index 839000347c..745fb66d4f 100644 --- a/types/ol/geom/flat/straightchunk.d.ts +++ b/types/ol/geom/flat/straightchunk.d.ts @@ -1 +1,7 @@ -export function matchingChunk(maxAngle: number, flatCoordinates: number[], offset: number, end: number, stride: number): number[]; +export function matchingChunk( + maxAngle: number, + flatCoordinates: number[], + offset: number, + end: number, + stride: number +): number[]; diff --git a/types/ol/geom/flat/textpath.d.ts b/types/ol/geom/flat/textpath.d.ts index 2bfcfd1457..ad8c1a1a1c 100644 --- a/types/ol/geom/flat/textpath.d.ts +++ b/types/ol/geom/flat/textpath.d.ts @@ -1 +1,10 @@ -export function drawTextOnPath(flatCoordinates: number[], offset: number, end: number, stride: number, text: string, measure: ((p0: string) => number), startM: number, maxAngle: number): any[][]; +export function drawTextOnPath( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + text: string, + measure: (p0: string) => number, + startM: number, + maxAngle: number +): any[][]; diff --git a/types/ol/geom/flat/transform.d.ts b/types/ol/geom/flat/transform.d.ts index 9a8ef1225f..22d2f08d76 100644 --- a/types/ol/geom/flat/transform.d.ts +++ b/types/ol/geom/flat/transform.d.ts @@ -1,6 +1,38 @@ import { Transform } from '../../transform'; -export function rotate(flatCoordinates: number[], offset: number, end: number, stride: number, angle: number, anchor: number[], opt_dest?: number[]): number[]; -export function scale(flatCoordinates: number[], offset: number, end: number, stride: number, sx: number, sy: number, anchor: number[], opt_dest?: number[]): number[]; -export function transform2D(flatCoordinates: number[], offset: number, end: number, stride: number, transform: Transform, opt_dest?: number[]): number[]; -export function translate(flatCoordinates: number[], offset: number, end: number, stride: number, deltaX: number, deltaY: number, opt_dest?: number[]): number[]; +export function rotate( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + angle: number, + anchor: number[], + opt_dest?: number[] +): number[]; +export function scale( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + sx: number, + sy: number, + anchor: number[], + opt_dest?: number[] +): number[]; +export function transform2D( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + transform: Transform, + opt_dest?: number[] +): number[]; +export function translate( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + deltaX: number, + deltaY: number, + opt_dest?: number[] +): number[]; diff --git a/types/ol/index.d.ts b/types/ol/index.d.ts index ccbf5d191b..bb314f8b81 100644 --- a/types/ol/index.d.ts +++ b/types/ol/index.d.ts @@ -32,7 +32,4 @@ export { default as VectorImageTile } from './VectorImageTile'; export { default as VectorTile } from './VectorTile'; export { default as View } from './View'; export { default as WebGLMap } from './WebGLMap'; -export { VERSION } from './util'; - -export function getUid(obj: any): string; -export function inherits(childCtor: (() => void), parentCtor: (() => void)): void; +export { getUid, inherits, VERSION } from './util'; diff --git a/types/ol/interaction/DoubleClickZoom.d.ts b/types/ol/interaction/DoubleClickZoom.d.ts index 2c0ada4154..e2af6af944 100644 --- a/types/ol/interaction/DoubleClickZoom.d.ts +++ b/types/ol/interaction/DoubleClickZoom.d.ts @@ -10,9 +10,9 @@ export interface Options { } export default class DoubleClickZoom extends Interaction { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/DragAndDrop.d.ts b/types/ol/interaction/DragAndDrop.d.ts index 3257f7ec82..2dc5e8014f 100644 --- a/types/ol/interaction/DragAndDrop.d.ts +++ b/types/ol/interaction/DragAndDrop.d.ts @@ -19,9 +19,9 @@ export enum DragAndDropEventType { } export default class DragAndDrop extends Interaction { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'addfeatures', listener: (evt: DragAndDropEvent) => void): EventsKey; once(type: 'addfeatures', listener: (evt: DragAndDropEvent) => void): EventsKey; un(type: 'addfeatures', listener: (evt: DragAndDropEvent) => void): void; diff --git a/types/ol/interaction/DragBox.d.ts b/types/ol/interaction/DragBox.d.ts index bedb0e81cf..44bc0ad105 100644 --- a/types/ol/interaction/DragBox.d.ts +++ b/types/ol/interaction/DragBox.d.ts @@ -8,13 +8,13 @@ import { ObjectEvent } from '../Object'; import { Pixel } from '../pixel'; import PointerInteraction from './Pointer'; -export type EndCondition = ((this: any, p0: MapBrowserEvent, p1: Pixel, p2: Pixel) => boolean); +export type EndCondition = (this: any, p0: MapBrowserEvent, p1: Pixel, p2: Pixel) => boolean; export interface Options { className?: string; condition?: Condition; minArea?: number; boxEndCondition?: EndCondition; - onBoxEnd: ((this: DragBox, p0: MapBrowserEvent) => void); + onBoxEnd: (this: DragBox, p0: MapBrowserEvent) => void; } export enum DragBoxEventType { BOXSTART = 'boxstart', @@ -25,9 +25,9 @@ export default class DragBox extends PointerInteraction { constructor(opt_options?: Options); defaultBoxEndCondition(mapBrowserEvent: MapBrowserEvent, startPixel: Pixel, endPixel: Pixel): boolean; getGeometry(): Polygon; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'boxdrag', listener: (evt: DragBoxEvent) => void): EventsKey; once(type: 'boxdrag', listener: (evt: DragBoxEvent) => void): EventsKey; un(type: 'boxdrag', listener: (evt: DragBoxEvent) => void): void; diff --git a/types/ol/interaction/DragPan.d.ts b/types/ol/interaction/DragPan.d.ts index d3c25240ba..f78fef1aa8 100644 --- a/types/ol/interaction/DragPan.d.ts +++ b/types/ol/interaction/DragPan.d.ts @@ -11,9 +11,9 @@ export interface Options { } export default class DragPan extends PointerInteraction { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/DragRotate.d.ts b/types/ol/interaction/DragRotate.d.ts index ecdfd86d18..1e6a8a4d2b 100644 --- a/types/ol/interaction/DragRotate.d.ts +++ b/types/ol/interaction/DragRotate.d.ts @@ -10,9 +10,9 @@ export interface Options { } export default class DragRotate extends PointerInteraction { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/DragRotateAndZoom.d.ts b/types/ol/interaction/DragRotateAndZoom.d.ts index 9bd0641fd8..f6fe692c92 100644 --- a/types/ol/interaction/DragRotateAndZoom.d.ts +++ b/types/ol/interaction/DragRotateAndZoom.d.ts @@ -10,9 +10,9 @@ export interface Options { } export default class DragRotateAndZoom extends PointerInteraction { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/DragZoom.d.ts b/types/ol/interaction/DragZoom.d.ts index 52dd2a62d0..91ab9ab0cb 100644 --- a/types/ol/interaction/DragZoom.d.ts +++ b/types/ol/interaction/DragZoom.d.ts @@ -12,9 +12,9 @@ export interface Options { } export default class DragZoom extends DragBox { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'boxdrag', listener: (evt: DragBoxEvent) => void): EventsKey; once(type: 'boxdrag', listener: (evt: DragBoxEvent) => void): EventsKey; un(type: 'boxdrag', listener: (evt: DragBoxEvent) => void): void; diff --git a/types/ol/interaction/Draw.d.ts b/types/ol/interaction/Draw.d.ts index f47d77b314..070e24b9fb 100644 --- a/types/ol/interaction/Draw.d.ts +++ b/types/ol/interaction/Draw.d.ts @@ -12,7 +12,7 @@ import VectorSource from '../source/Vector'; import { StyleFunction, StyleLike } from '../style/Style'; import PointerInteraction from './Pointer'; -export type GeometryFunction = ((p0: SketchCoordType, p1?: SimpleGeometry) => SimpleGeometry); +export type GeometryFunction = (p0: SketchCoordType, p1?: SimpleGeometry) => SimpleGeometry; export type LineCoordType = Coordinate[]; export interface Options { type: GeometryType; @@ -46,9 +46,9 @@ export default class Draw extends PointerInteraction { finishDrawing(): void; getOverlay(): VectorLayer; removeLastPoint(): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/Extent.d.ts b/types/ol/interaction/Extent.d.ts index 82a0ae292c..8cb6b1ddd3 100644 --- a/types/ol/interaction/Extent.d.ts +++ b/types/ol/interaction/Extent.d.ts @@ -17,9 +17,9 @@ export default class ExtentInteraction extends PointerInteraction { constructor(opt_options?: Options); getExtent(): Extent; setExtent(extent: Extent): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/Interaction.d.ts b/types/ol/interaction/Interaction.d.ts index 6c2dc834d0..0a5f7292aa 100644 --- a/types/ol/interaction/Interaction.d.ts +++ b/types/ol/interaction/Interaction.d.ts @@ -7,7 +7,7 @@ import PluggableMap from '../PluggableMap'; import View from '../View'; export interface InteractionOptions { - handleEvent: ((p0: MapBrowserEvent) => boolean); + handleEvent: (p0: MapBrowserEvent) => boolean; } export default class Interaction extends BaseObject { constructor(options: InteractionOptions); @@ -16,9 +16,9 @@ export default class Interaction extends BaseObject { handleEvent(mapBrowserEvent: MapBrowserEvent): boolean; setActive(active: boolean): void; setMap(map: PluggableMap): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; @@ -30,8 +30,24 @@ export default class Interaction extends BaseObject { un(type: 'propertychange', listener: (evt: ObjectEvent) => void): void; } export function pan(view: View, delta: Coordinate, opt_duration?: number): void; -export function rotate(view: View, rotation: number, opt_anchor?: Coordinate, opt_duration?: number): void; -export function rotateWithoutConstraints(view: View, rotation: number, opt_anchor?: Coordinate, opt_duration?: number): void; -export function zoom(view: View, resolution: number, opt_anchor?: Coordinate, opt_duration?: number, opt_direction?: number): void; +export function rotate(view: View, rotation: number | undefined, opt_anchor?: Coordinate, opt_duration?: number): void; +export function rotateWithoutConstraints( + view: View, + rotation: number | undefined, + opt_anchor?: Coordinate, + opt_duration?: number +): void; +export function zoom( + view: View, + resolution: number | undefined, + opt_anchor?: Coordinate, + opt_duration?: number, + opt_direction?: number +): void; export function zoomByDelta(view: View, delta: number, opt_anchor?: Coordinate, opt_duration?: number): void; -export function zoomWithoutConstraints(view: View, resolution: number, opt_anchor?: Coordinate, opt_duration?: number): void; +export function zoomWithoutConstraints( + view: View, + resolution: number | undefined, + opt_anchor?: Coordinate, + opt_duration?: number +): void; diff --git a/types/ol/interaction/KeyboardPan.d.ts b/types/ol/interaction/KeyboardPan.d.ts index 92b15bb519..e2b18db457 100644 --- a/types/ol/interaction/KeyboardPan.d.ts +++ b/types/ol/interaction/KeyboardPan.d.ts @@ -12,9 +12,9 @@ export interface Options { } export default class KeyboardPan extends Interaction { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/KeyboardZoom.d.ts b/types/ol/interaction/KeyboardZoom.d.ts index 774a37a1f2..c2ad81a5bc 100644 --- a/types/ol/interaction/KeyboardZoom.d.ts +++ b/types/ol/interaction/KeyboardZoom.d.ts @@ -12,9 +12,9 @@ export interface Options { } export default class KeyboardZoom extends Interaction { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/Modify.d.ts b/types/ol/interaction/Modify.d.ts index 8476059048..cc24f1da11 100644 --- a/types/ol/interaction/Modify.d.ts +++ b/types/ol/interaction/Modify.d.ts @@ -35,9 +35,9 @@ export default class Modify extends PointerInteraction { constructor(options: Options); getOverlay(): VectorLayer; removePoint(): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/MouseWheelZoom.d.ts b/types/ol/interaction/MouseWheelZoom.d.ts index c3fdce76af..9358ed3212 100644 --- a/types/ol/interaction/MouseWheelZoom.d.ts +++ b/types/ol/interaction/MouseWheelZoom.d.ts @@ -18,9 +18,9 @@ export enum Mode { export default class MouseWheelZoom extends Interaction { constructor(opt_options?: Options); setMouseAnchor(useAnchor: boolean): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/PinchRotate.d.ts b/types/ol/interaction/PinchRotate.d.ts index 297b30e230..1e93035207 100644 --- a/types/ol/interaction/PinchRotate.d.ts +++ b/types/ol/interaction/PinchRotate.d.ts @@ -9,9 +9,9 @@ export interface Options { } export default class PinchRotate extends PointerInteraction { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/PinchZoom.d.ts b/types/ol/interaction/PinchZoom.d.ts index f6c4c65f90..825136264a 100644 --- a/types/ol/interaction/PinchZoom.d.ts +++ b/types/ol/interaction/PinchZoom.d.ts @@ -9,9 +9,9 @@ export interface Options { } export default class PinchZoom extends PointerInteraction { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/Pointer.d.ts b/types/ol/interaction/Pointer.d.ts index 0f3fb0426d..76b1249841 100644 --- a/types/ol/interaction/Pointer.d.ts +++ b/types/ol/interaction/Pointer.d.ts @@ -8,12 +8,12 @@ import PointerEvent from '../pointer/PointerEvent'; import Interaction from './Interaction'; export interface Options { - handleDownEvent?: ((p0: MapBrowserPointerEvent) => boolean); - handleDragEvent?: ((p0: MapBrowserPointerEvent) => void); - handleEvent?: ((p0: MapBrowserEvent) => boolean); - handleMoveEvent?: ((p0: MapBrowserPointerEvent) => void); - handleUpEvent?: ((p0: MapBrowserPointerEvent) => boolean); - stopDown?: ((p0: boolean) => boolean); + handleDownEvent?: (p0: MapBrowserPointerEvent) => boolean; + handleDragEvent?: (p0: MapBrowserPointerEvent) => void; + handleEvent?: (p0: MapBrowserEvent) => boolean; + handleMoveEvent?: (p0: MapBrowserPointerEvent) => void; + handleUpEvent?: (p0: MapBrowserPointerEvent) => boolean; + stopDown?: (p0: boolean) => boolean; } export default class PointerInteraction extends Interaction { constructor(opt_options?: Options); @@ -24,9 +24,9 @@ export default class PointerInteraction extends Interaction { protected handleMoveEvent(mapBrowserEvent: MapBrowserPointerEvent): void; protected handleUpEvent(mapBrowserEvent: MapBrowserPointerEvent): boolean; stopDown(handled: boolean): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/Select.d.ts b/types/ol/interaction/Select.d.ts index e37bcfce6f..14abd6f08f 100644 --- a/types/ol/interaction/Select.d.ts +++ b/types/ol/interaction/Select.d.ts @@ -10,7 +10,7 @@ import { ObjectEvent } from '../Object'; import { StyleFunction, StyleLike } from '../style/Style'; import Interaction from './Interaction'; -export type FilterFunction = ((p0: FeatureLike, p1: Layer) => boolean); +export type FilterFunction = (p0: FeatureLike, p1: Layer) => boolean; export interface Options { addCondition?: Condition; condition?: Condition; @@ -34,9 +34,9 @@ export default class Select extends Interaction { getLayer(feature: FeatureLike): VectorLayer; getOverlay(): VectorLayer; setHitTolerance(hitTolerance: number): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/Snap.d.ts b/types/ol/interaction/Snap.d.ts index bebefaeeaf..1a2368aacd 100644 --- a/types/ol/interaction/Snap.d.ts +++ b/types/ol/interaction/Snap.d.ts @@ -30,9 +30,9 @@ export default class Snap extends PointerInteraction { addFeature(feature: Feature, opt_listen?: boolean): void; removeFeature(feature: Feature, opt_unlisten?: boolean): void; snapTo(pixel: Pixel, pixelCoordinate: Coordinate, map: PluggableMap): Result; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/interaction/Translate.d.ts b/types/ol/interaction/Translate.d.ts index 84bc615fcb..b6728fb092 100644 --- a/types/ol/interaction/Translate.d.ts +++ b/types/ol/interaction/Translate.d.ts @@ -16,9 +16,9 @@ export default class Translate extends PointerInteraction { constructor(opt_options?: Options); getHitTolerance(): number; setHitTolerance(hitTolerance: number): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/layer/Base.d.ts b/types/ol/layer/Base.d.ts index ed9fdbb935..6554af8590 100644 --- a/types/ol/layer/Base.d.ts +++ b/types/ol/layer/Base.d.ts @@ -27,15 +27,15 @@ export default class BaseLayer extends BaseObject { getType(): LayerType; getVisible(): boolean; getZIndex(): number; - setExtent(extent: Extent): void; + setExtent(extent: Extent | undefined): void; setMaxResolution(maxResolution: number): void; setMinResolution(minResolution: number): void; setOpacity(opacity: number): void; setVisible(visible: boolean): void; setZIndex(zindex: number): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/layer/Group.d.ts b/types/ol/layer/Group.d.ts index 297c69178c..11ef2f4e75 100644 --- a/types/ol/layer/Group.d.ts +++ b/types/ol/layer/Group.d.ts @@ -18,9 +18,9 @@ export default class LayerGroup extends BaseLayer { constructor(opt_options?: Options); getLayers(): Collection; setLayers(layers: Collection): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/layer/Heatmap.d.ts b/types/ol/layer/Heatmap.d.ts index 315963f88a..81cfd9e379 100644 --- a/types/ol/layer/Heatmap.d.ts +++ b/types/ol/layer/Heatmap.d.ts @@ -31,9 +31,9 @@ export default class Heatmap extends VectorLayer { setBlur(blur: number): void; setGradient(colors: string[]): void; setRadius(radius: number): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/layer/Image.d.ts b/types/ol/layer/Image.d.ts index 5c13689911..f4aa86c384 100644 --- a/types/ol/layer/Image.d.ts +++ b/types/ol/layer/Image.d.ts @@ -24,9 +24,9 @@ export default class ImageLayer extends Layer { protected type: LayerType; getSource(): ImageSource; getSource(): Source; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/layer/Layer.d.ts b/types/ol/layer/Layer.d.ts index d0b6355892..d455c3cc8d 100644 --- a/types/ol/layer/Layer.d.ts +++ b/types/ol/layer/Layer.d.ts @@ -34,9 +34,9 @@ export default class Layer extends BaseLayer { getSource(): Source; setMap(map: PluggableMap): void; setSource(source: Source): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/layer/Tile.d.ts b/types/ol/layer/Tile.d.ts index c7c2852c3f..6db7ce548e 100644 --- a/types/ol/layer/Tile.d.ts +++ b/types/ol/layer/Tile.d.ts @@ -30,9 +30,9 @@ export default class TileLayer extends Layer { getUseInterimTilesOnError(): boolean; setPreload(preload: number): void; setUseInterimTilesOnError(useInterimTilesOnError: boolean): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/layer/Vector.d.ts b/types/ol/layer/Vector.d.ts index 3abdbe8128..a4ee04ae18 100644 --- a/types/ol/layer/Vector.d.ts +++ b/types/ol/layer/Vector.d.ts @@ -36,7 +36,7 @@ export default class VectorLayer extends Layer { getDeclutter(): boolean; getRenderBuffer(): number; getRenderMode(): VectorRenderType | string; - getRenderOrder(): ((p0: Feature, p1: Feature) => number); + getRenderOrder(): (p0: Feature, p1: Feature) => number; getSource(): VectorSource; getSource(): Source; getStyle(): StyleLike; @@ -44,11 +44,11 @@ export default class VectorLayer extends Layer { getUpdateWhileAnimating(): boolean; getUpdateWhileInteracting(): boolean; setDeclutter(declutter: boolean): void; - setRenderOrder(renderOrder: OrderFunction): void; - setStyle(style: Style | Style[] | StyleFunction): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + setRenderOrder(renderOrder: OrderFunction | undefined | undefined): void; + setStyle(style: Style | Style[] | StyleFunction | undefined | undefined): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/layer/VectorTile.d.ts b/types/ol/layer/VectorTile.d.ts index 226f428bda..b585d2bc68 100644 --- a/types/ol/layer/VectorTile.d.ts +++ b/types/ol/layer/VectorTile.d.ts @@ -40,9 +40,9 @@ export default class VectorTileLayer extends VectorLayer { getUseInterimTilesOnError(): boolean; setPreload(preload: number): void; setUseInterimTilesOnError(useInterimTilesOnError: boolean): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/loadingstrategy.d.ts b/types/ol/loadingstrategy.d.ts index 202260fe30..14694b4a85 100644 --- a/types/ol/loadingstrategy.d.ts +++ b/types/ol/loadingstrategy.d.ts @@ -3,4 +3,4 @@ import TileGrid from './tilegrid/TileGrid'; export function all(extent: Extent, resolution: number): Extent[]; export function bbox(extent: Extent, resolution: number): Extent[]; -export function tile(tileGrid: TileGrid): ((p0: Extent, p1: number) => Extent[]); +export function tile(tileGrid: TileGrid): (p0: Extent, p1: number) => Extent[]; diff --git a/types/ol/net.d.ts b/types/ol/net.d.ts index 120df63d68..aecac47331 100644 --- a/types/ol/net.d.ts +++ b/types/ol/net.d.ts @@ -1 +1 @@ -export function jsonp(url: string, callback: (() => void), opt_errback?: (() => void), opt_callbackParam?: string): void; +export function jsonp(url: string, callback: () => void, opt_errback?: () => void, opt_callbackParam?: string): void; diff --git a/types/ol/ol-tests.ts b/types/ol/ol-tests.ts index 199ae766af..6d0d4c4c2f 100644 --- a/types/ol/ol-tests.ts +++ b/types/ol/ol-tests.ts @@ -1,7 +1,14 @@ -import { Collection, Map, MapBrowserEvent, PluggableMap, View } from 'ol'; +import { Collection, Map, MapBrowserEvent, Overlay, PluggableMap, View } from 'ol'; import { unByKey } from 'ol/Observable'; import { - Control, FullScreen, MousePosition, OverviewMap, ScaleLine, ZoomSlider, ZoomToExtent, defaults as defaultControls + Control, + FullScreen, + MousePosition, + OverviewMap, + ScaleLine, + ZoomSlider, + ZoomToExtent, + defaults as defaultControls, } from 'ol/control'; import { Options as ControlOptions } from 'ol/control/Control'; import { toStringXY } from 'ol/coordinate'; @@ -11,7 +18,7 @@ import { GeoJSON, MVT } from 'ol/format'; import GeometryType from 'ol/geom/GeometryType'; import { Draw, Modify, Select, defaults as defaultInteractions } from 'ol/interaction'; import { Tile as TileLayer, Vector as VectorLayer, VectorTile as VectorTileLayer } from 'ol/layer'; -import { get as getProjection, getTransform } from 'ol/proj'; +import { fromLonLat, get as getProjection, getTransform } from 'ol/proj'; import { register } from 'ol/proj/proj4'; import { OSM, Vector as VectorSource, VectorTile as VectorTileSource } from 'ol/source'; import { Circle, Fill, Stroke, Style } from 'ol/style'; @@ -25,74 +32,74 @@ import proj4 = require('proj4'); */ const image = new Circle({ - radius: 5, - fill: null as any, - stroke: new Stroke({ color: 'red', width: 1 }) + radius: 5, + fill: null as any, + stroke: new Stroke({ color: 'red', width: 1 }), }); const styles: { [key: string]: Style } = { - Point: new Style({ - image - }), - LineString: new Style({ - stroke: new Stroke({ - color: 'green', - width: 1 - }) - }), - MultiLineString: new Style({ - stroke: new Stroke({ - color: 'green', - width: 1 - }) - }), - MultiPoint: new Style({ - image - }), - MultiPolygon: new Style({ - stroke: new Stroke({ - color: 'yellow', - width: 1 + Point: new Style({ + image, }), - fill: new Fill({ - color: 'rgba(255, 255, 0, 0.1)' - }) - }), - Polygon: new Style({ - stroke: new Stroke({ - color: 'blue', - lineDash: [4], - width: 3 + LineString: new Style({ + stroke: new Stroke({ + color: 'green', + width: 1, + }), }), - fill: new Fill({ - color: 'rgba(0, 0, 255, 0.1)' - }) - }), - GeometryCollection: new Style({ - stroke: new Stroke({ - color: 'magenta', - width: 2 + MultiLineString: new Style({ + stroke: new Stroke({ + color: 'green', + width: 1, + }), }), - fill: new Fill({ - color: 'magenta' + MultiPoint: new Style({ + image, }), - image: new Circle({ - radius: 10, - fill: null as any, - stroke: new Stroke({ - color: 'magenta' - }) - }) - }), - Circle: new Style({ - stroke: new Stroke({ - color: 'red', - width: 2 + MultiPolygon: new Style({ + stroke: new Stroke({ + color: 'yellow', + width: 1, + }), + fill: new Fill({ + color: 'rgba(255, 255, 0, 0.1)', + }), + }), + Polygon: new Style({ + stroke: new Stroke({ + color: 'blue', + lineDash: [4], + width: 3, + }), + fill: new Fill({ + color: 'rgba(0, 0, 255, 0.1)', + }), + }), + GeometryCollection: new Style({ + stroke: new Stroke({ + color: 'magenta', + width: 2, + }), + fill: new Fill({ + color: 'magenta', + }), + image: new Circle({ + radius: 10, + fill: null as any, + stroke: new Stroke({ + color: 'magenta', + }), + }), + }), + Circle: new Style({ + stroke: new Stroke({ + color: 'red', + width: 2, + }), + fill: new Fill({ + color: 'rgba(255,0,0,0.2)', + }), }), - fill: new Fill({ - color: 'rgba(255,0,0,0.2)' - }) - }) }; const styleFunction: StyleFunction = feature => styles[feature.getGeometry().getType()]; @@ -103,28 +110,29 @@ const styleFunction: StyleFunction = feature => styles[feature.getGeometry().get * ================================================== */ -const geojsonString = '{"type":"FeatureCollection","crs":{"type":"name","properties":{"name":"EPSG:3857"}},"features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[0,0]}},{"type":"Feature","geometry":{"type":"LineString","coordinates":[[4000000,-2000000],[8000000,2000000]]}},{"type":"Feature","geometry":{"type":"LineString","coordinates":[[4000000,2000000],[8000000,-2000000]]}},{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[-5000000,-1000000],[-4000000,1000000],[-3000000,-1000000]]]}},{"type":"Feature","geometry":{"type":"MultiLineString","coordinates":[[[-1000000,-750000],[-1000000,750000]],[[1000000,-750000],[1000000,750000]],[[-750000,-1000000],[750000,-1000000]],[[-750000,1000000],[750000,1000000]]]}},{"type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[[[[-5000000,6000000],[-5000000,8000000],[-3000000,8000000],[-3000000,6000000]]],[[[-2000000,6000000],[-2000000,8000000],[0,8000000],[0,6000000]]],[[[1000000,6000000],[1000000,8000000],[3000000,8000000],[3000000,6000000]]]]}},{"type":"Feature","geometry":{"type":"GeometryCollection","geometries":[{"type":"LineString","coordinates":[[-5000000,-5000000],[0,-5000000]]},{"type":"Point","coordinates":[4000000,-5000000]},{"type":"Polygon","coordinates":[[[1000000,-6000000],[2000000,-4000000],[3000000,-6000000]]]}]}}]}'; +const geojsonString = + '{"type":"FeatureCollection","crs":{"type":"name","properties":{"name":"EPSG:3857"}},"features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[0,0]}},{"type":"Feature","geometry":{"type":"LineString","coordinates":[[4000000,-2000000],[8000000,2000000]]}},{"type":"Feature","geometry":{"type":"LineString","coordinates":[[4000000,2000000],[8000000,-2000000]]}},{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[-5000000,-1000000],[-4000000,1000000],[-3000000,-1000000]]]}},{"type":"Feature","geometry":{"type":"MultiLineString","coordinates":[[[-1000000,-750000],[-1000000,750000]],[[1000000,-750000],[1000000,750000]],[[-750000,-1000000],[750000,-1000000]],[[-750000,1000000],[750000,1000000]]]}},{"type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[[[[-5000000,6000000],[-5000000,8000000],[-3000000,8000000],[-3000000,6000000]]],[[[-2000000,6000000],[-2000000,8000000],[0,8000000],[0,6000000]]],[[[1000000,6000000],[1000000,8000000],[3000000,8000000],[3000000,6000000]]]]}},{"type":"Feature","geometry":{"type":"GeometryCollection","geometries":[{"type":"LineString","coordinates":[[-5000000,-5000000],[0,-5000000]]},{"type":"Point","coordinates":[4000000,-5000000]},{"type":"Polygon","coordinates":[[[1000000,-6000000],[2000000,-4000000],[3000000,-6000000]]]}]}}]}'; const vectorSource = new VectorSource({ - features: (new GeoJSON()).readFeatures(JSON.parse(geojsonString)) + features: new GeoJSON().readFeatures(JSON.parse(geojsonString)), }); const vectorLayer = new VectorLayer({ - source: vectorSource, - style: styleFunction, - visible: true, - zIndex: 10 + source: vectorSource, + style: styleFunction, + visible: true, + zIndex: 10, }); const vectorTileSource = new VectorTileSource({ - format: new MVT(), - url: 'https://basemaps.arcgis.com/v1/arcgis/rest/services/World_Basemap/VectorTileServer/tile/{z}/{y}/{x}.pbf' + format: new MVT(), + url: 'https://basemaps.arcgis.com/v1/arcgis/rest/services/World_Basemap/VectorTileServer/tile/{z}/{y}/{x}.pbf', }); const vectorTileLayer = new VectorTileLayer({ - source: vectorTileSource, - visible: false, - zIndex: 9 + source: vectorTileSource, + visible: false, + zIndex: 9, }); /** @@ -134,11 +142,11 @@ const vectorTileLayer = new VectorTileLayer({ */ const osmLayer = new TileLayer({ - source: new OSM({ - crossOrigin: 'anonymous' - }), - visible: true, - zIndex: 0 + source: new OSM({ + crossOrigin: 'anonymous', + }), + visible: true, + zIndex: 0, }); /** @@ -147,27 +155,23 @@ const osmLayer = new TileLayer({ * ================================================== */ -const layers = [ - osmLayer, - vectorLayer, - vectorTileLayer -]; +const layers = [osmLayer, vectorLayer, vectorTileLayer]; const controls = defaultControls().extend([ - new FullScreen(), - new MousePosition({ - coordinateFormat: coord => toStringXY(coord, 8), - undefinedHTML: '' - }), - new OverviewMap({ - layers, - view: new View({ - projection: 'EPSG:3857' - }) - }), - new ScaleLine(), - new ZoomSlider(), - new ZoomToExtent(), + new FullScreen(), + new MousePosition({ + coordinateFormat: coord => toStringXY(coord, 8), + undefinedHTML: '', + }), + new OverviewMap({ + layers, + view: new View({ + projection: 'EPSG:3857', + }), + }), + new ScaleLine(), + new ZoomSlider(), + new ZoomToExtent(), ]); /** @@ -178,26 +182,22 @@ const controls = defaultControls().extend([ const drawInteractions: Draw[] = []; (Object.keys(GeometryType) as (keyof typeof GeometryType)[]).forEach(type => { - const draw = new Draw({ - type: GeometryType[type], - }); + const draw = new Draw({ + type: GeometryType[type], + }); - drawInteractions.push(draw); + drawInteractions.push(draw); }); const selectInteraction = new Select({ - features: new Collection(vectorSource.getFeatures()) + features: new Collection(vectorSource.getFeatures()), }); const modifyInteraction = new Modify({ - features: selectInteraction.getFeatures() + features: selectInteraction.getFeatures(), }); -const interactions = defaultInteractions() - .extend([ - selectInteraction, - modifyInteraction - ]); +const interactions = defaultInteractions().extend([selectInteraction, modifyInteraction]); /** * ================================================== @@ -206,17 +206,17 @@ const interactions = defaultInteractions() */ const view = new View({ - center: [0, 0], - projection: 'EPSG:3857', - zoom: 10 + center: [0, 0], + projection: 'EPSG:3857', + zoom: 10, }); const map = new Map({ - target: document.getElementById('map') as HTMLElement, - view, - layers, - controls, - interactions + target: document.getElementById('map') as HTMLElement, + view, + layers, + controls, + interactions, }); /** @@ -226,15 +226,10 @@ const map = new Map({ */ const projSpec = { - code: 'EPSG:4813', - bbox: [ - -5.83, - 105.06, - -8.91, - 115.77 - ], - proj4: '+proj=longlat +ellps=bessel +towgs84=-377,681,-50,0,0,0,0 +pm=jakarta +no_defs', - name: 'Batavia (Jakarta)' + code: 'EPSG:4813', + bbox: [-5.83, 105.06, -8.91, 115.77], + proj4: '+proj=longlat +ellps=bessel +towgs84=-377,681,-50,0,0,0,0 +pm=jakarta +no_defs', + name: 'Batavia (Jakarta)', }; proj4.defs(projSpec.code, projSpec.proj4); @@ -245,12 +240,12 @@ const transform = getTransform('EPSG:4326', proj); const extent = applyTransform([projSpec.bbox[1], projSpec.bbox[2], projSpec.bbox[3], projSpec.bbox[0]], transform); proj.setExtent(extent); const newView = new View({ - projection: proj + projection: proj, }); setTimeout(() => { - map.setView(newView); - newView.fit(extent); + map.setView(newView); + newView.fit(extent); }, 5000); /** @@ -260,51 +255,68 @@ setTimeout(() => { */ interface CustomControlOptions extends ControlOptions { - name?: string; + name?: string; } class CustomControl extends Control { - element: HTMLElement; - name: string; - mapViewport?: HTMLElement; - private readonly _boundListener: (e: Event) => void; - private readonly _eventKeys: EventsKey[]; + element: HTMLElement; + name: string; + mapViewport?: HTMLElement; + private readonly _boundListener: (e: Event) => void; + private readonly _eventKeys: EventsKey[]; - constructor(options: CustomControlOptions = {}) { - options.element = document.createElement('div'); - options.element.className = 'ol-custom-control ol-unselectable ol-control'; - super(options); - this.name = options.name || this.constructor.name; - this._boundListener = this._listener.bind(this); - this._eventKeys = []; - } + constructor(options: CustomControlOptions = {}) { + options.element = document.createElement('div'); + options.element.className = 'ol-custom-control ol-unselectable ol-control'; + super(options); + this.name = options.name || this.constructor.name; + this._boundListener = this._listener.bind(this); + this._eventKeys = []; + } - // Override - setMap(map: PluggableMap) { - super.setMap(map); - unByKey(this._eventKeys); - this._eventKeys.splice(0); + // Override + setMap(map: PluggableMap) { + super.setMap(map); + unByKey(this._eventKeys); + this._eventKeys.splice(0); - if (this.mapViewport) - this.mapViewport.removeEventListener('click', this._boundListener); + if (this.mapViewport) this.mapViewport.removeEventListener('click', this._boundListener); - this.mapViewport = map ? map.getViewport() : undefined; + this.mapViewport = map ? map.getViewport() : undefined; - if (!this.mapViewport) return; + if (!this.mapViewport) return; - this.mapViewport.addEventListener('click', this._boundListener); - const view = map.getView(); - this._eventKeys.push( - view.on('change:center', evt => { - console.log(evt.oldValue, view.getCenter()); - }) - ); - } + this.mapViewport.addEventListener('click', this._boundListener); + const view = map.getView(); + this._eventKeys.push( + view.on('change:center', evt => { + console.log(evt.oldValue, view.getCenter()); + }) + ); + } - private _listener(evt: MouseEvent) { - const mapEvent = new MapBrowserEvent(evt.type, this.getMap(), evt); - console.log(mapEvent); - } + private _listener(evt: MouseEvent) { + const mapEvent = new MapBrowserEvent(evt.type, this.getMap(), evt); + console.log(mapEvent); + } } map.addControl(new CustomControl()); + +/** + * ================================================== + * # Overlay + * ================================================== + */ + +const overlay = new Overlay({ + position: fromLonLat([0, 0]), + element: document.createElement('div'), +}); + +map.addOverlay(overlay); + +map.on('click', evt => { + if (overlay.getPosition() === undefined) overlay.setPosition(evt.coordinate); + else overlay.setPosition(undefined); +}); diff --git a/types/ol/pointer/EventSource.d.ts b/types/ol/pointer/EventSource.d.ts index 20dc942600..6592fa27a5 100644 --- a/types/ol/pointer/EventSource.d.ts +++ b/types/ol/pointer/EventSource.d.ts @@ -3,5 +3,5 @@ import PointerEventHandler from './PointerEventHandler'; export default class EventSource { constructor(dispatcher: PointerEventHandler, mapping: { [key: string]: (p0: Event) => void }); getEvents(): string[]; - getHandlerForEvent(eventType: string): ((p0: Event) => void); + getHandlerForEvent(eventType: string): (p0: Event) => void; } diff --git a/types/ol/proj.d.ts b/types/ol/proj.d.ts index 152108a485..4f428d660f 100644 --- a/types/ol/proj.d.ts +++ b/types/ol/proj.d.ts @@ -4,25 +4,49 @@ import Projection from './proj/Projection'; import Units from './proj/Units'; export type ProjectionLike = Projection | string; -export type TransformFunction = ((p0: number[], p1?: number[], p2?: number) => number[]); +export type TransformFunction = (p0: number[], p1?: number[], p2?: number) => number[]; export function addCommon(): void; -export function addCoordinateTransforms(source: ProjectionLike, destination: ProjectionLike, forward: ((p0: Coordinate) => Coordinate), inverse: ((p0: Coordinate) => Coordinate)): void; +export function addCoordinateTransforms( + source: ProjectionLike, + destination: ProjectionLike, + forward: (p0: Coordinate) => Coordinate, + inverse: (p0: Coordinate) => Coordinate +): void; export function addEquivalentProjections(projections: Projection[]): void; -export function addEquivalentTransforms(projections1: Projection[], projections2: Projection[], forwardTransform: TransformFunction, inverseTransform: TransformFunction): void; +export function addEquivalentTransforms( + projections1: Projection[], + projections2: Projection[], + forwardTransform: TransformFunction, + inverseTransform: TransformFunction +): void; export function addProjection(projection: Projection): void; export function addProjections(projections: Projection[]): void; export function clearAllProjections(): void; export function cloneTransform(input: number[], opt_output?: number[], opt_dimension?: number): number[]; -export function createProjection(projection: Projection | string, defaultCode: string): Projection; -export function createTransformFromCoordinateTransform(coordTransform: ((p0: Coordinate) => Coordinate)): TransformFunction; +export function createProjection(projection: Projection | string | undefined, defaultCode: string): Projection; +export function createTransformFromCoordinateTransform( + coordTransform: (p0: Coordinate) => Coordinate +): TransformFunction; export function equivalent(projection1: Projection, projection2: Projection): boolean; export function fromLonLat(coordinate: Coordinate, opt_projection?: ProjectionLike): Coordinate; export function get(projectionLike: ProjectionLike): Projection; -export function getPointResolution(projection: ProjectionLike, resolution: number, point: Coordinate, opt_units?: Units): number; +export function getPointResolution( + projection: ProjectionLike, + resolution: number, + point: Coordinate, + opt_units?: Units +): number; export function getTransform(source: ProjectionLike, destination: ProjectionLike): TransformFunction; -export function getTransformFromProjections(sourceProjection: Projection, destinationProjection: Projection): TransformFunction; +export function getTransformFromProjections( + sourceProjection: Projection, + destinationProjection: Projection +): TransformFunction; export function identityTransform(input: number[], opt_output?: number[], opt_dimension?: number): number[]; export function toLonLat(coordinate: Coordinate, opt_projection?: ProjectionLike): Coordinate; export function transform(coordinate: Coordinate, source: ProjectionLike, destination: ProjectionLike): Coordinate; export function transformExtent(extent: Extent, source: ProjectionLike, destination: ProjectionLike): Extent; -export function transformWithProjections(point: Coordinate, sourceProjection: Projection, destinationProjection: Projection): Coordinate; +export function transformWithProjections( + point: Coordinate, + sourceProjection: Projection, + destinationProjection: Projection +): Coordinate; diff --git a/types/ol/proj/Projection.d.ts b/types/ol/proj/Projection.d.ts index 9dbaeebc01..77ca34ccd4 100644 --- a/types/ol/proj/Projection.d.ts +++ b/types/ol/proj/Projection.d.ts @@ -11,7 +11,7 @@ export interface Options { global?: boolean; metersPerUnit?: number; worldExtent?: Extent; - getPointResolution?: ((p0: number, p1: Coordinate) => number); + getPointResolution?: (p0: number, p1: Coordinate) => number; } export default class Projection { constructor(options: Options); @@ -21,13 +21,13 @@ export default class Projection { getDefaultTileGrid(): TileGrid; getExtent(): Extent; getMetersPerUnit(): number; - getPointResolutionFunc(): ((p0: number, p1: Coordinate) => number); + getPointResolutionFunc(): (p0: number, p1: Coordinate) => number; getUnits(): Units; getWorldExtent(): Extent; isGlobal(): boolean; setDefaultTileGrid(tileGrid: TileGrid): void; setExtent(extent: Extent): void; - setGetPointResolution(func: ((p0: number, p1: Coordinate) => number)): void; + setGetPointResolution(func: (p0: number, p1: Coordinate) => number): void; setGlobal(global: boolean): void; setWorldExtent(worldExtent: Extent): void; } diff --git a/types/ol/render.d.ts b/types/ol/render.d.ts index a544fb32b7..6c79c07d4c 100644 --- a/types/ol/render.d.ts +++ b/types/ol/render.d.ts @@ -3,7 +3,7 @@ import SimpleGeometry from './geom/SimpleGeometry'; import CanvasImmediateRenderer from './render/canvas/Immediate'; import { Size } from './size'; -export type OrderFunction = ((p0: FeatureLike, p1: FeatureLike) => number); +export type OrderFunction = (p0: FeatureLike, p1: FeatureLike) => number; export interface State { context: CanvasRenderingContext2D; feature: FeatureLike; diff --git a/types/ol/render/Event.d.ts b/types/ol/render/Event.d.ts index 24b75a2c85..c2db36786a 100644 --- a/types/ol/render/Event.d.ts +++ b/types/ol/render/Event.d.ts @@ -5,7 +5,13 @@ import EventType from './EventType'; import VectorContext from './VectorContext'; export default class RenderEvent extends Event { - constructor(type: EventType, opt_vectorContext?: VectorContext, opt_frameState?: FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: WebGLContext); + constructor( + type: EventType, + opt_vectorContext?: VectorContext, + opt_frameState?: FrameState, + opt_context?: CanvasRenderingContext2D, + opt_glContext?: WebGLContext + ); context: CanvasRenderingContext2D; frameState: FrameState; glContext: WebGLContext; diff --git a/types/ol/render/Feature.d.ts b/types/ol/render/Feature.d.ts index b3d0c78383..a3e03491ce 100644 --- a/types/ol/render/Feature.d.ts +++ b/types/ol/render/Feature.d.ts @@ -3,7 +3,13 @@ import GeometryType from '../geom/GeometryType'; import { ProjectionLike } from '../proj'; export default class RenderFeature { - constructor(type: GeometryType, flatCoordinates: number[], ends: number[] | number[][], properties: { [key: string]: any }, id: number | string); + constructor( + type: GeometryType, + flatCoordinates: number[], + ends: number[] | number[][], + properties: { [key: string]: any }, + id: number | string | undefined + ); get(key: string): any; getExtent(): Extent; getFlatInteriorPoint(): number[]; diff --git a/types/ol/render/ReplayGroup.d.ts b/types/ol/render/ReplayGroup.d.ts index 5a384fd647..9ea0d32dee 100644 --- a/types/ol/render/ReplayGroup.d.ts +++ b/types/ol/render/ReplayGroup.d.ts @@ -4,6 +4,6 @@ import VectorContext from './VectorContext'; export default class ReplayGroup { constructor(); addDeclutter(group: boolean): any[]; - getReplay(zIndex: number, replayType: ReplayType): VectorContext; + getReplay(zIndex: number | undefined, replayType: ReplayType): VectorContext; isEmpty(): boolean; } diff --git a/types/ol/render/VectorContext.d.ts b/types/ol/render/VectorContext.d.ts index 3c2750525b..da727218b1 100644 --- a/types/ol/render/VectorContext.d.ts +++ b/types/ol/render/VectorContext.d.ts @@ -20,12 +20,15 @@ import RenderFeature from './Feature'; export default class VectorContext { constructor(); drawCircle(circleGeometry: Circle, feature: Feature): void; - drawCustom(geometry: SimpleGeometry, feature: Feature | RenderFeature, renderer: (() => void)): void; + drawCustom(geometry: SimpleGeometry, feature: Feature | RenderFeature, renderer: () => void): void; drawFeature(feature: Feature, style: Style): void; drawGeometry(geometry: Geometry): void; drawGeometryCollection(geometryCollectionGeometry: GeometryCollection, feature: Feature): void; drawLineString(lineStringGeometry: LineString | RenderFeature, feature: Feature | RenderFeature): void; - drawMultiLineString(multiLineStringGeometry: MultiLineString | RenderFeature, feature: Feature | RenderFeature): void; + drawMultiLineString( + multiLineStringGeometry: MultiLineString | RenderFeature, + feature: Feature | RenderFeature + ): void; drawMultiPoint(multiPointGeometry: MultiPoint | RenderFeature, feature: Feature | RenderFeature): void; drawMultiPolygon(multiPolygonGeometry: MultiPolygon, feature: Feature | RenderFeature): void; drawPoint(pointGeometry: Point | RenderFeature, feature: Feature | RenderFeature): void; diff --git a/types/ol/render/canvas.d.ts b/types/ol/render/canvas.d.ts index bad3af79eb..e85044cb41 100644 --- a/types/ol/render/canvas.d.ts +++ b/types/ol/render/canvas.d.ts @@ -49,6 +49,23 @@ export interface TextState { padding?: number[]; } export const labelCache: LRUCache; -export function drawImage(context: CanvasRenderingContext2D, transform: Transform, opacity: number, image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, originX: number, originY: number, w: number, h: number, x: number, y: number, scale: number): void; +export function drawImage( + context: CanvasRenderingContext2D, + transform: Transform | undefined, + opacity: number, + image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, + originX: number, + originY: number, + w: number, + h: number, + x: number, + y: number, + scale: number +): void; export function measureTextWidth(font: string, text: string): number; -export function rotateAtOffset(context: CanvasRenderingContext2D, rotation: number, offsetX: number, offsetY: number): void; +export function rotateAtOffset( + context: CanvasRenderingContext2D, + rotation: number, + offsetX: number, + offsetY: number +): void; diff --git a/types/ol/render/canvas/ImageReplay.d.ts b/types/ol/render/canvas/ImageReplay.d.ts index a922681444..664777965f 100644 --- a/types/ol/render/canvas/ImageReplay.d.ts +++ b/types/ol/render/canvas/ImageReplay.d.ts @@ -2,5 +2,12 @@ import { Extent } from '../../extent'; import CanvasReplay from './Replay'; export default class CanvasImageReplay extends CanvasReplay { - constructor(tolerance: number, maxExtent: Extent, resolution: number, pixelRatio: number, overlaps: boolean, declutterTree: any); + constructor( + tolerance: number, + maxExtent: Extent, + resolution: number, + pixelRatio: number, + overlaps: boolean, + declutterTree: any + ); } diff --git a/types/ol/render/canvas/Immediate.d.ts b/types/ol/render/canvas/Immediate.d.ts index 9be5f14b9f..158af18fe4 100644 --- a/types/ol/render/canvas/Immediate.d.ts +++ b/types/ol/render/canvas/Immediate.d.ts @@ -3,5 +3,11 @@ import { Transform } from '../../transform'; import VectorContext from '../VectorContext'; export default class CanvasImmediateRenderer extends VectorContext { - constructor(context: CanvasRenderingContext2D, pixelRatio: number, extent: Extent, transform: Transform, viewRotation: number); + constructor( + context: CanvasRenderingContext2D, + pixelRatio: number, + extent: Extent, + transform: Transform, + viewRotation: number + ); } diff --git a/types/ol/render/canvas/LineStringReplay.d.ts b/types/ol/render/canvas/LineStringReplay.d.ts index adb3a73170..aecf5a013f 100644 --- a/types/ol/render/canvas/LineStringReplay.d.ts +++ b/types/ol/render/canvas/LineStringReplay.d.ts @@ -3,7 +3,14 @@ import { FillStrokeState } from '../canvas'; import CanvasReplay from './Replay'; export default class CanvasLineStringReplay extends CanvasReplay { - constructor(tolerance: number, maxExtent: Extent, resolution: number, pixelRatio: number, overlaps: boolean, declutterTree: any); + constructor( + tolerance: number, + maxExtent: Extent, + resolution: number, + pixelRatio: number, + overlaps: boolean, + declutterTree: any + ); applyStroke(): void; applyStroke(state: FillStrokeState): void; } diff --git a/types/ol/render/canvas/PolygonReplay.d.ts b/types/ol/render/canvas/PolygonReplay.d.ts index 858f31f068..17f14299ff 100644 --- a/types/ol/render/canvas/PolygonReplay.d.ts +++ b/types/ol/render/canvas/PolygonReplay.d.ts @@ -2,5 +2,12 @@ import { Extent } from '../../extent'; import CanvasReplay from './Replay'; export default class CanvasPolygonReplay extends CanvasReplay { - constructor(tolerance: number, maxExtent: Extent, resolution: number, pixelRatio: number, overlaps: boolean, declutterTree: any); + constructor( + tolerance: number, + maxExtent: Extent, + resolution: number, + pixelRatio: number, + overlaps: boolean, + declutterTree: any + ); } diff --git a/types/ol/render/canvas/Replay.d.ts b/types/ol/render/canvas/Replay.d.ts index 66caba49c2..e829ead4ea 100644 --- a/types/ol/render/canvas/Replay.d.ts +++ b/types/ol/render/canvas/Replay.d.ts @@ -9,7 +9,14 @@ import RenderFeature from '../Feature'; import VectorContext from '../VectorContext'; export default class CanvasReplay extends VectorContext { - constructor(tolerance: number, maxExtent: Extent, resolution: number, pixelRatio: number, overlaps: boolean, declutterTree: any); + constructor( + tolerance: number, + maxExtent: Extent, + resolution: number, + pixelRatio: number, + overlaps: boolean, + declutterTree: any + ); protected coordinates: number[]; protected hitDetectionInstructions: any[]; protected instructions: any[]; @@ -18,7 +25,14 @@ export default class CanvasReplay extends VectorContext { protected pixelRatio: number; protected state: FillStrokeState; protected tolerance: number; - protected appendFlatCoordinates(flatCoordinates: number[], offset: number, end: number, stride: number, closed: boolean, skipFirst: boolean): number; + protected appendFlatCoordinates( + flatCoordinates: number[], + offset: number, + end: number, + stride: number, + closed: boolean, + skipFirst: boolean + ): number; protected applyPixelRatio(dashArray: number[]): number[]; protected beginGeometry(geometry: Geometry | RenderFeature, feature: Feature | RenderFeature): void; protected getBufferedMaxExtent(): Extent; @@ -28,16 +42,66 @@ export default class CanvasReplay extends VectorContext { createFill(state: FillStrokeState, geometry: Geometry | RenderFeature): any[]; createStroke(state: FillStrokeState): any[]; drawCustom(): void; - drawCustom(geometry: SimpleGeometry, feature: Feature | RenderFeature, renderer: (() => void)): void; - drawCustomCoordinates_(flatCoordinates: number[], offset: number, ends: number[], stride: number, replayEnds: number[]): number; + drawCustom(geometry: SimpleGeometry, feature: Feature | RenderFeature, renderer: () => void): void; + drawCustomCoordinates_( + flatCoordinates: number[], + offset: number, + ends: number[], + stride: number, + replayEnds: number[] + ): number; endGeometry(geometry: Geometry | RenderFeature, feature: Feature | RenderFeature): void; finish(): void; renderDeclutter_(declutterGroup: DeclutterGroup, feature: Feature | RenderFeature): void; - replay(context: CanvasRenderingContext2D, transform: Transform, viewRotation: number, skippedFeaturesHash: { [key: string]: boolean }, snapToPixel: boolean): void; - replayHitDetection(context: CanvasRenderingContext2D, transform: Transform, viewRotation: number, skippedFeaturesHash: { [key: string]: boolean }, opt_featureCallback?: (() => void), opt_hitExtent?: Extent): T; - replayImage_(context: CanvasRenderingContext2D, x: number, y: number, image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, anchorX: number, anchorY: number, declutterGroup: DeclutterGroup, height: number, opacity: number, originX: number, originY: number, rotation: number, scale: number, snapToPixel: boolean, width: number, padding: number[], fillInstruction: any[], strokeInstruction: any[]): void; - replayTextBackground_(context: CanvasRenderingContext2D, p1: Coordinate, p2: Coordinate, p3: Coordinate, p4: Coordinate, fillInstruction: any[], strokeInstruction: any[]): void; + replay( + context: CanvasRenderingContext2D, + transform: Transform, + viewRotation: number, + skippedFeaturesHash: { [key: string]: boolean }, + snapToPixel: boolean + ): void; + replayHitDetection( + context: CanvasRenderingContext2D, + transform: Transform, + viewRotation: number, + skippedFeaturesHash: { [key: string]: boolean }, + opt_featureCallback?: () => void, + opt_hitExtent?: Extent + ): T; + replayImage_( + context: CanvasRenderingContext2D, + x: number, + y: number, + image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, + anchorX: number, + anchorY: number, + declutterGroup: DeclutterGroup, + height: number, + opacity: number, + originX: number, + originY: number, + rotation: number, + scale: number, + snapToPixel: boolean, + width: number, + padding: number[], + fillInstruction: any[], + strokeInstruction: any[] + ): void; + replayTextBackground_( + context: CanvasRenderingContext2D, + p1: Coordinate, + p2: Coordinate, + p3: Coordinate, + p4: Coordinate, + fillInstruction: any[], + strokeInstruction: any[] + ): void; reverseHitDetectionInstructions(): void; - updateFillStyle(state: FillStrokeState, createFill: ((this: CanvasReplay, p0: FillStrokeState, p1: (Geometry | RenderFeature)) => any[]), geometry: Geometry | RenderFeature): void; - updateStrokeStyle(state: FillStrokeState, applyStroke: ((this: CanvasReplay, p0: FillStrokeState) => void)): void; + updateFillStyle( + state: FillStrokeState, + createFill: (this: CanvasReplay, p0: FillStrokeState, p1: Geometry | RenderFeature) => any[], + geometry: Geometry | RenderFeature + ): void; + updateStrokeStyle(state: FillStrokeState, applyStroke: (this: CanvasReplay, p0: FillStrokeState) => void): void; } diff --git a/types/ol/render/canvas/ReplayGroup.d.ts b/types/ol/render/canvas/ReplayGroup.d.ts index 8840250112..f6c6d6734d 100644 --- a/types/ol/render/canvas/ReplayGroup.d.ts +++ b/types/ol/render/canvas/ReplayGroup.d.ts @@ -9,14 +9,43 @@ import ReplayType from '../ReplayType'; import CanvasReplay from './Replay'; export default class CanvasReplayGroup extends ReplayGroup { - constructor(tolerance: number, maxExtent: Extent, resolution: number, pixelRatio: number, overlaps: boolean, declutterTree: any, opt_renderBuffer?: number); + constructor( + tolerance: number, + maxExtent: Extent, + resolution: number, + pixelRatio: number, + overlaps: boolean, + declutterTree: any, + opt_renderBuffer?: number + ); clip(context: CanvasRenderingContext2D, transform: Transform): void; finish(): void; - forEachFeatureAtCoordinate(coordinate: Coordinate, resolution: number, rotation: number, hitTolerance: number, skippedFeaturesHash: { [key: string]: boolean }, callback: ((p0: (Feature | RenderFeature)) => T), declutterReplays: { [key: string]: DeclutterGroup }): T; + forEachFeatureAtCoordinate( + coordinate: Coordinate, + resolution: number, + rotation: number, + hitTolerance: number, + skippedFeaturesHash: { [key: string]: boolean }, + callback: (p0: Feature | RenderFeature) => T, + declutterReplays: { [key: string]: DeclutterGroup } + ): T; getClipCoords(transform: Transform): number[]; getReplays(): { [key: string]: { [key in ReplayType]: CanvasReplay } }; hasReplays(replays: ReplayType[]): boolean; - replay(context: CanvasRenderingContext2D, transform: Transform, viewRotation: number, skippedFeaturesHash: { [key: string]: boolean }, snapToPixel: boolean, opt_replayTypes?: ReplayType[], opt_declutterReplays?: { [key: string]: DeclutterGroup }): void; + replay( + context: CanvasRenderingContext2D, + transform: Transform, + viewRotation: number, + skippedFeaturesHash: { [key: string]: boolean }, + snapToPixel: boolean, + opt_replayTypes?: ReplayType[], + opt_declutterReplays?: { [key: string]: DeclutterGroup } + ): void; } export function getCircleArray(radius: number): boolean[][]; -export function replayDeclutter(declutterReplays: { [key: string]: any[] }, context: CanvasRenderingContext2D, rotation: number, snapToPixel: boolean): void; +export function replayDeclutter( + declutterReplays: { [key: string]: any[] }, + context: CanvasRenderingContext2D, + rotation: number, + snapToPixel: boolean +): void; diff --git a/types/ol/render/canvas/TextReplay.d.ts b/types/ol/render/canvas/TextReplay.d.ts index f9d0fd7db8..e7aacb222d 100644 --- a/types/ol/render/canvas/TextReplay.d.ts +++ b/types/ol/render/canvas/TextReplay.d.ts @@ -2,7 +2,14 @@ import { Extent } from '../../extent'; import CanvasReplay from './Replay'; export default class CanvasTextReplay extends CanvasReplay { - constructor(tolerance: number, maxExtent: Extent, resolution: number, pixelRatio: number, overlaps: boolean, declutterTree: any); + constructor( + tolerance: number, + maxExtent: Extent, + resolution: number, + pixelRatio: number, + overlaps: boolean, + declutterTree: any + ); getImage(text: string, textKey: string, fillKey: string, strokeKey: string): HTMLCanvasElement; } export function measureTextWidths(font: string, lines: string[], widths: number[]): number; diff --git a/types/ol/render/webgl.d.ts b/types/ol/render/webgl.d.ts index 19186b1b8e..aaf854998e 100644 --- a/types/ol/render/webgl.d.ts +++ b/types/ol/render/webgl.d.ts @@ -1 +1,8 @@ -export function triangleIsCounterClockwise(x1: number, y1: number, x2: number, y2: number, x3: number, y3: number): boolean; +export function triangleIsCounterClockwise( + x1: number, + y1: number, + x2: number, + y2: number, + x3: number, + y3: number +): boolean; diff --git a/types/ol/render/webgl/Immediate.d.ts b/types/ol/render/webgl/Immediate.d.ts index f1d096dfb6..edc9840c70 100644 --- a/types/ol/render/webgl/Immediate.d.ts +++ b/types/ol/render/webgl/Immediate.d.ts @@ -5,5 +5,13 @@ import WebGLContext from '../../webgl/Context'; import VectorContext from '../VectorContext'; export default class WebGLImmediateRenderer extends VectorContext { - constructor(context: WebGLContext, center: Coordinate, resolution: number, rotation: number, size: Size, extent: Extent, pixelRatio: number); + constructor( + context: WebGLContext, + center: Coordinate, + resolution: number, + rotation: number, + size: Size, + extent: Extent, + pixelRatio: number + ); } diff --git a/types/ol/render/webgl/Replay.d.ts b/types/ol/render/webgl/Replay.d.ts index f2b8e56e39..f1a1be427e 100644 --- a/types/ol/render/webgl/Replay.d.ts +++ b/types/ol/render/webgl/Replay.d.ts @@ -24,14 +24,57 @@ export default class WebGLReplay extends VectorContext { protected vertices: number[]; protected verticesBuffer: WebGLBuffer; protected drawElements(gl: WebGLRenderingContext, context: WebGLContext, start: number, end: number): void; - protected drawHitDetectionReplay(gl: WebGLRenderingContext, context: WebGLContext, skippedFeaturesHash: { [key: string]: boolean }, featureCallback: ((p0: (Feature | RenderFeature)) => T), oneByOne: boolean, opt_hitExtent?: Extent): T; - protected drawHitDetectionReplayAll(gl: WebGLRenderingContext, context: WebGLContext, skippedFeaturesHash: { [key: string]: boolean }, featureCallback: ((p0: (Feature | RenderFeature)) => T)): T; - protected drawHitDetectionReplayOneByOne(gl: WebGLRenderingContext, context: WebGLContext, skippedFeaturesHash: { [key: string]: boolean }, featureCallback: ((p0: (Feature | RenderFeature)) => T), opt_hitExtent?: Extent): T; - protected drawReplay(gl: WebGLRenderingContext, context: WebGLContext, skippedFeaturesHash: { [key: string]: boolean }, hitDetection: boolean): void; - protected setUpProgram(gl: WebGLRenderingContext, context: WebGLContext, size: Size, pixelRatio: number): Locations | Locations_1 | Locations_2 | Locations_3; - protected shutDownProgram(gl: WebGLRenderingContext, locations: Locations | Locations_1 | Locations_2 | Locations_3): void; + protected drawHitDetectionReplay( + gl: WebGLRenderingContext, + context: WebGLContext, + skippedFeaturesHash: { [key: string]: boolean }, + featureCallback: (p0: Feature | RenderFeature) => T, + oneByOne: boolean, + opt_hitExtent?: Extent + ): T; + protected drawHitDetectionReplayAll( + gl: WebGLRenderingContext, + context: WebGLContext, + skippedFeaturesHash: { [key: string]: boolean }, + featureCallback: (p0: Feature | RenderFeature) => T + ): T; + protected drawHitDetectionReplayOneByOne( + gl: WebGLRenderingContext, + context: WebGLContext, + skippedFeaturesHash: { [key: string]: boolean }, + featureCallback: (p0: Feature | RenderFeature) => T, + opt_hitExtent?: Extent + ): T; + protected drawReplay( + gl: WebGLRenderingContext, + context: WebGLContext, + skippedFeaturesHash: { [key: string]: boolean }, + hitDetection: boolean + ): void; + protected setUpProgram( + gl: WebGLRenderingContext, + context: WebGLContext, + size: Size, + pixelRatio: number + ): Locations | Locations_1 | Locations_2 | Locations_3; + protected shutDownProgram( + gl: WebGLRenderingContext, + locations: Locations | Locations_1 | Locations_2 | Locations_3 + ): void; protected maxExtent: Extent; finish(context: WebGLContext): void; - getDeleteResourcesFunction(context: WebGLContext): (() => void); - replay(context: WebGLContext, center: Coordinate, resolution: number, rotation: number, size: Size, pixelRatio: number, opacity: number, skippedFeaturesHash: { [key: string]: boolean }, featureCallback: ((p0: (Feature | RenderFeature)) => T), oneByOne: boolean, opt_hitExtent?: Extent): T; + getDeleteResourcesFunction(context: WebGLContext): () => void; + replay( + context: WebGLContext, + center: Coordinate, + resolution: number, + rotation: number, + size: Size, + pixelRatio: number, + opacity: number, + skippedFeaturesHash: { [key: string]: boolean }, + featureCallback: (p0: Feature | RenderFeature) => T, + oneByOne: boolean, + opt_hitExtent?: Extent + ): T; } diff --git a/types/ol/render/webgl/ReplayGroup.d.ts b/types/ol/render/webgl/ReplayGroup.d.ts index beb5a7489e..cf3c196c91 100644 --- a/types/ol/render/webgl/ReplayGroup.d.ts +++ b/types/ol/render/webgl/ReplayGroup.d.ts @@ -9,8 +9,38 @@ import ReplayGroup from '../ReplayGroup'; export default class WebGLReplayGroup extends ReplayGroup { constructor(tolerance: number, maxExtent: Extent, opt_renderBuffer?: number); finish(context: WebGLContext): void; - forEachFeatureAtCoordinate(coordinate: Coordinate, context: WebGLContext, center: Coordinate, resolution: number, rotation: number, size: Size, pixelRatio: number, opacity: number, skippedFeaturesHash: { [key: string]: boolean }, callback: ((p0: (Feature | RenderFeature)) => T)): T; - getDeleteResourcesFunction(context: WebGLContext): (() => void); - hasFeatureAtCoordinate(coordinate: Coordinate, context: WebGLContext, center: Coordinate, resolution: number, rotation: number, size: Size, pixelRatio: number, opacity: number, skippedFeaturesHash: { [key: string]: boolean }): boolean; - replay(context: WebGLContext, center: Coordinate, resolution: number, rotation: number, size: Size, pixelRatio: number, opacity: number, skippedFeaturesHash: { [key: string]: boolean }): void; + forEachFeatureAtCoordinate( + coordinate: Coordinate, + context: WebGLContext, + center: Coordinate, + resolution: number, + rotation: number, + size: Size, + pixelRatio: number, + opacity: number, + skippedFeaturesHash: { [key: string]: boolean }, + callback: (p0: Feature | RenderFeature) => T + ): T; + getDeleteResourcesFunction(context: WebGLContext): () => void; + hasFeatureAtCoordinate( + coordinate: Coordinate, + context: WebGLContext, + center: Coordinate, + resolution: number, + rotation: number, + size: Size, + pixelRatio: number, + opacity: number, + skippedFeaturesHash: { [key: string]: boolean } + ): boolean; + replay( + context: WebGLContext, + center: Coordinate, + resolution: number, + rotation: number, + size: Size, + pixelRatio: number, + opacity: number, + skippedFeaturesHash: { [key: string]: boolean } + ): void; } diff --git a/types/ol/render/webgl/TextureReplay.d.ts b/types/ol/render/webgl/TextureReplay.d.ts index 98fe463fe4..aab3b58b58 100644 --- a/types/ol/render/webgl/TextureReplay.d.ts +++ b/types/ol/render/webgl/TextureReplay.d.ts @@ -20,9 +20,20 @@ export default class WebGLTextureReplay extends WebGLReplay { protected rotation: number; protected scale: number; protected width: number; - protected createTextures(textures: WebGLTexture[], images: (HTMLCanvasElement | HTMLImageElement | HTMLVideoElement)[], texturePerImage: { [key: string]: WebGLTexture }, gl: WebGLRenderingContext): void; + protected createTextures( + textures: WebGLTexture[], + images: (HTMLCanvasElement | HTMLImageElement | HTMLVideoElement)[], + texturePerImage: { [key: string]: WebGLTexture }, + gl: WebGLRenderingContext + ): void; protected drawCoordinates(flatCoordinates: number[], offset: number, end: number, stride: number): number; - protected drawReplaySkipping(gl: WebGLRenderingContext, context: WebGLContext, skippedFeaturesHash: { [key: string]: boolean }, textures: WebGLTexture[], groupIndices: number[]): void; + protected drawReplaySkipping( + gl: WebGLRenderingContext, + context: WebGLContext, + skippedFeaturesHash: { [key: string]: boolean }, + textures: WebGLTexture[], + groupIndices: number[] + ): void; protected getHitDetectionTextures(): WebGLTexture[]; protected getTextures(opt_all?: boolean): WebGLTexture[]; } diff --git a/types/ol/renderer/Layer.d.ts b/types/ol/renderer/Layer.d.ts index c6d22c286c..fea820abda 100644 --- a/types/ol/renderer/Layer.d.ts +++ b/types/ol/renderer/Layer.d.ts @@ -15,18 +15,43 @@ import TileRange from '../TileRange'; export default class LayerRenderer extends Observable { constructor(layer: Layer); - protected createLoadedTileFinder(source: TileSource, projection: Projection, tiles: { [key: number]: { [key: string]: Tile } }): ((p0: number, p1: TileRange) => boolean); + protected createLoadedTileFinder( + source: TileSource, + projection: Projection, + tiles: { [key: number]: { [key: string]: Tile } } + ): (p0: number, p1: TileRange) => boolean; protected loadImage(image: ImageBase): boolean; - protected manageTilePyramid(frameState: FrameState, tileSource: TileSource, tileGrid: TileGrid, pixelRatio: number, projection: Projection, extent: Extent, currentZ: number, preload: number, opt_tileCallback?: (() => void), opt_this?: T): void; + protected manageTilePyramid( + frameState: FrameState, + tileSource: TileSource, + tileGrid: TileGrid, + pixelRatio: number, + projection: Projection, + extent: Extent, + currentZ: number, + preload: number, + opt_tileCallback?: () => void, + opt_this?: T + ): void; protected renderIfReadyAndVisible(): void; protected scheduleExpireCache(frameState: FrameState, tileSource: TileSource): void; - protected updateUsedTiles(usedTiles: { [key: string]: { [key: string]: TileRange } }, tileSource: TileSource, z: number, tileRange: TileRange): void; - forEachFeatureAtCoordinate(coordinate: Coordinate, frameState: FrameState, hitTolerance: number, callback: ((p0: FeatureLike, p1: Layer) => T)): T | void; + protected updateUsedTiles( + usedTiles: { [key: string]: { [key: string]: TileRange } }, + tileSource: TileSource, + z: number, + tileRange: TileRange + ): void; + forEachFeatureAtCoordinate( + coordinate: Coordinate, + frameState: FrameState, + hitTolerance: number, + callback: (p0: FeatureLike, p1: Layer) => T + ): T | void; getLayer(): Layer; hasFeatureAtCoordinate(coordinate: Coordinate, frameState: FrameState): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/Map.d.ts b/types/ol/renderer/Map.d.ts index 150def32a9..dcba1913cd 100644 --- a/types/ol/renderer/Map.d.ts +++ b/types/ol/renderer/Map.d.ts @@ -17,10 +17,32 @@ export default class MapRenderer extends Disposable { protected scheduleExpireIconCache(frameState: FrameState): void; protected scheduleRemoveUnusedLayerRenderers(frameState: FrameState): void; dispatchRenderEvent(type: EventType, frameState: FrameState): void; - forEachFeatureAtCoordinate(coordinate: Coordinate, frameState: FrameState, hitTolerance: number, callback: ((this: S, p0: FeatureLike, p1: Layer) => T), thisArg: S, layerFilter: ((this: U, p0: Layer) => boolean), thisArg2: U): T; - forEachLayerAtPixel(pixel: Pixel, frameState: FrameState, hitTolerance: number, callback: ((this: S, p0: Layer, p1: (Uint8ClampedArray | Uint8Array)) => T), thisArg: S, layerFilter: ((this: U, p0: Layer) => boolean), thisArg2: U): T; + forEachFeatureAtCoordinate( + coordinate: Coordinate, + frameState: FrameState, + hitTolerance: number, + callback: (this: S, p0: FeatureLike, p1: Layer) => T, + thisArg: S, + layerFilter: (this: U, p0: Layer) => boolean, + thisArg2: U + ): T; + forEachLayerAtPixel( + pixel: Pixel, + frameState: FrameState, + hitTolerance: number, + callback: (this: S, p0: Layer, p1: Uint8ClampedArray | Uint8Array) => T, + thisArg: S, + layerFilter: (this: U, p0: Layer) => boolean, + thisArg2: U + ): T; getMap(): PluggableMap; - hasFeatureAtCoordinate(coordinate: Coordinate, frameState: FrameState, hitTolerance: number, layerFilter: ((this: U, p0: Layer) => boolean), thisArg: U): boolean; + hasFeatureAtCoordinate( + coordinate: Coordinate, + frameState: FrameState, + hitTolerance: number, + layerFilter: (this: U, p0: Layer) => boolean, + thisArg: U + ): boolean; registerLayerRenderers(constructors: LayerRenderer[]): void; removeLayerRenderers(): void; renderFrame(frameState: FrameState): void; diff --git a/types/ol/renderer/canvas/ImageLayer.d.ts b/types/ol/renderer/canvas/ImageLayer.d.ts index 1b3623633d..8d95b5488c 100644 --- a/types/ol/renderer/canvas/ImageLayer.d.ts +++ b/types/ol/renderer/canvas/ImageLayer.d.ts @@ -10,9 +10,9 @@ export default class CanvasImageLayerRenderer extends IntermediateCanvasRenderer constructor(imageLayer: ImageLayer | VectorLayer); create(mapRenderer: MapRenderer, layer: Layer): CanvasImageLayerRenderer; handles(layer: Layer): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/canvas/IntermediateCanvas.d.ts b/types/ol/renderer/canvas/IntermediateCanvas.d.ts index 1cfb195b87..0fb0154979 100644 --- a/types/ol/renderer/canvas/IntermediateCanvas.d.ts +++ b/types/ol/renderer/canvas/IntermediateCanvas.d.ts @@ -9,9 +9,9 @@ export default class IntermediateCanvasRenderer extends CanvasLayerRenderer { protected coordinateToCanvasPixelTransform: Transform; getImage(): HTMLCanvasElement | HTMLVideoElement | HTMLImageElement; getImageTransform(): Transform; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/canvas/Layer.d.ts b/types/ol/renderer/canvas/Layer.d.ts index f34df94041..9e315e45df 100644 --- a/types/ol/renderer/canvas/Layer.d.ts +++ b/types/ol/renderer/canvas/Layer.d.ts @@ -11,16 +11,31 @@ export default class CanvasLayerRenderer extends LayerRenderer { constructor(layer: Layer); protected renderedResolution: number; protected clip(context: CanvasRenderingContext2D, frameState: FrameState, extent: Extent): void; - protected dispatchRenderEvent(context: CanvasRenderingContext2D, frameState: FrameState, opt_transform?: Transform): void; + protected dispatchRenderEvent( + context: CanvasRenderingContext2D, + frameState: FrameState, + opt_transform?: Transform + ): void; protected getTransform(frameState: FrameState, offsetX: number): Transform; - protected postCompose(context: CanvasRenderingContext2D, frameState: FrameState, layerState: State, opt_transform?: Transform): void; + protected postCompose( + context: CanvasRenderingContext2D, + frameState: FrameState, + layerState: State, + opt_transform?: Transform + ): void; protected preCompose(context: CanvasRenderingContext2D, frameState: FrameState, opt_transform?: Transform): void; composeFrame(frameState: FrameState, layerState: State, context: CanvasRenderingContext2D): void; - forEachLayerAtCoordinate(coordinate: Coordinate, frameState: FrameState, hitTolerance: number, callback: ((this: S, p0: Layer, p1: (Uint8ClampedArray | Uint8Array)) => T), thisArg: S): T; + forEachLayerAtCoordinate( + coordinate: Coordinate, + frameState: FrameState, + hitTolerance: number, + callback: (this: S, p0: Layer, p1: Uint8ClampedArray | Uint8Array) => T, + thisArg: S + ): T; prepareFrame(frameState: FrameState, layerState: State): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/canvas/TileLayer.d.ts b/types/ol/renderer/canvas/TileLayer.d.ts index cfc8fc19d2..94a559357b 100644 --- a/types/ol/renderer/canvas/TileLayer.d.ts +++ b/types/ol/renderer/canvas/TileLayer.d.ts @@ -20,13 +20,23 @@ export default class CanvasTileLayerRenderer extends IntermediateCanvasRenderer protected getTileImage(tile: Tile): HTMLCanvasElement | HTMLImageElement | HTMLVideoElement; create(mapRenderer: MapRenderer, layer: Layer): CanvasTileLayerRenderer; handles(layer: Layer): boolean; - drawTileImage(tile: Tile, frameState: FrameState, layerState: State, x: number, y: number, w: number, h: number, gutter: number, transition: boolean): void; + drawTileImage( + tile: Tile, + frameState: FrameState, + layerState: State, + x: number, + y: number, + w: number, + h: number, + gutter: number, + transition: boolean + ): void; getLayer(): TileLayer | VectorTileLayer; getLayer(): Layer; getTile(z: number, x: number, y: number, pixelRatio: number, projection: Projection): Tile; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/canvas/VectorLayer.d.ts b/types/ol/renderer/canvas/VectorLayer.d.ts index 00a1d100cb..74f1767a9d 100644 --- a/types/ol/renderer/canvas/VectorLayer.d.ts +++ b/types/ol/renderer/canvas/VectorLayer.d.ts @@ -15,10 +15,16 @@ export default class CanvasVectorLayerRenderer extends CanvasLayerRenderer { handles(layer: Layer): boolean; compose(context: CanvasRenderingContext2D, frameState: FrameState, layerState: State): void; handleFontsChanged_(event: Event): void; - renderFeature(feature: Feature, resolution: number, pixelRatio: number, styles: Style | Style[], replayGroup: CanvasReplayGroup): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + renderFeature( + feature: Feature, + resolution: number, + pixelRatio: number, + styles: Style | Style[], + replayGroup: CanvasReplayGroup + ): boolean; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/canvas/VectorTileLayer.d.ts b/types/ol/renderer/canvas/VectorTileLayer.d.ts index 2f23fbdbbd..f714e1085b 100644 --- a/types/ol/renderer/canvas/VectorTileLayer.d.ts +++ b/types/ol/renderer/canvas/VectorTileLayer.d.ts @@ -13,10 +13,15 @@ export default class CanvasVectorTileLayerRenderer extends CanvasTileLayerRender create(mapRenderer: MapRenderer, layer: Layer): CanvasVectorTileLayerRenderer; handles(layer: Layer): boolean; handleFontsChanged_(event: Event): void; - renderFeature(feature: FeatureLike, squaredTolerance: number, styles: Style | Style[], replayGroup: CanvasReplayGroup): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + renderFeature( + feature: FeatureLike, + squaredTolerance: number, + styles: Style | Style[], + replayGroup: CanvasReplayGroup + ): boolean; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/vector.d.ts b/types/ol/renderer/vector.d.ts index 730852974e..c38203f110 100644 --- a/types/ol/renderer/vector.d.ts +++ b/types/ol/renderer/vector.d.ts @@ -16,4 +16,11 @@ import Style from '../style/Style'; export function defaultOrder(feature1: FeatureLike, feature2: FeatureLike): number; export function getSquaredTolerance(resolution: number, pixelRatio: number): number; export function getTolerance(resolution: number, pixelRatio: number): number; -export function renderFeature(replayGroup: ReplayGroup, feature: FeatureLike, style: Style, squaredTolerance: number, listener: ((this: T, p0: Event) => void), thisArg: T): boolean; +export function renderFeature( + replayGroup: ReplayGroup, + feature: FeatureLike, + style: Style, + squaredTolerance: number, + listener: (this: T, p0: Event) => void, + thisArg: T +): boolean; diff --git a/types/ol/renderer/webgl/ImageLayer.d.ts b/types/ol/renderer/webgl/ImageLayer.d.ts index a23440541f..c8dd6ed3d1 100644 --- a/types/ol/renderer/webgl/ImageLayer.d.ts +++ b/types/ol/renderer/webgl/ImageLayer.d.ts @@ -10,9 +10,9 @@ export default class WebGLImageLayerRenderer extends WebGLLayerRenderer { constructor(mapRenderer: WebGLMapRenderer, imageLayer: ImageLayer); create(mapRenderer: MapRenderer, layer: Layer): WebGLImageLayerRenderer; handles(layer: Layer): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/webgl/Layer.d.ts b/types/ol/renderer/webgl/Layer.d.ts index 388a70628c..e30749be0e 100644 --- a/types/ol/renderer/webgl/Layer.d.ts +++ b/types/ol/renderer/webgl/Layer.d.ts @@ -18,15 +18,20 @@ export default class WebGLLayerRenderer extends LayerRenderer { protected texture: WebGLTexture; protected bindFramebuffer(frameState: FrameState, framebufferDimension: number): void; composeFrame(frameState: FrameState, layerState: State, context: WebGLContext): void; - forEachLayerAtPixel(pixel: Pixel, frameState: FrameState, callback: ((this: S, p0: Layer, p1: (Uint8ClampedArray | Uint8Array)) => T), thisArg: S): T; + forEachLayerAtPixel( + pixel: Pixel, + frameState: FrameState, + callback: (this: S, p0: Layer, p1: Uint8ClampedArray | Uint8Array) => T, + thisArg: S + ): T; getProjectionMatrix(): Transform; getTexCoordMatrix(): Transform; getTexture(): WebGLTexture; handleWebGLContextLost(): void; prepareFrame(frameState: FrameState, layerState: State, context: WebGLContext): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/webgl/TileLayer.d.ts b/types/ol/renderer/webgl/TileLayer.d.ts index 641f5bacda..2da3367e98 100644 --- a/types/ol/renderer/webgl/TileLayer.d.ts +++ b/types/ol/renderer/webgl/TileLayer.d.ts @@ -10,9 +10,9 @@ export default class WebGLTileLayerRenderer extends WebGLLayerRenderer { constructor(mapRenderer: WebGLMapRenderer, tileLayer: TileLayer); create(mapRenderer: MapRenderer, layer: Layer): WebGLTileLayerRenderer; handles(layer: Layer): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/renderer/webgl/VectorLayer.d.ts b/types/ol/renderer/webgl/VectorLayer.d.ts index 73b981df2d..7a9ac1f7a1 100644 --- a/types/ol/renderer/webgl/VectorLayer.d.ts +++ b/types/ol/renderer/webgl/VectorLayer.d.ts @@ -13,10 +13,16 @@ export default class WebGLVectorLayerRenderer extends WebGLLayerRenderer { constructor(mapRenderer: WebGLMapRenderer, vectorLayer: VectorLayer); create(mapRenderer: MapRenderer, layer: Layer): WebGLVectorLayerRenderer; handles(layer: Layer): boolean; - renderFeature(feature: Feature, resolution: number, pixelRatio: number, styles: Style | Style[], replayGroup: WebGLReplayGroup): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + renderFeature( + feature: Feature, + resolution: number, + pixelRatio: number, + styles: Style | Style[], + replayGroup: WebGLReplayGroup + ): boolean; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/reproj.d.ts b/types/ol/reproj.d.ts index 0ba36934ff..d73c397837 100644 --- a/types/ol/reproj.d.ts +++ b/types/ol/reproj.d.ts @@ -3,5 +3,22 @@ import { Extent } from './extent'; import Projection from './proj/Projection'; import Triangulation from './reproj/Triangulation'; -export function calculateSourceResolution(sourceProj: Projection, targetProj: Projection, targetCenter: Coordinate, targetResolution: number): number; -export function render(width: number, height: number, pixelRatio: number, sourceResolution: number, sourceExtent: Extent, targetResolution: number, targetExtent: Extent, triangulation: Triangulation, sources: any[], gutter: number, opt_renderEdges?: boolean): HTMLCanvasElement; +export function calculateSourceResolution( + sourceProj: Projection, + targetProj: Projection, + targetCenter: Coordinate, + targetResolution: number +): number; +export function render( + width: number, + height: number, + pixelRatio: number, + sourceResolution: number, + sourceExtent: Extent, + targetResolution: number, + targetExtent: Extent, + triangulation: Triangulation, + sources: any[], + gutter: number, + opt_renderEdges?: boolean +): HTMLCanvasElement; diff --git a/types/ol/reproj/Image.d.ts b/types/ol/reproj/Image.d.ts index c94598e1c3..bce9a1e785 100644 --- a/types/ol/reproj/Image.d.ts +++ b/types/ol/reproj/Image.d.ts @@ -2,8 +2,15 @@ import { Extent } from '../extent'; import ImageBase from '../ImageBase'; import Projection from '../proj/Projection'; -export type FunctionType = ((p0: Extent, p1: number, p2: number) => ImageBase); +export type FunctionType = (p0: Extent, p1: number, p2: number) => ImageBase; export default class ReprojImage extends ImageBase { - constructor(sourceProj: Projection, targetProj: Projection, targetExtent: Extent, targetResolution: number, pixelRatio: number, getImageFunction: FunctionType); + constructor( + sourceProj: Projection, + targetProj: Projection, + targetExtent: Extent, + targetResolution: number, + pixelRatio: number, + getImageFunction: FunctionType + ); getProjection(): Projection; } diff --git a/types/ol/reproj/Tile.d.ts b/types/ol/reproj/Tile.d.ts index 1f7f28561f..1b6dab4f36 100644 --- a/types/ol/reproj/Tile.d.ts +++ b/types/ol/reproj/Tile.d.ts @@ -3,8 +3,20 @@ import Tile from '../Tile'; import { TileCoord } from '../tilecoord'; import TileGrid from '../tilegrid/TileGrid'; -export type FunctionType = ((p0: number, p1: number, p2: number, p3: number) => Tile); +export type FunctionType = (p0: number, p1: number, p2: number, p3: number) => Tile; export default class ReprojTile extends Tile { - constructor(sourceProj: Projection, sourceTileGrid: TileGrid, targetProj: Projection, targetTileGrid: TileGrid, tileCoord: TileCoord, wrappedTileCoord: TileCoord, pixelRatio: number, gutter: number, getTileFunction: FunctionType, opt_errorThreshold?: number, opt_renderEdges?: boolean); + constructor( + sourceProj: Projection, + sourceTileGrid: TileGrid, + targetProj: Projection, + targetTileGrid: TileGrid, + tileCoord: TileCoord, + wrappedTileCoord: TileCoord, + pixelRatio: number, + gutter: number, + getTileFunction: FunctionType, + opt_errorThreshold?: number, + opt_renderEdges?: boolean + ); getImage(): HTMLCanvasElement; } diff --git a/types/ol/reproj/Triangulation.d.ts b/types/ol/reproj/Triangulation.d.ts index 55177964b1..795d76e59d 100644 --- a/types/ol/reproj/Triangulation.d.ts +++ b/types/ol/reproj/Triangulation.d.ts @@ -7,7 +7,13 @@ export interface Triangle { target: Coordinate[]; } export default class Triangulation { - constructor(sourceProj: Projection, targetProj: Projection, targetExtent: Extent, maxSourceExtent: Extent, errorThreshold: number); + constructor( + sourceProj: Projection, + targetProj: Projection, + targetExtent: Extent, + maxSourceExtent: Extent, + errorThreshold: number + ); calculateSourceExtent(): Extent; getTriangles(): Triangle[]; } diff --git a/types/ol/resolutionconstraint.d.ts b/types/ol/resolutionconstraint.d.ts index 908aef82dd..a81137f88a 100644 --- a/types/ol/resolutionconstraint.d.ts +++ b/types/ol/resolutionconstraint.d.ts @@ -1,3 +1,3 @@ -export type Type = ((p0: number, p1: number, p2: number) => number); +export type Type = (p0: number, p1: number, p2: number) => number; export function createSnapToPower(power: number, maxResolution: number, opt_maxLevel?: number): Type; export function createSnapToResolutions(resolutions: number[]): Type; diff --git a/types/ol/rotationconstraint.d.ts b/types/ol/rotationconstraint.d.ts index c1abd92ec4..43f2dc9700 100644 --- a/types/ol/rotationconstraint.d.ts +++ b/types/ol/rotationconstraint.d.ts @@ -1,5 +1,5 @@ -export type Type = ((p0: number, p1: number) => number); +export type Type = (p0: number, p1: number) => number; export function createSnapToN(n: number): Type; export function createSnapToZero(opt_tolerance?: number): Type; -export function disable(rotation: number, delta: number): number; -export function none(rotation: number, delta: number): number; +export function disable(rotation: number | undefined, delta: number): number; +export function none(rotation: number | undefined, delta: number): number; diff --git a/types/ol/source/BingMaps.d.ts b/types/ol/source/BingMaps.d.ts index a3f82d401d..c633ac40fd 100644 --- a/types/ol/source/BingMaps.d.ts +++ b/types/ol/source/BingMaps.d.ts @@ -49,9 +49,9 @@ export default class BingMaps extends TileImage { getApiKey(): string; getImagerySet(): string; handleImageryMetadataResponse(response: BingMapsImageryMetadataResponse): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/CartoDB.d.ts b/types/ol/source/CartoDB.d.ts index 0e844bdcbe..da112b435b 100644 --- a/types/ol/source/CartoDB.d.ts +++ b/types/ol/source/CartoDB.d.ts @@ -27,9 +27,9 @@ export default class CartoDB extends XYZ { getConfig(): any; setConfig(config: any): void; updateConfig(config: any): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/Cluster.d.ts b/types/ol/source/Cluster.d.ts index eaa88bf4b1..21555b347b 100644 --- a/types/ol/source/Cluster.d.ts +++ b/types/ol/source/Cluster.d.ts @@ -9,7 +9,7 @@ import VectorSource, { VectorSourceEvent } from './Vector'; export interface Options { attributions?: AttributionLike; distance?: number; - geometryFunction?: ((p0: Feature) => Point); + geometryFunction?: (p0: Feature) => Point; source: VectorSource; wrapX?: boolean; } @@ -17,7 +17,7 @@ export default class Cluster extends VectorSource { constructor(options: Options); protected distance: number; protected features: Feature[]; - protected geometryFunction: ((p0: Feature) => Point); + protected geometryFunction: (p0: Feature) => Point; protected resolution: number; protected source: VectorSource; protected cluster(): void; @@ -25,9 +25,9 @@ export default class Cluster extends VectorSource { getDistance(): number; getSource(): VectorSource; setDistance(distance: number): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'addfeature', listener: (evt: VectorSourceEvent) => void): EventsKey; once(type: 'addfeature', listener: (evt: VectorSourceEvent) => void): EventsKey; un(type: 'addfeature', listener: (evt: VectorSourceEvent) => void): void; diff --git a/types/ol/source/Image.d.ts b/types/ol/source/Image.d.ts index be8bd820ce..8396ae716a 100644 --- a/types/ol/source/Image.d.ts +++ b/types/ol/source/Image.d.ts @@ -23,12 +23,17 @@ export enum ImageSourceEventType { export default class ImageSource extends Source { constructor(options: Options); protected findNearestResolution(resolution: number): number; - protected getImageInternal(extent: Extent, resolution: number, pixelRatio: number, projection: Projection): ImageBase; + protected getImageInternal( + extent: Extent, + resolution: number, + pixelRatio: number, + projection: Projection + ): ImageBase; protected handleImageChange(event: Event): void; getImage(extent: Extent, resolution: number, pixelRatio: number, projection: Projection): ImageBase; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/ImageArcGISRest.d.ts b/types/ol/source/ImageArcGISRest.d.ts index 66ed5d1963..ce63bf8866 100644 --- a/types/ol/source/ImageArcGISRest.d.ts +++ b/types/ol/source/ImageArcGISRest.d.ts @@ -23,11 +23,11 @@ export default class ImageArcGISRest extends ImageSource { getParams(): any; getUrl(): string; setImageLoadFunction(imageLoadFunction: LoadFunction): void; - setUrl(url: string): void; + setUrl(url: string | undefined): void; updateParams(params: any): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/ImageCanvas.d.ts b/types/ol/source/ImageCanvas.d.ts index e83aa2a4c0..9d7288ca4c 100644 --- a/types/ol/source/ImageCanvas.d.ts +++ b/types/ol/source/ImageCanvas.d.ts @@ -10,7 +10,14 @@ import ImageSource from './Image'; import { AttributionLike } from './Source'; import State from './State'; -export type FunctionType = ((this: ImageCanvas, p0: Extent, p1: number, p2: number, p3: Size, p4: Projection) => HTMLCanvasElement); +export type FunctionType = ( + this: ImageCanvas, + p0: Extent, + p1: number, + p2: number, + p3: Size, + p4: Projection +) => HTMLCanvasElement; export interface Options { attributions?: AttributionLike; canvasFunction?: FunctionType; @@ -21,9 +28,9 @@ export interface Options { } export default class ImageCanvasSource extends ImageSource { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/ImageMapGuide.d.ts b/types/ol/source/ImageMapGuide.d.ts index 8dbfb4458f..b93400dbcc 100644 --- a/types/ol/source/ImageMapGuide.d.ts +++ b/types/ol/source/ImageMapGuide.d.ts @@ -25,12 +25,18 @@ export default class ImageMapGuide extends ImageSource { constructor(options: Options); getImageLoadFunction(): LoadFunction; getParams(): any; - getUrl(baseUrl: string, params: { [key: string]: (string | number) }, extent: Extent, size: Size, projection: Projection): string; + getUrl( + baseUrl: string, + params: { [key: string]: string | number }, + extent: Extent, + size: Size, + projection: Projection + ): string; setImageLoadFunction(imageLoadFunction: LoadFunction): void; updateParams(params: any): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/ImageStatic.d.ts b/types/ol/source/ImageStatic.d.ts index bb1a6f3aa7..12a5241d4f 100644 --- a/types/ol/source/ImageStatic.d.ts +++ b/types/ol/source/ImageStatic.d.ts @@ -21,9 +21,9 @@ export default class Static extends ImageSource { constructor(options: Options); getImageExtent(): Extent; getUrl(): string; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/ImageWMS.d.ts b/types/ol/source/ImageWMS.d.ts index c95e6c6b94..533251fe72 100644 --- a/types/ol/source/ImageWMS.d.ts +++ b/types/ol/source/ImageWMS.d.ts @@ -27,11 +27,11 @@ export default class ImageWMS extends ImageSource { getParams(): any; getUrl(): string; setImageLoadFunction(imageLoadFunction: LoadFunction): void; - setUrl(url: string): void; + setUrl(url: string | undefined): void; updateParams(params: any): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/OSM.d.ts b/types/ol/source/OSM.d.ts index 9d6822329c..e69b2423b7 100644 --- a/types/ol/source/OSM.d.ts +++ b/types/ol/source/OSM.d.ts @@ -20,9 +20,9 @@ export interface Options { export const ATTRIBUTION: string; export default class OSM extends XYZ { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/Raster.d.ts b/types/ol/source/Raster.d.ts index 42dbb2a8a5..a588701091 100644 --- a/types/ol/source/Raster.d.ts +++ b/types/ol/source/Raster.d.ts @@ -9,7 +9,7 @@ import ImageSource from './Image'; import Source from './Source'; import TileSource from './Tile'; -export type Operation = ((p0: (number[][] | ImageData[]), p1: object) => (number[] | ImageData)); +export type Operation = (p0: number[][] | ImageData[], p1: object) => number[] | ImageData; export interface Options { sources: (Source | Layer)[]; operation?: Operation; @@ -20,9 +20,9 @@ export interface Options { export default class RasterSource extends ImageSource { constructor(options: Options); setOperation(operation: Operation, opt_lib?: any): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'afteroperations', listener: (evt: RasterSourceEvent) => void): EventsKey; once(type: 'afteroperations', listener: (evt: RasterSourceEvent) => void): EventsKey; un(type: 'afteroperations', listener: (evt: RasterSourceEvent) => void): void; diff --git a/types/ol/source/Source.d.ts b/types/ol/source/Source.d.ts index 37031e08c6..77ce919028 100644 --- a/types/ol/source/Source.d.ts +++ b/types/ol/source/Source.d.ts @@ -6,7 +6,7 @@ import { ProjectionLike } from '../proj'; import Projection from '../proj/Projection'; import State from './State'; -export type Attribution = ((p0: FrameState) => (string | string[])); +export type Attribution = (p0: FrameState) => string | string[]; export type AttributionLike = string | string[] | Attribution; export interface Options { attributions?: AttributionLike; @@ -25,10 +25,10 @@ export default class Source extends BaseObject { getState(): State; getWrapX(): boolean; refresh(): void; - setAttributions(attributions: AttributionLike): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + setAttributions(attributions: AttributionLike | undefined): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/Stamen.d.ts b/types/ol/source/Stamen.d.ts index 79f3f24ef1..aa031e3476 100644 --- a/types/ol/source/Stamen.d.ts +++ b/types/ol/source/Stamen.d.ts @@ -17,9 +17,9 @@ export interface Options { } export default class Stamen extends XYZ { constructor(options: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/Tile.d.ts b/types/ol/source/Tile.d.ts index abd1ef0e41..90160d829d 100644 --- a/types/ol/source/Tile.d.ts +++ b/types/ol/source/Tile.d.ts @@ -36,7 +36,12 @@ export default class TileSource extends Source { protected setKey(key: string): void; canExpireCache(): boolean; expireCache(projection: Projection, usedTiles: { [key: string]: TileRange }): void; - forEachLoadedTile(projection: Projection, z: number, tileRange: TileRange, callback: ((p0: Tile) => boolean)): boolean; + forEachLoadedTile( + projection: Projection, + z: number, + tileRange: TileRange, + callback: (p0: Tile) => boolean + ): boolean; getGutterForProjection(projection: Projection): number; getOpaque(projection: Projection): boolean; getTile(z: number, x: number, y: number, pixelRatio: number, projection: Projection): Tile; @@ -46,9 +51,9 @@ export default class TileSource extends Source { getTilePixelRatio(pixelRatio: number): number; getTilePixelSize(z: number, pixelRatio: number, projection: Projection): Size; useTile(z: number, x: number, y: number, projection: Projection): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/TileArcGISRest.d.ts b/types/ol/source/TileArcGISRest.d.ts index de4182ee62..85b62abcbf 100644 --- a/types/ol/source/TileArcGISRest.d.ts +++ b/types/ol/source/TileArcGISRest.d.ts @@ -28,9 +28,9 @@ export default class TileArcGISRest extends TileImage { constructor(opt_options?: Options); getParams(): any; updateParams(params: any): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/TileDebug.d.ts b/types/ol/source/TileDebug.d.ts index 8b07cfc967..d72c6803b6 100644 --- a/types/ol/source/TileDebug.d.ts +++ b/types/ol/source/TileDebug.d.ts @@ -15,9 +15,9 @@ export interface Options { } export default class TileDebug extends TileSource { constructor(options: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/TileImage.d.ts b/types/ol/source/TileImage.d.ts index 21e9abb530..3235f5a98f 100644 --- a/types/ol/source/TileImage.d.ts +++ b/types/ol/source/TileImage.d.ts @@ -42,9 +42,9 @@ export default class TileImage extends UrlTile { getGutter(): number; setRenderReprojectionEdges(render: boolean): void; setTileGridForProjection(projection: ProjectionLike, tilegrid: TileGrid): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/TileJSON.d.ts b/types/ol/source/TileJSON.d.ts index 9902d0c2d5..3f806ce12e 100644 --- a/types/ol/source/TileJSON.d.ts +++ b/types/ol/source/TileJSON.d.ts @@ -38,9 +38,9 @@ export default class TileJSON extends TileImage { protected handleTileJSONError(): void; protected handleTileJSONResponse(tileJSON: Config): void; getTileJSON(): Config; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/TileWMS.d.ts b/types/ol/source/TileWMS.d.ts index 5dc7952e00..28cc7e4fac 100644 --- a/types/ol/source/TileWMS.d.ts +++ b/types/ol/source/TileWMS.d.ts @@ -36,9 +36,9 @@ export default class TileWMS extends TileImage { getGetFeatureInfoUrl(coordinate: Coordinate, resolution: number, projection: ProjectionLike, params: any): string; getParams(): any; updateParams(params: any): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/UTFGrid.d.ts b/types/ol/source/UTFGrid.d.ts index bcb428174a..3999a0d38b 100644 --- a/types/ol/source/UTFGrid.d.ts +++ b/types/ol/source/UTFGrid.d.ts @@ -21,8 +21,20 @@ export interface UTFGridJSON { data?: { [key: string]: object }; } export class CustomTile extends Tile { - constructor(tileCoord: TileCoord, state: TileState, src: string, extent: Extent, preemptive: boolean, jsonp: boolean); - forDataAtCoordinate(coordinate: Coordinate, callback: ((this: T, p0: any) => void), opt_this?: T, opt_request?: boolean): void; + constructor( + tileCoord: TileCoord, + state: TileState, + src: string, + extent: Extent, + preemptive: boolean, + jsonp: boolean + ); + forDataAtCoordinate( + coordinate: Coordinate, + callback: (this: T, p0: any) => void, + opt_this?: T, + opt_request?: boolean + ): void; getData(coordinate: Coordinate): any; getImage(): HTMLImageElement; } @@ -30,11 +42,16 @@ export default class UTFGrid extends TileSource { constructor(options: Options); protected handleTileJSONError(): void; protected handleTileJSONResponse(tileJSON: Config): void; - forDataAtCoordinateAndResolution(coordinate: Coordinate, resolution: number, callback: ((p0: any) => void), opt_request?: boolean): void; + forDataAtCoordinateAndResolution( + coordinate: Coordinate, + resolution: number, + callback: (p0: any) => void, + opt_request?: boolean + ): void; getTemplate(): string; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/UrlTile.d.ts b/types/ol/source/UrlTile.d.ts index 878ee5e6a1..bb4e43d85c 100644 --- a/types/ol/source/UrlTile.d.ts +++ b/types/ol/source/UrlTile.d.ts @@ -38,9 +38,9 @@ export default class UrlTile extends TileSource { setTileUrlFunction(tileUrlFunction: UrlFunction, key?: string): void; setUrl(url: string): void; setUrls(urls: string[]): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/Vector.d.ts b/types/ol/source/Vector.d.ts index ed429f8179..f397a1d4ed 100644 --- a/types/ol/source/Vector.d.ts +++ b/types/ol/source/Vector.d.ts @@ -10,7 +10,7 @@ import { ObjectEvent } from '../Object'; import Projection from '../proj/Projection'; import Source, { AttributionLike } from './Source'; -export type LoadingStrategy = ((p0: Extent, p1: number) => Extent[]); +export type LoadingStrategy = (p0: Extent, p1: number) => Extent[]; export interface Options { attributions?: AttributionLike; features?: Feature[] | Collection; @@ -30,11 +30,11 @@ export default class VectorSource extends Source { addFeature(feature: Feature): void; addFeatures(features: Feature[]): void; clear(opt_fast?: boolean): void; - forEachFeature(callback: ((p0: Feature) => T)): T; - forEachFeatureAtCoordinateDirect(coordinate: Coordinate, callback: ((p0: Feature) => T)): T; - forEachFeatureInExtent(extent: Extent, callback: ((p0: Feature) => T)): T; - forEachFeatureIntersectingExtent(extent: Extent, callback: ((p0: Feature) => T)): T; - getClosestFeatureToCoordinate(coordinate: Coordinate, opt_filter?: (() => void)): Feature; + forEachFeature(callback: (p0: Feature) => T): T; + forEachFeatureAtCoordinateDirect(coordinate: Coordinate, callback: (p0: Feature) => T): T; + forEachFeatureInExtent(extent: Extent, callback: (p0: Feature) => T): T; + forEachFeatureIntersectingExtent(extent: Extent, callback: (p0: Feature) => T): T; + getClosestFeatureToCoordinate(coordinate: Coordinate, opt_filter?: () => void): Feature; getExtent(opt_extent?: Extent): Extent; getFeatureById(id: string | number): Feature; getFeatures(): Feature[]; @@ -50,9 +50,9 @@ export default class VectorSource extends Source { removeFeature(feature: Feature): void; removeLoadedExtent(extent: Extent): void; setLoader(loader: FeatureLoader): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'addfeature', listener: (evt: VectorSourceEvent) => void): EventsKey; once(type: 'addfeature', listener: (evt: VectorSourceEvent) => void): EventsKey; un(type: 'addfeature', listener: (evt: VectorSourceEvent) => void): void; diff --git a/types/ol/source/VectorTile.d.ts b/types/ol/source/VectorTile.d.ts index ef5d02a72b..525976349e 100644 --- a/types/ol/source/VectorTile.d.ts +++ b/types/ol/source/VectorTile.d.ts @@ -38,9 +38,9 @@ export default class VectorTile extends UrlTile { protected tileClass: VectorTile_1; clear(): void; getOverlaps(): boolean; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/WMTS.d.ts b/types/ol/source/WMTS.d.ts index 0cc9e4d6de..5407a515d4 100644 --- a/types/ol/source/WMTS.d.ts +++ b/types/ol/source/WMTS.d.ts @@ -42,9 +42,9 @@ export default class WMTS extends TileImage { getStyle(): string; getVersion(): string; updateDimensions(dimensions: any): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/XYZ.d.ts b/types/ol/source/XYZ.d.ts index 5058818780..2732b3cc0b 100644 --- a/types/ol/source/XYZ.d.ts +++ b/types/ol/source/XYZ.d.ts @@ -31,9 +31,9 @@ export interface Options { } export default class XYZ extends TileImage { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/source/Zoomify.d.ts b/types/ol/source/Zoomify.d.ts index 3c149a7592..1d78ad6ec1 100644 --- a/types/ol/source/Zoomify.d.ts +++ b/types/ol/source/Zoomify.d.ts @@ -27,13 +27,21 @@ export interface Options { tileSize?: number; } export class CustomTile extends ImageTile { - constructor(tileGrid: TileGrid, tileCoord: TileCoord, state: TileState, src: string, crossOrigin: string, tileLoadFunction: LoadFunction, opt_options?: Options_1); + constructor( + tileGrid: TileGrid, + tileCoord: TileCoord, + state: TileState, + src: string, + crossOrigin: string, + tileLoadFunction: LoadFunction, + opt_options?: Options_1 + ); } export default class Zoomify extends TileImage { constructor(opt_options?: Options); - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/structs/LRUCache.d.ts b/types/ol/structs/LRUCache.d.ts index d5a6bf8e3e..ffbc4d5c28 100644 --- a/types/ol/structs/LRUCache.d.ts +++ b/types/ol/structs/LRUCache.d.ts @@ -13,7 +13,7 @@ export default class LRUCache extends Target { canExpireCache(): boolean; clear(): void; containsKey(key: string): boolean; - forEach(f: ((this: S, p0: T, p1: string, p2: LRUCache) => void), opt_this?: S): void; + forEach(f: (this: S, p0: T, p1: string, p2: LRUCache) => any, opt_this?: S): void; get(key: string): T; getCount(): number; getKeys(): string[]; @@ -27,9 +27,9 @@ export default class LRUCache extends Target { replace(key: string, value: T): void; set(key: string, value: T): void; setSize(size: number): void; - on(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - once(type: string | string[], listener: ((p0: any) => void)): EventsKey | EventsKey[]; - un(type: string | string[], listener: ((p0: any) => void)): void; + on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; + un(type: string | string[], listener: (p0: any) => void): void; on(type: 'change', listener: (evt: Event) => void): EventsKey; once(type: 'change', listener: (evt: Event) => void): EventsKey; un(type: 'change', listener: (evt: Event) => void): void; diff --git a/types/ol/structs/PriorityQueue.d.ts b/types/ol/structs/PriorityQueue.d.ts index 5ab34eef8a..a20fec69bf 100644 --- a/types/ol/structs/PriorityQueue.d.ts +++ b/types/ol/structs/PriorityQueue.d.ts @@ -1,5 +1,5 @@ export default class PriorityQueue { - constructor(priorityFunction: ((p0: T) => number), keyFunction: ((p0: T) => string)); + constructor(priorityFunction: (p0: T) => number, keyFunction: (p0: T) => string); clear(): void; dequeue(): T; enqueue(element: T): boolean; diff --git a/types/ol/structs/RBush.d.ts b/types/ol/structs/RBush.d.ts index f6b965850b..f84fa39473 100644 --- a/types/ol/structs/RBush.d.ts +++ b/types/ol/structs/RBush.d.ts @@ -11,8 +11,8 @@ export default class RBush { constructor(opt_maxEntries?: number); clear(): void; concat(rbush: RBush): void; - forEach(callback: ((this: S, p0: T) => void), opt_this?: S): any; - forEachInExtent(extent: Extent, callback: ((this: S, p0: T) => void), opt_this?: S): any; + forEach(callback: (this: S, p0: T) => any, opt_this?: S): any; + forEachInExtent(extent: Extent, callback: (this: S, p0: T) => any, opt_this?: S): any; getAll(): T[]; getExtent(opt_extent?: Extent): Extent; getInExtent(extent: Extent): T[]; diff --git a/types/ol/style/Atlas.d.ts b/types/ol/style/Atlas.d.ts index e3e1904268..02ca140f81 100644 --- a/types/ol/style/Atlas.d.ts +++ b/types/ol/style/Atlas.d.ts @@ -11,6 +11,12 @@ export interface AtlasInfo { } export default class Atlas { constructor(size: number, space: number); - add(id: string, width: number, height: number, renderCallback: ((p0: CanvasRenderingContext2D, p1: number, p2: number) => void), opt_this?: any): AtlasInfo; + add( + id: string, + width: number, + height: number, + renderCallback: (p0: CanvasRenderingContext2D, p1: number, p2: number) => void, + opt_this?: any + ): AtlasInfo; get(id: string): AtlasInfo; } diff --git a/types/ol/style/AtlasManager.d.ts b/types/ol/style/AtlasManager.d.ts index 77f42197dd..ae5aa75c17 100644 --- a/types/ol/style/AtlasManager.d.ts +++ b/types/ol/style/AtlasManager.d.ts @@ -11,6 +11,13 @@ export interface Options { } export default class AtlasManager { constructor(opt_options?: Options); - add(id: string, width: number, height: number, renderCallback: ((p0: CanvasRenderingContext2D, p1: number, p2: number) => void), opt_renderHitCallback?: (() => void), opt_this?: any): AtlasManagerInfo; + add( + id: string, + width: number, + height: number, + renderCallback: (p0: CanvasRenderingContext2D, p1: number, p2: number) => void, + opt_renderHitCallback?: () => void, + opt_this?: any + ): AtlasManagerInfo; getInfo(id: string): AtlasManagerInfo; } diff --git a/types/ol/style/IconImage.d.ts b/types/ol/style/IconImage.d.ts index f60cd35c7a..fedc4c7ba7 100644 --- a/types/ol/style/IconImage.d.ts +++ b/types/ol/style/IconImage.d.ts @@ -4,7 +4,14 @@ import ImageState from '../ImageState'; import { Size } from '../size'; export default class IconImage extends Target { - constructor(image: HTMLImageElement | HTMLCanvasElement, src: string, size: Size, crossOrigin: string, imageState: ImageState, color: Color); + constructor( + image: HTMLImageElement | HTMLCanvasElement, + src: string | undefined, + size: Size, + crossOrigin: string, + imageState: ImageState, + color: Color + ); getHitDetectionImage(pixelRatio: number): HTMLImageElement | HTMLCanvasElement; getImage(pixelRatio: number): HTMLImageElement | HTMLCanvasElement; getImageState(): ImageState; @@ -12,4 +19,11 @@ export default class IconImage extends Target { getSrc(): string; load(): void; } -export function get(image: HTMLImageElement | HTMLCanvasElement, src: string, size: Size, crossOrigin: string, imageState: ImageState, color: Color): IconImage; +export function get( + image: HTMLImageElement | HTMLCanvasElement, + src: string, + size: Size, + crossOrigin: string, + imageState: ImageState, + color: Color +): IconImage; diff --git a/types/ol/style/Image.d.ts b/types/ol/style/Image.d.ts index 52e689c61d..2ba16d00d2 100644 --- a/types/ol/style/Image.d.ts +++ b/types/ol/style/Image.d.ts @@ -25,12 +25,12 @@ export default class ImageStyle { getScale(): number; getSize(): Size; getSnapToPixel(): boolean; - listenImageChange(listener: ((this: T, p0: Event) => void), thisArg: T): EventsKey; + listenImageChange(listener: (this: T, p0: Event) => void, thisArg: T): EventsKey; load(): void; setOpacity(opacity: number): void; setRotateWithView(rotateWithView: boolean): void; setRotation(rotation: number): void; setScale(scale: number): void; setSnapToPixel(snapToPixel: boolean): void; - unlistenImageChange(listener: ((this: T, p0: Event) => void), thisArg: T): void; + unlistenImageChange(listener: (this: T, p0: Event) => void, thisArg: T): void; } diff --git a/types/ol/style/RegularShape.d.ts b/types/ol/style/RegularShape.d.ts index ce17238006..1697af49a3 100644 --- a/types/ol/style/RegularShape.d.ts +++ b/types/ol/style/RegularShape.d.ts @@ -30,7 +30,7 @@ export default class RegularShape extends ImageStyle { constructor(options: Options); protected atlasManager_: AtlasManager; protected radius_: number; - protected render_(atlasManager: AtlasManager): void; + protected render_(atlasManager: AtlasManager | undefined): void; clone(): RegularShape; clone(): ImageStyle; getAngle(): number; diff --git a/types/ol/style/Stroke.d.ts b/types/ol/style/Stroke.d.ts index b88aaa4c06..c9c6b25561 100644 --- a/types/ol/style/Stroke.d.ts +++ b/types/ol/style/Stroke.d.ts @@ -22,10 +22,10 @@ export default class Stroke { getMiterLimit(): number; getWidth(): number; setColor(color: Color | ColorLike): void; - setLineCap(lineCap: string): void; + setLineCap(lineCap: string | undefined): void; setLineDash(lineDash: number[]): void; - setLineDashOffset(lineDashOffset: number): void; - setLineJoin(lineJoin: string): void; - setMiterLimit(miterLimit: number): void; - setWidth(width: number): void; + setLineDashOffset(lineDashOffset: number | undefined): void; + setLineJoin(lineJoin: string | undefined): void; + setMiterLimit(miterLimit: number | undefined): void; + setWidth(width: number | undefined): void; } diff --git a/types/ol/style/Style.d.ts b/types/ol/style/Style.d.ts index 76befddf47..7f870a7bf1 100644 --- a/types/ol/style/Style.d.ts +++ b/types/ol/style/Style.d.ts @@ -9,7 +9,7 @@ import ImageStyle from './Image'; import Stroke from './Stroke'; import Text from './Text'; -export type GeometryFunction = ((p0: FeatureLike) => (Geometry | RenderFeature)); +export type GeometryFunction = (p0: FeatureLike) => Geometry | RenderFeature; export interface Options { geometry?: string | Geometry | GeometryFunction; fill?: Fill; @@ -19,8 +19,8 @@ export interface Options { text?: Text; zIndex?: number; } -export type RenderFunction = ((p0: (Coordinate | Coordinate[] | Coordinate[][]), p1: State) => void); -export type StyleFunction = ((p0: FeatureLike, p1: number) => (Style | Style[])); +export type RenderFunction = (p0: Coordinate | Coordinate[] | Coordinate[][], p1: State) => void; +export type StyleFunction = (p0: FeatureLike, p1: number) => Style | Style[]; export type StyleLike = Style | Style[] | StyleFunction; export default class Style { constructor(opt_options?: Options); @@ -36,10 +36,10 @@ export default class Style { setFill(fill: Fill): void; setGeometry(geometry: string | Geometry | GeometryFunction): void; setImage(image: ImageStyle): void; - setRenderer(renderer: RenderFunction): void; + setRenderer(renderer: RenderFunction | undefined): void; setStroke(stroke: Stroke): void; setText(text: Text): void; - setZIndex(zIndex: number): void; + setZIndex(zIndex: number | undefined): void; } export function createDefaultStyle(feature: FeatureLike, resolution: number): Style[]; export function createEditingStyle(): { [key in GeometryType]: Style[] }; diff --git a/types/ol/style/Text.d.ts b/types/ol/style/Text.d.ts index 315c015ad6..7c2ca4994c 100644 --- a/types/ol/style/Text.d.ts +++ b/types/ol/style/Text.d.ts @@ -44,17 +44,17 @@ export default class Text { setBackgroundFill(fill: Fill): void; setBackgroundStroke(stroke: Stroke): void; setFill(fill: Fill): void; - setFont(font: string): void; + setFont(font: string | undefined): void; setMaxAngle(maxAngle: number): void; setOffsetX(offsetX: number): void; setOffsetY(offsetY: number): void; setOverflow(overflow: boolean): void; setPadding(padding: number[]): void; setPlacement(placement: TextPlacement | string): void; - setRotation(rotation: number): void; - setScale(scale: number): void; + setRotation(rotation: number | undefined): void; + setScale(scale: number | undefined): void; setStroke(stroke: Stroke): void; - setText(text: string): void; - setTextAlign(textAlign: string): void; - setTextBaseline(textBaseline: string): void; + setText(text: string | undefined): void; + setTextAlign(textAlign: string | undefined): void; + setTextBaseline(textBaseline: string | undefined): void; } diff --git a/types/ol/tilegrid.d.ts b/types/ol/tilegrid.d.ts index 0907f33faf..ff6f81c1bf 100644 --- a/types/ol/tilegrid.d.ts +++ b/types/ol/tilegrid.d.ts @@ -12,8 +12,18 @@ export interface XYZOptions { minZoom?: number; tileSize?: number | Size; } -export function createForExtent(extent: Extent, opt_maxZoom?: number, opt_tileSize?: number | Size, opt_corner?: Corner): TileGrid; -export function createForProjection(projection: ProjectionLike, opt_maxZoom?: number, opt_tileSize?: number | Size, opt_corner?: Corner): TileGrid; +export function createForExtent( + extent: Extent, + opt_maxZoom?: number, + opt_tileSize?: number | Size, + opt_corner?: Corner +): TileGrid; +export function createForProjection( + projection: ProjectionLike, + opt_maxZoom?: number, + opt_tileSize?: number | Size, + opt_corner?: Corner +): TileGrid; export function createXYZ(opt_options?: XYZOptions): TileGrid; export function extentFromProjection(projection: ProjectionLike): Extent; export function getForProjection(projection: Projection): TileGrid; diff --git a/types/ol/tilegrid/TileGrid.d.ts b/types/ol/tilegrid/TileGrid.d.ts index a3eae4dc67..0824dc6135 100644 --- a/types/ol/tilegrid/TileGrid.d.ts +++ b/types/ol/tilegrid/TileGrid.d.ts @@ -18,8 +18,14 @@ export default class TileGrid { constructor(options: Options); protected maxZoom: number; protected minZoom: number; - forEachTileCoord(extent: Extent, zoom: number, callback: ((p0: TileCoord) => void)): void; - forEachTileCoordParentTileRange(tileCoord: TileCoord, callback: ((this: T, p0: number, p1: TileRange) => boolean), opt_this?: T, opt_tileRange?: TileRange, opt_extent?: Extent): boolean; + forEachTileCoord(extent: Extent, zoom: number, callback: (p0: TileCoord) => void): void; + forEachTileCoordParentTileRange( + tileCoord: TileCoord, + callback: (this: T, p0: number, p1: TileRange) => boolean, + opt_this?: T, + opt_tileRange?: TileRange, + opt_extent?: Extent + ): boolean; getExtent(): Extent; getFullTileRange(z: number): TileRange; getMaxZoom(): number; diff --git a/types/ol/tilegrid/WMTS.d.ts b/types/ol/tilegrid/WMTS.d.ts index 9aa6e9c7d8..9ace2c8ed0 100644 --- a/types/ol/tilegrid/WMTS.d.ts +++ b/types/ol/tilegrid/WMTS.d.ts @@ -19,4 +19,8 @@ export default class WMTSTileGrid extends TileGrid { getMatrixId(z: number): string; getMatrixIds(): string[]; } -export function createFromCapabilitiesMatrixSet(matrixSet: any, opt_extent?: Extent, opt_matrixLimits?: object[]): WMTSTileGrid; +export function createFromCapabilitiesMatrixSet( + matrixSet: any, + opt_extent?: Extent, + opt_matrixLimits?: object[] +): WMTSTileGrid; diff --git a/types/ol/transform.d.ts b/types/ol/transform.d.ts index 9205d35d7c..22abc73c52 100644 --- a/types/ol/transform.d.ts +++ b/types/ol/transform.d.ts @@ -3,7 +3,16 @@ import { Pixel } from './pixel'; export type Transform = number[]; export function apply(transform: Transform, coordinate: Coordinate | Pixel): Coordinate | Pixel; -export function compose(transform: Transform, dx1: number, dy1: number, sx: number, sy: number, angle: number, dx2: number, dy2: number): Transform; +export function compose( + transform: Transform, + dx1: number, + dy1: number, + sx: number, + sy: number, + angle: number, + dx2: number, + dy2: number +): Transform; export function create(): Transform; export function determinant(mat: Transform): number; export function invert(transform: Transform): Transform; diff --git a/types/ol/util.d.ts b/types/ol/util.d.ts index 5a43e0f34c..b02355e57a 100644 --- a/types/ol/util.d.ts +++ b/types/ol/util.d.ts @@ -1,2 +1,4 @@ export const VERSION: string; export function abstract(): any; +export function getUid(obj: any): string; +export function inherits(childCtor: () => void, parentCtor: () => void): void; diff --git a/types/ol/webgl/Context.d.ts b/types/ol/webgl/Context.d.ts index e7031527f0..146e2debad 100644 --- a/types/ol/webgl/Context.d.ts +++ b/types/ol/webgl/Context.d.ts @@ -21,5 +21,16 @@ export default class WebGLContext extends Disposable { handleWebGLContextRestored(): void; useProgram(program: WebGLProgram): boolean; } -export function createEmptyTexture(gl: WebGLRenderingContext, width: number, height: number, opt_wrapS?: number, opt_wrapT?: number): WebGLTexture; -export function createTexture(gl: WebGLRenderingContext, image: HTMLCanvasElement | HTMLImageElement | HTMLVideoElement, opt_wrapS?: number, opt_wrapT?: number): WebGLTexture; +export function createEmptyTexture( + gl: WebGLRenderingContext, + width: number, + height: number, + opt_wrapS?: number, + opt_wrapT?: number +): WebGLTexture; +export function createTexture( + gl: WebGLRenderingContext, + image: HTMLCanvasElement | HTMLImageElement | HTMLVideoElement, + opt_wrapS?: number, + opt_wrapT?: number +): WebGLTexture; diff --git a/types/ol/xml.d.ts b/types/ol/xml.d.ts index 4550e5782c..a765288734 100644 --- a/types/ol/xml.d.ts +++ b/types/ol/xml.d.ts @@ -1,24 +1,71 @@ export interface NodeStackItem { node: Node; } -export type Parser = ((p0: Element, p1: any[]) => void); -export type Serializer = ((p0: Element, p1: any, p2: any[]) => void); +export type Parser = (p0: Element, p1: any[]) => void; +export type Serializer = (p0: Element, p1: any, p2: any[]) => void; export function createElementNS(namespaceURI: string, qualifiedName: string): Element; export function getAllTextContent(node: Node, normalizeWhitespace: boolean): string; export function getAttributeNS(node: Element, namespaceURI: string, name: string): string; export function isDocument(object: any): boolean; -export function makeArrayExtender(valueReader: ((this: T, p0: Node, p1: any[]) => any[]), opt_this?: T): Parser; -export function makeArrayPusher(valueReader: ((this: T, p0: Element, p1: any[]) => void), opt_this?: T): Parser; -export function makeArraySerializer(nodeWriter: ((this: T, p0: Element, p1: V, p2: any[]) => void), opt_this?: T): Serializer; -export function makeChildAppender(nodeWriter: ((this: T, p0: Node, p1: V, p2: any[]) => void), opt_this?: T): Serializer; -export function makeObjectPropertyPusher(valueReader: ((this: T, p0: Element, p1: any[]) => void), opt_property?: string, opt_this?: T): Parser; -export function makeObjectPropertySetter(valueReader: ((this: T, p0: Element, p1: any[]) => void), opt_property?: string, opt_this?: T): Parser; -export function makeReplacer(valueReader: ((this: T, p0: Node, p1: any[]) => void), opt_this?: T): Parser; +export function makeArrayExtender(valueReader: (this: T, p0: Node, p1: any[]) => any[], opt_this?: T): Parser; +export function makeArrayPusher(valueReader: (this: T, p0: Element, p1: any[]) => any, opt_this?: T): Parser; +export function makeArraySerializer( + nodeWriter: (this: T, p0: Element, p1: V, p2: any[]) => void, + opt_this?: T +): Serializer; +export function makeChildAppender( + nodeWriter: (this: T, p0: Node, p1: V, p2: any[]) => void, + opt_this?: T +): Serializer; +export function makeObjectPropertyPusher( + valueReader: (this: T, p0: Element, p1: any[]) => any, + opt_property?: string, + opt_this?: T +): Parser; +export function makeObjectPropertySetter( + valueReader: (this: T, p0: Element, p1: any[]) => any, + opt_property?: string, + opt_this?: T +): Parser; +export function makeReplacer(valueReader: (this: T, p0: Node, p1: any[]) => any, opt_this?: T): Parser; export function makeSequence(object: { [key: string]: V }, orderedKeys: string[]): V[]; -export function makeSimpleNodeFactory(opt_nodeName?: string, opt_namespaceURI?: string): ((p0: any, p1: any[], p2?: string) => Node); -export function makeStructureNS(namespaceURIs: string[], structure: T, opt_structureNS?: { [key: string]: T }): { [key: string]: T }; +export function makeSimpleNodeFactory( + opt_nodeName?: string, + opt_namespaceURI?: string +): (p0: any, p1: any[], p2?: string) => Node; +export function makeStructureNS( + namespaceURIs: string[], + structure: T, + opt_structureNS?: { [key: string]: T } +): { [key: string]: T }; export function parse(xml: string): Document; -export function parseNode(parsersNS: { [key: string]: { [key: string]: Parser } }, node: Element, objectStack: any[], opt_this?: any): void; -export function pushParseAndPop(object: T, parsersNS: { [key: string]: { [key: string]: Parser } }, node: Element, objectStack: any[], opt_this?: any): T; -export function pushSerializeAndPop(object: O, serializersNS: { [key: string]: { [key: string]: Serializer } }, nodeFactory: ((this: T, p0: any, p1: any[], p2: string) => Node), values: any[], objectStack: any[], opt_keys?: string[], opt_this?: T): O; -export function serialize(serializersNS: { [key: string]: { [key: string]: Serializer } }, nodeFactory: ((this: T, p0: any, p1: any[], p2: string) => Node), values: any[], objectStack: any[], opt_keys?: string[], opt_this?: T): void; +export function parseNode( + parsersNS: { [key: string]: { [key: string]: Parser } }, + node: Element, + objectStack: any[], + opt_this?: any +): void; +export function pushParseAndPop( + object: T, + parsersNS: { [key: string]: { [key: string]: Parser } }, + node: Element, + objectStack: any[], + opt_this?: any +): T; +export function pushSerializeAndPop( + object: O, + serializersNS: { [key: string]: { [key: string]: Serializer } }, + nodeFactory: (this: T, p0: any, p1: any[], p2: string) => Node, + values: any[], + objectStack: any[], + opt_keys?: string[], + opt_this?: T +): O; +export function serialize( + serializersNS: { [key: string]: { [key: string]: Serializer } }, + nodeFactory: (this: T, p0: any, p1: any[], p2: string) => Node, + values: any[], + objectStack: any[], + opt_keys?: string[], + opt_this?: T +): void;