Changeset 9184 for src/django_gheat/website

Timestamp:

May 12, 2011, 12:05:59 PM (14 years ago)

Author:

rick

Message:

Implemented cross database tile caching method, using base64 storage.

File:

• src/django_gheat/website/tile.py (modified) (6 diffs)

src/django_gheat/website/tile.py

@@ -12 +12 @@
 import sys
 import tempfile
+import time
 
 # Rending with PIL and computation with numpy has proven to be to slow to be
@@ -22 +23 @@
   pass
 
-logging.basicConfig(level=logging.WARNING)
+logging.basicConfig(level=logging.DEBUG)
 log = logging.getLogger('tile')
 
@@ -44 +45 @@
     f.seek(0)
     fh.write(f.read())
+
+  def get_image(self,format='png'):
+    f = tempfile.NamedTemporaryFile(suffix=format)
+    pygame.image.save(self.surf,f.name)
+    f.seek(0)
+    return f.read()
 
 
@@ -222 +229 @@
     xcoord = int(dif(nw_deg.lon,meting.longitude) / (resolution_deg.lon))
     ycoord = int(dif(nw_deg.lat,meting.latitude) / (resolution_deg.lat))
-    log.info(meting.accespoint.ssid, meting.latitude, meting.longitude, xcoord, ycoord)
 
     # TODO: Please note that this 'logic' technically does apply to WiFi signals,
@@ -238 +244 @@
     signal_normalized = MAX_RANGE - (MAX_SIGNAL - meting.signaal)
     im.add_circle((xcoord,ycoord),float(signal_normalized) / meters_per_pixel,colour, MAX_SIGNAL - meting.signaal)
+    #im.add_point((xcoord,ycoord),float(signal_normalized) / meters_per_pixel,colour, MAX_SIGNAL - meting.signaal)
   
   log.info("BoundingBox NW: %s" % nw_deg)
@@ -253 +260 @@
 # Create your views here.
 def serve_tile(request,zoom,x,y):
-  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
-  im = make_tile(int(x),int(y),int(zoom),filter=filter,colour=colour)
+  hash_key = TileCache.make_key("%s %s %s %s" % (zoom, x ,y, request.GET.urlencode()))
+  try:
+    d = TileCache.objects.get(key=hash_key)
+    data = d.data
+  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')
+    r = TileCache.objects.create(key=hash_key,data=data)
+
   response = HttpResponse(mimetype="image/png")
-  im.write(response,'png')
+  response.write(data)
   return response
+