Merge branch 'develop' into redmine-issues/12721

src/assets/icons/fa-icons.js

 const faIcons = [
+  'circle',
   'address-book',
   'address-card',
   'adjust',

src/assets/js/map-util.js

@@ -394,7 +394,10 @@ const mapUtil = {
         if (color == undefined){
           color = featureType.color;
         }
-        const colorValue = color.value ? color.value : color;
+        const colorValue =
+          color.value && color.value.length ?
+            color.value : typeof color === 'string' && color.length ?
+              color : '#000000';
         if (geomJSON.type === 'Point') {
           if (
             customFieldOption &&
@@ -403,7 +406,10 @@ const mapUtil = {
             featureType.colors_style.value.icons &&
             !!Object.keys(featureType.colors_style.value.icons).length
           ) {
-            if (featureType.colors_style.value.icons[customFieldOption]) {
+            if (
+              featureType.colors_style.value.icons[customFieldOption] &&
+              featureType.colors_style.value.icons[customFieldOption] !== 'circle'
+            ) {
               const iconHTML = `
                 <i
                   class="fas fa-${featureType.colors_style.value.icons[customFieldOption]} fa-lg"
@@ -424,7 +430,7 @@ const mapUtil = {
                 .addTo(featureGroup);
             } else {
               L.circleMarker(geomJSON.coordinates, {
-                color: color,
+                color: colorValue,
                 radius: 4,
                 fillOpacity: 0.5,
                 weight: 3,
@@ -433,7 +439,7 @@ const mapUtil = {
                 .addTo(featureGroup);
             }
           } else {
-            if (featureType.icon) {
+            if (featureType.icon && featureType.icon !== 'circle') {
               const iconHTML = `
                 <i
                   class="fas fa-${featureType.icon} fa-lg"

src/views/feature_type/Feature_type_symbology.vue

@@ -247,7 +247,16 @@ export default {
           this.GET_PROJECT_FEATURE_TYPES(this.$route.params.slug)
             .then(() => {
               this.loading = false;
-              this.success = 'La modification de la symbologie a été prise en compte.';
+              this.success =
+                'La modification de la symbologie a été prise en compte. Vous allez être redirigé vers la page d\'acceuil du projet.';
+              setTimeout(() => {
+                this.$router.push({
+                  name: 'project_detail',
+                  params: {
+                    slug: this.$store.state.project_slug,
+                  },
+                });
+              }, 1500);
             })
             .catch((err) => {
               console.error(err);