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

some more improvements

Browse source
This commit is contained in:
Laura Klünder 2018-12-23 01:12:57 +01:00
parent ac694ac2b7
commit 84ceb344bc
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/c3nav/editor/api.py
View file

@ -10,6 +10,7 @@ from rest_framework.exceptions import NotFound, ParseError, PermissionDenied, Va
from rest_framework.generics import get_object_or_404 from rest_framework.generics import get_object_or_404
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
from shapely import prepared
from shapely.ops import cascaded_union from shapely.ops import cascaded_union
from c3nav.api.utils import get_api_post_data from c3nav.api.utils import get_api_post_data
@ -60,11 +61,13 @@ class EditorViewSet(EditorViewSetMixin, ViewSet):
holes_geom.append(space_holes_geom.intersection(space.geometry)) holes_geom.append(space_holes_geom.intersection(space.geometry))
space.geometry = space.geometry.difference(space_holes_geom) space.geometry = space.geometry.difference(space_holes_geom)
holes_geom = cascaded_union(holes_geom) holes_geom = cascaded_union(holes_geom)
holes_geom_prep = prepared.prep(holes_geom)
for building in buildings: for building in buildings:
building.original_geometry = building.geometry building.original_geometry = building.geometry
for obj in buildings: for obj in buildings:
obj.geometry = obj.geometry.difference(holes_geom) if holes_geom_prep.intersects(obj.geometry):
obj.geometry = obj.geometry.difference(holes_geom)
results = [] results = []
results.extend(buildings) results.extend(buildings)