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

add grid square to custom locations serialization and display as well

Browse source
This commit is contained in:
Laura Klünder 2018-12-10 19:43:00 +01:00
parent 525d708d3a
commit 9878ce76e7
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/c3nav/mapdata/utils/locations.py
View file

@ -278,10 +278,13 @@ class CustomLocation:
('level', self.level.pk), ('level', self.level.pk),
('space', self.space.pk if self.space else None), ('space', self.space.pk if self.space else None),
('areas', tuple(area.pk for area in self.areas)), ('areas', tuple(area.pk for area in self.areas)),
('grid_square', self.grid_square),
('near_area', self.near_area.pk if self.near_area else None), ('near_area', self.near_area.pk if self.near_area else None),
('near_poi', self.near_poi.pk if self.near_poi else None), ('near_poi', self.near_poi.pk if self.near_poi else None),
('altitude', None if self.altitude is None else round(self.altitude, 2)) ('altitude', None if self.altitude is None else round(self.altitude, 2))
)) ))
if not grid.enabled:
result.pop('grid_square')
if include_type: if include_type:
result['type'] = 'custom' result['type'] = 'custom'
result.move_to_end('type', last=False) result.move_to_end('type', last=False)
@ -296,7 +299,7 @@ class CustomLocation:
return result return result
def details_display(self, **kwargs): def details_display(self, **kwargs):
return { result = {
'id': self.pk, 'id': self.pk,
'display': [ 'display': [
(_('Type'), _('Coordinates')), (_('Type'), _('Coordinates')),
@ -320,6 +323,7 @@ class CustomLocation:
'title': area.title, 'title': area.title,
'can_search': area.can_search, 'can_search': area.can_search,
} for area in self.areas)), } for area in self.areas)),
(_('Grid Square'), self.grid_square or None),
(_('Near Area'), { (_('Near Area'), {
'id': self.near_area.pk, 'id': self.near_area.pk,
'slug': self.near_area.get_slug(), 'slug': self.near_area.get_slug(),
@ -340,6 +344,9 @@ class CustomLocation:
], ],
'geometry': self.serialized_geometry, 'geometry': self.serialized_geometry,
} }
if not grid.enabled:
result['display'].pop(6)
return result
@cached_property @cached_property
def description(self): def description(self):