Changeset 9208 for src/django_gheat/website/static/heatmap_extensions.js

Timestamp:

May 19, 2011, 3:21:39 PM (14 years ago)

Author:

dennisw

Message:

Some cleanup.

File:

• src/django_gheat/website/static/heatmap_extensions.js (modified) (1 diff)

src/django_gheat/website/static/heatmap_extensions.js

@@ -43 +43 @@
 
   if (user != ''){user='&accespoint__id='+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;} 
-  else {enc = '';}
   if (date != ''){date='&meetrondje__datum='+date;} 
-  else {date = '';}
   if (colour != ''){colour='colour='+colour;} 
-  else {colour = '&colour='+Math.floor(Math.random()*251)+','+Math.floor(Math.random()*251)+','+Math.floor(Math.random()*251);}
+  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";
+  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
+        baseurl + colour + user + dataset + wlnode + enc + date
       ];
       options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);