Index: src/django_gheat/website/filters.py
===================================================================
--- src/django_gheat/website/filters.py	(revision 9243)
+++ src/django_gheat/website/filters.py	(revision 9244)
@@ -2,58 +2,11 @@
 #
 # View serving filter values.
-#
-# Dennis Wagenaar
-# d.wagenaar@gmail.com
 
 from django.core.management import setup_environ
-from django.db.models import Max
 from django.http import HttpResponse
-from django.core import serializers
 from gheat.models import *
-from gheat import gmerc
-import logging
-import pygame
-import sys
-import tempfile
 import simplejson
 
-
-# todo: Create one single json file with all relevent info needed for filters.  datum - meetrondje - gebruiker
-def serve_filter(request, ftype):
-  filterlist = ''
-  if (ftype == 'filter_node'):
-    filterlist = get_node()
-  elif (ftype == 'filter_user'):
-    filterlist = get_user()
-  elif (ftype == 'filter_dataset'):
-    filterlist = get_dataset()
-  else:
-    print 'Invalid filter'
-  
-  return HttpResponse(filterlist, content_type = 'application/javascript; charset=utf8')
-
-
-def get_node():
-
-  nodes = Accespoint.objects.filter(ssid__contains='WirelessLeiden').distinct()
-  nodelist = serializers.serialize('json', nodes, fields=('ssid'))
-  return nodelist
-
-
-def get_user():
-
-  users = Gebruiker.objects.all()
-  userlist = serializers.serialize('json', users, fields=('naam'))
-  return userlist
-
-
-def get_dataset():
-
-  datasets = MeetRondje.objects.all()
-  datasetlist = serializers.serialize('json', datasets, fields=('naam', 'gebruiker'))
-  return datasetlist
-
-
-def foo_filter(request):
+def serve_filters(request):
   """Example json input for dynamic filter using multiple objects example:
   http://lijst.wirelessleiden.nl/pipermail/techniek/2011-May/005516.html"""
@@ -73,5 +26,5 @@
         {
           'naam' : mr.naam,
-          'date' : mr.datum.strftime('%Y-%m-%d'),
+          'datum' : mr.datum.strftime('%Y-%m-%d'),
           'nodes' : list(wirelessleiden_ssid)
         }
Index: src/django_gheat/website/nodelist.py
===================================================================
--- src/django_gheat/website/nodelist.py	(revision 9243)
+++ src/django_gheat/website/nodelist.py	(revision 9244)
@@ -7,13 +7,8 @@
 
 from django.core.management import setup_environ
-from django.db.models import Max
 from django.http import HttpResponse
 from django.core import serializers
 from gheat.models import *
 from gheat import gmerc
-import logging
-import pygame
-import sys
-import tempfile
 
 def get_bounds(zoom,lat,lon):
Index: src/django_gheat/website/static/heatmap_extensions.js
===================================================================
--- src/django_gheat/website/static/heatmap_extensions.js	(revision 9243)
+++ src/django_gheat/website/static/heatmap_extensions.js	(revision 9244)
@@ -5,7 +5,7 @@
       content = 'Wireless Leiden nodes on mouseposition:<br /><b>';
       $.each(json, function(i,json){
-        content += json.fields.ssid;
+        content += json.fields.ssid + '<br />';
       });
-      content += '</br>';
+      content += '</b>';
       $("#node_list").html(content);
     }
@@ -17,5 +17,5 @@
 
   // 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/",
+  $.getJSON("/website/filters/",
     function(json) {
       $.each(json, function(i,json){
Index: src/django_gheat/website/urls.py
===================================================================
--- src/django_gheat/website/urls.py	(revision 9243)
+++ src/django_gheat/website/urls.py	(revision 9244)
@@ -38,9 +38,4 @@
 
 urlpatterns += patterns('website.filters',
-    url(
-        regex = r'^filter/(?P<ftype>[a-z_]+)$',
-        view = 'serve_filter',
-        name = 'serve_filter',
-       ),
-    url(r'^foofilter/$', 'foo_filter'),
+    url(r'^filters/$', 'serve_filters'),
   )