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

display coordinates details

Browse source
This commit is contained in:
Laura Klünder 2017-11-28 21:24:08 +01:00
parent 4d2607ca3f
commit eeae2d019b
3 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/c3nav/mapdata/api.py
View file

@ -25,8 +25,7 @@ from c3nav.mapdata.models.level import Level
from c3nav.mapdata.models.locations import (Location, LocationGroupCategory, LocationRedirect, LocationSlug,
SpecificLocation)
from c3nav.mapdata.utils.locations import (get_location_by_id_for_request, get_location_by_slug_for_request,
locations_for_request, searchable_locations_for_request,
visible_locations_for_request)
searchable_locations_for_request, visible_locations_for_request)
from c3nav.mapdata.utils.models import get_submodels
@ -299,10 +298,8 @@ class LocationViewSet(RetrieveModelMixin, GenericViewSet):
@detail_route(methods=['get'])
@api_etag()
def display(self, request, pk=None):
if not pk.isdigit():
raise NotFound
location = get_location_by_id_for_request(pk, request)
location = locations_for_request(request).get(int(pk))
if location is None:
raise NotFound

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

@ -240,6 +240,13 @@ class CustomLocation:
'x': self.x,
'y': self.y})
@property
def serialized_geometry(self):
return {
'type': 'Point',
'coordinates': (self.x, self.y)
}
def serialize(self, simple_geometry=False, geometry=True, **kwargs):
result = OrderedDict((
('id', self.pk),
@ -252,8 +259,26 @@ class CustomLocation:
result['bounds'] = ((int(math.floor(self.x)), int(math.floor(self.y))),
(int(math.ceil(self.x)), int(math.ceil(self.y))))
if geometry:
result['geometry'] = {
'type': 'Point',
'coordinates': (self.x, self.y)
}
result['geometry'] = self.serialized_geometry
return result
def details_display(self):
return {
'id': self.pk,
'display': [
(str(_('Type')), str(_('Coordinates'))),
(str(_('ID')), str(self.pk)),
(str(_('Slug')), str(self.pk)),
(str(_('Level')), {
'id': self.level.pk,
'slug': self.level.get_slug(),
'title': self.level.title,
'can_search': self.level.can_search,
}),
(str(_('X Coordinate')), str(self.x)),
(str(_('Y Coordinate')), str(self.y)),
(str(_('Title')), str(self.title)),
(str(_('Subtitle')), str(self.subtitle)),
],
'geometry': self.serialized_geometry,
}