render ground colors

This commit is contained in:
Laura Klünder 2017-10-19 16:33:32 +02:00
parent 0694bf886a
commit e86df62535
2 changed files with 37 additions and 4 deletions

View file

@ -8,6 +8,13 @@ from shapely.ops import unary_union
from c3nav.mapdata.models import Level, MapUpdate
class AltitudeAreaGeometries:
def __init__(self, altitudearea, colors):
self.geometry = altitudearea.geometry
self.altitude = altitudearea.altitude
self.colors = colors
class LevelGeometries:
def __init__(self):
self.altitudeareas = []
@ -24,7 +31,7 @@ class LevelGeometries:
@staticmethod
def rebuild():
levels = Level.objects.prefetch_related('altitudeareas', 'buildings', 'doors', 'spaces',
'spaces__holes', 'spaces__columns')
'spaces__holes', 'spaces__columns', 'spaces__locationgroups')
for level in levels:
geoms = LevelGeometries()
buildings_geom = unary_union([b.geometry for b in level.buildings.all()])
@ -44,8 +51,26 @@ class LevelGeometries:
if level.on_top_of_id is None:
geoms.holes = spaces_geom.difference(walkable_geom)
colors = {}
for space in level.spaces.all():
access_restriction = space.access_restriction_id
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
colors.setdefault(area.get_color(), {}).setdefault(access_restriction, []).append(area.geometry)
colors.pop(None, None)
for color, color_group in colors.items():
for access_restriction, areas in tuple(color_group.items()):
color_group[access_restriction] = unary_union(areas)
for altitudearea in level.altitudeareas.all():
geoms.altitudeareas.append((altitudearea.geometry.intersection(walkable_geom), altitudearea.altitude))
altitudearea_colors = {color: {access_restriction: area.intersection(altitudearea.geometry)
for access_restriction, area in areas.items()
if area.intersects(altitudearea.geometry)}
for color, areas in colors.items()}
altitudearea_colors = {color: areas for color, areas in altitudearea_colors.items() if areas}
geoms.altitudeareas.append(AltitudeAreaGeometries(altitudearea, altitudearea_colors))
geoms.walls = buildings_geom.difference(spaces_geom).difference(doors_geom)
level.geoms_cache = pickle.dumps(geoms)

View file

@ -1,4 +1,5 @@
from shapely.geometry import box
from shapely.ops import unary_union
from c3nav.mapdata.render.base import get_render_level_data
from c3nav.mapdata.utils.svg import SVGImage
@ -31,8 +32,15 @@ def render_svg(level, miny, minx, maxy, maxx, scale=1):
if geoms.crop_to is not None:
crop_to = crop_to.intersection(geoms.crop_to)
for altitudearea_geom, altitude in geoms.altitudeareas:
svg.add_geometry(crop_to.intersection(altitudearea_geom), fill_color='#eeeeee', altitude=altitude)
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():
# 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)
svg.add_geometry(crop_to.intersection(geoms.walls),
fill_color='#aaaaaa', stroke_px=0.5, stroke_color='#aaaaaa', elevation=default_height)