From 72716154b94135986924c72dbc86bb290deffd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Fri, 28 Apr 2017 11:03:08 +0200
Subject: [PATCH] remove EscalatorSlope and OneWay

---
 src/c3nav/editor/views.py                     |  4 +-
 .../migrations/0037_auto_20170428_0902.py     | 43 +++++++++++++++++++
 src/c3nav/mapdata/models/geometry.py          | 20 ---------
 3 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 src/c3nav/mapdata/migrations/0037_auto_20170428_0902.py

diff --git a/src/c3nav/editor/views.py b/src/c3nav/editor/views.py
index b8cc204f..c5afe05e 100644
--- a/src/c3nav/editor/views.py
+++ b/src/c3nav/editor/views.py
@@ -11,7 +11,6 @@ from c3nav.editor.hosters import get_hoster_for_package, hosters
 from c3nav.mapdata.models import AreaLocation
 from c3nav.mapdata.models.base import MAPITEM_TYPES
 from c3nav.mapdata.models.package import Package
-from c3nav.mapdata.packageio.write import json_encode
 
 
 def list_mapitemtypes(request, level):
@@ -131,7 +130,8 @@ def edit_mapitem(request, mapitem_type, name=None):
                         mapitem.titles[language] = title
 
             if not settings.DIRECT_EDITING:
-                content = json_encode(mapitem.tofile(form=form))
+                # todo: suggest changes
+                content = ''
                 with translation.override('en'):
                     commit_msg = '%s %s: %s' % (commit_type, mapitemtype._meta.verbose_name, mapitem.title)
                 return render(request, 'editor/mapitem_success.html', {
diff --git a/src/c3nav/mapdata/migrations/0037_auto_20170428_0902.py b/src/c3nav/mapdata/migrations/0037_auto_20170428_0902.py
new file mode 100644
index 00000000..53ad6346
--- /dev/null
+++ b/src/c3nav/mapdata/migrations/0037_auto_20170428_0902.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-04-28 09:02
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mapdata', '0036_arealocation_bssids'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='escalatorslope',
+            name='level',
+        ),
+        migrations.RemoveField(
+            model_name='escalatorslope',
+            name='package',
+        ),
+        migrations.RemoveField(
+            model_name='oneway',
+            name='level',
+        ),
+        migrations.RemoveField(
+            model_name='oneway',
+            name='package',
+        ),
+        migrations.AlterField(
+            model_name='arealocation',
+            name='bssids',
+            field=models.TextField(blank=True, validators=[django.core.validators.RegexValidator(message='please enter a newline seperated lowercase list of BSSIDs', regex='^([0-9a-f]{2}(:[0-9a-f]{2}){5}(\\r?\\n[0-9a-f]{2}(:[0-9a-f]{2}){5})*)?$')], verbose_name='BSSIDs'),
+        ),
+        migrations.DeleteModel(
+            name='EscalatorSlope',
+        ),
+        migrations.DeleteModel(
+            name='OneWay',
+        ),
+    ]
diff --git a/src/c3nav/mapdata/models/geometry.py b/src/c3nav/mapdata/models/geometry.py
index f00a6d1e..2844ddf0 100644
--- a/src/c3nav/mapdata/models/geometry.py
+++ b/src/c3nav/mapdata/models/geometry.py
@@ -218,16 +218,6 @@ class Escalator(GeometryMapItemWithLevel):
         return result
 
 
-class EscalatorSlope(DirectedLineGeometryMapItemWithLevel):
-    """
-    An escalator slope, indicating which side of the escalator is up
-    """
-    class Meta:
-        verbose_name = _('Escalator Slope')
-        verbose_name_plural = _('Escalator Slopes')
-        default_related_name = 'escalatorslopes'
-
-
 class Stair(DirectedLineGeometryMapItemWithLevel):
     """
     A stair
@@ -238,16 +228,6 @@ class Stair(DirectedLineGeometryMapItemWithLevel):
         default_related_name = 'stairs'
 
 
-class OneWay(DirectedLineGeometryMapItemWithLevel):
-    """
-    A one way obstacle
-    """
-    class Meta:
-        verbose_name = _('Oneway')
-        verbose_name_plural = _('Oneways')
-        default_related_name = 'oneways'
-
-
 class Obstacle(GeometryMapItemWithLevel):
     """
     An obstacle