Merge branch 'develop' into redmine-issues/11834

src/assets/js/map-util.js

@@ -293,7 +293,7 @@ const mapUtil = {
   },
 
   retrieveFeatureColor: function (featureType, properties) {
-    const colorsStyle = featureType.colors_style && featureType.colors_style.value ? featureType.colors_style.value : featureType.colors_style;
+    const colorsStyle = featureType.colors_style;
     if (featureType && colorsStyle && colorsStyle.custom_field_name) {
       const currentValue = properties[colorsStyle.custom_field_name];
       const colorStyle = colorsStyle.colors[currentValue];
@@ -400,7 +400,13 @@ const mapUtil = {
         }
         const colorValue = color.value ? color.value : color;
         if (geomJSON.type === 'Point') {
-          if (customFieldOption && featureType.colors_style && featureType.colors_style.value && featureType.colors_style.value.icons) {
+          if (
+            customFieldOption &&
+            featureType.colors_style &&
+            featureType.colors_style.value &&
+            featureType.colors_style.value.icons &&
+            !!Object.keys(featureType.colors_style.value.icons).length
+          ) {
             if (featureType.colors_style.value.icons[customFieldOption]) {
               const iconHTML = `
                 <i

src/store/modules/feature.js

@@ -139,8 +139,10 @@ const feature = {
           const features_count = response.data.count;
           commit("SET_FEATURES_COUNT", features_count);
         }
+        return response;
       } catch (error) {
         console.error(error);
+        return error;
       }
     },
     GET_PROJECT_FEATURE({ commit, rootState }, { project_slug, feature_id }) {

src/views/feature_type/Feature_type_edit.vue

@@ -90,7 +90,7 @@
 
         <!--  //* s'affiche après sélection d'option de type liste dans type de champ -->
         <div
-          v-if="colorsStyleList.length > 0"
+          v-if="colorsStyleList.length > 0 && selectedGeomType !== 'Point'"
           class="custom_style"
           id="id_style_container"
         >