Add level to Feature

src/c3nav/mapdata/migrations/0005_feature_level.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-23 10:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mapdata', '0004_auto_20160920_1356'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='feature',
+            name='level',
+            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, related_name='features', to='mapdata.Level', verbose_name='level'),
+            preserve_default=False,
+        ),
+    ]

src/c3nav/mapdata/models/feature.py

@@ -3,11 +3,13 @@ from collections import OrderedDict, namedtuple
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+from c3nav.mapdata.models.level import Level
+from c3nav.mapdata.models.package import Package
 from ..fields import GeometryField
 
 
 class FeatureType(namedtuple('FeatureType', ('name', 'title', 'title_plural', 'geomtype', 'color'))):
-    def __init__(self, *args, **kwartgs):
+    def __init__(self, *args, **kwargs):
         FEATURE_TYPES[self.name] = self
 
 FEATURE_TYPES = OrderedDict()
@@ -27,9 +29,11 @@ class Feature(models.Model):
     TYPES = tuple((name, t.title) for name, t in FEATURE_TYPES.items())
 
     name = models.SlugField(_('feature identifier'), primary_key=True, max_length=50, help_text=_('e.g. noc'))
-    package = models.ForeignKey('Package', on_delete=models.CASCADE, related_name='features',
+    package = models.ForeignKey(Package, on_delete=models.CASCADE, related_name='features',
                                 verbose_name=_('map package'))
     feature_type = models.CharField(max_length=50, choices=TYPES)
+    level = models.ForeignKey(Level, on_delete=models.CASCADE, related_name='features',
+                              verbose_name=_('level'))
     geometry = GeometryField()
 
 

src/c3nav/mapdata/serializers.py

@@ -59,4 +59,4 @@ class FeatureSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Feature
-        fields = ('name', 'package', 'feature_type', 'geometry')
+        fields = ('name', 'package', 'level', 'feature_type', 'geometry')