Changeset 9186

Timestamp:

May 12, 2011, 12:56:07 PM (14 years ago)

Author:

dennisw

Message:

Nodelist progress. Shows nodes around mouse when you click on map. Next; fix boundaries per zoomlevel and nodelist display.

Location:

src/django_gheat/website

Files:

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

src/django_gheat/website/nodelist.py

@@ -9 +9 @@
 from django.db.models import Max
 from django.http import HttpResponse
+from django.core import serializers
 from gheat.models import *
 import logging
@@ -15 +16 @@
 import tempfile
 
+def make_list(swlat,swlon,nelat,nelon):
+  import simplejson
 
-def serve_nodelist(request,lat,lon):
-  import simplejson as json
-  s = json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4 * ' ')
-  html = '\n'.join([l.rstrip() for l in  s.splitlines()])
+  filter = {}
+  filter.update({
+    'accespoint__ssid__contains' : 'WirelessLeiden',
+    'latitude__lt' : swlat,
+    'longitude__lt' : swlon,
+    'latitude__gt' : nelat,
+    'longitude__gt' : nelon
+  })
+
+  html = Meting.objects.filter(**filter).values('accespoint__ssid').distinct()
+  nodelist = simplejson.dumps(list(html))
+  return HttpResponse(nodelist, content_type = 'application/javascript; charset=utf8')
+
+def serve_nodelist(request,swlat,swlon,nelat,nelon):
+  html = make_list(float(swlat),float(swlon),float(nelat),float(nelon))
   return HttpResponse(html)
+

src/django_gheat/website/static/heatmap.js

@@ -21 +21 @@
         map.events.register('click', map, GetMousePos);
         function GetMousePos(pos) {
-                var pixel = new OpenLayers.Pixel(pos.xy.x,pos.xy.y);
-                var lonlat = map.getLonLatFromPixel(pixel);
-                var mousepos = OpenLayers.Layer.SphericalMercator.inverseMercator(lonlat.lon, lonlat.lat);
-                loadNodeList(mousepos);
+                var pixbuffer = 100;
+                var sw = map.getLonLatFromPixel(new OpenLayers.Pixel(pos.xy.x+pixbuffer,pos.xy.y-pixbuffer));
+                var ne = map.getLonLatFromPixel(new OpenLayers.Pixel(pos.xy.x-pixbuffer,pos.xy.y+pixbuffer));
+                var pointsw = OpenLayers.Layer.SphericalMercator.inverseMercator(sw.lon, sw.lat);
+                var pointne = OpenLayers.Layer.SphericalMercator.inverseMercator(ne.lon, ne.lat);
+                getNodeList(pointsw, pointne);
         }
 
@@ -46 +48 @@
 }
 
-function loadNodeList(mousepos){
+function getNodeList(sw, ne){
   var nodelist;
   if (window.XMLHttpRequest){
@@ -59 +61 @@
   nodelist.onreadystatechange=function(){
     if (nodelist.readyState==4 && nodelist.status==200){
-      txt=eval("("+nodelist.responseText+")")
+      txt=nodelist.responseText
       document.getElementById('nodelist').innerHTML=txt;
     }
   }
 
-  nodelist.open("GET","/website/nodelist/" + mousepos.lat + "," + mousepos.lon,true);
+  nodelist.open("GET","/website/nodelist/" + sw.lat + "," + sw.lon + "," + ne.lat + "," + ne.lon,true);
   nodelist.send();
 }

src/django_gheat/website/urls.py

@@ -22 +22 @@
 urlpatterns += patterns('website.nodelist',
     url(
-        regex = r'^nodelist/(?P<lat>[0-9.]+),(?P<lon>[0-9.]+)$',
+        regex = r'^nodelist/(?P<swlat>[0-9.]+),(?P<swlon>[0-9.]+),(?P<nelat>[0-9.]+),(?P<nelon>[0-9.]+)$',
         view = 'serve_nodelist',
         name = 'serve_nodelist',