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

cache map_image

Browse source
This commit is contained in:
Laura Klünder 2016-12-21 21:28:31 +01:00
parent b856a0168a
commit 2d71468575
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/c3nav/site/urls.py
View file

@ -1,9 +1,9 @@
from django.conf.urls import url from django.conf.urls import url
from c3nav.site.views import level_image, main from c3nav.site.views import main, map_image
urlpatterns = [ urlpatterns = [
url(r'^map/(?P<level>[a-z0-9-_:]+)/(?P<area>[a-z0-9-_:]+).png$', level_image, name='site.level_image'), url(r'^map/(?P<level>[a-z0-9-_:]+)/(?P<area>[a-z0-9-_:]+).png$', map_image, name='site.level_image'),
url(r'^l/(?P<location>[a-z0-9-_:]+)/$', main, name='site.location'), url(r'^l/(?P<location>[a-z0-9-_:]+)/$', main, name='site.location'),
url(r'^o/(?P<origin>[a-z0-9-_:]+)/$', main, name='site.origin'), url(r'^o/(?P<origin>[a-z0-9-_:]+)/$', main, name='site.origin'),
url(r'^d/(?P<destination>[a-z0-9-_:]+)/$', main, name='site.destination'), url(r'^d/(?P<destination>[a-z0-9-_:]+)/$', main, name='site.destination'),

20
src/c3nav/site/views.py
View file

@ -1,14 +1,17 @@
import mimetypes import mimetypes
from calendar import timegm
from datetime import timedelta from datetime import timedelta
from django.core.files import File from django.core.files import File
from django.http import Http404, HttpResponse from django.http import Http404, HttpResponse, HttpResponseNotModified
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from django.utils.http import http_date, parse_http_date_safe
from c3nav.access.apply import get_visible_areas from c3nav.access.apply import get_visible_areas
from c3nav.mapdata.inclusion import get_includables_avoidables, parse_include_avoid from c3nav.mapdata.inclusion import get_includables_avoidables, parse_include_avoid
from c3nav.mapdata.lastupdate import get_last_mapdata_update
from c3nav.mapdata.models import Level from c3nav.mapdata.models import Level
from c3nav.mapdata.search import get_location, search_location from c3nav.mapdata.search import get_location, search_location
from c3nav.mapdata.utils.cache import get_levels_cached from c3nav.mapdata.utils.cache import get_levels_cached
@ -212,7 +215,7 @@ def main(request, location=None, origin=None, destination=None):
return response return response
def level_image(request, area, level): def map_image(request, area, level):
level = get_object_or_404(Level, name=level, intermediate=False) level = get_object_or_404(Level, name=level, intermediate=False)
if area == ':base': if area == ':base':
img = get_render_path('png', level.name, 'full', True) img = get_render_path('png', level.name, 'full', True)
@ -223,7 +226,20 @@ def level_image(request, area, level):
else: else:
raise Http404 raise Http404
last_update = get_last_mapdata_update()
if_modified_since = request.META.get('HTTP_IF_MODIFIED_SINCE')
if if_modified_since:
if_modified_since = parse_http_date_safe(if_modified_since)
if if_modified_since != last_update:
return HttpResponseNotModified()
response = HttpResponse(content_type=mimetypes.guess_type(img)[0]) response = HttpResponse(content_type=mimetypes.guess_type(img)[0])
for chunk in File(open(img, 'rb')).chunks(): for chunk in File(open(img, 'rb')).chunks():
response.write(chunk) response.write(chunk)
last_modified = http_date(timegm(last_update.utctimetuple()))
response['Last-Modifed'] = last_modified
response['Expires'] = last_modified
response['Cache-Control'] = 'max-age=0, must-revalidate'
return response return response