fix formatting
This commit is contained in:
parent
565404598b
commit
245e451033
4 changed files with 13 additions and 9 deletions
|
@ -229,10 +229,11 @@ class AltitudeArea(LevelGeometryMixin, models.Model):
|
||||||
if space.outside:
|
if space.outside:
|
||||||
space.geometry = space.geometry.difference(buildings_geom)
|
space.geometry = space.geometry.difference(buildings_geom)
|
||||||
space_accessible = space.geometry.difference(
|
space_accessible = space.geometry.difference(
|
||||||
unary_union(tuple(unwrap_geom(c.geometry) for c in space.columns.all() if c.access_restriction_id is None) +
|
unary_union(
|
||||||
tuple(unwrap_geom(o.geometry) for o in space.obstacles.all() if o.altitude == 0) +
|
tuple(unwrap_geom(c.geometry) for c in space.columns.all() if c.access_restriction_id is None) +
|
||||||
tuple(o.buffered_geometry for o in space.lineobstacles.all() if o.altitude == 0) +
|
tuple(unwrap_geom(o.geometry) for o in space.obstacles.all() if o.altitude == 0) +
|
||||||
tuple(unwrap_geom(h.geometry) for h in space.holes.all()))
|
tuple(o.buffered_geometry for o in space.lineobstacles.all() if o.altitude == 0) +
|
||||||
|
tuple(unwrap_geom(h.geometry) for h in space.holes.all()))
|
||||||
)
|
)
|
||||||
|
|
||||||
space_ramps = unary_union(tuple(unwrap_geom(r.geometry) for r in space.ramps.all()))
|
space_ramps = unary_union(tuple(unwrap_geom(r.geometry) for r in space.ramps.all()))
|
||||||
|
|
|
@ -109,9 +109,10 @@ class LevelGeometries:
|
||||||
obstacles = {}
|
obstacles = {}
|
||||||
heightareas = {}
|
heightareas = {}
|
||||||
for space in level.spaces.all():
|
for space in level.spaces.all():
|
||||||
buffered = space.geometry.buffer(0.01).union(unary_union(
|
buffered = space.geometry.buffer(0.01).union(unary_union(tuple(
|
||||||
tuple(unwrap_geom(door.geometry) for door in level.doors.all() if door.geometry.intersects(unwrap_geom(space.geometry)))
|
unwrap_geom(door.geometry)
|
||||||
).difference(walkable_spaces_geom))
|
for door in level.doors.all() if door.geometry.intersects(unwrap_geom(space.geometry))
|
||||||
|
)).difference(walkable_spaces_geom))
|
||||||
intersects = buildings_geom_prep.intersects(buffered)
|
intersects = buildings_geom_prep.intersects(buffered)
|
||||||
|
|
||||||
access_restriction = space.access_restriction_id
|
access_restriction = space.access_restriction_id
|
||||||
|
|
|
@ -210,7 +210,9 @@ class LevelRenderData:
|
||||||
new_color_obstacles = []
|
new_color_obstacles = []
|
||||||
for obstacle in color_obstacles:
|
for obstacle in color_obstacles:
|
||||||
if new_geometry_prep.intersects(obstacle):
|
if new_geometry_prep.intersects(obstacle):
|
||||||
new_color_obstacles.append(obstacle.intersection(unwrap_geom(altitudearea.geometry)))
|
new_color_obstacles.append(
|
||||||
|
obstacle.intersection(unwrap_geom(altitudearea.geometry))
|
||||||
|
)
|
||||||
if new_color_obstacles:
|
if new_color_obstacles:
|
||||||
new_height_obstacles[color] = new_color_obstacles
|
new_height_obstacles[color] = new_color_obstacles
|
||||||
if new_height_obstacles:
|
if new_height_obstacles:
|
||||||
|
|
|
@ -28,7 +28,7 @@ class MeshConsumer(AsyncWebsocketConsumer):
|
||||||
async def connect(self):
|
async def connect(self):
|
||||||
# todo: auth
|
# todo: auth
|
||||||
|
|
||||||
#await self.log_text(None, "new mesh websocket connection")
|
# await self.log_text(None, "new mesh websocket connection")
|
||||||
await self.accept()
|
await self.accept()
|
||||||
self.ping_task = get_event_loop().create_task(self.ping_regularly())
|
self.ping_task = get_event_loop().create_task(self.ping_regularly())
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue