2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

rename Section back to Level

Browse source
This commit is contained in:
Laura Klünder 2017-06-11 14:43:14 +02:00
parent 27ff35e785
commit 1498b7aeb0
27 changed files with 416 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/c3nav/mapdata/models/geometry/section.py → src/c3nav/mapdata/models/geometry/level.py
View file

@ -5,18 +5,18 @@ from c3nav.mapdata.fields import GeometryField
from c3nav.mapdata.models.geometry.base import GeometryMixin
from c3nav.mapdata.models.locations import SpecificLocation
SECTION_MODELS = []
LEVEL_MODELS = []
class SectionGeometryMixin(GeometryMixin):
section = models.ForeignKey('mapdata.Section', on_delete=models.CASCADE, verbose_name=_('section'))
class LevelGeometryMixin(GeometryMixin):
level = models.ForeignKey('mapdata.Level', on_delete=models.CASCADE, verbose_name=_('level'))
class Meta:
abstract = True
def get_geojson_properties(self) -> dict:
result = super().get_geojson_properties()
result['section'] = self.section_id
result['level'] = self.level_id
if hasattr(self, 'get_color'):
color = self.get_color()
if color:
@ -25,14 +25,14 @@ class SectionGeometryMixin(GeometryMixin):
result['opacity'] = self.opacity
return result
def _serialize(self, section=True, **kwargs):
def _serialize(self, level=True, **kwargs):
result = super()._serialize(**kwargs)
if section:
result['section'] = self.section.id
if level:
result['level'] = self.level_id
return result
class Building(SectionGeometryMixin, models.Model):
class Building(LevelGeometryMixin, models.Model):
"""
The outline of a building on a specific level
"""
@ -44,9 +44,9 @@ class Building(SectionGeometryMixin, models.Model):
default_related_name = 'buildings'
class Space(SpecificLocation, SectionGeometryMixin, models.Model):
class Space(SpecificLocation, LevelGeometryMixin, models.Model):
"""
An accessible space. Shouldn't overlap with spaces on same section.
An accessible space. Shouldn't overlap with spaces on the same level.
"""
CATEGORIES = (
('normal', _('normal')),
@ -81,7 +81,7 @@ class Space(SpecificLocation, SectionGeometryMixin, models.Model):
return color
class Door(SectionGeometryMixin, models.Model):
class Door(LevelGeometryMixin, models.Model):
"""
A connection between two spaces
"""