diff --git a/package-lock.json b/package-lock.json index 99d2fd51..f13f1576 100644 --- a/package-lock.json +++ b/package-lock.json @@ -530,12 +530,24 @@ "semver-intersect": "1.4.0" } }, + "@types/arcgis-rest-api": { + "version": "10.4.4", + "resolved": "https://registry.npmjs.org/@types/arcgis-rest-api/-/arcgis-rest-api-10.4.4.tgz", + "integrity": "sha512-5NwSfj4po+03fauyr4F5AxYzu8pbbqmxay+pNr5ef2V3Mj+7OylvV48VKuVoO9m799jhZdH3EQgQBHm3Y6q1Sw==", + "dev": true + }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true }, + "@types/geojson": { + "version": "7946.0.7", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz", + "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==", + "dev": true + }, "@types/jasmine": { "version": "2.8.16", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.16.tgz", @@ -557,6 +569,17 @@ "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==", "dev": true }, + "@types/ol": { + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/@types/ol/-/ol-5.3.5.tgz", + "integrity": "sha512-zX9Epdg4YJvi8diEFgn9sgfpHjij7TEz5lswqe2cvNb3GM9qJRjHU9kKUQDZcJH2aKwKqRQgvyn1IWsJk/MiJA==", + "dev": true, + "requires": { + "@types/arcgis-rest-api": "*", + "@types/geojson": "*", + "@types/topojson-specification": "*" + } + }, "@types/q": { "version": "0.0.32", "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", @@ -584,6 +607,15 @@ "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==", "dev": true }, + "@types/topojson-specification": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/topojson-specification/-/topojson-specification-1.0.1.tgz", + "integrity": "sha512-ZZYZUgkmUls9Uhxx2WZNt9f/h2+H3abUUjOVmq+AaaDFckC5oAwd+MDp95kBirk+XCXrYj0hfpI6DSUiJMrpYQ==", + "dev": true, + "requires": { + "@types/geojson": "*" + } + }, "@types/webpack-sources": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz", @@ -4367,7 +4399,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4388,12 +4421,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4408,17 +4443,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4535,7 +4573,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4547,6 +4586,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4561,6 +4601,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4568,12 +4609,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4592,6 +4635,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4672,7 +4716,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4684,6 +4729,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4769,7 +4815,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4805,6 +4852,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4824,6 +4872,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4867,12 +4916,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/package.json b/package.json index 2d6336d2..3a80506f 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "@angular/language-service": "^7.2.12", "@types/jasmine": "~2.8.6", "@types/jasminewd2": "~2.0.3", + "@types/ol": "^5.3.1", "@types/node": "~8.9.4", "codelyzer": "~4.5.0", "jasmine-core": "~2.99.1", diff --git a/projects/ngx-openlayers/src/lib/attribution.component.ts b/projects/ngx-openlayers/src/lib/attribution.component.ts index 9d0300f6..28b0c990 100644 --- a/projects/ngx-openlayers/src/lib/attribution.component.ts +++ b/projects/ngx-openlayers/src/lib/attribution.component.ts @@ -1,18 +1,15 @@ import { Component, ElementRef, OnInit } from '@angular/core'; -import { Attribution } from 'ol/control'; @Component({ selector: 'aol-attribution', template: '', }) export class AttributionComponent implements OnInit { - instance: Attribution; - html: string; + label: string; constructor(private elementRef: ElementRef) {} ngOnInit() { - this.html = this.elementRef.nativeElement.innerHTML; - this.instance = new Attribution(this); + this.label = this.elementRef.nativeElement.innerHTML; } } diff --git a/projects/ngx-openlayers/src/lib/attributions.component.ts b/projects/ngx-openlayers/src/lib/attributions.component.ts index 8e53b216..69b7be9d 100644 --- a/projects/ngx-openlayers/src/lib/attributions.component.ts +++ b/projects/ngx-openlayers/src/lib/attributions.component.ts @@ -1,5 +1,4 @@ import { AfterViewInit, Component, ContentChildren, Host, QueryList } from '@angular/core'; -import { Attribution } from 'ol/control'; import { SourceComponent } from './sources/source.component'; import { AttributionComponent } from './attribution.component'; @@ -8,7 +7,7 @@ import { AttributionComponent } from './attribution.component'; template: '', }) export class AttributionsComponent implements AfterViewInit { - instance: Array; + instance: Array; @ContentChildren(AttributionComponent) attributions: QueryList; @@ -18,7 +17,7 @@ export class AttributionsComponent implements AfterViewInit { /* we can do this at the very end */ ngAfterViewInit() { if (this.attributions.length) { - this.instance = this.attributions.map(cmp => cmp.instance); + this.instance = this.attributions.map(cmp => cmp.label); // console.log('setting attributions:', this.instance); this.source.instance.setAttributions(this.instance); } diff --git a/projects/ngx-openlayers/src/lib/controls/attribution.component.ts b/projects/ngx-openlayers/src/lib/controls/attribution.component.ts index 6de9ed71..6eb370d7 100644 --- a/projects/ngx-openlayers/src/lib/controls/attribution.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/attribution.component.ts @@ -1,15 +1,15 @@ import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core'; -import { Attribution } from 'ol/control'; +import Attribution, { Options as AttributionOptions } from 'ol/control/Attribution'; import { MapComponent } from '../map.component'; @Component({ selector: 'aol-control-attribution', template: ``, }) -export class ControlAttributionComponent implements OnInit, OnDestroy { +export class ControlAttributionComponent implements OnInit, OnDestroy, AttributionOptions { public componentType = 'control'; instance: Attribution; - target: Element; + target: HTMLElement; @Input() collapsible: boolean; diff --git a/projects/ngx-openlayers/src/lib/controls/control.component.ts b/projects/ngx-openlayers/src/lib/controls/control.component.ts index 124a04ca..fde23560 100644 --- a/projects/ngx-openlayers/src/lib/controls/control.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/control.component.ts @@ -1,5 +1,5 @@ import { Component, ContentChild, OnDestroy, OnInit } from '@angular/core'; -import { Control } from 'ol/control'; +import Control, { Options as ControlOptions } from 'ol/control/Control'; import { MapComponent } from '../map.component'; import { ContentComponent } from '../content.component'; @@ -9,10 +9,10 @@ import { ContentComponent } from '../content.component'; `, }) -export class ControlComponent implements OnInit, OnDestroy { +export class ControlComponent implements OnInit, OnDestroy, ControlOptions { public componentType = 'control'; instance: Control; - element: Element; + element: HTMLElement; @ContentChild(ContentComponent) content: ContentComponent; diff --git a/projects/ngx-openlayers/src/lib/controls/default.component.ts b/projects/ngx-openlayers/src/lib/controls/default.component.ts index 60791084..3455888d 100644 --- a/projects/ngx-openlayers/src/lib/controls/default.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/default.component.ts @@ -1,5 +1,6 @@ import { Component, OnDestroy, OnInit, Input } from '@angular/core'; import { Control, defaults } from 'ol/control'; +import { DefaultsOptions } from 'ol/control/util'; import { Collection } from 'ol'; import { Options as AttributionOptions } from 'ol/control/Attribution'; import { Options as RotateOptions } from 'ol/control/Rotate'; @@ -11,7 +12,7 @@ import { MapComponent } from '../map.component'; selector: 'aol-control-defaults', template: '', }) -export class DefaultControlComponent implements OnInit, OnDestroy { +export class DefaultControlComponent implements OnInit, OnDestroy, DefaultsOptions { instance: Collection; @Input() attribution: boolean; diff --git a/projects/ngx-openlayers/src/lib/controls/fullscreen.component.ts b/projects/ngx-openlayers/src/lib/controls/fullscreen.component.ts index e7671242..006754e0 100644 --- a/projects/ngx-openlayers/src/lib/controls/fullscreen.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/fullscreen.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { FullScreen } from 'ol/control'; +import FullScreen, { Options as FullScreenOptions } from 'ol/control/FullScreen'; import { MapComponent } from '../map.component'; @Component({ @@ -8,7 +8,7 @@ import { MapComponent } from '../map.component'; `, }) -export class ControlFullScreenComponent implements OnInit, OnDestroy { +export class ControlFullScreenComponent implements OnInit, OnDestroy, FullScreenOptions { instance: FullScreen; @Input() diff --git a/projects/ngx-openlayers/src/lib/controls/mouseposition.component.ts b/projects/ngx-openlayers/src/lib/controls/mouseposition.component.ts index fc4b8f1e..bb0a5fb5 100644 --- a/projects/ngx-openlayers/src/lib/controls/mouseposition.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/mouseposition.component.ts @@ -1,5 +1,5 @@ import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core'; -import MousePosition from 'ol/control/MousePosition'; +import MousePosition, { Options as MousePositionOptions } from 'ol/control/MousePosition'; import { MapComponent } from '../map.component'; import { CoordinateFormat } from 'ol/coordinate'; import { ProjectionLike } from 'ol/proj'; @@ -8,13 +8,13 @@ import { ProjectionLike } from 'ol/proj'; selector: 'aol-control-mouseposition', template: ``, }) -export class ControlMousePositionComponent implements OnInit, OnDestroy { +export class ControlMousePositionComponent implements OnInit, OnDestroy, MousePositionOptions { instance: MousePosition; @Input() coordinateFormat: CoordinateFormat; @Input() projection: ProjectionLike; - target: Element; + target: HTMLElement; constructor(private map: MapComponent, private element: ElementRef) {} diff --git a/projects/ngx-openlayers/src/lib/controls/overviewmap.component.ts b/projects/ngx-openlayers/src/lib/controls/overviewmap.component.ts index 6b96eb65..9a85ad90 100644 --- a/projects/ngx-openlayers/src/lib/controls/overviewmap.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/overviewmap.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnDestroy, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { Layer } from 'ol/layer'; import { View } from 'ol'; -import { OverviewMap } from 'ol/control'; +import OverviewMap, { Options as OverviewMapOptions } from 'ol/control/OverviewMap'; import { MapComponent } from '../map.component'; @Component({ @@ -10,7 +10,7 @@ import { MapComponent } from '../map.component'; `, }) -export class ControlOverviewMapComponent implements OnInit, OnChanges, OnDestroy { +export class ControlOverviewMapComponent implements OnInit, OnChanges, OnDestroy, OverviewMapOptions { instance: OverviewMap; @Input() collapsed: boolean; @@ -23,7 +23,7 @@ export class ControlOverviewMapComponent implements OnInit, OnChanges, OnDestroy @Input() layers: Layer[]; @Input() - target: Element; + target: HTMLElement; @Input() tipLabel: string; @Input() diff --git a/projects/ngx-openlayers/src/lib/controls/rotate.component.ts b/projects/ngx-openlayers/src/lib/controls/rotate.component.ts index e6e886bb..013ecd2e 100644 --- a/projects/ngx-openlayers/src/lib/controls/rotate.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/rotate.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Rotate } from 'ol/control'; +import Rotate, { Options as RotateOptions } from 'ol/control/Rotate'; import { MapComponent } from '../map.component'; @Component({ @@ -8,7 +8,7 @@ import { MapComponent } from '../map.component'; `, }) -export class ControlRotateComponent implements OnInit, OnDestroy { +export class ControlRotateComponent implements OnInit, OnDestroy, RotateOptions { instance: Rotate; @Input() diff --git a/projects/ngx-openlayers/src/lib/controls/scaleline.component.ts b/projects/ngx-openlayers/src/lib/controls/scaleline.component.ts index 28aa0610..0d6b88e6 100644 --- a/projects/ngx-openlayers/src/lib/controls/scaleline.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/scaleline.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { ScaleLine } from 'ol/control'; +import ScaleLine, { Options as ScaleLineOptions } from 'ol/control/ScaleLine'; import { MapComponent } from '../map.component'; @Component({ @@ -8,7 +8,7 @@ import { MapComponent } from '../map.component'; `, }) -export class ControlScaleLineComponent implements OnInit, OnDestroy { +export class ControlScaleLineComponent implements OnInit, OnDestroy, ScaleLineOptions { instance: ScaleLine; @Input() units: string; diff --git a/projects/ngx-openlayers/src/lib/controls/zoom.component.ts b/projects/ngx-openlayers/src/lib/controls/zoom.component.ts index 85ee4ffa..5076e12e 100644 --- a/projects/ngx-openlayers/src/lib/controls/zoom.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/zoom.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Zoom } from 'ol/control'; +import Zoom, { Options as ZoomOptions } from 'ol/control/Zoom'; import { MapComponent } from '../map.component'; @Component({ @@ -8,15 +8,15 @@ import { MapComponent } from '../map.component'; `, }) -export class ControlZoomComponent implements OnInit, OnDestroy { +export class ControlZoomComponent implements OnInit, OnDestroy, ZoomOptions { instance: Zoom; @Input() duration: number; @Input() - zoomInLabel: string | Node; + zoomInLabel: string | HTMLElement; @Input() - zoomOutLabel: string | Node; + zoomOutLabel: string | HTMLElement; @Input() zoomInTipLabel: string; @Input() diff --git a/projects/ngx-openlayers/src/lib/controls/zoomslider.component.ts b/projects/ngx-openlayers/src/lib/controls/zoomslider.component.ts index 68a6ce3b..55ca9915 100644 --- a/projects/ngx-openlayers/src/lib/controls/zoomslider.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/zoomslider.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { ZoomSlider } from 'ol/control'; +import ZoomSlider, { Options as ZoomSliderOptions } from 'ol/control/ZoomSlider'; import { MapComponent } from '../map.component'; @Component({ @@ -8,7 +8,7 @@ import { MapComponent } from '../map.component'; `, }) -export class ControlZoomSliderComponent implements OnInit, OnDestroy { +export class ControlZoomSliderComponent implements OnInit, OnDestroy, ZoomSliderOptions { instance: ZoomSlider; @Input() diff --git a/projects/ngx-openlayers/src/lib/controls/zoomtoextent.component.ts b/projects/ngx-openlayers/src/lib/controls/zoomtoextent.component.ts index b8a63462..6049eec9 100644 --- a/projects/ngx-openlayers/src/lib/controls/zoomtoextent.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/zoomtoextent.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { ZoomToExtent } from 'ol/control'; +import ZoomToExtent, { Options as ZoomToExtentOptions } from 'ol/control/ZoomToExtent'; import { MapComponent } from '../map.component'; import { Extent } from 'ol/extent'; @@ -9,13 +9,13 @@ import { Extent } from 'ol/extent'; `, }) -export class ControlZoomToExtentComponent implements OnInit, OnDestroy { +export class ControlZoomToExtentComponent implements OnInit, OnDestroy, ZoomToExtentOptions { instance: ZoomToExtent; @Input() className: string; @Input() - label: string | Node; + label: string | HTMLElement; @Input() tipLabel: string; @Input() diff --git a/projects/ngx-openlayers/src/lib/formats/mvt.component.ts b/projects/ngx-openlayers/src/lib/formats/mvt.component.ts index 89df4058..aeebce68 100644 --- a/projects/ngx-openlayers/src/lib/formats/mvt.component.ts +++ b/projects/ngx-openlayers/src/lib/formats/mvt.component.ts @@ -1,21 +1,18 @@ import { Component, forwardRef, Input } from '@angular/core'; import { FormatComponent } from './format.component'; -import { MVT } from 'ol/format'; -import { Geometry } from 'ol/geom'; -import GeometryType from 'ol/geom/GeometryType'; +import { FeatureClass } from 'ol/Feature'; +import MVT, { Options as MVTOptions } from 'ol/format/MVT'; @Component({ selector: 'aol-format-mvt', template: '', providers: [{ provide: FormatComponent, useExisting: forwardRef(() => FormatMVTComponent) }], }) -export class FormatMVTComponent extends FormatComponent { +export class FormatMVTComponent extends FormatComponent implements MVTOptions { instance: MVT; @Input() - featureClass: - | ((geom: Geometry | { [k: string]: any }) => any) - | ((geom: GeometryType, arg2: number[], arg3: number[] | number[][], arg4: { [k: string]: any }) => any); + featureClass: FeatureClass; @Input() geometryName: string; @Input() diff --git a/projects/ngx-openlayers/src/lib/interactions/draganddrop.component.ts b/projects/ngx-openlayers/src/lib/interactions/draganddrop.component.ts index 4f4e353f..0820376b 100644 --- a/projects/ngx-openlayers/src/lib/interactions/draganddrop.component.ts +++ b/projects/ngx-openlayers/src/lib/interactions/draganddrop.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { DragAndDrop } from 'ol/interaction'; -import Feature from 'ol/format/Feature'; +import DragAndDrop, { Options as DragAndDropOptions } from 'ol/interaction/DragAndDrop'; +import FeatureFormat from 'ol/format/Feature'; import { MapComponent } from '../map.component'; import { ProjectionLike } from 'ol/proj'; @@ -8,15 +8,15 @@ import { ProjectionLike } from 'ol/proj'; selector: 'aol-interaction-draganddrop', template: '', }) -export class DragAndDropInteractionComponent implements OnInit, OnDestroy { +export class DragAndDropInteractionComponent implements OnInit, OnDestroy, DragAndDropOptions { instance: DragAndDrop; @Input() - formatConstructors: ((n: Feature) => any)[]; + formatConstructors: FeatureFormat[]; @Input() projection: ProjectionLike; @Input() - target: Element; + target: HTMLElement; constructor(private map: MapComponent) {} diff --git a/projects/ngx-openlayers/src/lib/interactions/dragbox.component.ts b/projects/ngx-openlayers/src/lib/interactions/dragbox.component.ts index 6f0850ee..5e73f83d 100644 --- a/projects/ngx-openlayers/src/lib/interactions/dragbox.component.ts +++ b/projects/ngx-openlayers/src/lib/interactions/dragbox.component.ts @@ -1,14 +1,13 @@ import { Component, OnDestroy, OnInit, Input } from '@angular/core'; -import { DragBox } from 'ol/interaction'; -import { MapComponent } from '../map.component'; +import DragBox, { EndCondition, Options as DragBoxOptions } from 'ol/interaction/DragBox'; import { Condition } from 'ol/events/condition'; -import { EndCondition } from 'ol/interaction/DragBox'; +import { MapComponent } from '../map.component'; @Component({ selector: 'aol-interaction-dragbox', template: '', }) -export class DragBoxInteractionComponent implements OnInit, OnDestroy { +export class DragBoxInteractionComponent implements OnInit, OnDestroy, DragBoxOptions { instance: DragBox; @Input() @@ -18,6 +17,8 @@ export class DragBoxInteractionComponent implements OnInit, OnDestroy { @Input() boxEndCondition: EndCondition; + onBoxEnd = undefined; + constructor(private map: MapComponent) {} ngOnInit() { diff --git a/projects/ngx-openlayers/src/lib/layers/layer.component.ts b/projects/ngx-openlayers/src/lib/layers/layer.component.ts index b6c86f8a..399bbeb7 100644 --- a/projects/ngx-openlayers/src/lib/layers/layer.component.ts +++ b/projects/ngx-openlayers/src/lib/layers/layer.component.ts @@ -1,5 +1,5 @@ import { OnDestroy, OnInit, OnChanges, Input, SimpleChanges } from '@angular/core'; -import { Event } from 'ol/events'; +import Event from 'ol/events/Event'; import { MapComponent } from '../map.component'; import { LayerGroupComponent } from './layergroup.component'; import { Extent } from 'ol/extent'; diff --git a/projects/ngx-openlayers/src/lib/layers/layergroup.component.ts b/projects/ngx-openlayers/src/lib/layers/layergroup.component.ts index f8fa6422..4d526e3b 100644 --- a/projects/ngx-openlayers/src/lib/layers/layergroup.component.ts +++ b/projects/ngx-openlayers/src/lib/layers/layergroup.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, SkipSelf, Optional } from '@angular/core'; -import { Group } from 'ol/layer'; +import Group, { Options as GroupOptions } from 'ol/layer/Group'; import { LayerComponent } from './layer.component'; import { MapComponent } from '../map.component'; @@ -9,7 +9,7 @@ import { MapComponent } from '../map.component'; `, }) -export class LayerGroupComponent extends LayerComponent implements OnInit, OnDestroy { +export class LayerGroupComponent extends LayerComponent implements OnInit, OnDestroy, GroupOptions { public instance: Group; constructor( diff --git a/projects/ngx-openlayers/src/lib/layers/layerimage.component.ts b/projects/ngx-openlayers/src/lib/layers/layerimage.component.ts index e9ad0794..4d564385 100644 --- a/projects/ngx-openlayers/src/lib/layers/layerimage.component.ts +++ b/projects/ngx-openlayers/src/lib/layers/layerimage.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnChanges, OnInit, Optional, SimpleChanges } from '@angular/core'; -import { Image } from 'ol/layer'; +import Image, { Options as ImageOptions } from 'ol/layer/Image'; import { MapComponent } from '../map.component'; import { LayerComponent } from './layer.component'; import { LayerGroupComponent } from './layergroup.component'; @@ -11,9 +11,7 @@ import { Extent } from 'ol/extent'; `, }) -export class LayerImageComponent extends LayerComponent implements OnInit, OnChanges { - public source: Image; - +export class LayerImageComponent extends LayerComponent implements OnInit, OnChanges, ImageOptions { @Input() opacity: number; @Input() diff --git a/projects/ngx-openlayers/src/lib/layers/layertile.component.ts b/projects/ngx-openlayers/src/lib/layers/layertile.component.ts index a8ffdb74..683a0537 100644 --- a/projects/ngx-openlayers/src/lib/layers/layertile.component.ts +++ b/projects/ngx-openlayers/src/lib/layers/layertile.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, Input, Optional, OnChanges, SimpleChanges } from '@angular/core'; -import { Tile } from 'ol/layer'; +import Tile, { Options as TileOptions } from 'ol/layer/Tile'; import { MapComponent } from '../map.component'; import { LayerComponent } from './layer.component'; import { LayerGroupComponent } from './layergroup.component'; @@ -10,9 +10,7 @@ import { LayerGroupComponent } from './layergroup.component'; `, }) -export class LayerTileComponent extends LayerComponent implements OnInit, OnDestroy, OnChanges { - public source: Tile; - +export class LayerTileComponent extends LayerComponent implements OnInit, OnDestroy, OnChanges, TileOptions { @Input() preload: number; @Input() diff --git a/projects/ngx-openlayers/src/lib/layers/layervector.component.ts b/projects/ngx-openlayers/src/lib/layers/layervector.component.ts index 5c3843a6..2ebfcd87 100644 --- a/projects/ngx-openlayers/src/lib/layers/layervector.component.ts +++ b/projects/ngx-openlayers/src/lib/layers/layervector.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, Input, Optional, OnChanges, SimpleChanges } from '@angular/core'; import { MapComponent } from '../map.component'; -import { Vector } from 'ol/layer'; +import Vector, { Options as VectorOptions } from 'ol/layer/Vector'; import { Style } from 'ol/style'; import { StyleFunction } from 'ol/style/Style'; import { LayerComponent } from './layer.component'; @@ -12,9 +12,7 @@ import { LayerGroupComponent } from './layergroup.component'; `, }) -export class LayerVectorComponent extends LayerComponent implements OnInit, OnDestroy, OnChanges { - public source: Vector; - +export class LayerVectorComponent extends LayerComponent implements OnInit, OnDestroy, OnChanges, VectorOptions { @Input() renderBuffer: number; diff --git a/projects/ngx-openlayers/src/lib/layers/layervectortile.component.ts b/projects/ngx-openlayers/src/lib/layers/layervectortile.component.ts index 3817a995..5313964e 100644 --- a/projects/ngx-openlayers/src/lib/layers/layervectortile.component.ts +++ b/projects/ngx-openlayers/src/lib/layers/layervectortile.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, Input, Optional, SimpleChanges, OnChanges } from '@angular/core'; -import { VectorTile } from 'ol/layer'; -import { RenderType } from 'ol/layer/VectorTile'; +import VectorTile, { Options as VectorTileOptions } from 'ol/layer/VectorTile'; +import RenderType from 'ol/layer/VectorTileRenderType'; import { Feature } from 'ol'; import { Style } from 'ol/style'; import { MapComponent } from '../map.component'; @@ -14,7 +14,7 @@ import { StyleFunction } from 'ol/style/Style'; `, }) -export class LayerVectorTileComponent extends LayerComponent implements OnInit, OnChanges { +export class LayerVectorTileComponent extends LayerComponent implements OnInit, OnChanges, VectorTileOptions { @Input() renderBuffer: number; @Input() diff --git a/projects/ngx-openlayers/src/lib/map.component.ts b/projects/ngx-openlayers/src/lib/map.component.ts index 270a1da7..2b12c4ef 100644 --- a/projects/ngx-openlayers/src/lib/map.component.ts +++ b/projects/ngx-openlayers/src/lib/map.component.ts @@ -13,6 +13,7 @@ import Map from 'ol/Map'; import MapBrowserEvent from 'ol/MapBrowserEvent'; import MapEvent from 'ol/MapEvent'; import ObjectEvent from 'ol/Object'; +import { MapOptions } from 'ol/PluggableMap'; import RenderEvent from 'ol/render/Event'; import { Control } from 'ol/control'; import { Interaction } from 'ol/interaction'; @@ -24,7 +25,7 @@ import { Interaction } from 'ol/interaction'; `, }) -export class MapComponent implements OnInit, AfterViewInit, OnChanges { +export class MapComponent implements OnInit, AfterViewInit, OnChanges, MapOptions { public instance: Map; public componentType = 'map'; @@ -35,7 +36,7 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges { @Input() pixelRatio: number; @Input() - keyboardEventTarget: Element | string; + keyboardEventTarget: HTMLElement | string; @Input() loadTilesWhileAnimating: boolean; @Input() diff --git a/projects/ngx-openlayers/src/lib/overlay.component.ts b/projects/ngx-openlayers/src/lib/overlay.component.ts index c9ceea24..047b108d 100644 --- a/projects/ngx-openlayers/src/lib/overlay.component.ts +++ b/projects/ngx-openlayers/src/lib/overlay.component.ts @@ -1,17 +1,17 @@ import { Component, ContentChild, Input, OnDestroy, OnInit } from '@angular/core'; -import { MapComponent } from './map.component'; -import { Overlay, PanOptions } from 'ol'; -import { ContentComponent } from './content.component'; +import Overlay, { Options as OverlayOptions, PanOptions } from 'ol/Overlay'; import OverlayPositioning from 'ol/OverlayPositioning'; +import { ContentComponent } from './content.component'; +import { MapComponent } from './map.component'; @Component({ selector: 'aol-overlay', template: '', }) -export class OverlayComponent implements OnInit, OnDestroy { +export class OverlayComponent implements OnInit, OnDestroy, OverlayOptions { componentType = 'overlay'; instance: Overlay; - element: Element; + element: HTMLElement; @ContentChild(ContentComponent) content: ContentComponent; @@ -20,7 +20,7 @@ export class OverlayComponent implements OnInit, OnDestroy { @Input() offset: number[]; @Input() - positioning: OverlayPositioning | string; + positioning: OverlayPositioning; @Input() stopEvent: boolean; @Input() diff --git a/projects/ngx-openlayers/src/lib/sources/bingmaps.component.ts b/projects/ngx-openlayers/src/lib/sources/bingmaps.component.ts index 8977ba72..e318474b 100644 --- a/projects/ngx-openlayers/src/lib/sources/bingmaps.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/bingmaps.component.ts @@ -1,5 +1,5 @@ import { Component, Host, Input, OnInit, forwardRef } from '@angular/core'; -import { BingMaps } from 'ol/source'; +import BingMaps, { Options as BingMapsOptions } from 'ol/source/BingMaps'; import { SourceComponent } from './source.component'; import { LayerTileComponent } from '../layers/layertile.component'; import { LoadFunction } from 'ol/Tile'; @@ -11,7 +11,7 @@ import { LoadFunction } from 'ol/Tile'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceBingmapsComponent) }], }) -export class SourceBingmapsComponent extends SourceComponent implements OnInit { +export class SourceBingmapsComponent extends SourceComponent implements OnInit, BingMapsOptions { instance: BingMaps; @Input() diff --git a/projects/ngx-openlayers/src/lib/sources/cluster.component.ts b/projects/ngx-openlayers/src/lib/sources/cluster.component.ts index fb3d949d..8407d253 100644 --- a/projects/ngx-openlayers/src/lib/sources/cluster.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/cluster.component.ts @@ -9,11 +9,12 @@ import { OnChanges, } from '@angular/core'; import { Feature } from 'ol'; +import { Point } from 'ol/geom'; +import { Vector } from 'ol/source'; +import Cluster, { Options as ClusterOptions } from 'ol/source/Cluster'; import { LayerVectorComponent } from '../layers/layervector.component'; import { SourceComponent } from './source.component'; import { SourceVectorComponent } from './vector.component'; -import { Cluster, Vector } from 'ol/source'; -import { Point } from 'ol/geom'; @Component({ selector: 'aol-source-cluster', @@ -22,7 +23,7 @@ import { Point } from 'ol/geom'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceClusterComponent) }], }) -export class SourceClusterComponent extends SourceComponent implements AfterContentInit, OnChanges { +export class SourceClusterComponent extends SourceComponent implements AfterContentInit, OnChanges, ClusterOptions { instance: Cluster; @Input() diff --git a/projects/ngx-openlayers/src/lib/sources/geojson.component.ts b/projects/ngx-openlayers/src/lib/sources/geojson.component.ts index 0376ad88..dc455f0e 100644 --- a/projects/ngx-openlayers/src/lib/sources/geojson.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/geojson.component.ts @@ -1,9 +1,9 @@ import { Component, Host, Input, OnInit, forwardRef } from '@angular/core'; import { LayerVectorComponent } from '../layers/layervector.component'; import { SourceComponent } from './source.component'; -import { Feature } from 'ol'; -import { Vector } from 'ol/source'; -import { GeoJSON } from 'ol/format'; +import FeatureFormat from 'ol/format/Feature'; +import Vector, { Options as VectorOptions } from 'ol/source/Vector'; +import GeoJSON, { Options as GeoJSONOptions } from 'ol/format/GeoJSON'; import { ProjectionLike } from 'ol/proj'; @Component({ @@ -13,9 +13,9 @@ import { ProjectionLike } from 'ol/proj'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceGeoJSONComponent) }], }) -export class SourceGeoJSONComponent extends SourceComponent implements OnInit { +export class SourceGeoJSONComponent extends SourceComponent implements OnInit, VectorOptions, GeoJSONOptions { instance: Vector; - format: Feature; + format: FeatureFormat; @Input() defaultDataProjection: ProjectionLike; @Input() diff --git a/projects/ngx-openlayers/src/lib/sources/imagearcgisrest.component.ts b/projects/ngx-openlayers/src/lib/sources/imagearcgisrest.component.ts index 7a091ad3..ff349f41 100644 --- a/projects/ngx-openlayers/src/lib/sources/imagearcgisrest.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/imagearcgisrest.component.ts @@ -9,7 +9,7 @@ import { Output, SimpleChanges, } from '@angular/core'; -import { ImageArcGISRest } from 'ol/source'; +import ImageArcGISRest, { Options as ImageArcGISRestOptions } from 'ol/source/ImageArcGISRest'; import { LayerImageComponent } from '../layers/layerimage.component'; import { SourceComponent } from './source.component'; import { ProjectionLike } from 'ol/proj'; @@ -24,12 +24,13 @@ import { ImageSourceEvent } from 'ol/source/Image'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceImageArcGISRestComponent) }], }) -export class SourceImageArcGISRestComponent extends SourceComponent implements OnInit, OnChanges { +export class SourceImageArcGISRestComponent extends SourceComponent + implements OnInit, OnChanges, ImageArcGISRestOptions { instance: ImageArcGISRest; - @Input() projection: ProjectionLike | string; + @Input() projection: ProjectionLike; @Input() url: string; - @Input() attributions: AttributionLike[]; + @Input() attributions: AttributionLike; @Input() crossOrigin?: string; @Input() imageLoadFunction?: LoadFunction; @Input() params?: { [k: string]: any }; diff --git a/projects/ngx-openlayers/src/lib/sources/imagestatic.component.ts b/projects/ngx-openlayers/src/lib/sources/imagestatic.component.ts index 0a609866..06b744ba 100644 --- a/projects/ngx-openlayers/src/lib/sources/imagestatic.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/imagestatic.component.ts @@ -9,7 +9,7 @@ import { SimpleChanges, OnInit, } from '@angular/core'; -import { ImageStatic } from 'ol/source'; +import ImageStatic, { Options as ImageStaticOptions } from 'ol/source/ImageStatic'; import { SourceComponent } from './source.component'; import { LayerImageComponent } from '../layers/layerimage.component'; import { ProjectionLike } from 'ol/proj'; @@ -26,11 +26,11 @@ import { ImageSourceEvent } from 'ol/source/Image'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceImageStaticComponent) }], }) -export class SourceImageStaticComponent extends SourceComponent implements OnInit, OnChanges { +export class SourceImageStaticComponent extends SourceComponent implements OnInit, OnChanges, ImageStaticOptions { instance: ImageStatic; @Input() - projection: ProjectionLike | string; + projection: ProjectionLike; @Input() imageExtent: Extent; @Input() diff --git a/projects/ngx-openlayers/src/lib/sources/imagewms.component.ts b/projects/ngx-openlayers/src/lib/sources/imagewms.component.ts index 59ae1f47..b7963233 100644 --- a/projects/ngx-openlayers/src/lib/sources/imagewms.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/imagewms.component.ts @@ -9,13 +9,14 @@ import { Output, EventEmitter, } from '@angular/core'; -import { ImageWMS } from 'ol/source'; -import { LayerImageComponent } from '../layers/layerimage.component'; -import { SourceComponent } from './source.component'; +import ImageWMS, { Options as ImageWMSOptions } from 'ol/source/ImageWMS'; import { ProjectionLike } from 'ol/proj'; import { AttributionLike } from 'ol/source/Source'; import { LoadFunction } from 'ol/Image'; import { ImageSourceEvent } from 'ol/source/Image'; +import WMSServerType from 'ol/source/WMSServerType'; +import { LayerImageComponent } from '../layers/layerimage.component'; +import { SourceComponent } from './source.component'; @Component({ selector: 'aol-source-imagewms', @@ -24,7 +25,7 @@ import { ImageSourceEvent } from 'ol/source/Image'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceImageWMSComponent) }], }) -export class SourceImageWMSComponent extends SourceComponent implements OnChanges, OnInit { +export class SourceImageWMSComponent extends SourceComponent implements OnChanges, OnInit, ImageWMSOptions { instance: ImageWMS; @Input() @@ -34,17 +35,17 @@ export class SourceImageWMSComponent extends SourceComponent implements OnChange @Input() hidpi: boolean; @Input() - serverType: string; + serverType: WMSServerType | string; @Input() imageLoadFunction?: LoadFunction; @Input() - params: Object; + params: { [key: string]: any }; @Input() - projection: ProjectionLike | string; + projection: ProjectionLike; @Input() ratio: number; @Input() - resolutions: Array; + resolutions: number[]; @Input() url: string; diff --git a/projects/ngx-openlayers/src/lib/sources/osm.component.ts b/projects/ngx-openlayers/src/lib/sources/osm.component.ts index 8f9eb473..f93f9cb7 100644 --- a/projects/ngx-openlayers/src/lib/sources/osm.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/osm.component.ts @@ -1,5 +1,5 @@ import { Component, Host, forwardRef, Input, AfterContentInit, Optional, Output, EventEmitter } from '@angular/core'; -import { OSM } from 'ol/source'; +import OSM, { Options as OSMOptions } from 'ol/source/OSM'; import { LayerTileComponent } from '../layers/layertile.component'; import { SourceComponent } from './source.component'; import { SourceXYZComponent } from './xyz.component'; @@ -15,7 +15,7 @@ import { TileSourceEvent } from 'ol/source/Tile'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceOsmComponent) }], }) -export class SourceOsmComponent extends SourceXYZComponent implements AfterContentInit { +export class SourceOsmComponent extends SourceXYZComponent implements AfterContentInit, OSMOptions { instance: OSM; @Input() diff --git a/projects/ngx-openlayers/src/lib/sources/raster.component.ts b/projects/ngx-openlayers/src/lib/sources/raster.component.ts index 91c334d2..e07b295d 100644 --- a/projects/ngx-openlayers/src/lib/sources/raster.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/raster.component.ts @@ -1,6 +1,6 @@ import { AfterContentInit, Component, EventEmitter, forwardRef, Host, Input, Output } from '@angular/core'; -import { Raster, Source } from 'ol/source'; -import { RasterOperationType, RasterSourceEvent } from 'ol/source/Raster'; +import { Source } from 'ol/source'; +import Raster, { Options as RasterOptions, RasterSourceEvent } from 'ol/source/Raster'; import { LayerImageComponent } from '../layers/layerimage.component'; import { SourceComponent } from './source.component'; import { Operation } from 'ol/source/Raster'; @@ -17,7 +17,7 @@ import { Operation } from 'ol/source/Raster'; }, ], }) -export class SourceRasterComponent extends SourceComponent implements AfterContentInit { +export class SourceRasterComponent extends SourceComponent implements AfterContentInit, RasterOptions { instance: Raster; @Input() @@ -27,7 +27,7 @@ export class SourceRasterComponent extends SourceComponent implements AfterConte @Input() lib?: Object; @Input() - operationType?: RasterOperationType; + operationType?: 'pixel' | 'image'; @Output() beforeOperations: EventEmitter = new EventEmitter(); diff --git a/projects/ngx-openlayers/src/lib/sources/source.component.ts b/projects/ngx-openlayers/src/lib/sources/source.component.ts index 17fc8556..25186360 100644 --- a/projects/ngx-openlayers/src/lib/sources/source.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/source.component.ts @@ -1,5 +1,5 @@ import { Input, OnDestroy } from '@angular/core'; -import { Source } from 'ol'; +import Source from 'ol/source/Source'; import { LayerComponent } from '../layers/layer.component'; import { SourceRasterComponent } from './raster.component'; diff --git a/projects/ngx-openlayers/src/lib/sources/tilejson.component.ts b/projects/ngx-openlayers/src/lib/sources/tilejson.component.ts index d85737d7..09c7fd22 100644 --- a/projects/ngx-openlayers/src/lib/sources/tilejson.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/tilejson.component.ts @@ -1,5 +1,5 @@ import { Component, Host, Input, OnInit, forwardRef } from '@angular/core'; -import { TileJSON } from 'ol/source'; +import TileJSON, { Options as TileJSONOptions } from 'ol/source/TileJSON'; import { LayerTileComponent } from '../layers/layertile.component'; import { SourceComponent } from './source.component'; @@ -10,7 +10,7 @@ import { SourceComponent } from './source.component'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceTileJSONComponent) }], }) -export class SourceTileJSONComponent extends SourceComponent implements OnInit { +export class SourceTileJSONComponent extends SourceComponent implements OnInit, TileJSONOptions { instance: TileJSON; @Input() diff --git a/projects/ngx-openlayers/src/lib/sources/tilewms.component.ts b/projects/ngx-openlayers/src/lib/sources/tilewms.component.ts index 646f47f2..7384ecf7 100644 --- a/projects/ngx-openlayers/src/lib/sources/tilewms.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/tilewms.component.ts @@ -1,9 +1,9 @@ import { Component, Host, Input, OnChanges, OnInit, forwardRef, SimpleChanges } from '@angular/core'; +import TileWMS, { Options as TileWMSOptions } from 'ol/source/TileWMS'; +import TileGrid from 'ol/tilegrid/TileGrid'; +import { LoadFunction } from 'ol/Tile'; import { LayerTileComponent } from '../layers/layertile.component'; import { SourceComponent } from './source.component'; -import { TileWMS } from 'ol/source'; -import { TileGrid } from 'ol/tilegrid'; -import { LoadFunction } from 'ol/Tile'; @Component({ selector: 'aol-source-tilewms', @@ -12,7 +12,7 @@ import { LoadFunction } from 'ol/Tile'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceTileWMSComponent) }], }) -export class SourceTileWMSComponent extends SourceComponent implements OnChanges, OnInit { +export class SourceTileWMSComponent extends SourceComponent implements OnChanges, OnInit, TileWMSOptions { instance: TileWMS; @Input() cacheSize: number; diff --git a/projects/ngx-openlayers/src/lib/sources/tilewmts.component.ts b/projects/ngx-openlayers/src/lib/sources/tilewmts.component.ts index a59f437c..c3228286 100644 --- a/projects/ngx-openlayers/src/lib/sources/tilewmts.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/tilewmts.component.ts @@ -11,9 +11,9 @@ import { import { LayerTileComponent } from '../layers/layertile.component'; import { SourceComponent } from './source.component'; import { TileGridWMTSComponent } from '../tilegridwmts.component'; -import { WMTS } from 'ol/source'; -import { WMTS as TileGridWMTS } from 'ol/tilegrid'; -import { WMTSRequestEncoding } from 'ol/source'; +import WMTS, { Options as WMTSOptions } from 'ol/source/WMTS'; +import WMTSTileGrid from 'ol/tilegrid/WMTS'; +import WMTSRequestEncoding from 'ol/source/WMTSRequestEncoding'; import { ProjectionLike } from 'ol/proj'; import { LoadFunction } from 'ol/Tile'; @@ -24,14 +24,14 @@ import { LoadFunction } from 'ol/Tile'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceTileWMTSComponent) }], }) -export class SourceTileWMTSComponent extends SourceComponent implements AfterContentInit, OnChanges { +export class SourceTileWMTSComponent extends SourceComponent implements AfterContentInit, OnChanges, WMTSOptions { instance: WMTS; @Input() cacheSize?: number; @Input() crossOrigin?: string; @Input() - tileGrid: TileGridWMTS; + tileGrid: WMTSTileGrid; @Input() projection: ProjectionLike; @Input() diff --git a/projects/ngx-openlayers/src/lib/sources/utfgrid.component.ts b/projects/ngx-openlayers/src/lib/sources/utfgrid.component.ts index 9a350971..75cca849 100644 --- a/projects/ngx-openlayers/src/lib/sources/utfgrid.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/utfgrid.component.ts @@ -1,7 +1,8 @@ import { Component, Host, Input, OnInit, forwardRef } from '@angular/core'; +import UTFGrid, { Options as UTFGridOptions } from 'ol/source/UTFGrid'; +import { Config as TileJSONConfig } from 'ol/source/TileJSON'; import { SourceComponent } from './source.component'; import { LayerTileComponent } from '../layers/layertile.component'; -import { UTFGrid } from 'ol/source'; @Component({ selector: 'aol-source-utfgrid', @@ -10,9 +11,9 @@ import { UTFGrid } from 'ol/source'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceUTFGridComponent) }], }) -export class SourceUTFGridComponent extends SourceComponent implements OnInit { +export class SourceUTFGridComponent extends SourceComponent implements OnInit, UTFGridOptions { instance: UTFGrid; - @Input() tileJSON: JSON; + @Input() tileJSON: TileJSONConfig; @Input() url: string; constructor(@Host() layer: LayerTileComponent) { diff --git a/projects/ngx-openlayers/src/lib/sources/vector.component.ts b/projects/ngx-openlayers/src/lib/sources/vector.component.ts index 493f1837..73a18367 100644 --- a/projects/ngx-openlayers/src/lib/sources/vector.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/vector.component.ts @@ -1,5 +1,5 @@ import { Component, Host, Input, OnInit, forwardRef } from '@angular/core'; -import { Vector } from 'ol/source'; +import Vector, { Options as VectorOptions } from 'ol/source/Vector'; import Feature from 'ol/format/Feature'; import { LayerVectorComponent } from '../layers/layervector.component'; import { SourceComponent } from './source.component'; @@ -12,7 +12,7 @@ import { LoadingStrategy } from 'ol/source/Vector'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceVectorComponent) }], }) -export class SourceVectorComponent extends SourceComponent implements OnInit { +export class SourceVectorComponent extends SourceComponent implements OnInit, VectorOptions { instance: Vector; @Input() overlaps: boolean; diff --git a/projects/ngx-openlayers/src/lib/sources/vectortile.component.ts b/projects/ngx-openlayers/src/lib/sources/vectortile.component.ts index fb426dc2..10f78fc8 100644 --- a/projects/ngx-openlayers/src/lib/sources/vectortile.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/vectortile.component.ts @@ -1,13 +1,13 @@ import { Component, Host, Input, forwardRef, ContentChild, AfterContentInit } from '@angular/core'; -import { VectorTile } from 'ol'; +import VectorTile, { Options as VectorTileOptions } from 'ol/source/VectorTile'; import Feature from 'ol/format/Feature'; import TileGrid from 'ol/tilegrid/TileGrid'; +import { ProjectionLike } from 'ol/proj'; +import { UrlFunction } from 'ol/Tile'; import { LayerVectorTileComponent } from '../layers/layervectortile.component'; import { FormatComponent } from '../formats/format.component'; import { TileGridComponent } from '../tilegrid.component'; import { SourceComponent } from './source.component'; -import { ProjectionLike } from 'ol/proj'; -import { UrlFunction } from 'ol/Tile'; @Component({ selector: 'aol-source-vectortile', @@ -16,7 +16,7 @@ import { UrlFunction } from 'ol/Tile'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceVectorTileComponent) }], }) -export class SourceVectorTileComponent extends SourceComponent implements AfterContentInit { +export class SourceVectorTileComponent extends SourceComponent implements AfterContentInit, VectorTileOptions { public instance: VectorTile; @Input() cacheSize: number; diff --git a/projects/ngx-openlayers/src/lib/sources/xyz.component.ts b/projects/ngx-openlayers/src/lib/sources/xyz.component.ts index a3fff055..8432318f 100644 --- a/projects/ngx-openlayers/src/lib/sources/xyz.component.ts +++ b/projects/ngx-openlayers/src/lib/sources/xyz.component.ts @@ -11,7 +11,7 @@ import { Output, EventEmitter, } from '@angular/core'; -import { XYZ } from 'ol/source'; +import XYZ, { Options as XYZOptions } from 'ol/source/XYZ'; import { LayerTileComponent } from '../layers/layertile.component'; import { SourceComponent } from './source.component'; import { TileGridComponent } from '../tilegrid.component'; @@ -28,7 +28,7 @@ import { LoadFunction, UrlFunction } from 'ol/Tile'; `, providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceXYZComponent) }], }) -export class SourceXYZComponent extends SourceComponent implements AfterContentInit, OnChanges { +export class SourceXYZComponent extends SourceComponent implements AfterContentInit, OnChanges, XYZOptions { instance: XYZ; @Input() cacheSize: number; diff --git a/projects/ngx-openlayers/src/lib/styles/icon.component.ts b/projects/ngx-openlayers/src/lib/styles/icon.component.ts index a86f78b8..a7e69238 100644 --- a/projects/ngx-openlayers/src/lib/styles/icon.component.ts +++ b/projects/ngx-openlayers/src/lib/styles/icon.component.ts @@ -1,5 +1,5 @@ import { Component, Input, Host, OnInit, OnChanges, SimpleChanges } from '@angular/core'; -import { Icon } from 'ol/style'; +import Icon, { Options as IconOptions } from 'ol/style/Icon'; import IconAnchorUnits from 'ol/style/IconAnchorUnits'; import IconOrigin from 'ol/style/IconOrigin'; import { StyleComponent } from './style.component'; @@ -10,7 +10,7 @@ import { StyleComponent } from './style.component';
`, }) -export class StyleIconComponent implements OnInit, OnChanges { +export class StyleIconComponent implements OnInit, OnChanges, IconOptions { public instance: Icon; @Input() @@ -26,7 +26,7 @@ export class StyleIconComponent implements OnInit, OnChanges { @Input() crossOrigin: IconOrigin; @Input() - img: string; + img: HTMLImageElement | HTMLCanvasElement; @Input() offset: [number, number]; @Input() diff --git a/projects/ngx-openlayers/src/lib/tilegridwmts.component.ts b/projects/ngx-openlayers/src/lib/tilegridwmts.component.ts index 5ef6584a..e3b9496d 100644 --- a/projects/ngx-openlayers/src/lib/tilegridwmts.component.ts +++ b/projects/ngx-openlayers/src/lib/tilegridwmts.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import WMTS from 'ol/tilegrid/WMTS'; +import WMTS, { Options as WMTSOptions } from 'ol/tilegrid/WMTS'; import { TileGridComponent } from './tilegrid.component'; import { Coordinate } from 'ol/coordinate'; import { Size } from 'ol/size'; @@ -8,7 +8,7 @@ import { Size } from 'ol/size'; selector: 'aol-tilegrid-wmts', template: '', }) -export class TileGridWMTSComponent extends TileGridComponent implements OnInit { +export class TileGridWMTSComponent extends TileGridComponent implements OnInit, WMTSOptions { instance: WMTS; @Input() @@ -22,7 +22,7 @@ export class TileGridWMTSComponent extends TileGridComponent implements OnInit { @Input() sizes?: Size[]; @Input() - tileSizes?: (number | Size)[]; + tileSizes?: Size[]; @Input() widths?: number[]; diff --git a/projects/ngx-openlayers/src/lib/view.component.ts b/projects/ngx-openlayers/src/lib/view.component.ts index 6ccb0223..b72b17a7 100644 --- a/projects/ngx-openlayers/src/lib/view.component.ts +++ b/projects/ngx-openlayers/src/lib/view.component.ts @@ -1,9 +1,10 @@ import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges, EventEmitter, Output } from '@angular/core'; -import View from 'ol/View'; -import { MapComponent } from './map.component'; -import { ObjectEvent } from 'ol'; -import { Extent } from 'ol/extent'; +import { ObjectEvent } from 'ol/Object'; import { Coordinate } from 'ol/coordinate'; +import { ProjectionLike } from 'ol/proj'; +import View, { ViewOptions } from 'ol/View'; +import { Extent } from 'ol/extent'; +import { MapComponent } from './map.component'; @Component({ selector: 'aol-view', @@ -11,7 +12,7 @@ import { Coordinate } from 'ol/coordinate'; `, }) -export class ViewComponent implements OnInit, OnChanges, OnDestroy { +export class ViewComponent implements OnInit, OnChanges, OnDestroy, ViewOptions { public instance: View; public componentType = 'view'; @@ -42,7 +43,7 @@ export class ViewComponent implements OnInit, OnChanges, OnDestroy { @Input() center: Coordinate; @Input() - projection: string; + projection: ProjectionLike; @Input() zoomAnimation = false; diff --git a/src/app/modify-polygon/modify-polygon.component.ts b/src/app/modify-polygon/modify-polygon.component.ts index ea95be49..f7f5b283 100644 --- a/src/app/modify-polygon/modify-polygon.component.ts +++ b/src/app/modify-polygon/modify-polygon.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Feature } from 'ol'; +import Feature from 'geojson'; import Projection from 'ol/proj/Projection'; import { GeoJSON } from 'ol/format';