ol-wfst 3.0.1 → 3.0.4

package/lib/ol-wfst.js

@@ -93,6 +93,7 @@ const es = {
         capabilities: 'No se pudieron obtener las Capabilidades del GeoServer',
         wfst: 'El GeoServer no tiene soporte a Transacciones',
         layer: 'No se pudieron obtener datos de la capa',
+        layerNotFound: 'CApa no encontrada',
         noValidGeometry: 'No se encontraron geometrías válidas para agregar a esta capa',
         geoserver: 'No se pudieron obtener datos desde el GeoServer',
         badFormat: 'Formato no soportado',
@@ -131,20 +132,61 @@ const en = {
         capabilities: 'GeoServer Capabilities could not be downloaded.',
         wfst: 'The GeoServer does not support Transactions',
         layer: 'Could not get data from layer',
+        layerNotFound: 'Layer not found',
         noValidGeometry: 'No valid geometries found to add to this layer',
         geoserver: 'Could not get data from the GeoServer',
         badFormat: 'Unsupported format',
         badFile: 'Error reading items from file',
-        lockFeature: 'No se pudieron bloquear elementos en el GeoServer. HTTP status:',
+        lockFeature: 'Could not lock items on the GeoServer. HTTP status:',
         transaction: 'Error when doing Transaction with GeoServer. HTTP status:',
         getFeatures: 'Error getting elements from GeoServer. HTTP status:'
     }
 };
 
+const zh = {
+    labels: {
+        select: '选择',
+        addElement: '切换绘图类型',
+        editElement: '编辑元素',
+        save: '保存',
+        delete: '删除',
+        cancel: '取消',
+        apply: '确认并应用改变',
+        upload: '上传',
+        editMode: '编辑模式',
+        confirmDelete: '确认删除元素?',
+        geomTypeNotSupported: '图层不支持该几何',
+        editFields: '编辑区域',
+        editGeom: '编辑几何',
+        selectDrawType: '几何类型',
+        uploadToLayer: '通过文件上传图层',
+        uploadFeatures: '上传元素到图层',
+        validFeatures: '合法的几何类型',
+        invalidFeatures: '不合法',
+        loading: '加载中...',
+        toggleVisibility: '切换图层透明度',
+        close: '关闭'
+    },
+    errors: {
+        capabilities: '无法加载GeoServer服务所支持的能力.',
+        wfst: 'GeoServer不支持事务',
+        layer: '无法从图层获得数据',
+        layerNotFound: 'Layer not found',
+        noValidGeometry: '不支持的几何类型无法加载到图层',
+        geoserver: '无法从GeoServer获取数据',
+        badFormat: '不支持的格式',
+        badFile: '读取文件数据出错',
+        lockFeature: '无法锁定GeoServer上的元素. HTTP状态码:',
+        transaction: 'GeoServer处理事务出错. HTTP状态码:',
+        getFeatures: '从GeoServer获取元素出错. HTTP状态码:'
+    }
+};
+
 var i18n = /*#__PURE__*/Object.freeze({
     __proto__: null,
     es: es,
-    en: en
+    en: en,
+    zh: zh
 });
 
 // https://docs.geoserver.org/latest/en/user/services/wfs/axis_order.html
@@ -198,6 +240,7 @@ class Wfst extends Control {
                 projection: DEFAULT_GEOSERVER_SRS
             },
             headers: {},
+            credentials: 'same-origin',
             layers: null,
             evtType: 'singleclick',
             active: true,
@@ -309,7 +352,8 @@ class Wfst extends Control {
                 const url_fetch = this._options.geoServerUrl + '?' + params.toString();
                 try {
                     const response = yield fetch(url_fetch, {
-                        headers: this._options.headers
+                        headers: this._options.headers,
+                        credentials: this._options.credentials
                     });
                     if (!response.ok) {
                         throw new Error('');
@@ -375,7 +419,8 @@ class Wfst extends Control {
                 });
                 const url_fetch = geoServerUrl + '?' + params.toString();
                 const response = yield fetch(url_fetch, {
-                    headers: this._options.headers
+                    headers: this._options.headers,
+                    credentials: this._options.credentials
                 });
                 if (!response.ok) {
                     throw new Error('');
@@ -464,7 +509,8 @@ class Wfst extends Control {
                 tileLoadFunction: (tile, src) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const response = yield fetch(src, {
-                            headers: this._options.headers
+                            headers: this._options.headers,
+                            credentials: this._options.credentials
                         });
                         if (!response.ok) {
                             throw new Error('');
@@ -539,7 +585,8 @@ class Wfst extends Control {
                             '?' +
                             params.toString();
                         const response = yield fetch(url_fetch, {
-                            headers: this._options.headers
+                            headers: this._options.headers,
+                            credentials: this._options.credentials
                         });
                         if (!response.ok) {
                             throw new Error('');
@@ -720,7 +767,8 @@ class Wfst extends Control {
                     });
                     try {
                         const response = yield fetch(url, {
-                            headers: this._options.headers
+                            headers: this._options.headers,
+                            credentials: this._options.credentials
                         });
                         if (!response.ok) {
                             throw new Error(this._i18n.errors.getFeatures +
@@ -1088,7 +1136,8 @@ class Wfst extends Control {
             const url_fetch = this._options.geoServerUrl + '?' + params.toString();
             try {
                 const response = yield fetch(url_fetch, {
-                    headers: this._options.headers
+                    headers: this._options.headers,
+                    credentials: this._options.credentials
                 });
                 if (!response.ok) {
                     throw new Error(this._i18n.errors.lockFeature);
@@ -1217,7 +1266,8 @@ class Wfst extends Control {
                 }
             }
             if (!clonedFeatures.length) {
-                return this._showError(this._i18n.errors.noValidGeometry);
+                this._showError(this._i18n.errors.noValidGeometry);
+                return false;
             }
             switch (action) {
                 case 'insert':
@@ -1241,95 +1291,111 @@ class Wfst extends Control {
             }
             this._countRequests++;
             const numberRequest = this._countRequests;
-            setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    // Prevent fire multiples times
-                    if (numberRequest !== this._countRequests) {
-                        return;
-                    }
-                    let srs = this._view.getProjection().getCode();
-                    // Force latitude/longitude order on transactions
-                    // EPSG:4326 is longitude/latitude (assumption) and is not managed correctly by GML3
-                    srs = srs === 'EPSG:4326' ? 'urn:x-ogc:def:crs:EPSG:4326' : srs;
-                    const options = {
-                        featureNS: this._geoServerData[layerName].namespace,
-                        featureType: layerName,
-                        srsName: srs,
-                        featurePrefix: null,
-                        nativeElements: null,
-                        version: this._options.geoServerAdvanced
-                            .wfsTransactionVersion
-                    };
-                    const transaction = this._formatWFS.writeTransaction(this._insertFeatures, this._updateFeatures, this._deleteFeatures, options);
-                    let payload = this._xs.serializeToString(transaction);
-                    const geomType = this._geoServerData[layerName].geomType;
-                    const geomField = this._geoServerData[layerName].geomField;
-                    // Ugly fix to support GeometryCollection on GML
-                    // See https://github.com/openlayers/openlayers/issues/4220
-                    if (geomType === GeometryType.GeometryCollection) {
+            return new Promise((resolve, reject) => {
+                setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        // Prevent fire multiples times
+                        if (numberRequest !== this._countRequests) {
+                            return;
+                        }
+                        let srs = this._view.getProjection().getCode();
+                        // Force latitude/longitude order on transactions
+                        // EPSG:4326 is longitude/latitude (assumption) and is not managed correctly by GML3
+                        srs =
+                            srs === 'EPSG:4326'
+                                ? 'urn:x-ogc:def:crs:EPSG:4326'
+                                : srs;
+                        const geoLayer = this._geoServerData[layerName];
+                        if (!geoLayer) {
+                            throw new Error(this._i18n.errors.layerNotFound);
+                        }
+                        const options = {
+                            featureNS: geoLayer.namespace,
+                            featureType: layerName,
+                            srsName: srs,
+                            featurePrefix: null,
+                            nativeElements: null,
+                            version: this._options.geoServerAdvanced
+                                .wfsTransactionVersion
+                        };
+                        const transaction = this._formatWFS.writeTransaction(this._insertFeatures, this._updateFeatures, this._deleteFeatures, options);
+                        let payload = this._xs.serializeToString(transaction);
+                        const geomType = geoLayer.geomType;
+                        const geomField = geoLayer.geomField;
+                        // Ugly fix to support GeometryCollection on GML
+                        // See https://github.com/openlayers/openlayers/issues/4220
+                        if (geomType === GeometryType.GeometryCollection) {
+                            if (action === 'insert') {
+                                payload = payload.replace(/<geometry>/g, `<geometry><MultiGeometry xmlns="http://www.opengis.net/gml" srsName="${srs}"><geometryMember>`);
+                                payload = payload.replace(/<\/geometry>/g, `</geometryMember></MultiGeometry></geometry>`);
+                            }
+                            else if (action === 'update') {
+                                const gmemberIn = `<MultiGeometry xmlns="http://www.opengis.net/gml" srsName="${srs}"><geometryMember>`;
+                                const gmemberOut = `</geometryMember></MultiGeometry>`;
+                                payload = payload.replace(/(.*)(<Name>geometry<\/Name><Value>)(.*?)(<\/Value>)(.*)/g, `$1$2${gmemberIn}$3${gmemberOut}$4$5`);
+                            }
+                        }
+                        // Fixes geometry name, weird bug with GML:
+                        // The property for the geometry column is always named "geometry"
                         if (action === 'insert') {
-                            payload = payload.replace(/<geometry>/g, `<geometry><MultiGeometry xmlns="http://www.opengis.net/gml" srsName="${srs}"><geometryMember>`);
-                            payload = payload.replace(/<\/geometry>/g, `</geometryMember></MultiGeometry></geometry>`);
+                            payload = payload.replace(/<(\/?)\bgeometry\b>/g, `<$1${geomField}>`);
                         }
-                        else if (action === 'update') {
-                            const gmemberIn = `<MultiGeometry xmlns="http://www.opengis.net/gml" srsName="${srs}"><geometryMember>`;
-                            const gmemberOut = `</geometryMember></MultiGeometry>`;
-                            payload = payload.replace(/(.*)(<Name>geometry<\/Name><Value>)(.*?)(<\/Value>)(.*)/g, `$1$2${gmemberIn}$3${gmemberOut}$4$5`);
+                        else {
+                            payload = payload.replace(/<Name>geometry<\/Name>/g, `<Name>${geomField}</Name>`);
                         }
-                    }
-                    // Fixes geometry name, weird bug with GML:
-                    // The property for the geometry column is always named "geometry"
-                    if (action === 'insert') {
-                        payload = payload.replace(/<(\/?)\bgeometry\b>/g, `<$1${geomField}>`);
-                    }
-                    else {
-                        payload = payload.replace(/<Name>geometry<\/Name>/g, `<Name>${geomField}</Name>`);
-                    }
-                    // Add default LockId value
-                    if (this._hasLockFeature &&
-                        this._useLockFeature &&
-                        action !== 'insert') {
-                        payload = payload.replace(`</Transaction>`, `<LockId>GeoServer</LockId></Transaction>`);
-                    }
-                    const headers = Object.assign({ 'Content-Type': 'text/xml' }, this._options.headers);
-                    const response = yield fetch(this._options.geoServerUrl, {
-                        method: 'POST',
-                        body: payload,
-                        headers: headers
-                    });
-                    if (!response.ok) {
-                        throw new Error(this._i18n.errors.transaction + ' ' + response.status);
-                    }
-                    const parseResponse = this._formatWFS.readTransactionResponse(response);
-                    if (!Object.keys(parseResponse).length) {
-                        const responseStr = yield response.text();
-                        const findError = String(responseStr).match(/<ows:ExceptionText>([\s\S]*?)<\/ows:ExceptionText>/);
-                        if (findError) {
-                            this._showError(findError[1]);
+                        // Add default LockId value
+                        if (this._hasLockFeature &&
+                            this._useLockFeature &&
+                            action !== 'insert') {
+                            payload = payload.replace(`</Transaction>`, `<LockId>GeoServer</LockId></Transaction>`);
                         }
-                    }
-                    if (action !== 'delete') {
-                        for (const feature of features) {
-                            this._editLayer.getSource().removeFeature(feature);
+                        const headers = Object.assign({ 'Content-Type': 'text/xml' }, this._options.headers);
+                        const response = yield fetch(this._options.geoServerUrl, {
+                            method: 'POST',
+                            body: payload,
+                            headers: headers,
+                            credentials: this._options.credentials
+                        });
+                        if (!response.ok) {
+                            throw new Error(this._i18n.errors.transaction +
+                                ' ' +
+                                response.status);
                         }
+                        const parseResponse = this._formatWFS.readTransactionResponse(response);
+                        if (!Object.keys(parseResponse).length) {
+                            const responseStr = yield response.text();
+                            const findError = String(responseStr).match(/<ows:ExceptionText>([\s\S]*?)<\/ows:ExceptionText>/);
+                            if (findError) {
+                                throw new Error(findError[1]);
+                            }
+                        }
+                        if (action !== 'delete') {
+                            for (const feature of features) {
+                                this._editLayer.getSource().removeFeature(feature);
+                            }
+                        }
+                        const { mode } = this._options.layers.find((layer) => layer.name === layerName);
+                        if (mode === 'wfs') {
+                            refreshWfsLayer(this._mapLayers[layerName]);
+                        }
+                        else if (mode === 'wms') {
+                            refreshWmsLayer(this._mapLayers[layerName]);
+                        }
+                        this._hideLoading();
+                        this._insertFeatures = [];
+                        this._updateFeatures = [];
+                        this._deleteFeatures = [];
+                        this._countRequests = 0;
+                        resolve(true);
                     }
-                    const { mode } = this._options.layers.find((layer) => layer.name === layerName);
-                    if (mode === 'wfs') {
-                        refreshWfsLayer(this._mapLayers[layerName]);
-                    }
-                    else if (mode === 'wms') {
-                        refreshWmsLayer(this._mapLayers[layerName]);
+                    catch (err) {
+                        this._showError(err.message, err);
+                        this._hideLoading();
+                        this._countRequests = 0;
+                        reject();
                     }
-                    this._hideLoading();
-                }
-                catch (err) {
-                    this._showError(err.message, err);
-                }
-                this._insertFeatures = [];
-                this._updateFeatures = [];
-                this._deleteFeatures = [];
-                this._countRequests = 0;
-            }), 0);
+                }), 0);
+            });
         });
     }
     /**
@@ -2059,15 +2125,19 @@ class Wfst extends Control {
             this.interactionWfsSelect.setActive(bool);
     }
     /**
+     *
      * Add features directly to the geoserver, in a custom layer
      * without checking geometry or showing modal to confirm.
+     * Returns `true` if features are inserted correctly
      *
      * @param layerName
      * @param features
-     * @public
+     * @returns
      */
     insertFeaturesTo(layerName, features) {
-        this._transactWFS('insert', features, layerName);
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this._transactWFS('insert', features, layerName);
+        });
     }
     /**
      * Shows a fields form in a modal window to allow changes in the properties of the feature.