Changeset 9570

Timestamp:

Aug 25, 2011, 3:07:00 PM (13 years ago)

Author:

rick

Message:

Make signal dynamic default and redo some init calls.

Location:

src/django_gheat/wlheatmap

Files:

• static/heatmap.js (modified) (4 diffs)
• static/heatmap_extensions.js (modified) (3 diffs)
• templates/home.html (modified) (1 diff)

src/django_gheat/wlheatmap/static/heatmap.js

@@ -4 +4 @@
 var map;
 
-function init(){
-
+function init_heatmap(){
   var lat = getURLParameter('lat');
   var lon = getURLParameter('lon');
@@ -54 +53 @@
 
   layerHeatmap2 = new OpenLayers.Layer.OSM.Overlay2("All Access points", {isBaseLayer: false, visibility: false});
-  map.addLayer(layerHeatmap2);
+  //map.addLayer(layerHeatmap2);
+
+  signallayer = new OpenLayers.Layer.OSM.Overlay4("signallayer", {isBaseLayer: false, visibility: false});
+  map.addLayer(signallayer);
 
   layerHeatmap3 = new OpenLayers.Layer.OSM.Overlay3("Wireless Leiden Only", {isBaseLayer: false, visibility: true});
@@ -60 +62 @@
 
   layerHeatmap = new OpenLayers.Layer.OSM.Overlay1("Original Heatmap generator", {isBaseLayer: false, visibility: false});
-  map.addLayer(layerHeatmap);
+  //map.addLayer(layerHeatmap);
         
   var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
   map.setCenter (lonLat, zoom);
 
-  signallayer = new OpenLayers.Layer.OSM.Overlay4("signallayer", {isBaseLayer: false, visibility: false});
-  map.addLayer(signallayer);
 
   /**
@@ -73 +73 @@
    */
 
-  $("#default").append("<span id=\"" + layerHeatmap.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + layerHeatmap.colour + ")' /><input type=checkbox id=togglelayer /><font>" + layerHeatmap.name + " </font><br /></span>");
+  //$("#default").append("<span id=\"" + layerHeatmap.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + layerHeatmap.colour + ")' /><input type=checkbox id=togglelayer /><font>" + layerHeatmap.name + " </font><br /></span>");
 
-  $("#default").append("<span id=\"" + layerHeatmap2.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + layerHeatmap2.colour + ")' /><input type=checkbox id=togglelayer /><font>" + layerHeatmap2.name + " </font><br /></span>");
+  //$("#default").append("<span id=\"" + layerHeatmap2.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + layerHeatmap2.colour + ")' /><input type=checkbox id=togglelayer /><font>" + layerHeatmap2.name + " </font><br /></span>");
+
+  $("#default").append("<span id=\"" + signallayer.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + signallayer.colour + ")' /><input type=checkbox id=togglelayer /><font>Signal strength: 0 - 100</font><br /></span>");
 
   $("#default").append("<span id=\"" + layerHeatmap3.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + layerHeatmap3.colour + ")' /><input type=checkbox id=togglelayer checked/><font>" + layerHeatmap3.name + " </font><br /></span>");
 
-  $("#default").append("<span id=\"" + signallayer.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + signallayer.colour + ")' /><input type=checkbox id=togglelayer /><font>Signal strength: 0 - 100</font><br /></span>");
 }

src/django_gheat/wlheatmap/static/heatmap_extensions.js

@@ -55 +55 @@
    * Function set in: 'jquery-ui-1.8.13.custom.min.js'
    */
+  function update_slider(min,max) {
+      $("#sig_value").text("Signal strength: " + min + " - " + max);
+      $("#signallayer font").text("All Signal strength: " + min + " - " + max);
+  };
+
   $("#slider").slider({
     range: true,
@@ -62 +67 @@
     // while sliding, it changes the text above the slider to show the values realtime
     slide: function(event, sig){
-      $("#sig_value").text("Signal strength: " + sig.values[0] + " - " + sig.values[1]);
-      $("#signallayer font").text("Signal strength: " + sig.values[0] + " - " + sig.values[1]);
+      update_slider(sig.values[0], sig.values[1]);
     },
     // on slider stop, it sets a new URL with updated values and redraws the layer
     stop: function(event, sig){
       signallayer = map.getLayersByName('signallayer');
-      signallayer[0].setUrl("tile/${z}/${x},${y}.png?colour=250,250,0&signaal__gte=" + sig.values[0] + "&signaal__lte=" + sig.values[1]);
+      signallayer[0].setUrl("tile/${z}/${x},${y}.png?colour=90,90,90&signaal__gte=" + sig.values[0] + "&signaal__lte=" + sig.values[1]);
       signallayer[0].redraw();
     },
   });
+
+
+  function init_slider(min, max) {
+    $("#slider").slider( "option", "values", [min,max] );
+    signallayer = map.getLayersByName('signallayer');
+    signallayer[0].setUrl("tile/${z}/${x},${y}.png?colour=90,90,90&signaal__gte=" + min + "&signaal__lte=" + max);
+    signallayer[0].redraw();
+    update_slider(min,max);
+  };
+
+
 
   /**
@@ -349 +364 @@
     $("#custom").append("<span id=\"" + lname + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + colour + ")' /><input type=checkbox id=togglelayer checked /><font>" + lname + " </font><a id=rmvlayer>X</a><br /></span>");
   });
+  init_heatmap();
+  init_slider(35,75);
 });

src/django_gheat/wlheatmap/templates/home.html

@@ -8 +8 @@
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}heatmap.js"></script>
   <script type="text/javascript" language="javascript" src="{{ STATIC_URL }}jquery.chained.js"></script>
-  <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}heatmap_extensions.js"></script>
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}colorpicker.js"></script>
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}jquery-ui-1.8.13.custom.min.js"></script>
+  <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}heatmap_extensions.js"></script>
 </head>
-<body onload="init()">
+<body>
   <div id="heatmap"></div>
   <div id="container">