wip: Enhance marker rendering to homogenize map and legend display #795

Author: cnouguier

map/client/leaflet/ShapeMarker.js

@@ -2,24 +2,34 @@ import _ from 'lodash'
 import L from 'leaflet'
 import { utils as coreUtils } from '../../../core/client/index.js'
 
+// Defaults marker properties
+const defaults = {
+	shape: 'marker-pin',
+	width: 28,
+	height: 36,
+	icon: {
+		classes: 'fa fa-circle'
+	}
+}
+
 export const ShapeMarker = L.Marker.extend({
 	initialize (latlng, options) {
-		// set default values
-		const shape = _.get(options, 'shape', 'marker-pin')
-		const width = _.get(options, 'width', 28)
-		const height = _.get(options, 'height', 36)
-		// create divicon 
-		var icon = L.divIcon({
-			iconSize: [width, height],
-			iconAnchor: [width/2, height],
-			html: coreUtils.createShape(Object.assign({ shape, width, height }, options)),
-			className: 'dummy'
+		let _options = _.cloneDeep(options)
+		// map options from simplespec to SVG shape
+		if (_options.fillColor) _.set(_options, 'color', options.fillColor)
+		if (_options.fillOpacity) _.set(_options, 'opacity', options.fillOpacity)
+		if (_options.color) _.set(_options, 'stroke.color', options.color)
+		if (_options.weight) _.set(_options, 'stroke.Width', options.weight)
+    // create the marker with the corredt divIcon
+		const width = _options.width || defaults.width
+		const height = _options.height || defaults.height
+    L.Marker.prototype.initialize.call(this, latlng, { 
+			icon: L.divIcon({
+				iconSize: [width, height],
+				iconAnchor: [width/2, height],
+				html: coreUtils.createShape(_.defaultsDeep(_options, defaults)),
+				className: ''
+			}) 
 		})
-    // this.enableDebug = true
-    L.Marker.prototype.initialize.call(this, latlng, { icon })
 	}
 })
-
-L.shapeMarker = function (latlng, options) {
-  return new ShapeMarker(latlng, options)
-}

map/client/mixins/map/mixin.style.js

@@ -19,7 +19,6 @@ export const style = {
         _.get(this, 'activityOptions.engine.pointStyle'),
         leafletOptions.layerStyle,
         this.convertFromSimpleStyleSpec(feature.style || feature.properties))
-
       // We allow to template style properties according to feature,
       // because it can be slow you have to specify a subset of properties
       if (leafletOptions.template) {