From 47d2616469e49e70fec9fb107b377b3660969eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Wed, 10 May 2017 15:15:55 +0200 Subject: [PATCH] =?UTF-8?q?rename=20StuffedArea=20to=20Area=20with=20boole?= =?UTF-8?q?an=20field=20=E2=80=9Estuffed=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0067_auto_20170510_1311.py | 23 +++++++++++++++++++ .../mapdata/migrations/0068_area_stuffed.py | 21 +++++++++++++++++ src/c3nav/mapdata/models/__init__.py | 2 +- src/c3nav/mapdata/models/geometry/space.py | 9 ++++---- 4 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 src/c3nav/mapdata/migrations/0067_auto_20170510_1311.py create mode 100644 src/c3nav/mapdata/migrations/0068_area_stuffed.py diff --git a/src/c3nav/mapdata/migrations/0067_auto_20170510_1311.py b/src/c3nav/mapdata/migrations/0067_auto_20170510_1311.py new file mode 100644 index 00000000..59d9d386 --- /dev/null +++ b/src/c3nav/mapdata/migrations/0067_auto_20170510_1311.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2017-05-10 13:11 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapdata', '0066_auto_20170509_1148'), + ] + + operations = [ + migrations.RenameModel( + old_name='StuffedArea', + new_name='Area', + ), + migrations.AlterModelOptions( + name='area', + options={'verbose_name': 'Area', 'verbose_name_plural': 'Areas'}, + ), + ] diff --git a/src/c3nav/mapdata/migrations/0068_area_stuffed.py b/src/c3nav/mapdata/migrations/0068_area_stuffed.py new file mode 100644 index 00000000..146767b2 --- /dev/null +++ b/src/c3nav/mapdata/migrations/0068_area_stuffed.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2017-05-10 13:11 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapdata', '0067_auto_20170510_1311'), + ] + + operations = [ + migrations.AddField( + model_name='area', + name='stuffed', + field=models.BooleanField(default=True, verbose_name='stuffed area'), + preserve_default=False, + ), + ] diff --git a/src/c3nav/mapdata/models/__init__.py b/src/c3nav/mapdata/models/__init__.py index 50a5e662..fe53181e 100644 --- a/src/c3nav/mapdata/models/__init__.py +++ b/src/c3nav/mapdata/models/__init__.py @@ -1,5 +1,5 @@ from .section import Section # noqa from .source import Source # noqa from c3nav.mapdata.models.geometry.section import Building, Space, Hole, Door # noqa -from c3nav.mapdata.models.geometry.space import StuffedArea, Stair, Obstacle, LineObstacle # noqa +from c3nav.mapdata.models.geometry.space import Area, Stair, Obstacle, LineObstacle # noqa from .locations import AreaLocation, LocationGroup # noqa diff --git a/src/c3nav/mapdata/models/geometry/space.py b/src/c3nav/mapdata/models/geometry/space.py index 61bf3b6d..dc25dbc4 100644 --- a/src/c3nav/mapdata/models/geometry/space.py +++ b/src/c3nav/mapdata/models/geometry/space.py @@ -23,15 +23,16 @@ class SpaceGeometryMixin(GeometryMixin): return result -class StuffedArea(SpaceGeometryMixin, models.Model): +class Area(SpaceGeometryMixin, models.Model): """ - A slow area with many tables or similar. Avoid it from routing by slowing it a bit down + An area in a space. """ geometry = GeometryField('polygon') + stuffed = models.BooleanField(verbose_name=_('stuffed area')) class Meta: - verbose_name = _('Stuffed Area') - verbose_name_plural = _('Stuffed Areas') + verbose_name = _('Area') + verbose_name_plural = _('Areas') default_related_name = 'stuffedareas'