Merge branch 'redmine-issue/13696' into 'develop'

REDMINE_ISSUE-13696 | Erreur à la suppression d'un type de signalement

See merge request !362

src/components/Map/EditingToolbar.vue

@@ -57,7 +57,6 @@ export default {
   },
   methods: {
     update(){
-      console.log(this.editionService.editing_feature);
       editionService.activeUpdateFeature();
     },
     deleteObj(){

src/services/edition-service.js

@@ -90,7 +90,6 @@ const editionService = {
 
     this.draw.on('drawend', (evt) => {
       var feature = evt.feature;
-      console.log(feature);
       this.setEditingFeature(feature);
       this.draw.setActive(false);
     });

src/services/map-service.js

@@ -57,7 +57,7 @@ const mapService = {
     return this.map;
   },
   destroyMap() {
-    this.map=undefined;
+    this.map = undefined;
   },
   createMap(el, options) {
     const {
@@ -69,6 +69,11 @@ const mapService = {
       zoomControl = true,
       interactions = { doubleClickZoom: false, mouseWheelZoom: false, dragPan: true },
     } = options;
+
+    if (el.innerHTML) {
+      el.innerHTML = '';
+    }
+
     this.map = new Map({
       layers: [],
       target: el,
@@ -105,12 +110,14 @@ const mapService = {
         duration: 500,
       },
     });
-    const overlay = this.overlay;
-    closer.onclick = function () {
-      overlay.setPosition(undefined);
-      closer.blur();
-      return false;
-    };
+    let overlay = this.overlay;
+    if (closer) {
+      closer.onclick = function () {
+        overlay.setPosition(undefined);
+        closer.blur();
+        return false;
+      };
+    }
     this.map.addOverlay(this.overlay);
 
     this.map.on('click', this.onMapClick.bind(this));
@@ -342,7 +349,11 @@ const mapService = {
     options.format = mvt;
     const layerSource = new VectorTileSource(options);
     layerSource.setTileUrlFunction((p0) => {
+<<<<<<< HEAD
+      return url+'?tile=' + p0[0] + '/' + p0[1] + '/' + p0[2] + '&project_id=' + project_id;
+=======
       return `${url}/?tile=${p0[0]}/${p0[1]}/${p0[2]}&project_id=${projectId}`;
+>>>>>>> develop
     });
     const styleFunction = (feature) => this.getStyle(feature, featureTypes, formFilters);
     this.mvtLayer = new VectorTileLayer({
@@ -437,17 +448,17 @@ const mapService = {
     features.forEach((feature) => {
       retour = new GeoJSON().readFeature(feature, { dataProjection: 'EPSG:4326', featureProjection: 'EPSG:3857' });
       drawSource.addFeature(retour);
-      const featureProperties = feature.properties ? feature.properties : feature;
-      const featureType = featureTypes
-        .find((ft) => ft.slug === (featureProperties.feature_type.slug || featureProperties.feature_type));
-      let filters = [];
-      if (filter) {
-        const typeCheck = filter.featureType && featureProperties.feature_type.slug === filter.featureType;
-        const statusCheck = filter.featureStatus && featureProperties.status.value === filter.featureStatus;
-        const titleCheck = filter.featureTitle && featureProperties.title.includes(filter.featureTitle);
-        filters = [typeCheck, statusCheck, titleCheck];
-      }
-      console.log(featureType, filters);
+      // const featureProperties = feature.properties ? feature.properties : feature;
+      // const featureType = featureTypes
+      //   .find((ft) => ft.slug === (featureProperties.feature_type.slug || featureProperties.feature_type));
+      // let filters = [];
+      // if (filter) {
+      //   const typeCheck = filter.featureType && featureProperties.feature_type.slug === filter.featureType;
+      //   const statusCheck = filter.featureStatus && featureProperties.status.value === filter.featureStatus;
+      //   const titleCheck = filter.featureTitle && featureProperties.title.includes(filter.featureTitle);
+      //   filters = [typeCheck, statusCheck, titleCheck];
+      // }
+      // console.log(featureType, filters);
 
     });
     const styleFunction = (feature) => this.getStyle(feature, featureTypes, filter);

src/store/modules/map.store.js

@@ -108,8 +108,8 @@ const map = {
       const mapDefaultViewCenter = [46, 2]; // defaultMapView.center;
       const mapDefaultViewZoom = 5; // defaultMapView.zoom;
       mapService.createMap(el, {
-        mapDefaultViewCenter,
-        mapDefaultViewZoom,
+        mapDefaultViewCenter: mapDefaultViewCenter,
+        mapDefaultViewZoom: mapDefaultViewZoom,
       });
       commit('SET_MAP', mapService.getMap());   
       mapService.addLayers(

src/views/Project/ProjectDetail.vue

@@ -390,7 +390,7 @@ export default {
         .then((response) => {
           this.CLOSE_PROJECT_MODAL();
           if (response === 'success') {
-            this.GET_PROJECT();
+            this.GET_PROJECT(this.slug);
             this.retrieveProjectInfo();
             this.DISPLAY_MESSAGE({
               comment: `Le type de signalement ${this.featureTypeToDelete.title} a bien été supprimé.`,