rename models: Inside→Building, Room→Area

src/c3nav/api/urls.py

@@ -8,7 +8,7 @@ from rest_framework.response import Response
 from rest_framework.routers import SimpleRouter
 
 from c3nav.editor.api import HosterViewSet, SubmitTaskViewSet
-from c3nav.mapdata.api.features import FeatureTypeViewSet, FeatureViewSet, InsideViewSet, RoomViewSet
+from c3nav.mapdata.api.features import AreaViewSet, BuildingViewSet, FeatureTypeViewSet, FeatureViewSet
 from c3nav.mapdata.api.main import LevelViewSet, PackageViewSet, SourceViewSet
 
 router = SimpleRouter()
@@ -18,8 +18,8 @@ router.register(r'sources', SourceViewSet)
 
 router.register(r'featuretypes', FeatureTypeViewSet, base_name='featuretype')
 router.register(r'features', FeatureViewSet, base_name='features')
-router.register(r'insides', InsideViewSet)
+router.register(r'insides', BuildingViewSet)
-router.register(r'rooms', RoomViewSet)
+router.register(r'rooms', AreaViewSet)
 
 router.register(r'hosters', HosterViewSet, base_name='hoster')
 router.register(r'submittasks', SubmitTaskViewSet, base_name='submittask')

src/c3nav/editor/forms.py

@@ -8,7 +8,7 @@ from django.forms.widgets import HiddenInput
 from shapely.geometry.geo import mapping
 
 from c3nav.mapdata.models import Package
-from c3nav.mapdata.models.features import Door, Inside, Obstacle, Room
+from c3nav.mapdata.models.features import Area, Building, Door, Obstacle
 from c3nav.mapdata.permissions import get_unlocked_packages
 
 
@@ -80,7 +80,7 @@ def create_editor_form(feature_model, add_fields=None):
 
 
 def create_editor_forms():
-    create_editor_form(Inside)
+    create_editor_form(Building)
-    create_editor_form(Room)
+    create_editor_form(Area)
     create_editor_form(Obstacle, ['height'])
     create_editor_form(Door)

src/c3nav/mapdata/api/features.py

@@ -5,9 +5,9 @@ from rest_framework.response import Response
 from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
 
 from c3nav.mapdata.models import FEATURE_TYPES
-from c3nav.mapdata.models.features import Door, Inside, Obstacle, Room
+from c3nav.mapdata.models.features import Area, Building, Door, Obstacle
-from c3nav.mapdata.serializers.features import (DoorSerializer, FeatureTypeSerializer, InsideSerializer,
+from c3nav.mapdata.serializers.features import (AreaSerializer, BuildingSerializer, DoorSerializer,
-                                                ObstacleSerializer, RoomSerializer)
+                                                FeatureTypeSerializer, ObstacleSerializer)
 
 
 class FeatureTypeViewSet(ViewSet):
@@ -41,22 +41,22 @@ class FeatureViewSet(ViewSet):
         return Response(result)
 
 
-class InsideViewSet(ReadOnlyModelViewSet):
+class BuildingViewSet(ReadOnlyModelViewSet):
     """
     List and retrieve Inside Areas
     """
-    queryset = Inside.objects.all()
+    queryset = Building.objects.all()
-    serializer_class = InsideSerializer
+    serializer_class = BuildingSerializer
     lookup_field = 'name'
     lookup_value_regex = '[^/]+'
 
 
-class RoomViewSet(ReadOnlyModelViewSet):
+class AreaViewSet(ReadOnlyModelViewSet):
     """
-    List and retrieve Rooms
+    List and retrieve Areas
     """
-    queryset = Room.objects.all()
+    queryset = Area.objects.all()
-    serializer_class = RoomSerializer
+    serializer_class = AreaSerializer
     lookup_field = 'name'
     lookup_value_regex = '[^/]+'
 

src/c3nav/mapdata/migrations/0003_auto_20161016_1133.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.2 on 2016-10-16 11:33
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mapdata', '0002_door_obstacle'),
+    ]
+
+    operations = [
+        migrations.RenameModel('Inside', 'Building'),
+        migrations.RenameModel('Room', 'Area')
+    ]

src/c3nav/mapdata/models/features.py

@@ -57,7 +57,7 @@ class Feature(MapdataModel):
 
 
 @register_featuretype
-class Inside(Feature):
+class Building(Feature):
     """
     The outline of a building on a specific level
     """
@@ -65,23 +65,23 @@ class Inside(Feature):
     color = '#333333'
 
     class Meta:
-        verbose_name = _('Inside Area')
+        verbose_name = _('Building')
-        verbose_name_plural = _('Inside Areas')
+        verbose_name_plural = _('Buildings')
-        default_related_name = 'insides'
+        default_related_name = 'buildings'
 
 
 @register_featuretype
-class Room(Feature):
+class Area(Feature):
     """
-    A room inside
+    An accessible area like a room. Can also be outside. Can overlap.
     """
     geomtype = 'polygon'
     color = '#FFFFFF'
 
     class Meta:
-        verbose_name = _('Room')
+        verbose_name = _('Area')
-        verbose_name_plural = _('Rooms')
+        verbose_name_plural = _('Areas')
-        default_related_name = 'rooms'
+        default_related_name = 'areas'
 
 
 @register_featuretype

src/c3nav/mapdata/packageio/const.py

@@ -1,4 +1,4 @@
 from c3nav.mapdata.models import Level, Package, Source
-from c3nav.mapdata.models.features import Inside, Room
+from c3nav.mapdata.models.features import Area, Building
 
-ordered_models = (Package, Level, Source, Inside, Room)
+ordered_models = (Package, Level, Source, Building, Area)

src/c3nav/mapdata/serializers/features.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from c3nav.mapdata.models.features import Door, Inside, Obstacle, Room
+from c3nav.mapdata.models.features import Area, Building, Door, Obstacle
 from c3nav.mapdata.serializers.fields import GeometryField
 
 
@@ -31,15 +31,15 @@ class FeatureSerializer(serializers.ModelSerializer):
     geometry = GeometryField()
 
 
-class InsideSerializer(FeatureSerializer):
+class BuildingSerializer(FeatureSerializer):
     class Meta:
-        model = Inside
+        model = Building
         fields = ('name', 'level', 'package', 'geometry')
 
 
-class RoomSerializer(FeatureSerializer):
+class AreaSerializer(FeatureSerializer):
     class Meta:
-        model = Room
+        model = Area
         fields = ('name', 'level', 'package', 'geometry')