diff --git a/src/c3nav/mapdata/models/feature.py b/src/c3nav/mapdata/models/feature.py index e271d83d..b51ea716 100644 --- a/src/c3nav/mapdata/models/feature.py +++ b/src/c3nav/mapdata/models/feature.py @@ -4,9 +4,6 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ from django.utils.translation import get_language -from c3nav.mapdata.models.level import Level -from c3nav.mapdata.models.package import Package - from ..fields import GeometryField @@ -36,10 +33,10 @@ class Feature(models.Model): TYPES = tuple((name, t.title) for name, t in FEATURE_TYPES.items()) name = models.SlugField(_('feature identifier'), primary_key=True, max_length=50, help_text=_('e.g. noc')) - package = models.ForeignKey(Package, on_delete=models.CASCADE, related_name='features', + package = models.ForeignKey('Package', on_delete=models.CASCADE, related_name='features', verbose_name=_('map package')) feature_type = models.CharField(max_length=50, choices=TYPES) - level = models.ForeignKey(Level, on_delete=models.CASCADE, related_name='features', + level = models.ForeignKey('Level', on_delete=models.CASCADE, related_name='features', verbose_name=_('level')) geometry = GeometryField() diff --git a/src/c3nav/mapdata/models/level.py b/src/c3nav/mapdata/models/level.py index 17f7d474..681a7432 100644 --- a/src/c3nav/mapdata/models/level.py +++ b/src/c3nav/mapdata/models/level.py @@ -1,8 +1,6 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from c3nav.mapdata.models import Package - class Level(models.Model): """ @@ -11,7 +9,7 @@ class Level(models.Model): name = models.SlugField(_('level name'), primary_key=True, max_length=50, help_text=_('Usually just an integer (e.g. -1, 0, 1, 2)')) altitude = models.DecimalField(_('level altitude'), null=True, max_digits=6, decimal_places=2) - package = models.ForeignKey(Package, on_delete=models.CASCADE, related_name='levels', + package = models.ForeignKey('Package', on_delete=models.CASCADE, related_name='levels', verbose_name=_('map package')) path_regex = r'^levels/' diff --git a/src/c3nav/mapdata/models/source.py b/src/c3nav/mapdata/models/source.py index 0169ec2a..febd36e2 100644 --- a/src/c3nav/mapdata/models/source.py +++ b/src/c3nav/mapdata/models/source.py @@ -1,15 +1,13 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from c3nav.mapdata.models import Package - class Source(models.Model): """ A map source, images of levels that can be useful as backgrounds for the map editor """ name = models.SlugField(_('source name'), primary_key=True, max_length=50) - package = models.ForeignKey(Package, on_delete=models.CASCADE, related_name='sources', + package = models.ForeignKey('Package', on_delete=models.CASCADE, related_name='sources', verbose_name=_('map package')) bottom = models.DecimalField(_('bottom coordinate'), max_digits=6, decimal_places=2)