From 55a077dfd2d988700db89c045fbb64b75f87b692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 28 Sep 2017 16:01:28 +0200
Subject: [PATCH] maps: add four new marker icons (#19049)

---
 combo/apps/maps/migrations/0001_initial.py |  2 +-
 combo/apps/maps/models.py                  |  4 ++++
 combo/apps/maps/static/css/combo.map.css   | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/combo/apps/maps/migrations/0001_initial.py b/combo/apps/maps/migrations/0001_initial.py
index 5583aa6..9e463a9 100644
--- a/combo/apps/maps/migrations/0001_initial.py
+++ b/combo/apps/maps/migrations/0001_initial.py
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
                 ('slug', models.SlugField(verbose_name='Identifier')),
                 ('geojson_url', models.URLField(max_length=1024, verbose_name='Geojson URL')),
                 ('marker_colour', models.CharField(default=b'#0000FF', max_length=7, verbose_name='Marker colour')),
-                ('icon', models.CharField(blank=True, max_length=32, null=True, verbose_name='Marker icon', choices=[(b'book', 'Book'), (b'house', 'House'), (b'building', 'Building'), (b'hospital', 'Hospital'), (b'ambulance', 'Ambulance'), (b'taxi', 'Taxi'), (b'subway', 'Subway'), (b'wheelchair', 'Wheelchair'), (b'bicycle', 'Bicycle'), (b'car', 'Car'), (b'train', 'Train'), (b'bus', 'Bus'), (b'motorcycle', 'Motorcycle'), (b'truck', 'Truck')])),
+                ('icon', models.CharField(blank=True, max_length=32, null=True, verbose_name='Marker icon', choices=[(b'book', 'Book'), (b'house', 'House'), (b'building', 'Building'), (b'hospital', 'Hospital'), (b'ambulance', 'Ambulance'), (b'taxi', 'Taxi'), (b'subway', 'Subway'), (b'wheelchair', 'Wheelchair'), (b'bicycle', 'Bicycle'), (b'car', 'Car'), (b'train', 'Train'), (b'bus', 'Bus'), (b'motorcycle', 'Motorcycle'), (b'truck', 'Truck'), (b'shower', 'Shower'), (b'trash', 'Trash'), (b'recycle', 'Recycle'), (b'university', 'University')])),
                 ('icon_colour', models.CharField(default=b'#000000', max_length=7, verbose_name='Icon colour')),
             ],
             options={'ordering': ('label',)}
diff --git a/combo/apps/maps/models.py b/combo/apps/maps/models.py
index d25a289..e0f5d6d 100644
--- a/combo/apps/maps/models.py
+++ b/combo/apps/maps/models.py
@@ -44,6 +44,10 @@ ICONS = [
     ('bus', _('Bus')),
     ('motorcycle', _('Motorcycle')),
     ('truck', _('Truck')),
+    ('shower', _('Shower')),
+    ('trash', _('Trash')),
+    ('recycle', _('Recycle')),
+    ('university', _('University')),
 ]
 
 ZOOM_LEVELS = [ ('0', _('Whole world')),
diff --git a/combo/apps/maps/static/css/combo.map.css b/combo/apps/maps/static/css/combo.map.css
index c627286..9dfd7c2 100644
--- a/combo/apps/maps/static/css/combo.map.css
+++ b/combo/apps/maps/static/css/combo.map.css
@@ -131,3 +131,23 @@ select#id_icon option[value=book]::before,
 i.leaflet-marker-icon.book::before {
     content: "\f02d"; /* book */
 }
+
+select#id_icon option[value=shower]::before,
+i.leaflet-marker-icon.shower::before {
+    content: "\f2cc"; /* shower */
+}
+
+select#id_icon option[value=trash]::before,
+i.leaflet-marker-icon.trash::before {
+    content: "\f1f8"; /* trash */
+}
+
+select#id_icon option[value=recycle]::before,
+i.leaflet-marker-icon.recycle::before {
+    content: "\f1b8"; /* recycle */
+}
+
+select#id_icon option[value=university]::before,
+i.leaflet-marker-icon.university::before {
+    content: "\f19c"; /* university */
+}
-- 
2.14.2