Changeset 9275

Timestamp:

Jun 22, 2011, 10:46:13 AM (14 years ago)

Author:

dennisw

Message:

Added signallayer to default layers. Removed the ability to remove default layers.

Location:

src/django_gheat/website

Files:

• static/OpenStreetMap.js (modified) (1 diff)
• static/heatmap.js (modified) (1 diff)
• static/heatmap_extensions.js (modified) (1 diff)
• templates/home.html (modified) (1 diff)

src/django_gheat/website/static/OpenStreetMap.js

@@ -178 +178 @@
     CLASS_NAME: "OpenLayers.Layer.Overlay"
 });
+
+OpenLayers.Layer.OSM.Overlay4 = OpenLayers.Class(OpenLayers.Layer.OSM, {
+  initialize: function(name, options) {
+    var url = [
+      "/website/tile/${z}/${x},${y}.png?colour=250,250,0&signaal__gte=0&signaal__lte=100"
+    ];
+    options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
+    var newArguments = [name, url, options];
+    OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+  },
+  colour: "250,250,0",
+  CLASS_NAME: "OpenLayers.Layer.Overlay"
+});

src/django_gheat/website/static/heatmap.js

@@ -53 +53 @@
   map.setCenter (lonLat, zoom);
 
-  $("#default").append("<span id=\"" + layerHeatmap.name + "\"><input type=checkbox id=togglelayer /><font style='color:rgb(" + layerHeatmap.colour + ")'>" + layerHeatmap.name + " </font><a id=rmvlayer>X</a><br /></span>");
+  signallayer = new OpenLayers.Layer.OSM.Overlay4("signallayer", {isBaseLayer: false, visibility: true});
+  map.addLayer(signallayer);
 
-  $("#default").append("<span id=\"" + layerHeatmap2.name + "\"><input type=checkbox id=togglelayer checked/><font style='color:rgb(" + layerHeatmap2.colour + ")'>" + layerHeatmap2.name + " </font><a id=rmvlayer>X</a><br /></span>");
+  $("#default").append("<span id=\"" + layerHeatmap.name + "\"><input type=checkbox id=togglelayer /><font style='color:rgb(" + layerHeatmap.colour + ")'>" + layerHeatmap.name + " </font><br /></span>");
 
-  $("#default").append("<span id=\"" + layerHeatmap3.name + "\"><input type=checkbox id=togglelayer checked/><font style='color:rgb(" + layerHeatmap3.colour + ")'>" + layerHeatmap3.name + " </font><a id=rmvlayer>X</a><br /></span>");
+  $("#default").append("<span id=\"" + layerHeatmap2.name + "\"><input type=checkbox id=togglelayer checked/><font style='color:rgb(" + layerHeatmap2.colour + ")'>" + layerHeatmap2.name + " </font><br /></span>");
 
+  $("#default").append("<span id=\"" + layerHeatmap3.name + "\"><input type=checkbox id=togglelayer checked/><font style='color:rgb(" + layerHeatmap3.colour + ")'>" + layerHeatmap3.name + " </font><br /></span>");
 
-
-
+  $("#default").append("<span id=\"" + signallayer.name + "\"><input type=checkbox id=togglelayer checked /><font style='color:rgb(" + signallayer.colour + ")'>Signal strength: 0 - 100</font><br /></span>");
 }

src/django_gheat/website/static/heatmap_extensions.js

@@ -50 +50 @@
     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]);
     },
     // on slider stop, it tries to delete the old layer and creates a new layer with the slider values
     stop: function(event, sig){
-      if(signallayer){
-        map.removeLayer(signallayer);
-      }
-      OpenLayers.Layer.OSM.Overlay = OpenLayers.Class(OpenLayers.Layer.OSM, {
-        initialize: function(name, options) {
-          var url = [
-            "/website/tile/${z}/${x},${y}.png?colour=250,250,0&signaal__gte=" + sig.values[0] + "&signaal__lte=" + sig.values[1]
-          ];
-          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"
-      });
-      lname = "Signal strength: " + sig.values[0] + " - " + sig.values[1];
-      signallayer = new OpenLayers.Layer.OSM.Overlay(lname, {isBaseLayer: false, visibility: true});
-      map.addLayer(signallayer);
+      signallayer = map.getLayersByName('signallayer');
+      console.log(signallayer[0]);
+      signallayer[0].setUrl("/website/tile/${z}/${x},${y}.png?colour=250,250,0&signaal__gte=" + sig.values[0] + "&signaal__lte=" + sig.values[1]);
+      signallayer[0].redraw();
     },
   });

src/django_gheat/website/templates/home.html

@@ -59 +59 @@
   </div>
   <div id="layer_switcher">
-    <div id="layer_switcher_cat">Base layers</div><p><span id="default"></span><p>
+    <div id="layer_switcher_cat">Default layers</div><p><span id="default"></span><p>
     <div id="layer_switcher_cat">Nodes</div><p><span id="node"></span><input type="button" id="node_filter" value="Add nodefilter"/><br /><p>
     <div id="layer_switcher_cat">Users</div><p><span id="user"></span><input type="button" id="user_filter" value="Add userfilter"/><br /><P>