chore: update openlayers to ~6.15.1

BREAKING CHANGES: - `ol` peer dep is now `~6.15.1` - `DrawInteractionComponent` : input `type` is now of type `Type` - `SourceImageWMSComponent` : input `serverType` is now of type `ServerType` - `OverlayComponent` : input `positioning` is now of type `Positioning` - `SourceTileWMSComponent` : input `projection` is now of type `ProjectionLike` and input `serverType` is now of type `ServerType` - `SourceTileWMTSComponent` : input `requestEncoding` is now of type `RequestEncoding`
jeremy-eychenne · Mar 12, 2024 · c5e933e · c5e933e
1 parent 5be4690
commit c5e933e
Show file tree

Hide file tree

Showing 10 changed files with 1,344 additions and 1,103 deletions.
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "@angular/platform-browser-dynamic": "^14.3.0",
     "@angular/router": "^14.3.0",
     "hammerjs": "^2.0.8",
-    "ol": "~6.13.0",
+    "ol": "~6.15.1",
     "rxjs": "~7.5.0",
     "tslib": "^2.5.0",
     "zone.js": "~0.11.4"
@@ -58,7 +58,7 @@
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.0.0",
-    "ng-packagr": "^14.2.2",
+    "ng-packagr": "~14.2.2",
     "prettier": "^2.0.3",
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",

diff --git a/projects/ngx-openlayers/package.json b/projects/ngx-openlayers/package.json
@@ -7,6 +7,6 @@
   "peerDependencies": {
     "@angular/common": ">=6.0.0 <=14.x.x",
     "@angular/core": ">=6.0.0 <=14.x.x",
-    "ol": "~6.13.0"
+    "ol": "~6.15.1"
   }
 }
diff --git a/projects/ngx-openlayers/src/lib/interactions/draw.component.ts b/projects/ngx-openlayers/src/lib/interactions/draw.component.ts
@@ -8,6 +8,7 @@ import { Vector } from 'ol/source';
 import { Style } from 'ol/style';
 import { StyleFunction } from 'ol/style/Style';
 import { MapComponent } from '../map.component';
+import { Type } from 'ol/geom/Geometry';
 
 @Component({
   selector: 'aol-interaction-draw',
@@ -23,7 +24,7 @@ export class DrawInteractionComponent implements OnInit, OnDestroy {
   @Input()
   snapTolerance?: number;
   @Input()
-  type: string;
+  type: Type;
   @Input()
   maxPoints?: number;
   @Input()

diff --git a/projects/ngx-openlayers/src/lib/layers/layervectortile.component.ts b/projects/ngx-openlayers/src/lib/layers/layervectortile.component.ts
@@ -15,7 +15,7 @@ export class LayerVectorTileComponent extends LayerComponent implements OnInit,
   @Input()
   renderBuffer: number;
   @Input()
-  renderMode: string;
+  renderMode: 'hybrid' | 'vector';
   /* not marked as optional in the typings */
   @Input()
   renderOrder: (feature1: Feature, feature2: Feature) => number;

diff --git a/projects/ngx-openlayers/src/lib/overlay.component.ts b/projects/ngx-openlayers/src/lib/overlay.component.ts
@@ -1,6 +1,6 @@
 import { Component, ContentChild, Input, OnDestroy, OnInit } from '@angular/core';
 import { Overlay } from 'ol';
-import { PanOptions } from 'ol/Overlay';
+import { PanOptions, Positioning } from 'ol/Overlay';
 import { ContentComponent } from './content.component';
 import { MapComponent } from './map.component';
 
@@ -17,7 +17,7 @@ export class OverlayComponent implements OnInit, OnDestroy {
   @Input()
   offset: number[];
   @Input()
-  positioning: string;
+  positioning: Positioning;
   @Input()
   stopEvent: boolean;
   @Input()

diff --git a/projects/ngx-openlayers/src/lib/sources/imagewms.component.ts b/projects/ngx-openlayers/src/lib/sources/imagewms.component.ts
@@ -1,13 +1,13 @@
 import {
   Component,
+  EventEmitter,
+  forwardRef,
   Host,
   Input,
   OnChanges,
   OnInit,
-  forwardRef,
-  SimpleChanges,
   Output,
-  EventEmitter,
+  SimpleChanges,
 } from '@angular/core';
 import { ImageWMS } from 'ol/source';
 import { LayerImageComponent } from '../layers/layerimage.component';
@@ -16,6 +16,7 @@ import { ProjectionLike } from 'ol/proj';
 import { AttributionLike } from 'ol/source/Source';
 import { LoadFunction } from 'ol/Image';
 import { ImageSourceEvent } from 'ol/source/Image';
+import { ServerType } from 'ol/source/wms';
 
 @Component({
   selector: 'aol-source-imagewms',
@@ -30,7 +31,7 @@ export class SourceImageWMSComponent extends SourceComponent implements OnChange
   @Input()
   hidpi: boolean;
   @Input()
-  serverType: string;
+  serverType: ServerType;
   @Input()
   imageLoadFunction?: LoadFunction;
   @Input()

diff --git a/projects/ngx-openlayers/src/lib/sources/tilewms.component.ts b/projects/ngx-openlayers/src/lib/sources/tilewms.component.ts
@@ -1,9 +1,11 @@
-import { Component, Host, Input, OnChanges, OnInit, SimpleChanges, forwardRef } from '@angular/core';
+import { Component, forwardRef, Host, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
 import { LoadFunction } from 'ol/Tile';
 import { TileWMS } from 'ol/source';
 import TileGrid from 'ol/tilegrid/TileGrid';
 import { LayerTileComponent } from '../layers/layertile.component';
 import { SourceComponent } from './source.component';
+import { ProjectionLike } from 'ol/proj';
+import { ServerType } from 'ol/source/wms';
 
 @Component({
   selector: 'aol-source-tilewms',
@@ -22,11 +24,11 @@ export class SourceTileWMSComponent extends SourceComponent implements OnChanges
   @Input()
   params: { [key: string]: any };
   @Input()
-  projection: string;
+  projection: ProjectionLike;
   @Input()
   reprojectionErrorThreshold: number;
   @Input()
-  serverType: string;
+  serverType: ServerType;
   @Input()
   tileGrid: TileGrid;
   @Input()

diff --git a/projects/ngx-openlayers/src/lib/sources/tilewmts.component.ts b/projects/ngx-openlayers/src/lib/sources/tilewmts.component.ts
@@ -3,12 +3,12 @@ import {
   Component,
   ContentChild,
   EventEmitter,
+  forwardRef,
   Host,
   Input,
   OnChanges,
   Output,
   SimpleChanges,
-  forwardRef,
 } from '@angular/core';
 import { LoadFunction } from 'ol/Tile';
 import { ProjectionLike } from 'ol/proj';
@@ -18,6 +18,7 @@ import WMTSTileGrid from 'ol/tilegrid/WMTS';
 import { LayerTileComponent } from '../layers/layertile.component';
 import { TileGridWMTSComponent } from '../tilegridwmts.component';
 import { SourceComponent } from './source.component';
+import { RequestEncoding } from 'ol/source/WMTS';
 
 @Component({
   selector: 'aol-source-tilewmts',
@@ -36,7 +37,7 @@ export class SourceTileWMTSComponent extends SourceComponent implements AfterCon
   @Input()
   reprojectionErrorThreshold?: number;
   @Input()
-  requestEncoding?: string;
+  requestEncoding?: RequestEncoding;
   @Input()
   layer: string;
   @Input()

diff --git a/projects/ngx-openlayers/src/lib/styles/icon.component.ts b/projects/ngx-openlayers/src/lib/styles/icon.component.ts
@@ -2,7 +2,9 @@ import { Component, Host, Input, OnChanges, OnInit, SimpleChanges } from '@angul
 import { Color } from 'ol/color';
 import { Size } from 'ol/size';
 import { Icon } from 'ol/style';
+import IconOrigin from 'ol/style/IconOrigin';
 import { StyleComponent } from './style.component';
+import { Positioning } from 'ol/Overlay';
 
 @Component({
   selector: 'aol-style-icon',
@@ -12,11 +14,11 @@ export class StyleIconComponent implements OnInit, OnChanges {
   @Input()
   anchor: [number, number];
   @Input()
-  anchorXUnits: string;
+  anchorXUnits: 'fraction' | 'pixels';
   @Input()
-  anchorYUnits: string;
+  anchorYUnits: 'fraction' | 'pixels';
   @Input()
-  anchorOrigin: string;
+  anchorOrigin: 'bottom-left' | 'bottom-right' | 'top-left' | 'top-right';
   @Input()
   color: Color;
   @Input()
@@ -26,7 +28,7 @@ export class StyleIconComponent implements OnInit, OnChanges {
   @Input()
   offset: [number, number];
   @Input()
-  offsetOrigin: string;
+  offsetOrigin: 'bottom-left' | 'bottom-right' | 'top-left' | 'top-right';
   @Input()
   opacity: number;
   @Input()