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

move location stuff into the corresponding models (now renamed to Locations)

Browse source
This commit is contained in:
Laura Klünder 2016-12-16 11:03:40 +01:00
parent 7528686e87
commit ed0f168a77
11 changed files with 236 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/mapdata/packageio/read.py
View file

@ -7,7 +7,7 @@ from collections import OrderedDict
from django.conf import settings
from django.core.management import CommandError
from c3nav.mapdata.models import AreaOfInterest, Elevator, GroupOfInterest, Level, Package
from c3nav.mapdata.models import AreaLocation, Elevator, Level, LocationGroup, Package
from c3nav.mapdata.models.geometry import LevelConnector
from c3nav.mapdata.packageio.const import ordered_models
@ -166,8 +166,8 @@ class ReaderItem:
self.data.pop('levels')
groups = []
if self.model == AreaOfInterest:
groups = [self.reader.saved_items[GroupOfInterest][name].obj.pk for name in self.data['groups']]
if self.model == AreaLocation:
groups = [self.reader.saved_items[LocationGroup][name].obj.pk for name in self.data['groups']]
self.data.pop('groups')
# Change name references to the referenced object