diff --git a/src/services/edition-service.js b/src/services/edition-service.js
index fff42ff666463aec93028eaeb34ca55e9ff0346b..850bc21f9808eaf4082f4e122c9084955d0ed913 100644
--- a/src/services/edition-service.js
+++ b/src/services/edition-service.js
@@ -18,6 +18,8 @@ const isMobile = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer
|| /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(navigator.userAgent.substr(0,4));
const editionService = {
+ drawnFeature: null,
+ featureToEdit: null,
editing_feature: {},
geom_type: 'linestring',
drawStyle: new Style({
@@ -96,6 +98,7 @@ const editionService = {
this.draw.on('drawend', (evt) => {
var feature = evt.feature;
+ this.drawnFeature = feature;
this.setEditingFeature(feature);
this.draw.setActive(false);
});
@@ -119,7 +122,17 @@ const editionService = {
return new MultiPoint(coordinates);
},
})
- ]
+ ],
+ filter: (feature) => {
+ if (this.featureToEdit && feature.id_ === this.featureToEdit.id) {
+ return true;
+ } else if (this.drawnFeature && feature.ol_uid === this.drawnFeature.ol_uid) {
+ return true;
+ } else if (!this.drawnFeature && !this.featureToEdit) {
+ return true;
+ }
+ return false;
+ }
});
// On mobile stop drawing when selecting a drawn point
@@ -190,7 +203,7 @@ const editionService = {
activeDeleteFeature() {
this.resetAllTools();
if (!this.selectForDeletion) {
- var style = new Style({
+ const style = new Style({
fill: new Fill({
color: 'rgba(255, 0, 0, 0.2)'
}),
@@ -210,7 +223,19 @@ const editionService = {
}),
zIndex: 50
});
- this.selectForDeletion = new Select({ style: style });
+ this.selectForDeletion = new Select({
+ style: style,
+ filter: (feature) => {
+ if (this.featureToEdit && feature.id_ === this.featureToEdit.id) {
+ return true;
+ } else if (this.drawnFeature && feature.ol_uid === this.drawnFeature.ol_uid) {
+ return true;
+ } else if (!this.drawnFeature && !this.featureToEdit) {
+ return true;
+ }
+ return false;
+ }
+ });
mapService.getMap().addInteraction(this.selectForDeletion);
// Lorsque de nouvelles features sont sélectionnées
const selected_features = this.selectForDeletion.getFeatures();
@@ -235,6 +260,15 @@ const editionService = {
}
},
+ setFeatureToEdit(feature) {
+ this.featureToEdit = feature;
+ },
+
+ removeActiveFeatures() {
+ this.drawnFeature = null;
+ this.featureToEdit = null;
+ }
+
};
diff --git a/src/store/modules/map.store.js b/src/store/modules/map.store.js
index f4a65434bb4e026166436892f73d24b23752f5be..a8b3f37b29b4f49fef161c4d5f47d192182e7030 100644
--- a/src/store/modules/map.store.js
+++ b/src/store/modules/map.store.js
@@ -111,7 +111,8 @@ const map = {
mapDefaultViewCenter: mapDefaultViewCenter,
mapDefaultViewZoom: mapDefaultViewZoom,
});
- commit('SET_MAP', mapService.getMap());
+ const map = { ...mapService.getMap() };
+ commit('SET_MAP', map);
mapService.addLayers(
null,
this.state.configuration.DEFAULT_BASE_MAP_SERVICE,
diff --git a/src/views/Feature/FeatureEdit.vue b/src/views/Feature/FeatureEdit.vue
index 567fd72ba19ce0b15e7335b5f033acb9142d9fbc..a4686276d19b7374e5dab642699f3a2e7bcf1d7e 100644
--- a/src/views/Feature/FeatureEdit.vue
+++ b/src/views/Feature/FeatureEdit.vue
@@ -552,6 +552,7 @@ export default {
},
destroyed() {
+ editionService.removeActiveFeatures();
//* be sure that previous Formset have been cleared for creation
this.$store.commit('feature/CLEAR_ATTACHMENT_FORM');
this.$store.commit('feature/CLEAR_LINKED_FORM');
@@ -815,10 +816,10 @@ export default {
onFeatureTypeLoaded() {
- var geomType = this.feature_type.geom_type;
+ const geomType = this.feature_type.geom_type;
editionService.addEditionControls(geomType);
editionService.draw.on('drawend', (evt) => {
- var feature = evt.feature;
+ const feature = evt.feature;
this.updateGeomField(new GeoJSON().writeGeometry(feature.getGeometry(),{ dataProjection:'EPSG:4326',featureProjection:'EPSG:3857' }));
if (this.feature_type.geomType === 'point') {
this.showGeoPositionBtn = false;
@@ -900,6 +901,7 @@ export default {
const currentFeature = features.filter(
(feat) => feat.id === currentFeatureId
)[0];
+ editionService.setFeatureToEdit(currentFeature);
this.updateMap(currentFeature);
}
}