Changeset 9177 for src/django_gheat

Timestamp:

May 11, 2011, 12:17:18 PM (14 years ago)

Author:

dennisw

Message:

Progress on showing nodes around mouse when hovering over map.
Right now, it returns some placeholder json object on click.

Next steps: replace placeholder with real data, print readable lines instead of [object Object], and get mouse boundaries.

Location:

src/django_gheat/website

Files:

• nodelist.py (added)
• static/heatmap.js (modified) (3 diffs)
• templates/home.html (modified) (1 diff)
• urls.py (modified) (1 diff)

src/django_gheat/website/static/heatmap.js

@@ -24 +24 @@
                 var lonlat = map.getLonLatFromPixel(pixel);
                 var mousepos = OpenLayers.Layer.SphericalMercator.inverseMercator(lonlat.lon, lonlat.lat);
-                loadXMLDoc(mousepos);
-                //var url = "/website/wlnode/" + mousepos.lat + "," + mousepos.lon;
-                //window.location = url;
+                loadNodeList(mousepos);
         }
 
@@ -34 +32 @@
         map.addLayer(layerHeatmap);
 
-        layerHeatmap2 = new OpenLayers.Layer.OSM.Overlay2("All Access points", {isBaseLayer: false, visibility: false});
+        layerHeatmap2 = new OpenLayers.Layer.OSM.Overlay2("All Access points", {isBaseLayer: false, visibility: true});
         map.addLayer(layerHeatmap2);
 
@@ -48 +46 @@
 }
 
-function loadXMLDoc(mousepos)
-{
-var xmlhttp;
-var txt,xx,x,i;
-if (window.XMLHttpRequest)
-  {// code for IE7+, Firefox, Chrome, Opera, Safari
-  xmlhttp=new XMLHttpRequest();
+function loadNodeList(mousepos){
+  var nodelist;
+  if (window.XMLHttpRequest){
+    // code for IE7+, Firefox, Chrome, Opera, Safari
+    nodelist=new XMLHttpRequest();
   }
-else
-  {// code for IE6, IE5
-  xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
+  else{
+    // code for IE6, IE5
+    nodelist=new ActiveXObject("Microsoft.XMLHTTP");
   }
 
-
-xmlhttp.onreadystatechange=function()
-  {
-  if (xmlhttp.readyState==4 && xmlhttp.status==200)
-    {
-    txt="";
-    x=xmlhttp.responseXML.documentElement.getElementsByTagName("CD");
-    for (i=0;i<x.length;i++)
-      {
-      xx=x[i].getElementsByTagName("ARTIST");
-      txt=txt + xx[0].firstChild.nodeValue + "<br>";
-      }
-    document.getElementById('nodelist').innerHTML=txt;
+  nodelist.onreadystatechange=function(){
+    if (nodelist.readyState==4 && nodelist.status==200){
+      txt=eval("("+nodelist.responseText+")")
+      document.getElementById('nodelist').innerHTML=txt;
     }
   }
-xmlhttp.open("POST","/static/test.xml",true);
-//xmlhttp.open("POST","/website/lat=" + mousepos.lat + "&lon=" + mousepos.lon,true);
-xmlhttp.send();
+
+  nodelist.open("GET","/website/nodelist/" + mousepos.lat + "," + mousepos.lon,true);
+  nodelist.send();
 }

src/django_gheat/website/templates/home.html

@@ -17 +17 @@
         <h1>Info</h1><br />
         Info
-        <div id="nodelist"><h2>Let AJAX change this text</h2></div>
-        <button type="button" onclick="loadXMLDoc()">Change Content</button>
+        <div id="nodelist"></div>
       </div>
       <div id="footer"> <a href="http://www.wirelessleiden.nl/">wirelessleiden.nl</a> </div>

src/django_gheat/website/urls.py

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