diff --git a/src/assets/icons/fa-icons.js b/src/assets/icons/fa-icons.js index 6ee50a04c0bdcf03d8af346aa3f45b5ae8277a61..25b11db565ad90ac90592970d82d23d1568cc9b1 100644 --- a/src/assets/icons/fa-icons.js +++ b/src/assets/icons/fa-icons.js @@ -1,4 +1,5 @@ const faIcons = [ + 'circle', 'address-book', 'address-card', 'adjust', diff --git a/src/assets/js/map-util.js b/src/assets/js/map-util.js index b96a1fea724f3cbbbe40a2021d5566d5649486b0..1d12f0ad6213f67618d5b8ca51a5a7aff3c1093e 100644 --- a/src/assets/js/map-util.js +++ b/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" diff --git a/src/views/feature_type/Feature_type_symbology.vue b/src/views/feature_type/Feature_type_symbology.vue index 39c988f41b2caabe9c4303eda40273b8bdeec779..bd667ae4835896181ac9a6e9959574e383efd6a3 100644 --- a/src/views/feature_type/Feature_type_symbology.vue +++ b/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);