Commits

Yohan Boniface  committed a8002da

Add icon_class and pictogram to Marker (cf #21)

  • Participants
  • Parent commits e497b02

Comments (0)

Files changed (4)

File leaflet_storage/base_models.py

         }
 
 
-class Category(NamedModel):
-    """
-    Category of a Feature.
-    """
+class IconConfigMixin(models.Model):
+
     ICON_CLASS = (
         ('Default', 'Default'),
         ('Circle', 'Circle'),
         ('Drop', 'Drop'),
         ('Ball', 'Ball'),
     )
-    map = models.ForeignKey(Map)
-    description = models.TextField(
-        blank=True,
-        null=True,
-        verbose_name=_("description")
-    )
-    options = DictField(blank=True, null=True, verbose_name=_("options"))
     pictogram = models.ForeignKey(
         Pictogram,
         null=True,
         verbose_name=_("pictogram")
     )
     icon_class = models.CharField(
+        null=True,
+        blank=True,
         choices=ICON_CLASS,
         max_length=32,
-        default="Default",
         verbose_name=_("icon type"),
         help_text=_("Choose the style of the marker.")
     )
+
+    class Meta:
+        abstract = True
+
+
+class Category(NamedModel, IconConfigMixin):
+    """
+    Category of a Feature.
+    """
+    map = models.ForeignKey(Map)
+    description = models.TextField(
+        blank=True,
+        null=True,
+        verbose_name=_("description")
+    )
+    options = DictField(blank=True, null=True, verbose_name=_("options"))
     display_on_load = models.BooleanField(
         default=False,
         verbose_name=_("display on load"),
 
     objects = models.GeoManager()
 
+    @property
+    def icon(self):
+        # All the features are processed the same way by vectoformats
+        # so they need to share all exported properties
+        return {}
+
     class Meta:
         abstract = True
 
 
-class AbstractMarker(BaseFeature):
+class AbstractMarker(BaseFeature, IconConfigMixin):
     """
     Point of interest.
     """
     latlng = models.PointField(geography=True)
 
+    @property
+    def icon(self):
+        # All the features are processed the same way by vectoformats
+        # so they need to share all exported properties
+        return {
+            "class": self.icon_class,
+            "url": self.pictogram.pictogram.url if self.pictogram else None
+        }
+
     class Meta:
         abstract = True
 

File leaflet_storage/forms.py

 class MarkerForm(FeatureForm):
 
     class Meta:
-        fields = ('name', 'description', 'category', 'latlng')
+        fields = ('name', 'description', 'category', 'latlng', 'icon_class', 'pictogram')
         model = Marker
         widgets = {
             'latlng': forms.HiddenInput(),
+            "icon_class": forms.HiddenInput(),
+            "pictogram": forms.HiddenInput()
         }
 
 

File leaflet_storage/migrations/0007_auto__chg_field_category_icon_class__add_field_marker_pictogram__add_f.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Category.icon_class'
+        db.alter_column('leaflet_storage_category', 'icon_class', self.gf('django.db.models.fields.CharField')(max_length=32, null=True))
+        # Adding field 'Marker.pictogram'
+        db.add_column('leaflet_storage_marker', 'pictogram',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['leaflet_storage.Pictogram'], null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'Marker.icon_class'
+        db.add_column('leaflet_storage_marker', 'icon_class',
+                      self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+
+        # Changing field 'Category.icon_class'
+        db.alter_column('leaflet_storage_category', 'icon_class', self.gf('django.db.models.fields.CharField')(max_length=32))
+        # Deleting field 'Marker.pictogram'
+        db.delete_column('leaflet_storage_marker', 'pictogram_id')
+
+        # Deleting field 'Marker.icon_class'
+        db.delete_column('leaflet_storage_marker', 'icon_class')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'leaflet_storage.category': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Category'},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'display_on_load': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon_class': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'map': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leaflet_storage.Map']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'options': ('leaflet_storage.fields.DictField', [], {'null': 'True', 'blank': 'True'}),
+            'pictogram': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leaflet_storage.Pictogram']", 'null': 'True', 'blank': 'True'})
+        },
+        'leaflet_storage.licence': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Licence'},
+            'details': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'leaflet_storage.map': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Map'},
+            'center': ('django.contrib.gis.db.models.fields.PointField', [], {'geography': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'edit_status': ('django.db.models.fields.SmallIntegerField', [], {'default': '3'}),
+            'editors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'licence': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leaflet_storage.Licence']", 'on_delete': 'models.SET_DEFAULT'}),
+            'locate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owned_maps'", 'to': "orm['auth.User']"}),
+            'settings': ('leaflet_storage.fields.DictField', [], {'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'tilelayers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['leaflet_storage.TileLayer']", 'through': "orm['leaflet_storage.MapToTileLayer']", 'symmetrical': 'False'}),
+            'zoom': ('django.db.models.fields.IntegerField', [], {'default': '7'})
+        },
+        'leaflet_storage.maptotilelayer': {
+            'Meta': {'ordering': "['rank', 'tilelayer__name']", 'object_name': 'MapToTileLayer'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'map': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leaflet_storage.Map']"}),
+            'rank': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'tilelayer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leaflet_storage.TileLayer']"})
+        },
+        'leaflet_storage.marker': {
+            'Meta': {'object_name': 'Marker'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leaflet_storage.Category']"}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'icon_class': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latlng': ('django.contrib.gis.db.models.fields.PointField', [], {'geography': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'options': ('leaflet_storage.fields.DictField', [], {'null': 'True', 'blank': 'True'}),
+            'pictogram': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leaflet_storage.Pictogram']", 'null': 'True', 'blank': 'True'})
+        },
+        'leaflet_storage.pictogram': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Pictogram'},
+            'attribution': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'pictogram': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'})
+        },
+        'leaflet_storage.polygon': {
+            'Meta': {'object_name': 'Polygon'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leaflet_storage.Category']"}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latlng': ('django.contrib.gis.db.models.fields.PolygonField', [], {'geography': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'options': ('leaflet_storage.fields.DictField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'leaflet_storage.polyline': {
+            'Meta': {'object_name': 'Polyline'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['leaflet_storage.Category']"}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latlng': ('django.contrib.gis.db.models.fields.LineStringField', [], {'geography': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'options': ('leaflet_storage.fields.DictField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'leaflet_storage.tilelayer': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'TileLayer'},
+            'attribution': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'maxZoom': ('django.db.models.fields.IntegerField', [], {'default': '18'}),
+            'minZoom': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'url_template': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        }
+    }
+
+    complete_apps = ['leaflet_storage']

File leaflet_storage/views.py

 
     def geojson(self, context):
         qs = self.get_queryset()
-        djf = django.Django(geodjango="latlng", properties=['name', 'category_id', 'options'])
+        djf = django.Django(geodjango="latlng", properties=['name', 'category_id', 'options', 'icon'])
         geoj = geojson.GeoJSON()
         return geoj.encode(djf.decode(qs), to_string=False)