Merge branch 'redmine-issues/12634' into 'develop'

REDMINE_ISSUE-12634 | Biblio de pictos

See merge request !215

src/assets/js/map-util.js

@@ -427,11 +427,21 @@ const mapUtil = {
               .bindPopup(popupContent)
               .addTo(featureGroup);
           } else {
-            L.circleMarker(geomJSON.coordinates, {
+            const iconHTML = `
+              <i
+                class="fas fa-${featureType.icon} fa-2x"
+                style="color: ${colorValue}"
+              ></i>
+            `;
+            const customMapIcon = L.divIcon({
+              html: iconHTML,
+              iconSize: [20, 20],
+              className: 'myDivIcon',
+            });
+            L.marker(geomJSON.coordinates, {
+              icon: customMapIcon,
               color: colorValue,
-              radius: 4,
-              fillOpacity: 0.5,
-              weight: 3,
+              zIndexOffset: 100
             })
               .bindPopup(popupContent)
               .addTo(featureGroup);

src/views/feature_type/Feature_type_edit.vue

@@ -63,7 +63,7 @@
             <!-- {{ form.geom_type.errors }} -->
           </div>
 
-          <div class="required field">
+          <div v-if="selectedGeomType !== 'Point'" class="required field">
             <label :for="form.color.id_for_label">{{ form.color.label }}</label>
             <input
               type="color"