diff --git a/src/c3nav/mapdata/api.py b/src/c3nav/mapdata/api.py index 83893cd4..f9f2f0c0 100644 --- a/src/c3nav/mapdata/api.py +++ b/src/c3nav/mapdata/api.py @@ -12,7 +12,7 @@ from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet from c3nav.access.apply import filter_arealocations_by_access, filter_queryset_by_access from c3nav.mapdata.lastupdate import get_last_mapdata_update from c3nav.mapdata.models import AreaLocation, Level, LocationGroup, Source -from c3nav.mapdata.models.geometry.area import Stair +from c3nav.mapdata.models.geometry.space import Stair from c3nav.mapdata.models.geometry.base import GEOMETRY_FEATURE_TYPES from c3nav.mapdata.search import get_location from c3nav.mapdata.serializers.main import LevelSerializer, SourceSerializer diff --git a/src/c3nav/mapdata/migrations/0056_auto_20170506_1531.py b/src/c3nav/mapdata/migrations/0056_auto_20170506_1531.py new file mode 100644 index 00000000..96597178 --- /dev/null +++ b/src/c3nav/mapdata/migrations/0056_auto_20170506_1531.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-05-06 15:31 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapdata', '0055_auto_20170505_1334'), + ] + + operations = [ + migrations.RenameModel( + old_name='Area', + new_name='Space', + ), + migrations.AlterField( + model_name='lineobstacle', + name='area', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lineobstacles', to='mapdata.Space', verbose_name='space'), + ), + migrations.AlterField( + model_name='obstacle', + name='area', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='obstacles', to='mapdata.Space', verbose_name='space'), + ), + migrations.AlterField( + model_name='stair', + name='area', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stairs', to='mapdata.Space', verbose_name='space'), + ), + migrations.AlterField( + model_name='stuffedarea', + name='area', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stuffedareas', to='mapdata.Space', verbose_name='space'), + ), + ] diff --git a/src/c3nav/mapdata/migrations/0057_auto_20170506_1534.py b/src/c3nav/mapdata/migrations/0057_auto_20170506_1534.py new file mode 100644 index 00000000..a742e6c2 --- /dev/null +++ b/src/c3nav/mapdata/migrations/0057_auto_20170506_1534.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-05-06 15:34 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('mapdata', '0056_auto_20170506_1531'), + ] + + operations = [ + migrations.RenameField( + model_name='lineobstacle', + old_name='area', + new_name='space', + ), + migrations.RenameField( + model_name='obstacle', + old_name='area', + new_name='space', + ), + migrations.RenameField( + model_name='stair', + old_name='area', + new_name='space', + ), + migrations.RenameField( + model_name='stuffedarea', + old_name='area', + new_name='space', + ), + ] diff --git a/src/c3nav/mapdata/models/geometry/level.py b/src/c3nav/mapdata/models/geometry/level.py index 52d9d8d0..084ba665 100644 --- a/src/c3nav/mapdata/models/geometry/level.py +++ b/src/c3nav/mapdata/models/geometry/level.py @@ -42,9 +42,9 @@ class Building(LevelFeature): default_related_name = 'buildings' -class Area(LevelFeature): +class Space(LevelFeature): """ - An accessible area. Shouldn't overlap. + An accessible space. Shouldn't overlap. """ geomtype = 'polygon' diff --git a/src/c3nav/mapdata/models/geometry/area.py b/src/c3nav/mapdata/models/geometry/space.py similarity index 84% rename from src/c3nav/mapdata/models/geometry/area.py rename to src/c3nav/mapdata/models/geometry/space.py index e946a6cd..508433f3 100644 --- a/src/c3nav/mapdata/models/geometry/area.py +++ b/src/c3nav/mapdata/models/geometry/space.py @@ -7,33 +7,33 @@ from c3nav.mapdata.models.geometry.base import GeometryFeature, GeometryFeatureB from c3nav.mapdata.utils.json import format_geojson -AREA_FEATURE_TYPES = OrderedDict() +SPACE_FEATURE_TYPES = OrderedDict() -class AreaFeatureBase(GeometryFeatureBase): +class SpaceFeatureBase(GeometryFeatureBase): def __new__(mcs, name, bases, attrs): cls = super().__new__(mcs, name, bases, attrs) if not cls._meta.abstract: - AREA_FEATURE_TYPES[name.lower()] = cls + SPACE_FEATURE_TYPES[name.lower()] = cls return cls -class AreaFeature(GeometryFeature, metaclass=AreaFeatureBase): +class SpaceFeature(GeometryFeature, metaclass=SpaceFeatureBase): """ - a map feature that has a geometry and belongs to an area + a map feature that has a geometry and belongs to a space """ - area = models.ForeignKey('mapdata.Area', on_delete=models.CASCADE, verbose_name=_('area')) + space = models.ForeignKey('mapdata.Space', on_delete=models.CASCADE, verbose_name=_('space')) class Meta: abstract = True def get_geojson_properties(self): result = super().get_geojson_properties() - result['area'] = self.area.id + result['space'] = self.space.id return result -class StuffedArea(AreaFeature): +class StuffedArea(SpaceFeature): """ A slow area with many tables or similar. Avoid it from routing by slowing it a bit down """ @@ -45,7 +45,7 @@ class StuffedArea(AreaFeature): default_related_name = 'stuffedareas' -class Stair(AreaFeature): +class Stair(SpaceFeature): """ A stair """ @@ -73,13 +73,13 @@ class Stair(AreaFeature): ('type', 'shadow'), ('original_type', self.__class__.__name__.lower()), ('original_id', self.id), - ('area', self.area.id), + ('space', self.space.id), ))), ('geometry', format_geojson(mapping(shadow), round=False)), )) -class Obstacle(AreaFeature): +class Obstacle(SpaceFeature): """ An obstacle """ @@ -91,7 +91,7 @@ class Obstacle(AreaFeature): default_related_name = 'obstacles' -class LineObstacle(AreaFeature): +class LineObstacle(SpaceFeature): """ An obstacle that is a line with a specific width """