Changeset 9392 for src/django_gheat

Timestamp:

Jul 12, 2011, 11:10:22 AM (13 years ago)

Author:

rick

Message:

Get rid of the poor-mans-cache implementation and uses the django buildin memory one by default.

Remove some old logging lines

File:

• src/django_gheat/wlheatmap/tile.py (modified) (4 diffs)

src/django_gheat/wlheatmap/tile.py

@@ -4 +4 @@
 #
 # Rick van der Zwet <info@rickvanderzwet.nl>
-from django.core.cache import cache
 from django.core.management import setup_environ
 from django.db.models import Max
 from django.http import HttpResponse
+from django.views.decorators.cache import cache_page
 from gheat.models import *
-import logging
 import pygame
 import sys
@@ -23 +22 @@
 except ImportError:
   pass
-
-logging.basicConfig(level=logging.DEBUG)
-log = logging.getLogger('tile')
 
 class PyGamePicture():
@@ -247 +243 @@
     #im.add_point((xcoord,ycoord),float(signal_normalized) / meters_per_pixel,colour, MAX_SIGNAL - meting.signaal)
   
-  log.info("BoundingBox NW: %s" % nw_deg)
-  log.info("BoundingBox SE: %s" % se_deg)
-  log.info("")
-  log.info("MetingBox   NW: %.5f,%.5f" % (lat_max, lon_min))
-  log.info("MetingBox   SE: %.5f,%.5f" % (lat_min, lon_max))
-  log.info("")
-  log.info("Metingen Count: %s" % metingen.count())
-
   im.center_crop((SIZE,SIZE))
   return im
@@ -260 +248 @@
 
 # Create your views here.
+@cache_page(60 * 60 * 24)
 def serve_tile(request,zoom,x,y):
-  """
-  Showcase on caching and tile generation:
-
-  To make it 'easy' we use two types of caching here, memory cache expiring
-  at 30 seconds and database cache, always persistent storage on database.
-  """
-
-  hash_key = TileCache.make_key("%s %s %s %s" % (zoom, x ,y, request.GET.urlencode()))
-  data = cache.get(hash_key)
-
-  if not data:
-    try:
-      d = TileCache.objects.get(key=hash_key)
-      data = d.data
-      cache.set(hash_key,data, 30)
-    except TileCache.DoesNotExist:
-      #log.setLevel(logging.DEBUG)
-      filter = {}
-      colour = (255,0,0)
-      for key, value in request.GET.iteritems():
-        if key == 'colour':
-          colour = tuple(map(int,value.split(',')))
-        else:
-          filter[key] = value
-      now = time.time()
-      im = make_tile(int(x),int(y),int(zoom),filter=filter,colour=colour)
-      log.info("Processing time: %s" % (time.time() - now))
-      data = im.get_image('png')
-      cache.set(hash_key,data, 30)
-      r = TileCache.objects.create(key=hash_key,data=data)
+  raise KeyError("foo")
+  filter = {}
+  colour = (255,0,0)
+  for key, value in request.GET.iteritems():
+    if key == 'colour':
+      colour = tuple(map(int,value.split(',')))
+    else:
+      filter[key] = value
+  now = time.time()
+  im = make_tile(int(x),int(y),int(zoom),filter=filter,colour=colour)
+  data = im.get_image('png')
 
   response = HttpResponse(mimetype="image/png")