Changeset 9579 for src/django_gheat/wlheatmap

Timestamp:

Aug 26, 2011, 8:54:24 PM (13 years ago)

Author:

rick

Message:

Map a SSID to an organization to play nice with differnt SSIDs.

Location:

src/django_gheat/wlheatmap

Files:

• filters.py (modified) (1 diff)
• nodelist.py (modified) (1 diff)
• templates/js/LayerBase.js (modified) (3 diffs)

src/django_gheat/wlheatmap/filters.py

@@ -20 +20 @@
       # Get list if accespoints found in the specific 'Meting', and make this is list.
       wirelessleiden_ssid = Meting.objects.filter(meetrondje=mr,
-        accespoint__ssid__contains='WirelessLeiden').\
+        accespoint__organization='WirelessLeiden').\
         values_list('accespoint__ssid',flat=True).\
         order_by('accespoint__ssid').distinct()

src/django_gheat/wlheatmap/nodelist.py

@@ -40 +40 @@
   filter = {}
   filter.update({
-    'ssid__contains' : 'WirelessLeiden',
+    'organization' : 'WirelessLeiden',
     'meting__latitude__lt' : maxlat,
     'meting__longitude__lt' : maxlon,

src/django_gheat/wlheatmap/templates/js/LayerBase.js

@@ -168 +168 @@
 OpenLayers.Layer.OSM.Overlay2 = OpenLayers.Class(OpenLayers.Layer.OSM, {
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }}, '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=90,90,90');
+        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }},
+          '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=90,90,90');
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
         var newArguments = [name, url, options];
@@ -182 +183 @@
 OpenLayers.Layer.OSM.Overlay3 = OpenLayers.Class(OpenLayers.Layer.OSM, {
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }}, '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=255,0,0&accespoint__ssid__icontains=WirelessLeiden');
+        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }},
+          '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=255,0,0&accespoint__organization=WirelessLeiden');
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
         var newArguments = [name, url, options];
@@ -196 +198 @@
 OpenLayers.Layer.OSM.Overlay4 = OpenLayers.Class(OpenLayers.Layer.OSM, {
   initialize: function(name, options) {
-    var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }}, '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=50,150,50&signaal__gte=0&signaal__lte=100');
+    var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }},
+      '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=50,150,50&signaal__gte=0&signaal__lte=100');
     options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
     var newArguments = [name, url, options];