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

previews support for location groups

Browse source
This commit is contained in:
Gwendolyn 2023-12-26 23:10:20 +01:00
parent 4e69e8025a
commit 920af6ee66
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/c3nav/mapdata/views.py
View file

@ -1,5 +1,6 @@
import base64 import base64
import os import os
from collections import Counter
from shutil import rmtree from shutil import rmtree
from typing import Optional from typing import Optional
from wsgiref.util import FileWrapper from wsgiref.util import FileWrapper
@ -93,31 +94,37 @@ def preview_location(request, slug):
from c3nav.site.views import check_location from c3nav.site.views import check_location
from c3nav.mapdata.utils.locations import CustomLocation from c3nav.mapdata.utils.locations import CustomLocation
from c3nav.mapdata.models.geometry.base import GeometryMixin from c3nav.mapdata.models.geometry.base import GeometryMixin
from c3nav.mapdata.models import LocationGroup
location = check_location(slug, None) location = check_location(slug, None)
highlight = True highlight = True
if location is None: if location is None:
raise Http404 raise Http404
if isinstance(location, CustomLocation): if isinstance(location, CustomLocation):
geometry = Point(location.x, location.y) geometries = [Point(location.x, location.y)]
level = location.level.pk level = location.level.pk
elif isinstance(location, GeometryMixin): elif isinstance(location, GeometryMixin):
geometry = location.geometry geometries = [location.geometry]
level = location.level_id level = location.level_id
elif isinstance(location, Level): elif isinstance(location, Level):
[minx, miny, maxx, maxy] = location.bounds [minx, miny, maxx, maxy] = location.bounds
geometry = box(minx, miny, maxx, maxy) geometries = [box(minx, miny, maxx, maxy)]
level = location.pk level = location.pk
highlight = False highlight = False
elif isinstance(location, LocationGroup):
counts = Counter([loc.level_id for loc in location.locations])
level = counts.most_common(1)[0][0]
geometries = [loc.geometry for loc in location.locations if loc.level_id == level]
highlight = True
else: else:
raise NotImplementedError(f'location type {type(location)} is not supported yet') raise NotImplementedError(f'location type {type(location)} is not supported yet')
cache_package = CachePackage.open_cached() cache_package = CachePackage.open_cached()
if isinstance(geometry, Point): from c3nav.mapdata.utils.geometry import unwrap_geom
geometry = geometry.buffer(1) geometries = [geometry.buffer(1) if isinstance(geometry, Point) else unwrap_geom(geometry) for geometry in geometries]
minx, miny, maxx, maxy, img_scale = bounds_for_preview(geometry, cache_package) minx, miny, maxx, maxy, img_scale = bounds_for_preview(unary_union(geometries), cache_package)
level_data = cache_package.levels.get(level) level_data = cache_package.levels.get(level)
if level_data is None: if level_data is None:
@ -125,9 +132,10 @@ def preview_location(request, slug):
renderer = MapRenderer(level, minx, miny, maxx, maxy, scale=img_scale, access_permissions=set()) renderer = MapRenderer(level, minx, miny, maxx, maxy, scale=img_scale, access_permissions=set())
image = renderer.render(ImageRenderEngine) image = renderer.render(ImageRenderEngine)
if highlight: if highlight:
image.add_geometry(geometry, fill=FillAttribs(PREVIEW_HIGHLIGHT_FILL_COLOR, PREVIEW_HIGHLIGHT_FILL_OPACITY), for geometry in geometries:
stroke=StrokeAttribs(PREVIEW_HIGHLIGHT_STROKE_COLOR, PREVIEW_HIGHLIGHT_STROKE_WIDTH), image.add_geometry(geometry, fill=FillAttribs(PREVIEW_HIGHLIGHT_FILL_COLOR, PREVIEW_HIGHLIGHT_FILL_OPACITY),
category='highlight') stroke=StrokeAttribs(PREVIEW_HIGHLIGHT_STROKE_COLOR, PREVIEW_HIGHLIGHT_STROKE_WIDTH),
category='highlight')
data = image.render() data = image.render()
response = HttpResponse(data, 'image/png') response = HttpResponse(data, 'image/png')
# TODO use cache key like in tile render function, same for the routing option # TODO use cache key like in tile render function, same for the routing option