Changeset 9201

Timestamp:

May 16, 2011, 12:45:26 PM (14 years ago)

Author:

dennisw

Message:

Better mousebounds with nodelist. Some delay with mouseposition though.

Location:

src/django_gheat/website

Files:

• nodelist.py (modified) (3 diffs)
• static/heatmap.js (modified) (1 diff)

src/django_gheat/website/nodelist.py

@@ -11 +11 @@
 from django.core import serializers
 from gheat.models import *
+from gheat import gmerc
 import logging
 import pygame
@@ -16 +17 @@
 import tempfile
 
+def get_bounds(zoom,lat,lon):
+
+  # Getting max radius for zoomlevel. Note that it will make a square using this, not a circle.
+  SIZE = 250
+  tile_height = float(40008000) / (2 ** zoom)
+  meters_per_pixel = float(tile_height) / SIZE
+  radius = 150 / meters_per_pixel
+
+  # Getting pixel location for mouseposition
+  mouse_x, mouse_y = gmerc.ll2px(lat,lon,zoom)
+  
+  max_x = int(mouse_x + radius)
+  max_y = int(mouse_y + radius)
+  min_x = int(mouse_x - radius)
+  min_y = int(mouse_y - radius)
+
+  max_lat, max_lon = gmerc.px2ll(max_x, min_y, zoom)
+  min_lat, min_lon = gmerc.px2ll(min_x, max_y, zoom)
+
+  return (max_lat, max_lon, min_lat, min_lon)
+
+
 def make_list(zoom,lat,lon):
 
-  maxlat = (lat + 0.01)
-  maxlon = (lon + 0.01)
-  minlat = (lat - 0.01)
-  minlon = (lon - 0.01)
+  maxlat, maxlon, minlat, minlon = get_bounds(zoom,lat,lon)
 
   filter = {}
@@ -37 +57 @@
   return nodelist
 
+
 def serve_nodelist(request,zoom,lat,lon,):
-  html = make_list(int(zoom), float(lat), float(lon))
-  return HttpResponse(html, content_type = 'application/javascript; charset=utf8')
-
+  nodelist = make_list(int(zoom), float(lat), float(lon))
+  return HttpResponse(nodelist, content_type = 'application/javascript; charset=utf8')

src/django_gheat/website/static/heatmap.js

@@ -19 +19 @@
         });
 
-        map.events.register('click', map, GetMousePos);
+        map.events.register('mouseover', map, GetMousePos);
         function GetMousePos(pos) {
                 var pix = map.getLonLatFromPixel(new OpenLayers.Pixel(pos.xy.x,pos.xy.y));