From a6d8e779a378d616d7606324a881628ac5033964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 27 Sep 2021 10:21:42 +0200
Subject: [PATCH] maps: extend marker_colour to also be used for surfaces
 (#57279)

---
 combo/apps/maps/migrations/0007_auto_20180706_1345.py | 2 +-
 combo/apps/maps/models.py                             | 2 +-
 combo/apps/maps/static/js/combo.map.js                | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/combo/apps/maps/migrations/0007_auto_20180706_1345.py b/combo/apps/maps/migrations/0007_auto_20180706_1345.py
index e0b58db4..fd77994d 100644
--- a/combo/apps/maps/migrations/0007_auto_20180706_1345.py
+++ b/combo/apps/maps/migrations/0007_auto_20180706_1345.py
@@ -75,6 +75,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='maplayer',
             name='marker_colour',
-            field=models.CharField(default='#0000FF', max_length=7, verbose_name='Marker colour'),
+            field=models.CharField(default='#0000FF', max_length=7, verbose_name='Marker or surface colour'),
         ),
     ]
diff --git a/combo/apps/maps/models.py b/combo/apps/maps/models.py
index bdabe21e..3412dd85 100644
--- a/combo/apps/maps/models.py
+++ b/combo/apps/maps/models.py
@@ -124,7 +124,7 @@ class MapLayer(models.Model):
     tiles_default = models.BooleanField(_('Default tiles layer'), default=False)
 
     geojson_url = models.CharField(_('Geojson URL'), max_length=1024)
-    marker_colour = models.CharField(_('Marker colour'), max_length=7, default='#0000FF')
+    marker_colour = models.CharField(_('Marker or surface colour'), max_length=7, default='#0000FF')
     icon = models.CharField(_('Marker icon'), max_length=32, blank=True, null=True, choices=ICONS)
     icon_colour = models.CharField(_('Icon colour'), max_length=7, default='#000000')
     cache_duration = models.PositiveIntegerField(_('Cache duration'), default=60, help_text=_('In seconds.'))
diff --git a/combo/apps/maps/static/js/combo.map.js b/combo/apps/maps/static/js/combo.map.js
index 1c5acaf3..8e48e55d 100644
--- a/combo/apps/maps/static/js/combo.map.js
+++ b/combo/apps/maps/static/js/combo.map.js
@@ -87,6 +87,9 @@ $(function() {
                                               geojson_layer.icon_colour +'"></i></span>'
                                          });
                       return L.marker(latlng, {icon: marker});
+                  },
+                  style: function (feature) {
+                    return {weight: 2, color: geojson_layer.marker_colour, fillColor: geojson_layer.marker_colour};
                   }
               });