move location stuff into the corresponding models (now renamed to Locations)

src/c3nav/mapdata/migrations/0018_auto_20161212_1205.py

@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 import c3nav.mapdata.fields
-import c3nav.mapdata.models.interest
+import c3nav.mapdata.models.locations
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'Areas of Interest',
                 'verbose_name': 'Area of Interest',
             },
-            bases=(models.Model, c3nav.mapdata.models.interest.MapItemOfInterestMixin),
+            bases=(models.Model, c3nav.mapdata.models.locations.LocationModelMixin),
         ),
         migrations.CreateModel(
             name='GroupOfInterest',
@@ -43,7 +43,7 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'Groups of Interest',
                 'verbose_name': 'Group of Interest',
             },
-            bases=(models.Model, c3nav.mapdata.models.interest.MapItemOfInterestMixin),
+            bases=(models.Model, c3nav.mapdata.models.locations.LocationModelMixin),
         ),
         migrations.AddField(
             model_name='areaofinterest',

src/c3nav/mapdata/migrations/0019_auto_20161216_0923.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2016-12-16 09:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mapdata', '0018_auto_20161212_1205'),
+    ]
+
+    operations = [
+        migrations.RenameModel('AreaOfInterest', 'AreaLocation'),
+        migrations.RenameModel('GroupOfInterest', 'LocationGroup'),
+    ]

src/c3nav/mapdata/migrations/0020_auto_20161216_0934.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2016-12-16 09:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mapdata', '0019_auto_20161216_0923'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='arealocation',
+            options={'verbose_name': 'Area Location', 'verbose_name_plural': 'Area Locations'},
+        ),
+        migrations.AlterModelOptions(
+            name='locationgroup',
+            options={'verbose_name': 'Location Group', 'verbose_name_plural': 'Location Groups'},
+        ),
+        migrations.AlterField(
+            model_name='arealocation',
+            name='groups',
+            field=models.ManyToManyField(blank=True, related_name='arealocations', to='mapdata.LocationGroup', verbose_name='Location Groups'),
+        ),
+        migrations.AlterField(
+            model_name='arealocation',
+            name='level',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='arealocations', to='mapdata.Level', verbose_name='level'),
+        ),
+        migrations.AlterField(
+            model_name='arealocation',
+            name='package',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='arealocations', to='mapdata.Package', verbose_name='map package'),
+        ),
+        migrations.AlterField(
+            model_name='locationgroup',
+            name='package',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='locationgroups', to='mapdata.Package', verbose_name='map package'),
+        ),
+    ]