respect access restrictions in renderer
This commit is contained in:
Laura Klünder
parent
e86df62535
commit
4acee03ca3
4 changed files with 92 additions and 38 deletions
|
|
@ -1 +1 @@
|
|||
from c3nav.mapdata.render.svg import render_svg # noqa
|
||||
from c3nav.mapdata.render.svg import SVGRenderer # noqa
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ class LevelGeometries:
|
|||
self.walls = None
|
||||
self.doors = None
|
||||
self.holes = None
|
||||
self.access_restriction_affected = None
|
||||
|
||||
@staticmethod
|
||||
def crop(self, geometry, crop_to):
|
||||
|
|
@ -51,12 +52,18 @@ class LevelGeometries:
|
|||
if level.on_top_of_id is None:
|
||||
geoms.holes = spaces_geom.difference(walkable_geom)
|
||||
|
||||
access_restriction_affected = {}
|
||||
|
||||
colors = {}
|
||||
for space in level.spaces.all():
|
||||
access_restriction = space.access_restriction_id
|
||||
if access_restriction is not None:
|
||||
access_restriction_affected.setdefault(access_restriction, []).append(space.geometry)
|
||||
colors.setdefault(space.get_color(), {}).setdefault(access_restriction, []).append(space.geometry)
|
||||
for area in space.areas.all():
|
||||
access_restriction = area.access_restriction_id or space.access_restriction_id
|
||||
if access_restriction is not None:
|
||||
access_restriction_affected.setdefault(access_restriction, []).append(area.geometry)
|
||||
colors.setdefault(area.get_color(), {}).setdefault(access_restriction, []).append(area.geometry)
|
||||
colors.pop(None, None)
|
||||
|
||||
|
|
@ -72,6 +79,9 @@ class LevelGeometries:
|
|||
altitudearea_colors = {color: areas for color, areas in altitudearea_colors.items() if areas}
|
||||
geoms.altitudeareas.append(AltitudeAreaGeometries(altitudearea, altitudearea_colors))
|
||||
|
||||
geoms.access_restriction_affected = {access_restriction: unary_union(areas)
|
||||
for access_restriction, areas in access_restriction_affected.items()}
|
||||
|
||||
geoms.walls = buildings_geom.difference(spaces_geom).difference(doors_geom)
|
||||
level.geoms_cache = pickle.dumps(geoms)
|
||||
level.save()
|
||||
|
|
@ -81,8 +91,8 @@ class LevelGeometries:
|
|||
level.save()
|
||||
|
||||
|
||||
def get_render_level_data(level):
|
||||
cache_key = 'mapdata:render_level_data:%s:%s' % (str(level.pk if isinstance(level, Level) else level),
|
||||
def get_level_render_data(level):
|
||||
cache_key = 'mapdata:level_render_data:%s:%s' % (str(level.pk if isinstance(level, Level) else level),
|
||||
MapUpdate.cache_key())
|
||||
result = cache.get(cache_key, None)
|
||||
if result is not None:
|
||||
|
|
|
|||
|
|
@ -1,50 +1,88 @@
|
|||
from django.utils.functional import cached_property
|
||||
from shapely.geometry import box
|
||||
from shapely.ops import unary_union
|
||||
|
||||
from c3nav.mapdata.render.base import get_render_level_data
|
||||
from c3nav.mapdata.render.base import get_level_render_data
|
||||
from c3nav.mapdata.utils.svg import SVGImage
|
||||
|
||||
|
||||
def render_svg(level, miny, minx, maxy, maxx, scale=1):
|
||||
svg = SVGImage(bounds=((miny, minx), (maxy, maxx)), scale=scale, buffer=1)
|
||||
class SVGRenderer:
|
||||
def __init__(self, level, miny, minx, maxy, maxx, scale=1, user=None):
|
||||
self.level = level
|
||||
self.miny = miny
|
||||
self.minx = minx
|
||||
self.maxy = maxy
|
||||
self.maxx = maxx
|
||||
self.scale = scale
|
||||
self.user = user
|
||||
|
||||
within_coords = (minx-1, miny-1, maxx+1, maxy+1)
|
||||
bbox = box(*within_coords)
|
||||
@cached_property
|
||||
def bbox(self):
|
||||
return box(self.minx-1, self.miny-1, self.maxx+1, self.maxy+1)
|
||||
|
||||
render_level_data = get_render_level_data(level)
|
||||
@cached_property
|
||||
def level_render_data(self):
|
||||
return get_level_render_data(self.level)
|
||||
|
||||
crop_to = None
|
||||
primary_level_count = 0
|
||||
for geoms, default_height in reversed(render_level_data):
|
||||
if geoms.holes is not None:
|
||||
primary_level_count += 1
|
||||
def check_level(self):
|
||||
return self.level_render_data
|
||||
|
||||
geoms.crop_to = crop_to if primary_level_count > 1 else None
|
||||
@cached_property
|
||||
def affected_access_restrictions(self):
|
||||
access_restrictions = set()
|
||||
for geoms, default_height in self.level_render_data:
|
||||
for access_restriction, area in geoms.access_restriction_affected.items():
|
||||
if access_restriction not in access_restrictions and area.intersects(self.bbox):
|
||||
access_restrictions.add(access_restriction)
|
||||
return access_restrictions
|
||||
|
||||
if geoms.holes is not None:
|
||||
if crop_to is None:
|
||||
crop_to = geoms.holes
|
||||
else:
|
||||
crop_to = crop_to.intersection(geoms.holes)
|
||||
@cached_property
|
||||
def unlocked_access_restrictions(self):
|
||||
# todo access_restriction
|
||||
return set(access_restriction for access_restriction in self.affected_access_restrictions
|
||||
if self.user is not None and self.user.is_superuser)
|
||||
|
||||
for geoms, default_height in render_level_data:
|
||||
crop_to = bbox
|
||||
if geoms.crop_to is not None:
|
||||
crop_to = crop_to.intersection(geoms.crop_to)
|
||||
@cached_property
|
||||
def access_cache_key(self):
|
||||
return '_'.join(str(i) for i in sorted(self.unlocked_access_restrictions)) or '0'
|
||||
|
||||
for altitudearea in geoms.altitudeareas:
|
||||
svg.add_geometry(crop_to.intersection(altitudearea.geometry),
|
||||
fill_color='#eeeeee', altitude=altitudearea.altitude)
|
||||
def render(self):
|
||||
svg = SVGImage(bounds=((self.miny, self.minx), (self.maxy, self.maxx)), scale=self.scale, buffer=1)
|
||||
|
||||
for color, areas in altitudearea.colors.items():
|
||||
# todo access_restriction
|
||||
areas = [area for area in areas.values()]
|
||||
if areas:
|
||||
svg.add_geometry(crop_to.intersection(unary_union(areas)), fill_color=color, elevation=0)
|
||||
unlocked_access_restrictions = self.unlocked_access_restrictions | set([None])
|
||||
|
||||
svg.add_geometry(crop_to.intersection(geoms.walls),
|
||||
fill_color='#aaaaaa', stroke_px=0.5, stroke_color='#aaaaaa', elevation=default_height)
|
||||
crop_to = None
|
||||
primary_level_count = 0
|
||||
for geoms, default_height in reversed(self.level_render_data):
|
||||
if geoms.holes is not None:
|
||||
primary_level_count += 1
|
||||
|
||||
svg.add_geometry(crop_to.intersection(geoms.doors), fill_color='#ffffff', elevation=0)
|
||||
geoms.crop_to = crop_to if primary_level_count > 1 else None
|
||||
|
||||
return svg
|
||||
if geoms.holes is not None:
|
||||
if crop_to is None:
|
||||
crop_to = geoms.holes
|
||||
else:
|
||||
crop_to = crop_to.intersection(geoms.holes)
|
||||
|
||||
for geoms, default_height in self.level_render_data:
|
||||
crop_to = self.bbox
|
||||
if geoms.crop_to is not None:
|
||||
crop_to = crop_to.intersection(geoms.crop_to)
|
||||
|
||||
for altitudearea in geoms.altitudeareas:
|
||||
svg.add_geometry(crop_to.intersection(altitudearea.geometry),
|
||||
fill_color='#eeeeee', altitude=altitudearea.altitude)
|
||||
|
||||
for color, areas in altitudearea.colors.items():
|
||||
areas = tuple(area for access_restriction, area in areas.items()
|
||||
if access_restriction in unlocked_access_restrictions)
|
||||
if areas:
|
||||
svg.add_geometry(crop_to.intersection(unary_union(areas)), fill_color=color, elevation=0)
|
||||
|
||||
svg.add_geometry(crop_to.intersection(geoms.walls),
|
||||
fill_color='#aaaaaa', stroke_px=0.5, stroke_color='#aaaaaa', elevation=default_height)
|
||||
|
||||
svg.add_geometry(crop_to.intersection(geoms.doors), fill_color='#ffffff', elevation=0)
|
||||
|
||||
return svg
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue