diff --git a/types/ol/OTHER_FILES.txt b/types/ol/OTHER_FILES.txt index c4dd081396..ef96c36c1a 100644 --- a/types/ol/OTHER_FILES.txt +++ b/types/ol/OTHER_FILES.txt @@ -64,6 +64,7 @@ render/Box.d.ts render/canvas/Builder.d.ts render/canvas/BuilderGroup.d.ts render/canvas/BuilderType.d.ts +render/canvas/Executor.d.ts render/canvas/ExecutorGroup.d.ts render/canvas/hitdetet.d.ts render/canvas/ImageBuilder.d.ts diff --git a/types/ol/Tile.d.ts b/types/ol/Tile.d.ts index 3474bc5712..d32a1eed53 100644 --- a/types/ol/Tile.d.ts +++ b/types/ol/Tile.d.ts @@ -21,5 +21,6 @@ export default abstract class Tile extends Target { inTransition(id: string): boolean; abstract load(): void; refreshInterimChain(): void; + release(): void; setState(state: TileState): void; } diff --git a/types/ol/TileCache.d.ts b/types/ol/TileCache.d.ts index f93c68133a..c7f8419c2a 100644 --- a/types/ol/TileCache.d.ts +++ b/types/ol/TileCache.d.ts @@ -4,7 +4,7 @@ import LRUCache from './structs/LRUCache'; import TileRange from './TileRange'; export default class TileCache extends LRUCache { - constructor(opt_highWaterMark?: number); + constructor(); expireCache(usedTiles: { [key: string]: TileRange }): void; pruneExceptNewestZ(): void; on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; diff --git a/types/ol/TileState.d.ts b/types/ol/TileState.d.ts index 5543db6e01..aa61d8d34d 100644 --- a/types/ol/TileState.d.ts +++ b/types/ol/TileState.d.ts @@ -4,7 +4,6 @@ declare enum TileState { LOADED = 2, ERROR = 3, EMPTY = 4, - ABORT = 5, } export default TileState; diff --git a/types/ol/VectorRenderTile.d.ts b/types/ol/VectorRenderTile.d.ts index ad29cac35b..e475354458 100644 --- a/types/ol/VectorRenderTile.d.ts +++ b/types/ol/VectorRenderTile.d.ts @@ -3,7 +3,6 @@ import { OrderFunction } from './render'; import Source from './source/Source'; import Tile from './Tile'; import { TileCoord } from './tilecoord'; -import TileGrid from './tilegrid/TileGrid'; import TileState from './TileState'; import VectorTile from './VectorTile'; @@ -22,9 +21,7 @@ export default class VectorRenderTile extends Tile { tileCoord: TileCoord, state: TileState, urlTileCoord: TileCoord, - sourceTileGrid: TileGrid, getSourceTiles: (p0: VectorRenderTile) => VectorTile[], - removeSourceTiles: (p0: VectorRenderTile) => void, ); getContext(layer: Layer): CanvasRenderingContext2D; getImage(layer: Layer): HTMLCanvasElement; diff --git a/types/ol/View.d.ts b/types/ol/View.d.ts index d27a22d50e..665d3a7a19 100644 --- a/types/ol/View.d.ts +++ b/types/ol/View.d.ts @@ -72,6 +72,7 @@ export interface ViewOptions { multiWorld?: boolean; constrainResolution?: boolean; smoothResolutionConstraint?: boolean; + showFullExtent?: boolean; projection?: ProjectionLike; resolution?: number; resolutions?: number[]; @@ -139,6 +140,7 @@ export default class View extends BaseObject { setMinZoom(zoom: number): void; setResolution(resolution: number | undefined): void; setRotation(rotation: number): void; + setViewportSize(opt_size?: Size): void; setZoom(zoom: number): void; updateAnimations_(): void; on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; diff --git a/types/ol/control/Control.d.ts b/types/ol/control/Control.d.ts index 934ecb2c1b..cb5eced657 100644 --- a/types/ol/control/Control.d.ts +++ b/types/ol/control/Control.d.ts @@ -14,6 +14,7 @@ export default class Control extends BaseObject { protected element: HTMLElement; protected listenerKeys: EventsKey[]; getMap(): PluggableMap; + render(mapEvent: MapEvent): void; setMap(map: PluggableMap): void; setTarget(target: HTMLElement | string): void; on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; diff --git a/types/ol/dom.d.ts b/types/ol/dom.d.ts index da4fdbc282..3fef022857 100644 --- a/types/ol/dom.d.ts +++ b/types/ol/dom.d.ts @@ -1,4 +1,8 @@ -export function createCanvasContext2D(opt_width?: number, opt_height?: number): CanvasRenderingContext2D; +export function createCanvasContext2D( + opt_width?: number, + opt_height?: number, + opt_canvasPool?: HTMLCanvasElement[], +): CanvasRenderingContext2D; export function outerHeight(element: HTMLElement): number; export function outerWidth(element: HTMLElement): number; export function removeChildren(node: Node): void; diff --git a/types/ol/events/EventType.d.ts b/types/ol/events/EventType.d.ts index 873a124599..aba24434b1 100644 --- a/types/ol/events/EventType.d.ts +++ b/types/ol/events/EventType.d.ts @@ -14,6 +14,7 @@ declare enum EventType { KEYPRESS = 'keypress', LOAD = 'load', RESIZE = 'resize', + TOUCHMOVE = 'touchmove', WHEEL = 'wheel', } diff --git a/types/ol/format/KML.d.ts b/types/ol/format/KML.d.ts index 02a244ea82..af5e1bbf01 100644 --- a/types/ol/format/KML.d.ts +++ b/types/ol/format/KML.d.ts @@ -29,6 +29,7 @@ export interface Options { showPointNames?: boolean; defaultStyle?: Style[]; writeStyles?: boolean; + crossOrigin?: string; } export interface Vec2 { x: number; diff --git a/types/ol/index.d.ts b/types/ol/index.d.ts index 9203885e09..ded3c65e50 100644 --- a/types/ol/index.d.ts +++ b/types/ol/index.d.ts @@ -1,11 +1,11 @@ -// Type definitions for ol 6.1 +// Type definitions for ol 6.2 // Project: https://github.com/openlayers/openlayers, https://openlayers.org // Definitions by: Rifa'i M. Hanif // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 3.1 // Minimum TypeScript Version: 3.1 -// These definitions was generated using jsdoc. See https://github.com/hanreev/types-ol +// These definitions is generated using jsdoc. See https://github.com/hanreev/types-ol export { default as AssertionError } from './AssertionError'; export { default as Collection } from './Collection'; diff --git a/types/ol/interaction/Draw.d.ts b/types/ol/interaction/Draw.d.ts index 82ebe65884..d6e8a57212 100644 --- a/types/ol/interaction/Draw.d.ts +++ b/types/ol/interaction/Draw.d.ts @@ -10,11 +10,12 @@ import LineString from '../geom/LineString'; import SimpleGeometry from '../geom/SimpleGeometry'; import VectorLayer from '../layer/Vector'; import { ObjectEvent } from '../Object'; +import Projection from '../proj/Projection'; 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 | undefined, p2: Projection) => SimpleGeometry; export type LineCoordType = Coordinate[]; export interface Options { type: GeometryType; @@ -44,6 +45,7 @@ export enum DrawEventType { } export default class Draw extends PointerInteraction { constructor(options: Options); + appendCoordinates(coordinates: LineCoordType): void; extend(feature: Feature): void; finishDrawing(): void; getOverlay(): VectorLayer; diff --git a/types/ol/interaction/MouseWheelZoom.d.ts b/types/ol/interaction/MouseWheelZoom.d.ts index 581c71e13b..7850aa2e0f 100644 --- a/types/ol/interaction/MouseWheelZoom.d.ts +++ b/types/ol/interaction/MouseWheelZoom.d.ts @@ -11,10 +11,6 @@ export interface Options { timeout?: number; useAnchor?: boolean; } -export enum Mode { - TRACKPAD = 'trackpad', - WHEEL = 'wheel', -} export default class MouseWheelZoom extends Interaction { constructor(opt_options?: Options); setMouseAnchor(useAnchor: boolean): void; diff --git a/types/ol/interaction/Pointer.d.ts b/types/ol/interaction/Pointer.d.ts index 6e904504b2..94d6a80a7a 100644 --- a/types/ol/interaction/Pointer.d.ts +++ b/types/ol/interaction/Pointer.d.ts @@ -22,6 +22,7 @@ export default class PointerInteraction extends Interaction { protected handleDragEvent(mapBrowserEvent: MapBrowserPointerEvent): void; protected handleMoveEvent(mapBrowserEvent: MapBrowserPointerEvent): void; protected handleUpEvent(mapBrowserEvent: MapBrowserPointerEvent): boolean; + getPointerCount(): number; stopDown(handled: boolean): boolean; on(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; once(type: string | string[], listener: (p0: any) => void): EventsKey | EventsKey[]; diff --git a/types/ol/layer/Graticule.d.ts b/types/ol/layer/Graticule.d.ts index c640b2fd90..a71c06eb51 100644 --- a/types/ol/layer/Graticule.d.ts +++ b/types/ol/layer/Graticule.d.ts @@ -40,6 +40,7 @@ export default class Graticule extends VectorLayer { getMeridians(): LineString[]; getParallels(): LineString[]; loaderFunction(extent: Extent, resolution: number, projection: Projection): void; + strategyFunction(extent: Extent, resolution: number): Extent[]; 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; diff --git a/types/ol/layer/VectorTileRenderType.d.ts b/types/ol/layer/VectorTileRenderType.d.ts index 934f0e1d1d..2e9dc72b57 100644 --- a/types/ol/layer/VectorTileRenderType.d.ts +++ b/types/ol/layer/VectorTileRenderType.d.ts @@ -1,6 +1,7 @@ declare enum VectorTileRenderType { IMAGE = 'image', HYBRID = 'hybrid', + VECTOR = 'vector', } export default VectorTileRenderType; diff --git a/types/ol/ol-tests.ts b/types/ol/ol-tests.ts index 702f0895c5..bb6d9fb61f 100644 --- a/types/ol/ol-tests.ts +++ b/types/ol/ol-tests.ts @@ -26,6 +26,7 @@ import { Circle, Fill, Stroke, Style } from 'ol/style'; import { StyleFunction } from 'ol/style/Style'; import proj4 = require('proj4'); + /** * ================================================== * # Styles @@ -333,7 +334,7 @@ const view = new View({ }); const map = new Map({ - target: document.getElementById('map') as HTMLElement, + target: 'map', view, layers, controls, diff --git a/types/ol/render/canvas.d.ts b/types/ol/render/canvas.d.ts index 6fb2682056..be83f36a04 100644 --- a/types/ol/render/canvas.d.ts +++ b/types/ol/render/canvas.d.ts @@ -2,7 +2,6 @@ import { ColorLike } from '../colorlike'; import Fill from '../style/Fill'; import Stroke from '../style/Stroke'; import { Transform } from '../transform'; -import LabelCache from './canvas/LabelCache'; export type DeclutterGroup = any[]; export type DeclutterGroups = DeclutterGroup[]; @@ -28,6 +27,11 @@ export interface FillStrokeState { lineWidth?: number; miterLimit?: number; } +export interface Label { + width: number; + height: number; + contextInstructions: (string | number)[]; +} export interface StrokeState { lineCap: CanvasLineCap; lineDash: number[]; @@ -49,12 +53,12 @@ export interface TextState { scale?: number; padding?: number[]; } -export const labelCache: LabelCache; -export function drawImage( +export const labelCache: any; +export function drawImageOrLabel( context: CanvasRenderingContext2D, transform: Transform | null, opacity: number, - image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, + labelOrImage: Label | HTMLCanvasElement | HTMLImageElement | HTMLVideoElement, originX: number, originY: number, w: number, diff --git a/types/ol/render/canvas/Executor.d.ts b/types/ol/render/canvas/Executor.d.ts index e9d586d500..5dc65c256a 100644 --- a/types/ol/render/canvas/Executor.d.ts +++ b/types/ol/render/canvas/Executor.d.ts @@ -1,9 +1,8 @@ import { Coordinate } from '../../coordinate'; -import Disposable from '../../Disposable'; import { Extent } from '../../extent'; import { FeatureLike } from '../../Feature'; import { Transform } from '../../transform'; -import { DeclutterGroup, FillState, StrokeState, TextState } from '../canvas'; +import { DeclutterGroup, FillState, Label, StrokeState, TextState } from '../canvas'; export interface SerializableInstructions { instructions: any[]; @@ -13,7 +12,7 @@ export interface SerializableInstructions { fillStates: { [key: string]: FillState }; strokeStates: { [key: string]: StrokeState }; } -export default class Executor extends Disposable { +export default class Executor { constructor(resolution: number, pixelRatio: number, overlaps: boolean, instructions: SerializableInstructions); protected coordinates: number[]; protected hitDetectionInstructions: any[]; @@ -21,6 +20,7 @@ export default class Executor extends Disposable { protected overlaps: boolean; protected pixelRatio: number; protected resolution: number; + createLabel(text: string, textKey: string, fillKey: string, strokeKey: string): Label; execute(context: CanvasRenderingContext2D, transform: Transform, viewRotation: number, snapToPixel: boolean): void; executeHitDetection( context: CanvasRenderingContext2D, @@ -29,13 +29,12 @@ export default class Executor extends Disposable { opt_featureCallback?: () => void, opt_hitExtent?: Extent, ): T; - getTextImage(text: string, textKey: string, fillKey: string, strokeKey: string): HTMLCanvasElement; renderDeclutter(declutterGroup: DeclutterGroup, feature: FeatureLike, opacity: number, declutterTree: any): any; - replayImage_( + replayImageOrLabel_( context: CanvasRenderingContext2D, x: number, y: number, - image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, + imageOrLabel: Label | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, anchorX: number, anchorY: number, declutterGroup: DeclutterGroup, diff --git a/types/ol/render/canvas/ExecutorGroup.d.ts b/types/ol/render/canvas/ExecutorGroup.d.ts index 176fdbcc76..1c2c4ca0d2 100644 --- a/types/ol/render/canvas/ExecutorGroup.d.ts +++ b/types/ol/render/canvas/ExecutorGroup.d.ts @@ -1,5 +1,4 @@ import { Coordinate } from '../../coordinate'; -import Disposable from '../../Disposable'; import { Extent } from '../../extent'; import { FeatureLike } from '../../Feature'; import { DeclutterItems } from '../../PluggableMap'; @@ -8,7 +7,7 @@ import { DeclutterGroup } from '../canvas'; import { SerializableInstructions } from './Builder'; import BuilderType from './BuilderType'; -export default class ExecutorGroup extends Disposable { +export default class ExecutorGroup { constructor( maxExtent: Extent, resolution: number, diff --git a/types/ol/render/canvas/LabelCache.d.ts b/types/ol/render/canvas/LabelCache.d.ts deleted file mode 100644 index 6b5022d6ce..0000000000 --- a/types/ol/render/canvas/LabelCache.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { EventsKey } from '../../events'; -import BaseEvent from '../../events/Event'; -import LRUCache from '../../structs/LRUCache'; -import Executor from './Executor'; - -export default class LabelCache extends LRUCache { - constructor(); - release(consumer: Executor): 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: BaseEvent) => void): EventsKey; - once(type: 'change', listener: (evt: BaseEvent) => void): EventsKey; - un(type: 'change', listener: (evt: BaseEvent) => void): void; - on(type: 'error', listener: (evt: BaseEvent) => void): EventsKey; - once(type: 'error', listener: (evt: BaseEvent) => void): EventsKey; - un(type: 'error', listener: (evt: BaseEvent) => void): void; -} diff --git a/types/ol/resolutionconstraint.d.ts b/types/ol/resolutionconstraint.d.ts index d48e3bcb90..eb928e4527 100644 --- a/types/ol/resolutionconstraint.d.ts +++ b/types/ol/resolutionconstraint.d.ts @@ -7,6 +7,7 @@ export function createMinMaxResolution( minResolution: number, opt_smooth?: boolean, opt_maxExtent?: Extent, + opt_showFullExtent?: boolean, ): Type; export function createSnapToPower( power: number, @@ -14,5 +15,11 @@ export function createSnapToPower( opt_minResolution?: number, opt_smooth?: boolean, opt_maxExtent?: Extent, + opt_showFullExtent?: boolean, +): Type; +export function createSnapToResolutions( + resolutions: number[], + opt_smooth?: boolean, + opt_maxExtent?: Extent, + opt_showFullExtent?: boolean, ): Type; -export function createSnapToResolutions(resolutions: number[], opt_smooth?: boolean, opt_maxExtent?: Extent): Type; diff --git a/types/ol/size.d.ts b/types/ol/size.d.ts index 0cd8be5ca3..3b93fc0b5b 100644 --- a/types/ol/size.d.ts +++ b/types/ol/size.d.ts @@ -1,4 +1,4 @@ -export type Size = number[]; +export type Size = [number, number]; export function buffer(size: Size, num: number, opt_size?: Size): Size; export function hasArea(size: Size): boolean; export function scale(size: Size, ratio: number, opt_size?: Size): Size; diff --git a/types/ol/source/IIIF.d.ts b/types/ol/source/IIIF.d.ts index 79195a7e8b..e4727f9fde 100644 --- a/types/ol/source/IIIF.d.ts +++ b/types/ol/source/IIIF.d.ts @@ -33,7 +33,7 @@ export interface Options { zDirection?: number; } export default class IIIF extends TileImage { - constructor(opt_options: Options); + 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; diff --git a/types/ol/source/VectorTile.d.ts b/types/ol/source/VectorTile.d.ts index 9c59026f66..7f61337fce 100644 --- a/types/ol/source/VectorTile.d.ts +++ b/types/ol/source/VectorTile.d.ts @@ -1,6 +1,7 @@ import { EventsKey } from '../events'; import BaseEvent from '../events/Event'; import { Extent } from '../extent'; +import { FeatureLike } from '../Feature'; import FeatureFormat from '../format/Feature'; import { ObjectEvent } from '../Object'; import { ProjectionLike } from '../proj'; @@ -40,12 +41,11 @@ export interface Options { export default class VectorTile extends UrlTile { constructor(options: Options); protected tileClass: VectorTile_1; - addSourceTiles(tile: VectorRenderTile, sourceTiles: VectorTile_1[]): void; clear(): void; + getFeaturesInExtent(extent: Extent): FeatureLike[]; getOverlaps(): boolean; getSourceTiles(pixelRatio: number, projection: Projection, tile: VectorRenderTile): VectorTile_1[]; getTile(z: number, x: number, y: number, pixelRatio: number, projection: Projection): Tile; - removeSourceTiles(tile: VectorRenderTile): 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; diff --git a/types/ol/source/Zoomify.d.ts b/types/ol/source/Zoomify.d.ts index 293201c1a6..90fc8516b8 100644 --- a/types/ol/source/Zoomify.d.ts +++ b/types/ol/source/Zoomify.d.ts @@ -7,7 +7,6 @@ import { ProjectionLike } from '../proj'; import { Size } from '../size'; import { LoadFunction, Options as Options_1 } from '../Tile'; import { TileCoord } from '../tilecoord'; -import TileGrid from '../tilegrid/TileGrid'; import TileState from '../TileState'; import { AttributionLike } from './Source'; import { TileSourceEvent } from './Tile'; @@ -30,8 +29,7 @@ export interface Options { } export class CustomTile extends ImageTile { constructor( - tilePixelRatio: number, - tileGrid: TileGrid, + tileSize: Size, tileCoord: TileCoord, state: TileState, src: string, diff --git a/types/ol/structs/LRUCache.d.ts b/types/ol/structs/LRUCache.d.ts index 881524d9b9..7d6acb2b6c 100644 --- a/types/ol/structs/LRUCache.d.ts +++ b/types/ol/structs/LRUCache.d.ts @@ -1,6 +1,5 @@ import { EventsKey } from '../events'; import BaseEvent from '../events/Event'; -import Target from '../events/Target'; export interface Entry { key_: string; @@ -8,7 +7,7 @@ export interface Entry { older: any; value_: any; } -export default class LRUCache extends Target { +export default class LRUCache { constructor(opt_highWaterMark?: number); canExpireCache(): boolean; clear(): void; diff --git a/types/ol/style/Circle.d.ts b/types/ol/style/Circle.d.ts index c48bb1f67c..3ac0670bfb 100644 --- a/types/ol/style/Circle.d.ts +++ b/types/ol/style/Circle.d.ts @@ -6,6 +6,7 @@ export interface Options { fill?: Fill; radius: number; stroke?: Stroke; + displacement?: number[]; } export default class CircleStyle extends RegularShape { constructor(opt_options?: Options); diff --git a/types/ol/style/Icon.d.ts b/types/ol/style/Icon.d.ts index 3fa0caa41d..f6e27a4d74 100644 --- a/types/ol/style/Icon.d.ts +++ b/types/ol/style/Icon.d.ts @@ -15,6 +15,7 @@ export interface Options { crossOrigin?: string; img?: HTMLImageElement | HTMLCanvasElement; offset?: number[]; + displacement?: number[]; offsetOrigin?: IconOrigin; opacity?: number; scale?: number; diff --git a/types/ol/style/Image.d.ts b/types/ol/style/Image.d.ts index b29904e83a..07098b09c7 100644 --- a/types/ol/style/Image.d.ts +++ b/types/ol/style/Image.d.ts @@ -7,11 +7,13 @@ export interface Options { rotateWithView: boolean; rotation: number; scale: number; + displacement: number[]; } export default abstract class ImageStyle { constructor(options: Options); clone(): ImageStyle; abstract getAnchor(): number[]; + getDisplacement(): number[]; abstract getHitDetectionImage(pixelRatio: number): HTMLCanvasElement | HTMLVideoElement | HTMLImageElement; abstract getHitDetectionImageSize(): Size; abstract getImage(pixelRatio: number): HTMLCanvasElement | HTMLVideoElement | HTMLImageElement; diff --git a/types/ol/style/LiteralStyle.d.ts b/types/ol/style/LiteralStyle.d.ts index 41dfb9af55..03e3a9f804 100644 --- a/types/ol/style/LiteralStyle.d.ts +++ b/types/ol/style/LiteralStyle.d.ts @@ -13,6 +13,7 @@ export interface LiteralSymbolStyle { src?: string; color?: Color | ExpressionValue[] | string; opacity?: ExpressionValue; + rotation?: ExpressionValue; offset?: ExpressionValue[]; textureCoord?: ExpressionValue[]; rotateWithView?: boolean; diff --git a/types/ol/style/RegularShape.d.ts b/types/ol/style/RegularShape.d.ts index d67196a44a..343c6003f5 100644 --- a/types/ol/style/RegularShape.d.ts +++ b/types/ol/style/RegularShape.d.ts @@ -13,6 +13,7 @@ export interface Options { radius1?: number; radius2?: number; angle?: number; + displacement?: number[]; stroke?: Stroke; rotation?: number; rotateWithView?: boolean; diff --git a/types/ol/tilegrid/WMTS.d.ts b/types/ol/tilegrid/WMTS.d.ts index 62402a05e9..b1e22c3683 100644 --- a/types/ol/tilegrid/WMTS.d.ts +++ b/types/ol/tilegrid/WMTS.d.ts @@ -12,7 +12,6 @@ export interface Options { sizes?: Size[]; tileSize?: number | Size; tileSizes?: Size[]; - widths?: number[]; } export default class WMTSTileGrid extends TileGrid { constructor(options: Options); diff --git a/types/ol/transform.d.ts b/types/ol/transform.d.ts index 90678a1067..78b3375b02 100644 --- a/types/ol/transform.d.ts +++ b/types/ol/transform.d.ts @@ -13,6 +13,15 @@ export function compose( dx2: number, dy2: number, ): Transform; +export function composeCssTransform( + dx1: number, + dy1: number, + sx: number, + sy: number, + angle: number, + dx2: number, + dy2: number, +): string; export function create(): Transform; export function determinant(mat: Transform): number; export function invert(source: Transform): Transform; diff --git a/types/ol/webgl/ShaderBuilder.d.ts b/types/ol/webgl/ShaderBuilder.d.ts index d049c2f913..8c0276338f 100644 --- a/types/ol/webgl/ShaderBuilder.d.ts +++ b/types/ol/webgl/ShaderBuilder.d.ts @@ -26,6 +26,7 @@ export class ShaderBuilder { getTextureCoordinateExpression(): string; setColorExpression(expression: string): ShaderBuilder; setFragmentDiscardExpression(expression: string): ShaderBuilder; + setRotationExpression(expression: string): ShaderBuilder; setSizeExpression(expression: string): ShaderBuilder; setSymbolOffsetExpression(expression: string): ShaderBuilder; setSymbolRotateWithView(rotateWithView: boolean): ShaderBuilder; diff --git a/types/ol/xml.d.ts b/types/ol/xml.d.ts index c5cb6efe9d..baa6743019 100644 --- a/types/ol/xml.d.ts +++ b/types/ol/xml.d.ts @@ -6,6 +6,8 @@ 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 getDocument(): Document; +export function getXMLSerializer(): XMLSerializer; 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[]) => any, opt_this?: T): Parser; @@ -61,6 +63,8 @@ export function pushSerializeAndPop( opt_keys?: string[], opt_this?: T, ): O; +export function registerDocument(document: Document): void; +export function registerXMLSerializer(xmlSerializer: XMLSerializer): void; export function serialize( serializersNS: { [key: string]: { [key: string]: Serializer } }, nodeFactory: (this: T, p0: any, p1: any[], p2: string | undefined) => Node,