From e70eaea471b635f33d8467b65f567b5533efd64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Tue, 9 May 2017 13:42:09 +0200
Subject: [PATCH] rename Space.layer to Space.level

---
 src/c3nav/editor/forms.py                     |  4 +--
 .../migrations/0064_auto_20170509_1140.py     | 25 +++++++++++++++++++
 .../migrations/0065_auto_20170509_1140.py     | 20 +++++++++++++++
 src/c3nav/mapdata/models/geometry/section.py  |  8 +++---
 4 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 src/c3nav/mapdata/migrations/0064_auto_20170509_1140.py
 create mode 100644 src/c3nav/mapdata/migrations/0065_auto_20170509_1140.py

diff --git a/src/c3nav/editor/forms.py b/src/c3nav/editor/forms.py
index 1a69cc3b..706a08d3 100644
--- a/src/c3nav/editor/forms.py
+++ b/src/c3nav/editor/forms.py
@@ -66,9 +66,9 @@ class MapitemFormMixin(ModelForm):
 
 
 def create_editor_form(mapitemtype):
-    possible_fields = ['name', 'public', 'altitude', 'level', 'levels', 'geometry', 'width', 'groups', 'color',
+    possible_fields = ['section', 'space', 'name', 'public', 'altitude', 'geometry', 'width', 'groups', 'color',
                        'location_type', 'can_search', 'can_describe', 'routing_inclusion', 'compiled_room', 'bssids',
-                       'category', 'layer']
+                       'category', 'level']
     existing_fields = [field.name for field in mapitemtype._meta.get_fields() if field.name in possible_fields]
 
     class EditorForm(MapitemFormMixin, ModelForm):
diff --git a/src/c3nav/mapdata/migrations/0064_auto_20170509_1140.py b/src/c3nav/mapdata/migrations/0064_auto_20170509_1140.py
new file mode 100644
index 00000000..c109f832
--- /dev/null
+++ b/src/c3nav/mapdata/migrations/0064_auto_20170509_1140.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-05-09 11:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mapdata', '0063_auto_20170508_1404'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='space',
+            name='category',
+            field=models.CharField(choices=[('', 'normal'), ('stairs', 'stairs'), ('escalator', 'escalator'), ('elevator', 'elevator')], default='', max_length=16, verbose_name='category'),
+        ),
+        migrations.AlterField(
+            model_name='space',
+            name='layer',
+            field=models.CharField(choices=[('', 'normal'), ('upper', 'upper'), ('lower', 'lower')], default='', max_length=16, verbose_name='level'),
+        ),
+    ]
diff --git a/src/c3nav/mapdata/migrations/0065_auto_20170509_1140.py b/src/c3nav/mapdata/migrations/0065_auto_20170509_1140.py
new file mode 100644
index 00000000..b973197e
--- /dev/null
+++ b/src/c3nav/mapdata/migrations/0065_auto_20170509_1140.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-05-09 11:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mapdata', '0064_auto_20170509_1140'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='space',
+            old_name='layer',
+            new_name='level',
+        ),
+    ]
diff --git a/src/c3nav/mapdata/models/geometry/section.py b/src/c3nav/mapdata/models/geometry/section.py
index 92fdb24b..a5e53533 100644
--- a/src/c3nav/mapdata/models/geometry/section.py
+++ b/src/c3nav/mapdata/models/geometry/section.py
@@ -44,15 +44,15 @@ class Space(SectionGeometryMixin, models.Model):
         ('escalator', _('escalator')),
         ('elevator', _('elevator')),
     )
-    LAYERS = (
+    LEVELS = (
         ('', _('normal')),
         ('upper', _('upper')),
-        ('lowerr', _('lower')),
+        ('lower', _('lower')),
     )
     geometry = GeometryField('polygon')
     public = models.BooleanField(verbose_name=_('public'), default=True)
     category = models.CharField(verbose_name=_('category'), choices=CATEGORIES, default='', max_length=16)
-    layer = models.CharField(verbose_name=_('layer'), choices=LAYERS, default='', max_length=16)
+    level = models.CharField(verbose_name=_('level'), choices=LEVELS, default='', max_length=16)
 
     class Meta:
         verbose_name = _('Area')
@@ -62,7 +62,7 @@ class Space(SectionGeometryMixin, models.Model):
     def get_geojson_properties(self):
         result = super().get_geojson_properties()
         result['category'] = self.category
-        result['layer'] = self.layer
+        result['level'] = self.level
         result['public'] = self.public
         return result