ol-wfst 4.0.5 → 4.0.6

package/lib/ol-wfst.js

@@ -1,7 +1,13 @@
-import { Style, Stroke, Fill, Circle } from 'ol/style';
-import { Control } from 'ol/control';
-import { Modify, Snap, Select, Draw } from 'ol/interaction';
-import { Observable, Feature, Overlay, Collection } from 'ol';
+import CircleStyle from 'ol/style/Circle';
+import Fill$1 from 'ol/style/Fill';
+import Stroke$1 from 'ol/style/Stroke';
+import Style$1 from 'ol/style/Style';
+import Control$1 from 'ol/control/Control';
+import Draw from 'ol/interaction/Draw';
+import Modify from 'ol/interaction/Modify';
+import Select from 'ol/interaction/Select';
+import Snap from 'ol/interaction/Snap';
+import Collection from 'ol/Collection';
 import BaseEvent from 'ol/events/Event';
 import { primaryAction, never } from 'ol/events/condition';
 import { unByKey } from 'ol/Observable';
@@ -14,11 +20,19 @@ import VectorSource, { VectorSourceEvent } from 'ol/source/Vector';
 import { transformExtent } from 'ol/proj';
 import { bbox } from 'ol/loadingstrategy';
 import TileLayer from 'ol/layer/Tile';
-import { GeoJSON as GeoJSON$1, WFS, KML } from 'ol/format';
 import TileWMS from 'ol/source/TileWMS';
 import TileState from 'ol/TileState';
-import { MultiPolygon, MultiLineString, MultiPoint, GeometryCollection, Polygon, Circle as Circle$1 } from 'ol/geom';
+import { Observable, Overlay } from 'ol';
+import { MultiPolygon, MultiLineString, MultiPoint, GeometryCollection, Polygon } from 'ol/geom';
+import { WFS, GeoJSON as GeoJSON$1, KML } from 'ol/format';
+import { Control } from 'ol/control';
+import { Style, Stroke, Fill, Circle } from 'ol/style';
 import BaseObject from 'ol/Object';
+import Circle$1 from 'ol/geom/Circle';
+import GeometryCollection$1 from 'ol/geom/GeometryCollection';
+import Feature from 'ol/Feature';
+import KML$1 from 'ol/format/KML';
+import WFS$1 from 'ol/format/WFS';
 import { fromCircle } from 'ol/geom/Polygon';
 import { getCenter } from 'ol/extent';
 
@@ -29,9 +43,11 @@ const isError = new Set();
 const initModal = (opts) => {
     options = opts;
 };
-const parseError = (geoserverError) => {
-    if ('exceptions' in geoserverError) {
-        return geoserverError.exceptions.map((e) => e.text).join(',');
+const parseError = (geoserverResponse) => {
+    if ('exceptions' in geoserverResponse) {
+        return geoserverResponse.exceptions
+            .map((e) => e.text)
+            .join(',');
     }
     else {
         return '';
@@ -50,7 +66,7 @@ const showError = (msg, originalError = null, layerName = '') => {
     }
     isError.add(layerName);
     let err_msg = `<b>Error: ${msg}</b>`;
-    if (originalError) {
+    if (originalError && originalError.message !== msg) {
         err_msg += `. ${originalError.message}`;
     }
     const al = Modal.alert(err_msg, options);
@@ -94,9 +110,9 @@ const es = {
         geoserver: 'No se pudieron obtener datos desde el GeoServer',
         badFormat: 'Formato no soportado',
         badFile: 'Error al leer elementos del archivo',
-        lockFeature: 'No se pudieron bloquear elementos en el GeoServer.',
-        transaction: 'Error al hacer transacción con el GeoServer.',
-        getFeatures: 'Error al obtener elemento desde el GeoServer.'
+        lockFeature: 'No se pudieron bloquear elementos en el GeoServer',
+        transaction: 'Error al hacer transacción con el GeoServer',
+        getFeatures: 'Error al obtener elemento desde el GeoServer'
     }
 };
 
@@ -134,9 +150,9 @@ const en = {
         geoserver: 'Failed to get data from GeoServer',
         badFormat: 'Unsupported format',
         badFile: 'Error reading items from file',
-        lockFeature: 'Could not lock items on the GeoServer.',
-        transaction: 'Error when doing Transaction with GeoServer.',
-        getFeatures: 'Error getting elements from GeoServer.'
+        lockFeature: 'Could not lock items on the GeoServer',
+        transaction: 'Error when doing Transaction with GeoServer',
+        getFeatures: 'Error getting elements from GeoServer'
     }
 };
 
@@ -293,7 +309,7 @@ class BaseLayer extends Layer {
             this.getAndUpdateDescribeFeatureType();
         }
         else {
-            geoserver.on('change:capabilities', () => {
+            geoserver.on('change:capabilities', async () => {
                 this.getAndUpdateDescribeFeatureType();
             });
         }
@@ -328,6 +344,9 @@ class BaseLayer extends Layer {
             if (!data) {
                 throw new Error('');
             }
+            if (data.exceptions) {
+                throw new Error(parseError(data));
+            }
             const targetNamespace = data.targetNamespace;
             const properties = data.featureTypes[0].properties;
             // Find the geometry field
@@ -342,7 +361,7 @@ class BaseLayer extends Layer {
         }
         catch (err) {
             console.error(err);
-            throw new Error(`${I18N.errors.layer} "${layerLabel}"`);
+            showError(`${I18N.errors.layer} "${layerLabel}"`, err, layerName);
         }
     }
     /**
@@ -635,7 +654,7 @@ class WmsLayer extends Mixin(BaseLayer, (TileLayer)) {
         if (options.beforeTransactFeature) {
             this.beforeTransactFeature = options.beforeTransactFeature;
         }
-        this._formatGeoJSON = new GeoJSON$1();
+        this._formatGeoJSON = new GeoJSON();
         const geoserver = options.geoserver;
         const source = new WmsSource({
             name: options.name,
@@ -826,8 +845,8 @@ class LayersControl extends Observable {
         const layerName = layer.get(BaseLayerProperty.NAME);
         const checked = layer === getActiveLayerToInsertEls() ? { checked: 'checked' } : {};
         const input = (createElement("input", { value: layerName, id: `wfst--${layerName}`, type: "radio", className: "ol-wfst--tools-control-input", name: "wfst--select-layer", ...checked, onchange: (evt) => this._layerChangeHandler(evt, layer) }));
-        const layerDom = (createElement("div", { className: `wfst--layer-control 
-                            ${layer.getVisible() ? 'ol-wfst--visible-on' : ''}
+        const layerDom = (createElement("div", { className: `wfst--layer-control 
+                            ${layer.getVisible() ? 'ol-wfst--visible-on' : ''}
                             ${layer === getActiveLayerToInsertEls()
                 ? 'ol-wfst--selected-on'
                 : ''}`, "data-layer": layerName },
@@ -1053,8 +1072,8 @@ class Uploads extends Observable {
             else {
                 resetStateButtons();
                 this.dispatchEvent(new VectorSourceEvent('loadedFeatures', null, featuresToInsert));
-                const content = `
-            ${I18N.labels.validFeatures}: ${validFeaturesCount}<br>
+                const content = `
+            ${I18N.labels.validFeatures}: ${validFeaturesCount}<br>
             ${invalidFeaturesCount
                     ? `${I18N.labels.invalidFeatures}: ${invalidFeaturesCount}`
                     : ''}`;
@@ -1150,13 +1169,13 @@ class Uploads extends Observable {
      * @private
      */
     _initModal(content, featuresToInsert) {
-        const footer = `
-        <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">
-            ${I18N.labels.cancel}
-        </button>
-        <button type="button" class="btn btn-sm btn-primary" data-action="save" data-dismiss="modal">
-            ${I18N.labels.upload}
-        </button>
+        const footer = `
+        <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">
+            ${I18N.labels.cancel}
+        </button>
+        <button type="button" class="btn btn-sm btn-primary" data-action="save" data-dismiss="modal">
+            ${I18N.labels.upload}
+        </button>
     `;
         const modal = new Modal({
             ...this._options.modal,
@@ -1405,16 +1424,16 @@ class EditFieldsModal extends Observable {
     constructor(options) {
         super();
         this._options = options;
-        const footer = `
-            <button type="button" class="btn btn-sm btn-link btn-third" data-action="delete" data-dismiss="modal">
-                ${I18N.labels.delete}
-            </button>
-            <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">
-                ${I18N.labels.cancel}
-            </button>
-            <button type="button" class="btn btn-sm btn-primary" data-action="save" data-dismiss="modal">
-                ${I18N.labels.save}
-            </button>
+        const footer = `
+            <button type="button" class="btn btn-sm btn-link btn-third" data-action="delete" data-dismiss="modal">
+                ${I18N.labels.delete}
+            </button>
+            <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">
+                ${I18N.labels.cancel}
+            </button>
+            <button type="button" class="btn btn-sm btn-primary" data-action="save" data-dismiss="modal">
+                ${I18N.labels.save}
+            </button>
         `;
         this._modal = new Modal({
             ...this._options,
@@ -1472,10 +1491,10 @@ class EditFieldsModal extends Observable {
                         type = 'text';
                 }
                 if (type) {
-                    content += `
-                <div class="ol-wfst--input-field-container">
-                    <label class="ol-wfst--input-field-label" for="${key}">${key}</label>
-                    <input placeholder="NULL" class="ol-wfst--input-field-input" type="${type}" name="${key}" value="${properties[key] || ''}">
+                    content += `
+                <div class="ol-wfst--input-field-container">
+                    <label class="ol-wfst--input-field-label" for="${key}">${key}</label>
+                    <input placeholder="NULL" class="ol-wfst--input-field-input" type="${type}" name="${key}" value="${properties[key] || ''}">
                 </div>`;
                 }
             }
@@ -1540,9 +1559,9 @@ class Geoserver extends BaseObject {
         this._updateFeatures = [];
         this._deleteFeatures = [];
         // Formats
-        this._formatWFS = new WFS();
-        this._formatGeoJSON = new GeoJSON$1();
-        this._formatKml = new KML({
+        this._formatWFS = new WFS$1();
+        this._formatGeoJSON = new GeoJSON();
+        this._formatKml = new KML$1({
             extractStyles: false,
             showPointNames: false
         });
@@ -1740,7 +1759,7 @@ class Geoserver extends BaseObject {
      * @private
      */
     async transact(transactionType, features, layerName) {
-        features = Array.isArray(features) ? features : [features];
+        features = (Array.isArray(features) ? features : [features]);
         const clonedFeatures = [];
         const geoLayer = getStoredLayer(layerName);
         for (const feature of features) {
@@ -1748,7 +1767,7 @@ class Geoserver extends BaseObject {
             const cloneGeom = clone.getGeometry();
             // Ugly fix to support GeometryCollection on GML
             // See https://github.com/openlayers/openlayers/issues/4220
-            if (cloneGeom instanceof GeometryCollection) {
+            if (cloneGeom instanceof GeometryCollection$1) {
                 this._transformGeoemtryCollectionToGeometries(clone, cloneGeom);
             }
             else if (cloneGeom instanceof Circle$1) {
@@ -1804,10 +1823,10 @@ class Geoserver extends BaseObject {
                         srs === 'EPSG:4326'
                             ? 'urn:x-ogc:def:crs:EPSG:4326'
                             : srs;
-                    const describeFeatureType = geoLayer.getDescribeFeatureType()._parsed;
-                    if (!geoLayer) {
-                        throw new Error(I18N.errors.layerNotFound);
+                    if (!geoLayer || !geoLayer.getDescribeFeatureType()) {
+                        throw new Error(`${I18N.errors.layerNotFound}: "${layerName}"`);
                     }
+                    const describeFeatureType = geoLayer.getDescribeFeatureType()._parsed;
                     const options = {
                         featureNS: describeFeatureType.namespace,
                         featureType: layerName,
@@ -1860,20 +1879,22 @@ class Geoserver extends BaseObject {
                     if (!response.ok) {
                         throw new Error(I18N.errors.transaction + ' ' + response.status);
                     }
-                    const parseResponse = this._formatWFS.readTransactionResponse(await response.text());
+                    const responseStr = await response.text();
+                    const parseResponse = this._formatWFS.readTransactionResponse(responseStr);
+                    const wlayer = getStoredLayer(layerName);
                     if (!Object.keys(parseResponse).length) {
-                        const responseStr = await response.text();
                         const findError = String(responseStr).match(/<ows:ExceptionText>([\s\S]*?)<\/ows:ExceptionText>/);
                         if (findError) {
+                            if (wlayer instanceof WmsLayer) {
+                                this._removeFeatures(features);
+                            }
+                            // maybe remove tmp wms features here
                             throw new Error(findError[1]);
                         }
                     }
                     if (transactionType !== TransactionType.Delete) {
-                        for (const feature of features) {
-                            getEditLayer().getSource().removeFeature(feature);
-                        }
+                        this._removeFeatures(features);
                     }
-                    const wlayer = getStoredLayer(layerName);
                     wlayer.refresh();
                     showLoading(false);
                     this._insertFeatures = [];
@@ -1891,6 +1912,14 @@ class Geoserver extends BaseObject {
             }, 0);
         });
     }
+    /**
+     * @privatwe
+     */
+    _removeFeatures(features) {
+        for (const feature of features) {
+            getEditLayer().getSource().removeFeature(feature);
+        }
+    }
     /**
      *
      * @param feature
@@ -1964,6 +1993,7 @@ class Geoserver extends BaseObject {
                 // First, check if is a JSON (with errors)
                 const dataParsed = JSON.parse(data);
                 if ('exceptions' in dataParsed) {
+                    const error = new Error(parseError(dataParsed));
                     const exceptions = dataParsed.exceptions;
                     if (exceptions[0].code === 'CannotLockAllFeatures') {
                         // Maybe the Feature is already blocked, ant thats trigger error, so, we try one locking more time again
@@ -1971,11 +2001,11 @@ class Geoserver extends BaseObject {
                             this.lockFeature(featureId, layerName, 1);
                         }
                         else {
-                            showError(I18N.errors.lockFeature, exceptions);
+                            throw error;
                         }
                     }
                     else {
-                        showError(exceptions[0].text, exceptions);
+                        throw error;
                     }
                 }
             }
@@ -2062,7 +2092,7 @@ const controlElement = document.createElement('div');
  * @extends {ol/control/Control~Control}
  * @param options Wfst options, see [Wfst Options](#options) for more details.
  */
-class Wfst extends Control {
+class Wfst extends Control$1 {
     _options;
     _i18n;
     // Ol
@@ -2338,13 +2368,13 @@ class Wfst extends Control {
         this._interactionModify = new Modify({
             style: () => {
                 if (getMode() === Modes.Edit) {
-                    return new Style({
-                        image: new Circle({
+                    return new Style$1({
+                        image: new CircleStyle({
                             radius: 6,
-                            fill: new Fill({
+                            fill: new Fill$1({
                                 color: '#ff0000'
                             }),
-                            stroke: new Stroke({
+                            stroke: new Stroke$1({
                                 width: 2,
                                 color: 'rgba(5, 5, 5, 0.9)'
                             })
@@ -2766,5 +2796,5 @@ class WfstEvent extends BaseEvent {
     }
 }
 
-export { Geoserver, WfsLayer, WmsLayer, Wfst as default };
+export { Geoserver, WfsLayer, WfstEvent, WmsLayer, Wfst as default };
 //# sourceMappingURL=ol-wfst.js.map