This commit is contained in:
Laura Klünder 2017-05-13 16:42:39 +02:00
parent 6512ef7905
commit 860d80a88b
2 changed files with 2 additions and 2 deletions

View file

@ -178,7 +178,7 @@ class LocationViewSet(RetrieveModelMixin, GenericViewSet):
def search(self, request):
# todo: implement caching here
results = sorted(chain(*(model.objects.filter(can_search=True)
for model in LOCATION_MODELS)), key=lambda obj: obj.id)
for model in LOCATION_MODELS)), key=lambda obj: obj.id)
search = request.GET.get('s')
if not search:
return Response([obj.serialize(include_type=True, detailed='detailed' in request.GET) for obj in results])

View file

@ -54,7 +54,7 @@ class Section(SpecificLocation, EditorFormMixin, models.Model):
space_levels[space.level].append(space)
space_geometries = {
level: cascaded_union(tuple((s.geometry.difference(building_geometries) if s.outside else s.geometry)
for s in level_spaces))
for s in level_spaces))
for level, level_spaces in space_levels.items()}
hole_geometries = cascaded_union(tuple(h.geometry for h in self.holes.all()))