rudimentary theme support
This commit is contained in:
Gwendolyn
parent
b44197a1c5
commit
9399e5c377
23 changed files with 925 additions and 307 deletions
|
|
@ -14,6 +14,7 @@ from shapely.ops import unary_union
|
|||
from shapely.prepared import PreparedGeometry
|
||||
|
||||
from c3nav.mapdata.models import Level, MapUpdate, Source
|
||||
from c3nav.mapdata.models.theme import Theme
|
||||
from c3nav.mapdata.render.geometry import AltitudeAreaGeometries, LevelGeometries
|
||||
from c3nav.mapdata.utils.cache import AccessRestrictionAffected, MapHistory
|
||||
from c3nav.mapdata.utils.cache.package import CachePackage
|
||||
|
|
@ -66,290 +67,300 @@ class LevelRenderData:
|
|||
|
||||
# todo: we should check that levels on top come before their levels as they should
|
||||
|
||||
"""
|
||||
first pass in reverse to collect some data that we need later
|
||||
"""
|
||||
# level geometry for every single level
|
||||
single_level_geoms: dict[int, LevelGeometries] = {}
|
||||
# interpolator are used to create the 3d mesh
|
||||
interpolators = {}
|
||||
last_interpolator: NearestNDInterpolator | None = None
|
||||
# altitudeareas of levels on top are are collected on the way down to supply to the levelgeometries builder
|
||||
altitudeareas_above = [] # todo: typing
|
||||
for render_level in reversed(levels):
|
||||
# build level geometry for every single level
|
||||
single_level_geoms[render_level.pk] = LevelGeometries.build_for_level(render_level, altitudeareas_above)
|
||||
|
||||
# ignore intermediate levels in this pass
|
||||
if render_level.on_top_of_id is not None:
|
||||
# todo: shouldn't this be cleared or something?
|
||||
altitudeareas_above.extend(single_level_geoms[render_level.pk].altitudeareas)
|
||||
altitudeareas_above.sort(key=operator.attrgetter('altitude'))
|
||||
continue
|
||||
|
||||
# create interpolator to create the pieces that fit multiple 3d layers together
|
||||
if last_interpolator is not None:
|
||||
interpolators[render_level.pk] = last_interpolator
|
||||
|
||||
coords = deque()
|
||||
values = deque()
|
||||
for area in single_level_geoms[render_level.pk].altitudeareas:
|
||||
new_coords = np.vstack(tuple(np.array(ring.coords) for ring in get_rings(area.geometry)))
|
||||
coords.append(new_coords)
|
||||
values.append(np.full((new_coords.shape[0], 1), fill_value=area.altitude))
|
||||
|
||||
if coords:
|
||||
last_interpolator = NearestNDInterpolator(np.vstack(coords), np.vstack(values))
|
||||
else:
|
||||
last_interpolator = NearestNDInterpolator(np.array([[0, 0]]),
|
||||
np.array([float(render_level.base_altitude)]))
|
||||
|
||||
"""
|
||||
second pass, forward to create the LevelRenderData for each level
|
||||
"""
|
||||
for render_level in levels:
|
||||
# we don't create render data for on_top_of levels
|
||||
if render_level.on_top_of_id is not None:
|
||||
continue
|
||||
|
||||
map_history = MapHistory.open_level(render_level.pk, 'base')
|
||||
|
||||
# collect potentially relevant levels for rendering this level
|
||||
# these are all levels that are on_top_of this level or below this level
|
||||
relevant_levels = tuple(
|
||||
sublevel for sublevel in levels
|
||||
if sublevel.on_top_of_id == render_level.pk or sublevel.base_altitude <= render_level.base_altitude
|
||||
)
|
||||
themes = [None, *Theme.objects.values_list('pk', flat=True)]
|
||||
from c3nav.mapdata.render.theme import ColorManager
|
||||
|
||||
for theme in themes:
|
||||
color_manager = ColorManager.for_theme(theme)
|
||||
"""
|
||||
choose a crop area for each level. non-intermediate levels (not on_top_of) below the one that we are
|
||||
currently rendering will be cropped to only render content that is visible through holes indoors in the
|
||||
levels above them.
|
||||
first pass in reverse to collect some data that we need later
|
||||
"""
|
||||
# area to crop each level to, by id
|
||||
level_crop_to: dict[int, Cropper] = {}
|
||||
# current remaining area that we're cropping to – None means no cropping
|
||||
crop_to = None
|
||||
primary_level_count = 0
|
||||
main_level_passed = 0
|
||||
lowest_important_level = None
|
||||
last_lower_bound = None
|
||||
for level in reversed(relevant_levels): # reversed means we are going down
|
||||
geoms = single_level_geoms[level.pk]
|
||||
# level geometry for every single level
|
||||
single_level_geoms: dict[int, LevelGeometries] = {}
|
||||
# interpolator are used to create the 3d mesh
|
||||
interpolators = {}
|
||||
last_interpolator: NearestNDInterpolator | None = None
|
||||
# altitudeareas of levels on top are are collected on the way down to supply to the levelgeometries builder
|
||||
altitudeareas_above = [] # todo: typing
|
||||
for render_level in reversed(levels):
|
||||
# build level geometry for every single level
|
||||
single_level_geoms[render_level.pk] = LevelGeometries.build_for_level(render_level, color_manager, altitudeareas_above)
|
||||
|
||||
if geoms.holes is not None:
|
||||
primary_level_count += 1
|
||||
# ignore intermediate levels in this pass
|
||||
if render_level.on_top_of_id is not None:
|
||||
# todo: shouldn't this be cleared or something?
|
||||
altitudeareas_above.extend(single_level_geoms[render_level.pk].altitudeareas)
|
||||
altitudeareas_above.sort(key=operator.attrgetter('altitude'))
|
||||
continue
|
||||
|
||||
# get lowest intermediate level directly below main level
|
||||
if not main_level_passed:
|
||||
if geoms.pk == render_level.pk:
|
||||
main_level_passed = 1
|
||||
# create interpolator to create the pieces that fit multiple 3d layers together
|
||||
if last_interpolator is not None:
|
||||
interpolators[render_level.pk] = last_interpolator
|
||||
|
||||
coords = deque()
|
||||
values = deque()
|
||||
for area in single_level_geoms[render_level.pk].altitudeareas:
|
||||
new_coords = np.vstack(tuple(np.array(ring.coords) for ring in get_rings(area.geometry)))
|
||||
coords.append(new_coords)
|
||||
values.append(np.full((new_coords.shape[0], 1), fill_value=area.altitude))
|
||||
|
||||
if coords:
|
||||
last_interpolator = NearestNDInterpolator(np.vstack(coords), np.vstack(values))
|
||||
else:
|
||||
if not level.on_top_of_id:
|
||||
main_level_passed += 1
|
||||
if main_level_passed < 2:
|
||||
lowest_important_level = level
|
||||
last_interpolator = NearestNDInterpolator(np.array([[0, 0]]),
|
||||
np.array([float(render_level.base_altitude)]))
|
||||
|
||||
# make upper bounds
|
||||
if geoms.on_top_of_id is None:
|
||||
if last_lower_bound is None:
|
||||
geoms.upper_bound = geoms.max_altitude+geoms.max_height
|
||||
else:
|
||||
geoms.upper_bound = last_lower_bound
|
||||
last_lower_bound = geoms.lower_bound
|
||||
|
||||
# set crop area if we area on the second primary layer from top or below
|
||||
level_crop_to[level.pk] = Cropper(crop_to if primary_level_count > 1 else None)
|
||||
|
||||
if geoms.holes is not None: # there area holes on this area
|
||||
if crop_to is None:
|
||||
crop_to = geoms.holes
|
||||
else:
|
||||
crop_to = crop_to.intersection(geoms.holes)
|
||||
|
||||
if crop_to.is_empty:
|
||||
break
|
||||
|
||||
render_data = LevelRenderData(
|
||||
base_altitude=render_level.base_altitude,
|
||||
lowest_important_level=lowest_important_level.pk,
|
||||
)
|
||||
access_restriction_affected = {}
|
||||
|
||||
# go through sublevels, get their level geometries and crop them
|
||||
lowest_important_level_passed = False
|
||||
for level in relevant_levels:
|
||||
try:
|
||||
crop_to = level_crop_to[level.pk]
|
||||
except KeyError:
|
||||
"""
|
||||
second pass, forward to create the LevelRenderData for each level
|
||||
"""
|
||||
for render_level in levels:
|
||||
# we don't create render data for on_top_of levels
|
||||
if render_level.on_top_of_id is not None:
|
||||
continue
|
||||
|
||||
old_geoms = single_level_geoms[level.pk]
|
||||
map_history = MapHistory.open_level(render_level.pk, 'base')
|
||||
|
||||
if render_data.lowest_important_level == level.pk:
|
||||
lowest_important_level_passed = True
|
||||
# collect potentially relevant levels for rendering this level
|
||||
# these are all levels that are on_top_of this level or below this level
|
||||
relevant_levels = tuple(
|
||||
sublevel for sublevel in levels
|
||||
if sublevel.on_top_of_id == render_level.pk or sublevel.base_altitude <= render_level.base_altitude
|
||||
)
|
||||
|
||||
if old_geoms.holes and render_data.darken_area is None and lowest_important_level_passed:
|
||||
render_data.darken_area = old_geoms.holes
|
||||
"""
|
||||
choose a crop area for each level. non-intermediate levels (not on_top_of) below the one that we are
|
||||
currently rendering will be cropped to only render content that is visible through holes indoors in the
|
||||
levels above them.
|
||||
"""
|
||||
# area to crop each level to, by id
|
||||
level_crop_to: dict[int, Cropper] = {}
|
||||
# current remaining area that we're cropping to – None means no cropping
|
||||
crop_to = None
|
||||
primary_level_count = 0
|
||||
main_level_passed = 0
|
||||
lowest_important_level = None
|
||||
last_lower_bound = None
|
||||
for level in reversed(relevant_levels): # reversed means we are going down
|
||||
geoms = single_level_geoms[level.pk]
|
||||
|
||||
if crop_to.geometry is not None:
|
||||
map_history.composite(MapHistory.open_level(level.pk, 'base'), crop_to.geometry)
|
||||
elif render_level.pk != level.pk:
|
||||
map_history.composite(MapHistory.open_level(level.pk, 'base'), None)
|
||||
if geoms.holes is not None:
|
||||
primary_level_count += 1
|
||||
|
||||
new_geoms = LevelGeometries()
|
||||
new_geoms.buildings = crop_to.intersection(old_geoms.buildings)
|
||||
if old_geoms.on_top_of_id is None:
|
||||
new_geoms.holes = crop_to.intersection(old_geoms.holes)
|
||||
new_geoms.doors = crop_to.intersection(old_geoms.doors)
|
||||
new_geoms.walls = crop_to.intersection(old_geoms.walls)
|
||||
new_geoms.all_walls = crop_to.intersection(old_geoms.all_walls)
|
||||
new_geoms.short_walls = tuple((altitude, geom) for altitude, geom in tuple(
|
||||
(altitude, crop_to.intersection(geom))
|
||||
for altitude, geom in old_geoms.short_walls
|
||||
) if not geom.is_empty)
|
||||
# get lowest intermediate level directly below main level
|
||||
if not main_level_passed:
|
||||
if geoms.pk == render_level.pk:
|
||||
main_level_passed = 1
|
||||
else:
|
||||
if not level.on_top_of_id:
|
||||
main_level_passed += 1
|
||||
if main_level_passed < 2:
|
||||
lowest_important_level = level
|
||||
|
||||
for altitudearea in old_geoms.altitudeareas:
|
||||
new_geometry = crop_to.intersection(unwrap_geom(altitudearea.geometry))
|
||||
if new_geometry.is_empty:
|
||||
# make upper bounds
|
||||
if geoms.on_top_of_id is None:
|
||||
if last_lower_bound is None:
|
||||
geoms.upper_bound = geoms.max_altitude+geoms.max_height
|
||||
else:
|
||||
geoms.upper_bound = last_lower_bound
|
||||
last_lower_bound = geoms.lower_bound
|
||||
|
||||
# set crop area if we area on the second primary layer from top or below
|
||||
level_crop_to[level.pk] = Cropper(crop_to if primary_level_count > 1 else None)
|
||||
|
||||
if geoms.holes is not None: # there area holes on this area
|
||||
if crop_to is None:
|
||||
crop_to = geoms.holes
|
||||
else:
|
||||
crop_to = crop_to.intersection(geoms.holes)
|
||||
|
||||
if crop_to.is_empty:
|
||||
break
|
||||
|
||||
render_data = LevelRenderData(
|
||||
base_altitude=render_level.base_altitude,
|
||||
lowest_important_level=lowest_important_level.pk,
|
||||
)
|
||||
access_restriction_affected = {}
|
||||
|
||||
# go through sublevels, get their level geometries and crop them
|
||||
lowest_important_level_passed = False
|
||||
for level in relevant_levels:
|
||||
try:
|
||||
crop_to = level_crop_to[level.pk]
|
||||
except KeyError:
|
||||
continue
|
||||
new_geometry_prep = prepared.prep(new_geometry)
|
||||
|
||||
new_altitudearea = AltitudeAreaGeometries()
|
||||
new_altitudearea.geometry = new_geometry
|
||||
new_altitudearea.altitude = altitudearea.altitude
|
||||
new_altitudearea.altitude2 = altitudearea.altitude2
|
||||
new_altitudearea.point1 = altitudearea.point1
|
||||
new_altitudearea.point2 = altitudearea.point2
|
||||
old_geoms = single_level_geoms[level.pk]
|
||||
|
||||
new_colors = {}
|
||||
for color, areas in altitudearea.colors.items():
|
||||
new_areas = {}
|
||||
for access_restriction, area in areas.items():
|
||||
if not new_geometry_prep.intersects(area):
|
||||
continue
|
||||
new_area = new_geometry.intersection(area)
|
||||
if not new_area.is_empty:
|
||||
new_areas[access_restriction] = new_area
|
||||
if new_areas:
|
||||
new_colors[color] = new_areas
|
||||
new_altitudearea.colors = new_colors
|
||||
if render_data.lowest_important_level == level.pk:
|
||||
lowest_important_level_passed = True
|
||||
|
||||
new_altitudearea_obstacles = {}
|
||||
for height, height_obstacles in altitudearea.obstacles.items():
|
||||
new_height_obstacles = {}
|
||||
for color, color_obstacles in height_obstacles.items():
|
||||
new_color_obstacles = []
|
||||
for obstacle in color_obstacles:
|
||||
if new_geometry_prep.intersects(obstacle):
|
||||
new_color_obstacles.append(
|
||||
obstacle.intersection(unwrap_geom(altitudearea.geometry))
|
||||
)
|
||||
if new_color_obstacles:
|
||||
new_height_obstacles[color] = new_color_obstacles
|
||||
if new_height_obstacles:
|
||||
new_altitudearea_obstacles[height] = new_height_obstacles
|
||||
new_altitudearea.obstacles = new_altitudearea_obstacles
|
||||
if old_geoms.holes and render_data.darken_area is None and lowest_important_level_passed:
|
||||
render_data.darken_area = old_geoms.holes
|
||||
|
||||
new_geoms.altitudeareas.append(new_altitudearea)
|
||||
if crop_to.geometry is not None:
|
||||
map_history.composite(MapHistory.open_level(level.pk, 'base'), crop_to.geometry)
|
||||
elif render_level.pk != level.pk:
|
||||
map_history.composite(MapHistory.open_level(level.pk, 'base'), None)
|
||||
|
||||
if new_geoms.walls.is_empty and not new_geoms.altitudeareas:
|
||||
continue
|
||||
new_geoms = LevelGeometries()
|
||||
new_geoms.buildings = crop_to.intersection(old_geoms.buildings)
|
||||
if old_geoms.on_top_of_id is None:
|
||||
new_geoms.holes = crop_to.intersection(old_geoms.holes)
|
||||
new_geoms.doors = crop_to.intersection(old_geoms.doors)
|
||||
new_geoms.walls = crop_to.intersection(old_geoms.walls)
|
||||
new_geoms.all_walls = crop_to.intersection(old_geoms.all_walls)
|
||||
new_geoms.short_walls = tuple((altitude, geom) for altitude, geom in tuple(
|
||||
(altitude, crop_to.intersection(geom))
|
||||
for altitude, geom in old_geoms.short_walls
|
||||
) if not geom.is_empty)
|
||||
|
||||
new_geoms.ramps = tuple(
|
||||
ramp for ramp in (crop_to.intersection(unwrap_geom(ramp)) for ramp in old_geoms.ramps)
|
||||
if not ramp.is_empty
|
||||
)
|
||||
for altitudearea in old_geoms.altitudeareas:
|
||||
new_geometry = crop_to.intersection(unwrap_geom(altitudearea.geometry))
|
||||
if new_geometry.is_empty:
|
||||
continue
|
||||
new_geometry_prep = prepared.prep(new_geometry)
|
||||
|
||||
new_geoms.heightareas = tuple(
|
||||
(area, height) for area, height in ((crop_to.intersection(unwrap_geom(area)), height)
|
||||
for area, height in old_geoms.heightareas)
|
||||
if not area.is_empty
|
||||
)
|
||||
new_altitudearea = AltitudeAreaGeometries()
|
||||
new_altitudearea.geometry = new_geometry
|
||||
new_altitudearea.altitude = altitudearea.altitude
|
||||
new_altitudearea.altitude2 = altitudearea.altitude2
|
||||
new_altitudearea.point1 = altitudearea.point1
|
||||
new_altitudearea.point2 = altitudearea.point2
|
||||
|
||||
new_geoms.affected_area = unary_union((
|
||||
*(altitudearea.geometry for altitudearea in new_geoms.altitudeareas),
|
||||
crop_to.intersection(new_geoms.walls.buffer(1)),
|
||||
*((new_geoms.holes.buffer(1),) if new_geoms.holes else ()),
|
||||
))
|
||||
new_colors = {}
|
||||
for color, areas in altitudearea.colors.items():
|
||||
new_areas = {}
|
||||
for access_restriction, area in areas.items():
|
||||
if not new_geometry_prep.intersects(area):
|
||||
continue
|
||||
new_area = new_geometry.intersection(area)
|
||||
if not new_area.is_empty:
|
||||
new_areas[access_restriction] = new_area
|
||||
if new_areas:
|
||||
new_colors[color] = new_areas
|
||||
new_altitudearea.colors = new_colors
|
||||
|
||||
for access_restriction, area in old_geoms.access_restriction_affected.items():
|
||||
new_area = crop_to.intersection(area)
|
||||
if not new_area.is_empty:
|
||||
access_restriction_affected.setdefault(access_restriction, []).append(new_area)
|
||||
new_altitudearea_obstacles = {}
|
||||
for height, height_obstacles in altitudearea.obstacles.items():
|
||||
new_height_obstacles = {}
|
||||
for color, color_obstacles in height_obstacles.items():
|
||||
new_color_obstacles = []
|
||||
for obstacle in color_obstacles:
|
||||
if new_geometry_prep.intersects(obstacle):
|
||||
new_color_obstacles.append(
|
||||
obstacle.intersection(unwrap_geom(altitudearea.geometry))
|
||||
)
|
||||
if new_color_obstacles:
|
||||
new_height_obstacles[color] = new_color_obstacles
|
||||
if new_height_obstacles:
|
||||
new_altitudearea_obstacles[height] = new_height_obstacles
|
||||
new_altitudearea.obstacles = new_altitudearea_obstacles
|
||||
|
||||
new_geoms.restricted_spaces_indoors = {}
|
||||
for access_restriction, area in old_geoms.restricted_spaces_indoors.items():
|
||||
new_area = crop_to.intersection(area)
|
||||
if not new_area.is_empty:
|
||||
new_geoms.restricted_spaces_indoors[access_restriction] = new_area
|
||||
new_geoms.altitudeareas.append(new_altitudearea)
|
||||
|
||||
new_geoms.restricted_spaces_outdoors = {}
|
||||
for access_restriction, area in old_geoms.restricted_spaces_outdoors.items():
|
||||
new_area = crop_to.intersection(area)
|
||||
if not new_area.is_empty:
|
||||
new_geoms.restricted_spaces_outdoors[access_restriction] = new_area
|
||||
if new_geoms.walls.is_empty and not new_geoms.altitudeareas:
|
||||
continue
|
||||
|
||||
new_geoms.pk = old_geoms.pk
|
||||
new_geoms.on_top_of_id = old_geoms.on_top_of_id
|
||||
new_geoms.short_label = old_geoms.short_label
|
||||
new_geoms.base_altitude = old_geoms.base_altitude
|
||||
new_geoms.default_height = old_geoms.default_height
|
||||
new_geoms.door_height = old_geoms.door_height
|
||||
new_geoms.min_altitude = (min(area.altitude for area in new_geoms.altitudeareas)
|
||||
if new_geoms.altitudeareas else new_geoms.base_altitude)
|
||||
new_geoms.max_altitude = (max(area.altitude for area in new_geoms.altitudeareas)
|
||||
if new_geoms.altitudeareas else new_geoms.base_altitude)
|
||||
new_geoms.max_height = (min(height for area, height in new_geoms.heightareas)
|
||||
if new_geoms.heightareas else new_geoms.default_height)
|
||||
new_geoms.lower_bound = old_geoms.lower_bound
|
||||
new_geoms.upper_bound = old_geoms.upper_bound
|
||||
new_geoms.ramps = tuple(
|
||||
ramp for ramp in (crop_to.intersection(unwrap_geom(ramp)) for ramp in old_geoms.ramps)
|
||||
if not ramp.is_empty
|
||||
)
|
||||
|
||||
new_geoms.build_mesh(interpolators.get(render_level.pk) if level.pk == render_level.pk else None)
|
||||
new_geoms.heightareas = tuple(
|
||||
(area, height) for area, height in ((crop_to.intersection(unwrap_geom(area)), height)
|
||||
for area, height in old_geoms.heightareas)
|
||||
if not area.is_empty
|
||||
)
|
||||
|
||||
render_data.levels.append(new_geoms)
|
||||
new_geoms.affected_area = unary_union((
|
||||
*(altitudearea.geometry for altitudearea in new_geoms.altitudeareas),
|
||||
crop_to.intersection(new_geoms.walls.buffer(1)),
|
||||
*((new_geoms.holes.buffer(1),) if new_geoms.holes else ()),
|
||||
))
|
||||
|
||||
access_restriction_affected = {
|
||||
access_restriction: unary_union(areas)
|
||||
for access_restriction, areas in access_restriction_affected.items()
|
||||
}
|
||||
for access_restriction, area in old_geoms.access_restriction_affected.items():
|
||||
new_area = crop_to.intersection(area)
|
||||
if not new_area.is_empty:
|
||||
access_restriction_affected.setdefault(access_restriction, []).append(new_area)
|
||||
|
||||
access_restriction_affected = AccessRestrictionAffected.build(access_restriction_affected)
|
||||
access_restriction_affected.save_level(render_level.pk, 'composite')
|
||||
new_geoms.restricted_spaces_indoors = {}
|
||||
for access_restriction, area in old_geoms.restricted_spaces_indoors.items():
|
||||
new_area = crop_to.intersection(area)
|
||||
if not new_area.is_empty:
|
||||
new_geoms.restricted_spaces_indoors[access_restriction] = new_area
|
||||
|
||||
map_history.save_level(render_level.pk, 'composite')
|
||||
new_geoms.restricted_spaces_outdoors = {}
|
||||
for access_restriction, area in old_geoms.restricted_spaces_outdoors.items():
|
||||
new_area = crop_to.intersection(area)
|
||||
if not new_area.is_empty:
|
||||
new_geoms.restricted_spaces_outdoors[access_restriction] = new_area
|
||||
|
||||
package.add_level(render_level.pk, map_history, access_restriction_affected)
|
||||
new_geoms.pk = old_geoms.pk
|
||||
new_geoms.on_top_of_id = old_geoms.on_top_of_id
|
||||
new_geoms.short_label = old_geoms.short_label
|
||||
new_geoms.base_altitude = old_geoms.base_altitude
|
||||
new_geoms.default_height = old_geoms.default_height
|
||||
new_geoms.door_height = old_geoms.door_height
|
||||
new_geoms.min_altitude = (min(area.altitude for area in new_geoms.altitudeareas)
|
||||
if new_geoms.altitudeareas else new_geoms.base_altitude)
|
||||
new_geoms.max_altitude = (max(area.altitude for area in new_geoms.altitudeareas)
|
||||
if new_geoms.altitudeareas else new_geoms.base_altitude)
|
||||
new_geoms.max_height = (min(height for area, height in new_geoms.heightareas)
|
||||
if new_geoms.heightareas else new_geoms.default_height)
|
||||
new_geoms.lower_bound = old_geoms.lower_bound
|
||||
new_geoms.upper_bound = old_geoms.upper_bound
|
||||
|
||||
render_data.save(render_level.pk)
|
||||
new_geoms.build_mesh(interpolators.get(render_level.pk) if level.pk == render_level.pk else None)
|
||||
|
||||
render_data.levels.append(new_geoms)
|
||||
|
||||
access_restriction_affected = {
|
||||
access_restriction: unary_union(areas)
|
||||
for access_restriction, areas in access_restriction_affected.items()
|
||||
}
|
||||
|
||||
access_restriction_affected = AccessRestrictionAffected.build(access_restriction_affected)
|
||||
access_restriction_affected.save_level(render_level.pk, 'composite')
|
||||
|
||||
map_history.save_level(render_level.pk, 'composite')
|
||||
|
||||
package.add_level(render_level.pk, theme, map_history, access_restriction_affected)
|
||||
|
||||
render_data.save(render_level.pk, theme)
|
||||
|
||||
package.save_all()
|
||||
|
||||
cached = LocalContext()
|
||||
|
||||
@staticmethod
|
||||
def _level_filename(pk):
|
||||
return settings.CACHE_ROOT / ('render_data_level_%d.pickle' % pk)
|
||||
def _level_filename(level_pk, theme_pk):
|
||||
if theme_pk is None:
|
||||
name = 'render_data_level_%d.pickle' % level_pk
|
||||
else:
|
||||
name = 'render_data_level_%d_theme_%d.pickle' % (level_pk, theme_pk)
|
||||
return settings.CACHE_ROOT / name
|
||||
|
||||
@classmethod
|
||||
def get(cls, level):
|
||||
def get(cls, level, theme):
|
||||
# get the current render data from local variable if no new processed mapupdate exists.
|
||||
# this is much faster than any other possible cache
|
||||
cache_key = MapUpdate.current_processed_cache_key()
|
||||
level_pk = str(level.pk if isinstance(level, Level) else level)
|
||||
level_pk = level.pk if isinstance(level, Level) else level
|
||||
theme_pk = theme.pk if isinstance(theme, Theme) else theme
|
||||
key = f'{level_pk}_{theme_pk}'
|
||||
if getattr(cls.cached, 'key', None) != cache_key:
|
||||
cls.cached.key = cache_key
|
||||
cls.cached.data = {}
|
||||
else:
|
||||
result = cls.cached.data.get(level_pk, None)
|
||||
result = cls.cached.data.get(key, None)
|
||||
if result is not None:
|
||||
return result
|
||||
|
||||
pk = level.pk if isinstance(level, Level) else level
|
||||
result = pickle.load(open(cls._level_filename(pk), 'rb'))
|
||||
result = pickle.load(open(cls._level_filename(level_pk, theme_pk), 'rb'))
|
||||
|
||||
cls.cached.data[level_pk] = result
|
||||
cls.cached.data[key] = result
|
||||
return result
|
||||
|
||||
def save(self, pk):
|
||||
return pickle.dump(self, open(self._level_filename(pk), 'wb'))
|
||||
def save(self, level_pk, theme_pk):
|
||||
return pickle.dump(self, open(self._level_filename(level_pk, theme_pk), 'wb'))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue