Merge pull request #59 from milieuinfo/feature/filter-for-delete-action

Introduceer de mogelijkheid om de delete action te filteren op basis van feature
milieuinfo · Mar 22, 2022 · af0802e · af0802e
2 parents 664826e + be88811
commit af0802e
Show file tree

Hide file tree

Showing 7 changed files with 3,455 additions and 3,152 deletions.
diff --git a/bamboo-specs/bamboo.yml b/bamboo-specs/bamboo.yml
@@ -7,6 +7,7 @@ plan:
 
 triggers:
   - polling: 130
+  - cron: "0 30 2 * * ?"
 
 variables:
   release_version: patch
@@ -25,7 +26,7 @@ Build:
   tasks:
     - clean
     - script: |
-        #!/usr/env/bin bash
+        #!/bin/bash
         set -e
         export browserstack_username="${bamboo_browserstack_username}"
         export browserstack_password="${bamboo_browserstack_password}"

diff --git a/dist/style.css b/dist/style.css
diff --git a/dist/vl-mapactions.js b/dist/vl-mapactions.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/style.css b/src/style.css
diff --git a/src/vl-mapactions-delete-action.js b/src/vl-mapactions-delete-action.js
@@ -2,7 +2,7 @@ import {Fill, Stroke, Style, Circle} from 'ol/style';
 import {VlBoxSelectAction} from './vl-mapactions-box-select-action';
 
 export class VlDeleteAction extends VlBoxSelectAction {
-  constructor(layer, onDelete, options) {
+  constructor(layer, onDelete, options = {}) {
     const defaultStyle = new Style({
       fill: new Fill({
         color: 'rgba(241, 174, 174, 0.26)',
@@ -23,8 +23,6 @@ export class VlDeleteAction extends VlBoxSelectAction {
       }),
     });
 
-    const style = options ? options.style || defaultStyle : defaultStyle;
-
     const removeFeature = (feature) => {
       if (feature && (feature.getId() == null || layer.getSource().getFeatureById(feature.getId()) === feature)) {
         layer.getSource().removeFeature(feature);
@@ -51,7 +49,8 @@ export class VlDeleteAction extends VlBoxSelectAction {
         clearAndRender();
       }
     }, {
-      style: style,
+      style: options.style || defaultStyle,
+      filter: options.filter
     });
   }
 }
diff --git a/test/unit/vl-mapactions-delete-action.test.js b/test/unit/vl-mapactions-delete-action.test.js
@@ -132,4 +132,14 @@ describe('delete action', () => {
     deleteAction.dragBoxInteraction.dispatchEvent('boxend');
     expect(deleteAction.map.render.called).to.be.true;
   });
+
+  it('de feature filter zal doorgegeven worden aan de select action', () => {
+    const layers = {};
+    const filter = () => {};
+    const options = {
+      filter: filter,
+    };
+    const action = new VlDeleteAction(layers, null, options);
+    expect(action.filter).to.equal(filter);
+  });
 });