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

improve location matching and fix some performance issues as well

Browse source
This commit is contained in:
Laura Klünder 2019-12-26 12:11:51 +01:00
parent f5d9b13d75
commit e59932f2b2
5 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,16 +104,21 @@ class Location(LocationSlug, AccessRestrictionMixin, TitledMixin, models.Model):
result = super().serialize(detailed=detailed, **kwargs)
if not detailed:
fields = ('id', 'type', 'slug', 'title', 'subtitle', 'icon', 'point', 'bounds', 'grid_square',
'locations', 'on_top_of', 'label_settings', 'label_override')
'locations', 'on_top_of', 'label_settings', 'label_override', 'add_search')
result = {name: result[name] for name in fields if name in result}
return result
def _serialize(self, **kwargs):
def _serialize(self, search=False, **kwargs):
result = super()._serialize(**kwargs)
result['subtitle'] = str(self.subtitle)
result['icon'] = self.get_icon()
result['can_search'] = self.can_search
result['can_describe'] = self.can_search
if search:
result['add_search'] = ' '.join((
*(redirect.slug for redirect in self.redirects.all()),
*self.other_titles,
))
return result
def details_display(self, **kwargs):