Index: src/django_gheat/website/static/heatmap_extensions.js =================================================================== --- src/django_gheat/website/static/heatmap_extensions.js (revision 9240) +++ src/django_gheat/website/static/heatmap_extensions.js (revision 9241) @@ -1,146 +1,83 @@ -// Base stolen from http://java.sun.com/developer/technicalArticles/J2EE/AJAX/RealtimeValidation/ -function AjaxRequest(url, callback, filter, field) { - - var req = init(); - req.onreadystatechange = processRequest; - - function init() { - if (window.XMLHttpRequest) { - return new XMLHttpRequest(); - } else if (window.ActiveXObject) { - return new ActiveXObject("Microsoft.XMLHTTP"); +// Uses zoomlevel en mouseposition to call the nodelist.py view. View returns nodes in json format which is read and printed in document element. +function getNodeList(zoomlevel, mousepos) { + $.getJSON("/website/nodelist/" + zoomlevel + "," + mousepos.lat + "," + mousepos.lon, + function(json) { + content = 'Wireless Leiden nodes on mouseposition:
'; + $.each(json, function(i,json){ + content += json.fields.ssid; + }); + content += '
'; + $("#node_list").html(content); } - } - - function processRequest () { - if (req.readyState == 4) { - if (req.status == 200) { - if (callback) { - if (filter) callback(filter, field, req.responseText); - else callback(req.responseText); - } - } - } - } - - this.doGet = function() { - req.open("GET", url, true); - req.send(null); - } + ); } +// set filter values +$(document).ready(function() { -// Uses zoomlevel en mouseposition to call the nodelist.py view. View returns nodes in json format which is read and printed in document element. -function getNodeList(zoomlevel, mousepos) { - var url = "/website/nodelist/" + zoomlevel + "," + mousepos.lat + "," + mousepos.lon; - var ajax = new AjaxRequest(url, setNodeList); - ajax.doGet(); -} + // Fastest?: http://stackoverflow.com/questions/170986/what-is-the-best-way-to-add-options-to-a-select-from-an-array-with-jquery + $.getJSON("/website/foofilter/", + function(json) { + $.each(json, function(i,json){ + // $("").appendTo("#select_user"); + $("#select_user").append($("").appendTo("#select_dataset"); + $.each(meetrondje.nodes, function(n, nodes){ + $("").appendTo("#select_node"); + }); +// $("").appendTo("#select_date"); + }); + }); +// Initiate the chain + $("#select_dataset").chained("#select_user"); + $("#select_node").chained("#select_dataset"); + } + ); +}); +// add filter +$(function(){ + $('#add_filter').click(function(){ -function setNodeList(responseText) { - json=eval('(' + responseText + ')'); - if (json.length>0){ - list = 'Wireless Leiden nodes on mouseposition:
'; - for (var i=0; i'; - } - list += ''; - } - else{ - list = 'No nodes to display.'; - } - document.getElementById('node_list').innerHTML=list; -} + user = $('#select_user option:selected').text(); + dataset = $('#select_dataset option:selected').text(); + wlnode = $('#select_node option:selected').text(); + enc = $('#select_enc option:selected').text(); + date = $('#select_date option:selected').text(); + colour = encodeURIComponent(document.getElementById("colour").value); + lname = encodeURIComponent(document.getElementById("lname").value); + if (user != ''){user='&meetrondje__gebruiker__naam='+user;} + else{user='';} + if (dataset != ''){dataset='&meetrondje__naam='+dataset;} + else{dataset='';} + if (wlnode != ''){wlnode='&accespoint__ssid='+wlnode;} + else{wlnode='';} + if (enc != ''){enc='&accespoint__encryptie='+enc;} + if (date != ''){date='&meetrondje__datum='+date;} + else{date='';} + if (colour != ''){colour='colour='+colour;} + else {colour = '&colour='+Math.floor(Math.random()*256)+','+Math.floor(Math.random()*256)+','+Math.floor(Math.random()*256);} + if (lname != ''){lname=lname;} + else {lname = 'Custom Filter';} -function get_filters() { + var baseurl = "/website/tile/${z}/${x},${y}.png?"; - // Create form - var formstart = '
'; - var formend = '
'; - var layername = ' Layername
'; - var colour = ' Colour
'; - var user = ' User
'; - var dataset = ' Dataset
'; - var node = ' Node
'; - var enc = ' Encryption
'; - var date = ' Date
'; + OpenLayers.Layer.OSM.Overlay = OpenLayers.Class(OpenLayers.Layer.OSM, { + initialize: function(name, options) { + var url = [ + baseurl + colour + user + dataset + wlnode + enc + date + ]; + document.getElementById('filter_text').innerHTML+="
Added: " + url; + options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options); + var newArguments = [name, url, options]; + OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); + }, + CLASS_NAME: "OpenLayers.Layer.Overlay" + }); - // Write form to document - document.getElementById('filter_list').innerHTML+=(formstart + user + dataset + node + enc + date + colour + layername + formend); - - // Get values for select boxes - // filters[] first value is what to get, second value is which field values will be shown in select box - var filters = [['user','naam'],['dataset','naam'],['node','ssid']] - for (var i=0; i' + json[i].fields[field] + ''; - } - else{ - options += ''; - } - } - document.getElementById(filter).innerHTML+=options; -} - - -function update_filters(id){ - var filtervalue = id.options[id.selectedIndex].value; - -} - - -function addFilter(){ - - var user = encodeURIComponent(document.getElementById("user").value); - var dataset = encodeURIComponent(document.getElementById("dataset").value); - var wlnode = encodeURIComponent(document.getElementById("node").value); - var enc = encodeURIComponent(document.getElementById("enc").value); - var date = encodeURIComponent(document.getElementById("date").value); - var colour = encodeURIComponent(document.getElementById("colour").value); - var lname = encodeURIComponent(document.getElementById("lname").value); - - if (user != ''){user='&meetrondje__gebruiker__naam='+user;} - if (dataset != ''){dataset='&meetrondje__naam='+dataset;} - if (wlnode != ''){wlnode='&accespoint__ssid='+wlnode;} - if (enc != ''){enc='&accespoint__encryptie='+enc;} - if (date != ''){date='&meetrondje__datum='+date;} - if (colour != ''){colour='colour='+colour;} - else {colour = '&colour='+Math.floor(Math.random()*256)+','+Math.floor(Math.random()*256)+','+Math.floor(Math.random()*256);} - if (lname != ''){lname=lname;} - else {lname = 'Custom Filter';} - - var baseurl = "/website/tile/${z}/${x},${y}.png?"; - - OpenLayers.Layer.OSM.Overlay = OpenLayers.Class(OpenLayers.Layer.OSM, { - initialize: function(name, options) { - var url = [ - baseurl + colour + user + dataset + wlnode + enc + date - ]; - options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options); - var newArguments = [name, url, options]; - OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); - }, - CLASS_NAME: "OpenLayers.Layer.Overlay" + filterlayer = new OpenLayers.Layer.OSM.Overlay(lname, {isBaseLayer: false, visibility: true}); + map.addLayer(filterlayer); }); - - filterlayer = new OpenLayers.Layer.OSM.Overlay(lname, {isBaseLayer: false, visibility: true}); - map.addLayer(filterlayer); -} +}); Index: src/django_gheat/website/static/heatmap_extensions_test.js =================================================================== --- src/django_gheat/website/static/heatmap_extensions_test.js (revision 9240) +++ (revision ) @@ -1,82 +1,0 @@ -// Uses zoomlevel en mouseposition to call the nodelist.py view. View returns nodes in json format which is read and printed in document element. -function getNodeList(zoomlevel, mousepos) { - $.getJSON("/website/nodelist/" + zoomlevel + "," + mousepos.lat + "," + mousepos.lon, - function(json) { - content = 'Wireless Leiden nodes on mouseposition:
'; - $.each(json, function(i,json){ - content += json.fields.ssid; - }); - content += '
'; - $("#node_list").html(content); - } - ); -} - -// set filter values -$(document).ready(function() { - - // Fastest?: http://stackoverflow.com/questions/170986/what-is-the-best-way-to-add-options-to-a-select-from-an-array-with-jquery - $.getJSON("/website/foofilter/", - function(json) { - $.each(json, function(i,json){ - $("").appendTo("#select_user"); - $.each(json.meetrondje, function(m, meetrondje){ - $("").appendTo("#select_dataset"); - $.each(meetrondje.nodes, function(n, nodes){ - $("").appendTo("#select_node"); - }); -// $("").appendTo("#select_date"); - }); - }); -// Initiate the chain - $("#select_dataset").chained("#select_user"); - $("#select_node").chained("#select_dataset"); - } - ); -}); - -// add filter -$(function(){ - $('#add_filter').click(function(){ - - user = $('#select_user option:selected').text(); - dataset = $('#select_dataset option:selected').text(); - wlnode = $('#select_node option:selected').text(); - enc = $('#select_enc option:selected').text(); - date = $('#select_date option:selected').text(); - colour = encodeURIComponent(document.getElementById("colour").value); - lname = encodeURIComponent(document.getElementById("lname").value); - - if (user != 'All'){user='&meetrondje__gebruiker__naam='+user;} - else{user='';} - if (dataset != 'All'){dataset='&meetrondje__naam='+dataset;} - else{dataset='';} - if (wlnode != 'All'){wlnode='&accespoint__ssid='+wlnode;} - else{wlnode='';} - if (enc != ''){enc='&accespoint__encryptie='+enc;} - if (date != 'All'){date='&meetrondje__datum='+date;} - else{date='';} - if (colour != ''){colour='colour='+colour;} - else {colour = '&colour='+Math.floor(Math.random()*256)+','+Math.floor(Math.random()*256)+','+Math.floor(Math.random()*256);} - if (lname != ''){lname=lname;} - else {lname = 'Custom Filter';} - - var baseurl = "/website/tile/${z}/${x},${y}.png?"; - - OpenLayers.Layer.OSM.Overlay = OpenLayers.Class(OpenLayers.Layer.OSM, { - initialize: function(name, options) { - var url = [ - baseurl + colour + user + dataset + wlnode + enc + date - ]; - document.getElementById('filter_text').innerHTML+="
Added: " + url; - options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options); - var newArguments = [name, url, options]; - OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); - }, - CLASS_NAME: "OpenLayers.Layer.Overlay" - }); - - filterlayer = new OpenLayers.Layer.OSM.Overlay(lname, {isBaseLayer: false, visibility: true}); - map.addLayer(filterlayer); - }); -});