@vcmap/core 5.0.0-rc.3 → 5.0.0-rc.31

package/src/{vcs/vcm/layer/featureStoreChanges.js → layer/featureStoreLayerChanges.js}

@@ -1,10 +1,13 @@
-import axios from 'axios';
 import { unByKey } from 'ol/Observable.js';
 import Feature from 'ol/Feature.js';
 import { check } from '@vcsuite/check';
-import { featureStoreState, featureStoreStateSymbol } from './featureStoreState.js';
+import {
+  FeatureStoreLayerState,
+  featureStoreStateSymbol,
+} from './featureStoreLayerState.js';
 import { parseGeoJSON, writeGeoJSONFeature } from './geojsonHelpers.js';
-import VcsObject from '../object.js';
+import VcsObject from '../vcsObject.js';
+import { requestJson } from '../util/fetch.js';
 
 /**
  * @typedef {Object} FeatureStoreTrackResults
@@ -26,22 +29,83 @@ import VcsObject from '../object.js';
  * @property {boolean} changed
  */
 
+/**
+ * @typedef {Object} CommitAction
+ * @property {string} action
+ * @property {import("ol/format/GeoJSON").GeoJSONFeature} feature
+ * @property {import("ol").Feature<import("ol/geom/Geometry").default>} original
+ * @property {function(string=):void} success
+ */
+
+/**
+ * @param {Set<import("ol").Feature<import("ol/geom/Geometry").default>>} added
+ * @param {Set<import("ol").Feature<import("ol/geom/Geometry").default>>} edited
+ * @param {Set<import("ol").Feature<import("ol/geom/Geometry").default>>} removed
+ * @returns {Array<CommitAction>}
+ * @private
+ */
+export function createCommitActions(added, edited, removed) {
+  const actions = [];
+  added.forEach((f) => {
+    const feature = writeGeoJSONFeature(f, { writeStyle: true });
+    actions.push({
+      action: 'add',
+      feature,
+      original: f,
+      success(data) {
+        f.setId(data);
+        f[featureStoreStateSymbol] = FeatureStoreLayerState.DYNAMIC;
+      },
+    });
+  });
+
+  edited.forEach((f) => {
+    const feature = writeGeoJSONFeature(f, { writeStyle: true });
+    feature._id = f.getId();
+    feature.geomety = 'test'; // XXX why test???
+    actions.push({
+      action: 'edit',
+      original: f,
+      feature,
+      success() {
+        if (f[featureStoreStateSymbol] === FeatureStoreLayerState.STATIC) {
+          f[featureStoreStateSymbol] = FeatureStoreLayerState.EDITED;
+        }
+      },
+    });
+  });
+
+  removed.forEach((f) => {
+    const _id = f.getId();
+    actions.push({
+      original: f,
+      action: 'remove',
+      feature: { _id },
+      success() {},
+    });
+  });
+
+  return actions;
+}
+
 /**
  * do not construct directly, use the layers .changeTracker instead
  * @class
  * @extends {VcsObject}
  * @api
  */
-class FeatureStoreChanges extends VcsObject {
-  static get className() { return 'vcs.vcm.layer.FeatureStoreChanges'; }
+class FeatureStoreLayerChanges extends VcsObject {
+  static get className() {
+    return 'FeatureStoreLayerChanges';
+  }
 
   /**
-   * @param {import("@vcmap/core").FeatureStore} layer
+   * @param {import("@vcmap/core").FeatureStoreLayer} layer
    */
   constructor(layer) {
     super({});
 
-    /** @type {import("@vcmap/core").FeatureStore} */
+    /** @type {import("@vcmap/core").FeatureStoreLayer} */
     this.layer = layer;
     /** @type {FeatureStoreChangesListeners} */
     this._changesListeners = {
@@ -69,7 +133,9 @@ class FeatureStoreChanges extends VcsObject {
    * @returns {boolean}
    * @api
    */
-  get active() { return Object.values(this._changesListeners).some(c => c !== null); }
+  get active() {
+    return Object.values(this._changesListeners).some((c) => c !== null);
+  }
 
   /**
    * starts tracking changes on the layer
@@ -78,15 +144,24 @@ class FeatureStoreChanges extends VcsObject {
    */
   track() {
     if (this._changesListeners.addfeature === null) {
-      this._changesListeners.addfeature = this.layer.source.on('addfeature', this._featureAdded.bind(this));
+      this._changesListeners.addfeature = this.layer.source.on(
+        'addfeature',
+        this._featureAdded.bind(this),
+      );
     }
 
     if (this._changesListeners.changefeature === null) {
-      this._changesListeners.changefeature = this.layer.source.on('changefeature', this._featureChanged.bind(this));
+      this._changesListeners.changefeature = this.layer.source.on(
+        'changefeature',
+        this._featureChanged.bind(this),
+      );
     }
 
     if (this._changesListeners.removefeature === null) {
-      this._changesListeners.removefeature = this.layer.source.on('removefeature', this._featureRemoved.bind(this));
+      this._changesListeners.removefeature = this.layer.source.on(
+        'removefeature',
+        this._featureRemoved.bind(this),
+      );
     }
   }
 
@@ -104,88 +179,57 @@ class FeatureStoreChanges extends VcsObject {
   /**
    * commits the changes to the provided url. url should contain accessTokens and point to a featureStore layers bulk operation endpoint
    * @param {string} url
+   * @param {Object<string, string>=} headers
    * @returns {Promise<void>}
    * @api
    */
-  commitChanges(url) {
-    const actions = [];
-    this._addedFeatures.forEach((f) => {
-      const feature = writeGeoJSONFeature(f, { writeStyle: true });
-      actions.push({
-        action: 'add',
-        feature,
-        original: f,
-        success(data) {
-          f.setId(data);
-          f[featureStoreStateSymbol] = featureStoreState.DYNAMIC;
+  async commitChanges(url, headers = {}) {
+    const actions = createCommitActions(
+      this._addedFeatures,
+      this._editedFeatures,
+      this._removedFeatures,
+    );
+    if (actions.length > 0) {
+      const data = await requestJson(url.toString(), {
+        method: 'POST',
+        headers: {
+          ...headers,
+          'Content-Type': 'application/json',
         },
+        body: JSON.stringify(
+          actions.map((a) => ({ action: a.action, feature: a.feature })),
+        ),
       });
-    });
 
-    this._editedFeatures.forEach((f) => {
-      const feature = writeGeoJSONFeature(f, { writeStyle: true });
-      feature._id = f.getId();
-      feature.geomety = 'test';
-      actions.push({
-        action: 'edit',
-        original: f,
-        feature,
-        success() {
-          if (f[featureStoreStateSymbol] === featureStoreState.STATIC) {
-            f[featureStoreStateSymbol] = featureStoreState.EDITED;
-          }
-        },
+      const failures = data.failedActions.map(({ index, error }) => {
+        const action = actions[index];
+        this.getLogger().log(`failed action ${action.action}: ${error}`);
+        actions[index] = null;
+        return this._resetFeature(action.original);
       });
-    });
 
-    this._removedFeatures.forEach((f) => {
-      const _id = f.getId();
-      actions.push({
-        original: f,
-        action: 'remove',
-        feature: { _id },
-        success() {},
-      });
-    });
-    /** @type {Promise<void>} */
-    let promise = Promise.resolve();
-    if (actions.length) {
-      // @ts-ignore
-      promise = axios.post(url.toString(), actions.map(a => ({ action: a.action, feature: a.feature })))
-        .then(({ data }) => {
-          const failures = data.failedActions.map(({ index, error }) => {
-            const action = actions[index];
-            this.getLogger().log(`failed action ${action.action}: ${error}`);
-            actions[index] = null;
-            return this._resetFeature(action.original);
-          });
-
-          actions
-            .filter(a => a)
-            .forEach(({ action, success }) => {
-              if (action === 'add') {
-                success(data.insertedIds.shift()._id); // XXX should this be shift or should we find the index?
-              } else {
-                success();
-              }
-            });
-          return Promise.all(failures);
+      actions
+        .filter((a) => a)
+        .forEach(({ action, success }) => {
+          if (action === 'add') {
+            success(data.insertedIds.shift()._id); // XXX should this be shift or should we find the index?
+          } else {
+            success();
+          }
         });
-    }
-
-    return promise
-      .then(() => {
-        const promises = [];
-        this._convertedFeatures.forEach((f) => { promises.push(this._resetFeature(f)); });
-        return Promise.all(promises);
-      })
-      .then(() => {
-        this._resetValues();
-      })
-      .catch((err) => {
-        this._resetValues();
+      await Promise.all(failures);
+    } else {
+      try {
+        await Promise.all(
+          [...this._convertedFeatures].map(async (f) => {
+            await this._resetFeature(f);
+          }),
+        );
+      } catch (err) {
         this.getLogger().error(err.message);
-      });
+      }
+      this._resetValues();
+    }
   }
 
   /**
@@ -195,10 +239,18 @@ class FeatureStoreChanges extends VcsObject {
    */
   async reset() {
     const promises = [];
-    this._addedFeatures.forEach((f) => { promises.push(this._resetFeature(f)); });
-    this._editedFeatures.forEach((f) => { promises.push(this._resetFeature(f)); });
-    this._removedFeatures.forEach((f) => { promises.push(this._resetFeature(f)); });
-    this._convertedFeatures.forEach((f) => { promises.push(this._resetFeature(f)); });
+    this._addedFeatures.forEach((f) => {
+      promises.push(this._resetFeature(f));
+    });
+    this._editedFeatures.forEach((f) => {
+      promises.push(this._resetFeature(f));
+    });
+    this._removedFeatures.forEach((f) => {
+      promises.push(this._resetFeature(f));
+    });
+    this._convertedFeatures.forEach((f) => {
+      promises.push(this._resetFeature(f));
+    });
     return Promise.all(promises)
       .then(() => {
         this._resetValues();
@@ -222,19 +274,23 @@ class FeatureStoreChanges extends VcsObject {
       return Promise.resolve();
     }
 
-    if (feature[featureStoreStateSymbol] === featureStoreState.STATIC) {
+    if (feature[featureStoreStateSymbol] === FeatureStoreLayerState.STATIC) {
       this.layer.resetStaticFeature(featureId);
       return Promise.resolve();
     }
 
-    return this.layer.injectedFetchDynamicFeatureFunc(featureId)
+    return this.layer
+      .injectedFetchDynamicFeatureFunc(featureId)
       .then((data) => {
         const { features } = parseGeoJSON(data);
         this.layer.removeFeaturesById(idArray);
         this.layer.addFeatures(features);
       })
       .catch((err) => {
-        this.getLogger().error('failed to reset feature, giving up', err.message);
+        this.getLogger().error(
+          'failed to reset feature, giving up',
+          err.message,
+        );
       });
   }
 
@@ -279,7 +335,9 @@ class FeatureStoreChanges extends VcsObject {
     if (!feature[featureStoreStateSymbol]) {
       this._addedFeatures.add(feature);
       this.values.changed = true;
-    } else if (feature[featureStoreStateSymbol] === featureStoreState.STATIC) {
+    } else if (
+      feature[featureStoreStateSymbol] === FeatureStoreLayerState.STATIC
+    ) {
       this._convertedFeatures.add(feature);
       this.values.changed = true;
     }
@@ -357,4 +415,4 @@ class FeatureStoreChanges extends VcsObject {
   }
 }
 
-export default FeatureStoreChanges;
+export default FeatureStoreLayerChanges;

package/src/{vcs/vcm/layer/featureStoreState.js → layer/featureStoreLayerState.js}

@@ -10,9 +10,8 @@ export const featureStoreStateSymbol = Symbol('vcsFeatureType');
  * @property {string} STATIC
  * @property {string} EDITED
  * @api
- * @export
  */
-export const featureStoreState = {
+export const FeatureStoreLayerState = {
   DYNAMIC: 'dynamic',
   STATIC: 'static',
   EDITED: 'edited',