Merge branch 'remove-symbology' into 'develop'

Remove symbology

See merge request !243

src/assets/js/map-util.js

@@ -316,14 +316,6 @@ const mapUtil = {
             color.value : typeof color === 'string' && color.length ?
               color : '#000000';
 
-          // Look for a custom field
-          let customField;
-          let customFieldOption;
-          if (featureType.customfield_set && Object.keys(properties).some(el => featureType.customfield_set.map(e => e.name).includes(el))) {
-            customField = Object.keys(properties).filter(el => featureType.customfield_set.map(e => e.name).includes(el));
-            customFieldOption = properties[customField[0]];
-          }
-
           const hiddenStyle = ({
             radius: 0,
             fillOpacity: 0.5,
@@ -332,38 +324,14 @@ const mapUtil = {
             color: featureType.color,
           });
 
-          let defaultStyle;
-          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"
-                style="color: ${colorValue}"
-              ></i>
-            `;
-            const customMapIcon = L.divIcon({
-              html: iconHTML,
-              iconSize: [20, 20],
-              className: 'myDivIcon',
-            });
-
-            defaultStyle = {
-              icon: customMapIcon
-            };
-
-          } else {
-
-            defaultStyle = {
-              radius: 4,
-              fillOpacity: 0.5,
-              weight: 3,
-              fill: true,
-              color: color,
-            };
+          const defaultStyle = {
+            radius: 4,
+            fillOpacity: 0.5,
+            weight: 3,
+            fill: true,
+            color: colorValue,
+          };
             
-          }
 
           // Filtre sur le feature type
           if (form_filters && form_filters.type.selected) {

src/components/feature_type/SymbologySelector.vue

@@ -14,7 +14,7 @@
           v-model.lazy="form.color.value"
         />
       </div>
-      <div class="required inline field">
+      <!-- <div class="required inline field">
         <label>Symbole</label>
         <button
           class="ui icon button picker-button"
@@ -27,7 +27,7 @@
             class="icon alt"
           />
         </button>
-      </div>
+      </div> -->
     </div>
     <div
       :class="isIconPickerModalOpen ? 'active' : ''"

src/views/project/Project_detail.vue

@@ -715,26 +715,6 @@ export default {
         }
       }
     },
-
-    features: {
-      deep: true,
-      handler(newValue, oldValue) {
-        if (newValue && newValue.length && newValue !== oldValue) {
-          mapUtil.addFeatures(
-            this.features,
-            {},
-            true,
-            this.feature_types
-          );
-          this.mapLoading = false;
-        }
-      }
-    },
-    featuresLoading(newValue) {
-      if (!newValue && this.features && this.features.length === 0) {
-        this.mapLoading = false;
-      }
-    }
   },
 
   created() {
@@ -969,6 +949,7 @@ export default {
           true,
           this.$store.state.feature_type.feature_types
         );
+        this.mapLoading = false;
 
         this.GET_PROJECT_FEATURES({
           project_slug: this.slug,