Merge pull request #728 from terrestris/fix-cleanup-layer-interaction

Ensure single extent layer and transform interaction

Author: dnlkoch

Diff for: .github/workflows/on-pull-request.yml

@@ -33,7 +33,7 @@ jobs:
       run: npm ci
 
     - name: Run typecheck, lint and tests 🧪
-      run: npm test
+      run: npm run check
 
     - name: Build artifacts 🏗️
       run: npm run build:docs && npm run build:examples && npm run build:dist

Diff for: .husky/pre-push

@@ -1 +1 @@
-npm run lint
+npm run check

Diff for: eslint.config.mjs

@@ -17,11 +17,6 @@ export default tsEslint.config({
     'src/**/*.ts',
     'spec/**/*.spec.ts'
   ],
-  ignores: [
-    '**/*.spec.ts',
-    '**/dist/*.js',
-    '**/jest/__mocks__/*.ts'
-  ],
   languageOptions: {
     ecmaVersion: 2022,
     globals: globals.browser,

Diff for: package.json

@@ -22,21 +22,21 @@
   ],
   "scripts": {
     "build": "npm run clean && npm run build:dist",
-    "build:dist": "npm run clean:dist && tsc -p .",
+    "build:dist": "npm run clean:dist && tsc -p ./tsconfig.build.json",
     "build:docs": "npm run clean:docs && typedoc",
     "build:examples": "npm run clean:examples && webpack --config webpack.prod.cjs",
     "clean": "npm run clean:dist && npm run clean:examples && npm run clean:docs",
+    "check": "npm run typecheck && npm run lint && npm run test",
     "clean:dist": "rimraf ./dist/*",
     "clean:docs": "rimraf ./build/docs/*",
     "clean:examples": "rimraf ./build/examples/*",
-    "lint": "eslint -c eslint.config.mjs",
+    "lint": "eslint -c eslint.config.mjs src/ spec/",
     "lint:fix": "npm run lint -- --fix",
     "postpublish": "node ./tasks/update-gh-pages.cjs",
     "prepare": "husky",
     "prepublishOnly": "npm run build:dist && npm run build:docs",
-    "pretest": "npm run clean:dist && npm run typecheck && npm run lint",
     "start": "webpack-dev-server --config webpack.dev.cjs",
-    "test": "jest --maxWorkers=4 --coverage --config jest.config.cjs",
+    "test": "jest --maxWorkers=50% --coverage --config jest.config.cjs",
     "test:watch": "jest --watchAll --config jest.config.cjs",
     "typecheck": "tsc --pretty --noEmit"
   },

Diff for: spec/manager/MapFishPrintV2Manager.spec.ts

@@ -4,17 +4,17 @@ import {
   FetchMock
 } from 'jest-fetch-mock';
 
-import OlMap from 'ol/Map';
 import OlLayerImage from 'ol/layer/Image';
-import OlSourceImageWMS from 'ol/source/ImageWMS';
-import OlView from 'ol/View';
 import OlLayerVector from 'ol/layer/Vector';
+import OlMap from 'ol/Map';
+import OlSourceImageWMS from 'ol/source/ImageWMS';
 import OlSourceVector from 'ol/source/Vector';
-
-import { MapFishPrintV2Manager } from '../../src/index';
+import OlView from 'ol/View';
 
 import mockResponse from '../../assets/v2/info.json';
 
+import { MapFishPrintV2Manager } from '../../src/index';
+
 describe('MapFishPrintV2Manager', () => {
 
   const testMap = new OlMap({

Diff for: spec/manager/MapFishPrintV3Manager.spec.ts

@@ -4,15 +4,14 @@ import {
   FetchMock
 } from 'jest-fetch-mock';
 
-import OlMap from 'ol/Map';
-import OlView from 'ol/View';
 import OlLayerVector from 'ol/layer/Vector';
+import OlMap from 'ol/Map';
 import OlSourceVector from 'ol/source/Vector';
-
-import { MapFishPrintV3Manager, V3CustomMapParams } from '../../src/manager/MapFishPrintV3Manager';
+import OlView from 'ol/View';
 
 import printAppsMockResponse from '../../assets/v3/apps.json';
 import printCapabilitiesMockResponse from '../../assets/v3/capabilities.json';
+import { MapFishPrintV3Manager, V3CustomMapParams } from '../../src/manager/MapFishPrintV3Manager';
 
 describe('MapFishPrintV3Manager', () => {
 
@@ -80,6 +79,7 @@ describe('MapFishPrintV3Manager', () => {
       url: 'https://mock:8080/print/pdf/'
     });
 
+    // @ts-expect-error protected method
     const response = await manager.loadPrintApps();
 
     expect(response).toEqual(printAppsMockResponse);
@@ -96,6 +96,7 @@ describe('MapFishPrintV3Manager', () => {
 
     const printApp = 'default';
 
+    // @ts-expect-error protected method
     const response = await manager.loadAppCapabilities(printApp);
 
     expect(response.app).toBe(printCapabilitiesMockResponse.app);
@@ -107,6 +108,7 @@ describe('MapFishPrintV3Manager', () => {
         map: testMap,
         url: 'https://mock:8080/print/pdf/'
       });
+      // @ts-expect-error protected method
       expect(manager.getBasePath).not.toBeUndefined();
     });
   });

Diff for: spec/serializer/MapFishPrintV2VectorSerializer.spec.ts

@@ -1,20 +1,19 @@
-import OlLayerVector from 'ol/layer/Vector';
+import OlFeature from 'ol/Feature';
+import { Geometry } from 'ol/geom';
+import OlGeomLineString from 'ol/geom/LineString';
+import OlGeomPoint from 'ol/geom/Point';
+import OlGeomPolygon from 'ol/geom/Polygon';
 import OlLayerTile from 'ol/layer/Tile';
-import OlSourceVector from 'ol/source/Vector';
+import OlLayerVector from 'ol/layer/Vector';
 import OlSourceOSM from 'ol/source/OSM';
-import OlStyleStyle from 'ol/style/Style';
+import OlSourceVector from 'ol/source/Vector';
 import OlStyleCircle from 'ol/style/Circle';
-import OlStyleText from 'ol/style/Text';
-import OlStyleStroke from 'ol/style/Stroke';
 import OlStyleFill from 'ol/style/Fill';
-import OlFeature from 'ol/Feature';
-import OlGeomPoint from 'ol/geom/Point';
-import OlGeomLineString from 'ol/geom/LineString';
-import OlGeomPolygon from 'ol/geom/Polygon';
+import OlStyleStroke from 'ol/style/Stroke';
+import OlStyleStyle from 'ol/style/Style';
+import OlStyleText from 'ol/style/Text';
 
 import { MapFishPrintV2VectorSerializer } from '../../src/serializer/MapFishPrintV2VectorSerializer';
-import { Geometry } from 'ol/geom';
-import Feature from 'ol/Feature';
 
 describe('MapFishPrintV2VectorSerializer', () => {
   let serializer: MapFishPrintV2VectorSerializer;
@@ -197,7 +196,7 @@ describe('MapFishPrintV2VectorSerializer', () => {
       ]])
     });
 
-    const features: Feature<Geometry>[] = [
+    const features: OlFeature<Geometry>[] = [
       pointFeature1,
       pointFeature2,
       lineFeature,

Diff for: spec/serializer/MapFishPrintV2WMSSerializer.spec.ts

@@ -1,8 +1,8 @@
 import OlLayerImage from 'ol/layer/Image';
 import OlLayerTile from 'ol/layer/Tile';
 import OlSourceImageWMS from 'ol/source/ImageWMS';
-import OlSourceTileWMS from 'ol/source/TileWMS';
 import OlSourceOSM from 'ol/source/OSM';
+import OlSourceTileWMS from 'ol/source/TileWMS';
 
 import { MapFishPrintV2WMSSerializer } from '../../src/serializer/MapFishPrintV2WMSSerializer';
 

Diff for: spec/serializer/MapFishPrintV3GeoJsonSerializer.spec.ts

@@ -1,14 +1,14 @@
+import OlFeature from 'ol/Feature';
+import { Geometry } from 'ol/geom';
+import OlGeomLineString from 'ol/geom/LineString';
+import OlGeomPoint from 'ol/geom/Point';
+import OlGeomPolygon from 'ol/geom/Polygon';
 import OlLayerImage from 'ol/layer/Image';
 import OlLayerVector from 'ol/layer/Vector';
 import OlSourceImageWMS from 'ol/source/ImageWMS';
 import OlSourceVector from 'ol/source/Vector';
-import OlFeature from 'ol/Feature';
-import OlGeomPoint from 'ol/geom/Point';
-import OlGeomLineString from 'ol/geom/LineString';
-import OlGeomPolygon from 'ol/geom/Polygon';
 
 import { MapFishPrintV3GeoJsonSerializer } from '../../src/serializer/MapFishPrintV3GeoJsonSerializer';
-import { Geometry } from 'ol/geom';
 
 describe('MapFishPrintV3GeoJsonSerializer', () => {
   let serializer: MapFishPrintV3GeoJsonSerializer;
@@ -147,8 +147,4 @@ describe('MapFishPrintV3GeoJsonSerializer', () => {
       renderAsSvg: false
     });
   });
-
-  it('accepts additional serializer opts', () => {
-
-  });
 });

Diff for: spec/serializer/MapFishPrintV3TiledWMSSerializer.spec.ts

@@ -1,6 +1,6 @@
 import OlLayerTile from 'ol/layer/Tile';
-import OlSourceTileWMS from 'ol/source/TileWMS';
 import OlSourceOSM from 'ol/source/OSM';
+import OlSourceTileWMS from 'ol/source/TileWMS';
 
 import { MapFishPrintV3TiledWMSSerializer } from '../../src/serializer/MapFishPrintV3TiledWMSSerializer';
 

Diff for: spec/serializer/MapFishPrintV3WMTSSerializer.spec.ts

@@ -1,9 +1,10 @@
 import OlLayerTile from 'ol/layer/Tile';
 
-import { MapFishPrintV3WMTSSerializer } from '../../src/serializer/MapFishPrintV3WMTSSerializer';
 import OlSourceWMTS from 'ol/source/WMTS';
 import OlTileGridWMTS from 'ol/tilegrid/WMTS';
 
+import { MapFishPrintV3WMTSSerializer } from '../../src/serializer/MapFishPrintV3WMTSSerializer';
+
 describe('MapFishPrintV3WMTSSerializer', () => {
   let serializer: MapFishPrintV3WMTSSerializer;
 
@@ -19,9 +20,13 @@ describe('MapFishPrintV3WMTSSerializer', () => {
     const layer = new OlLayerTile({
       source: new OlSourceWMTS({
         layer: ' test',
-        matrixSet: undefined,
+        matrixSet: 'example',
         style: 'default',
-        tileGrid: undefined,
+        tileGrid: new OlTileGridWMTS({
+          matrixIds: ['0'],
+          resolutions: [1000],
+          origin: [19, 0.9]
+        })
       })
     });
 

Diff for: spec/util/Shared.spec.ts

@@ -1,14 +1,14 @@
-import OlMap from 'ol/Map';
-import OlView from 'ol/View';
+import OlCollection from 'ol/Collection';
 import OlInteractionDragRotateAndZoom from 'ol/interaction/DragRotateAndZoom';
-import OlLayerVector from 'ol/layer/Vector';
+import OlLayerGroup from 'ol/layer/Group';
 import OlLayerImage from 'ol/layer/Image';
 import OlLayerTile from 'ol/layer/Tile';
+import OlLayerVector from 'ol/layer/Vector';
+import OlMap from 'ol/Map';
 import OlSourceImageWMS from 'ol/source/ImageWMS';
 import OlSourceTileWMS from 'ol/source/TileWMS';
 import OlSourceVector from 'ol/source/Vector';
-import OlLayerGroup from 'ol/layer/Group';
-import OlCollection from 'ol/Collection';
+import OlView from 'ol/View';
 
 import { Shared } from '../../src/util/Shared';
 
@@ -104,7 +104,7 @@ describe('Shared', () => {
 
       const layerArrayReturned = Shared.getMapLayers(map);
       expect(layerArrayReturned).toHaveLength(names.length + 1);
-      for (var i = 0; i < names.length; i++) {
+      for (let i = 0; i < names.length; i++) {
         expect(layerArrayReturned[i + 1].get('name')).toEqual(names[i]);
       }
     });

Diff for: src/interaction/InteractionTransform.ts

@@ -356,8 +356,8 @@ export class OlInteractionTransform extends OlInteractionPointer {
       this.style[style] = [olstyle];
     }
 
-    for (let i = 0; i < this.style[style].length; i++) {
-      const im = this.style[style][i].getImage();
+    for (const st of this.style[style]) {
+      const im = st.getImage();
       if (im) {
         if (style === 'rotate') {
           im.getAnchor()[0] = -5;
@@ -366,7 +366,7 @@ export class OlInteractionTransform extends OlInteractionPointer {
           im.setScale(1.8);
         }
       }
-      const tx = this.style[style][i].getText();
+      const tx = st.getText();
       if (tx) {
         if (style === 'rotate') {
           tx.setOffsetX(this.isTouch ? 14 : 7);
@@ -376,13 +376,15 @@ export class OlInteractionTransform extends OlInteractionPointer {
         }
       }
     }
+
     this.drawSketch_(false);
   }
 
   /**
    * Get Feature at pixel
    */
   getFeatureAtPixel_(pixel: OlPixel) {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     const self = this;
     let found: {
       feature?: OlFeatureLike;
@@ -416,9 +418,8 @@ export class OlInteractionTransform extends OlInteractionPointer {
       // eslint-disable-next-line no-underscore-dangle
       if (self.layers_) {
         // eslint-disable-next-line no-underscore-dangle
-        for (let i = 0; i < self.layers_.length; i++) {
-          // eslint-disable-next-line no-underscore-dangle
-          if (self.layers_[i] === layer) {
+        for (const lyr of self.layers_) {
+          if (lyr === layer) {
             found = { feature: feature };
             return true;
           }