From 1f4cc0dc47c23d254c3c1308ab63857f5a368346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 21 Jan 2018 11:03:33 +0100
Subject: [PATCH] mas: add more marker icons (#20922)

---
 combo/apps/maps/models.py                 | 39 ++++++++++++++++++++++---------
 combo/apps/maps/static/css/combo.map.scss | 18 ++++++++++++++
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/combo/apps/maps/models.py b/combo/apps/maps/models.py
index bc5bc6b..eb5bcf6 100644
--- a/combo/apps/maps/models.py
+++ b/combo/apps/maps/models.py
@@ -30,24 +30,41 @@ from combo.utils import requests
 
 
 ICONS = [
-    ('book', _('Book')),
-    ('house', _('House')),
-    ('building', _('Building')),
-    ('hospital', _('Hospital')),
     ('ambulance', _('Ambulance')),
-    ('taxi', _('Taxi')),
-    ('subway', _('Subway')),
-    ('wheelchair', _('Wheelchair')),
+    ('asterisk', _('Asterisk')),
+    ('bell', _('Bell')),
     ('bicycle', _('Bicycle')),
-    ('car', _('Car')),
-    ('train', _('Train')),
+    ('book', _('Book')),
+    ('broken_chain', _('Broken chain')),
+    ('building', _('Building')),
     ('bus', _('Bus')),
+    ('car', _('Car')),
+    ('checkmark', _('Checkmark')),
+    ('cube', _('Cube')),
+    ('drop', _('Drop')),
+    ('eye', _('Eye')),
+    ('flag', _('Flag')),
+    ('gavel', _('Gavel')),
+    ('hospital', _('Hospital')),
+    ('house', _('House')),
+    ('lightbulb', _('Lightbulb')),
+    ('map_signs', _('Map signs')),
     ('motorcycle', _('Motorcycle')),
-    ('truck', _('Truck')),
+    ('paint_brush', _('Paint brush')),
+    ('paw', _('Paw')),
+    ('recycle', _('Recycle')),
+    ('road', _('Road')),
     ('shower', _('Shower')),
+    ('star', _('Star')),
+    ('subway', _('Subway')),
+    ('taxi', _('Taxi')),
+    ('train', _('Train')),
     ('trash', _('Trash')),
-    ('recycle', _('Recycle')),
+    ('tree', _('Tree')),
+    ('truck', _('Truck')),
     ('university', _('University')),
+    ('warning', _('Warning')),
+    ('wheelchair', _('Wheelchair')),
 ]
 
 ZOOM_LEVELS = [ ('0', _('Whole world')),
diff --git a/combo/apps/maps/static/css/combo.map.scss b/combo/apps/maps/static/css/combo.map.scss
index de188bd..c6fbfc9 100644
--- a/combo/apps/maps/static/css/combo.map.scss
+++ b/combo/apps/maps/static/css/combo.map.scss
@@ -17,6 +17,24 @@ $marker_icons: (
 	(truck, "\f9d1"),
 	(university, "\f19c"),
 	(wheelchair, "\f193"),
+	(drop, "\f043"), // tint
+	(bolt, "\f0e7"),
+	(broken_chain, "\f127"), // chain-broken
+	(bell, "\f0a2"), // bell-o
+	(eye, "\f06e"),
+	(gavel, "\f0e3"),
+	(asterisk, "\f069"),
+	(star, "\f005"),
+	(checkmark, "\f00c"), // check
+	(paw, "\f1b0"),
+	(lightbulb, "\f0eb"), // lightbulb-o
+	(cube, "\f1b2"),
+	(paint_brush, "\f1fc"),
+	(tree, "\f1bb"),
+	(road, "\f018"),
+	(warning, "\f071"), // exclamation-triangle
+	(map_signs, "\f277"),
+	(flag, "\f024"),
 );
 
 div.combo-cell-map.leaflet-container {
-- 
2.15.1