Changeset 9653 for src/django_gheat/wlheatmap

Timestamp:

Sep 3, 2011, 12:14:02 PM (13 years ago)

Author:

rick

Message:

Allow prefixing on domain proto to 'hack' a way making relative URLs by making
both CDN variables blank in local_settings.py.

File:

• src/django_gheat/wlheatmap/templates/js/LayerBase.js (modified) (5 diffs)

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

@@ -52 +52 @@
      */
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', {{ settings.OSM_PROXY_CDN_DOMAINS|safe }}, '{{ settings.OSM_PREFIX }}/${z}/${x}/${y}.png');
+        var url = get_balanced_urls('{{ settings.OSM_PROXY_CDN_DOMAINS_PROTOCOL }}', {{ settings.OSM_PROXY_CDN_DOMAINS|safe }}, '{{ settings.OSM_PREFIX }}/${z}/${x}/${y}.png');
         options = OpenLayers.Util.extend({ numZoomLevels: 19 }, options);
         var newArguments = [name, url, options];
@@ -166 +166 @@
 OpenLayers.Layer.OSM.Overlay2 = OpenLayers.Class(OpenLayers.Layer.OSM, {
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }},
+        var url = get_balanced_urls('{{ settings.DJANGO_CDN_DOMAINS_PROTOCOL }}' , {{ 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);
@@ -181 +181 @@
 OpenLayers.Layer.OSM.Overlay3 = OpenLayers.Class(OpenLayers.Layer.OSM, {
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }},
+        var url = get_balanced_urls('{{ settings.DJANGO_CDN_DOMAINS_PROTOCOL }}', {{ settings.DJANGO_CDN_DOMAINS|safe }},
           '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=255,0,0&accespoint__organization__name__startswith=Wireless');
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
@@ -196 +196 @@
 OpenLayers.Layer.OSM.Overlay4 = OpenLayers.Class(OpenLayers.Layer.OSM, {
   initialize: function(name, options) {
-    var url = get_balanced_urls('http://', {{ settings.DJANGO_CDN_DOMAINS|safe }},
+    var url = get_balanced_urls('{{ settings.DJANGO_CDN_DOMAINS_PROTOCOL }}', {{ 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);
@@ -205 +205 @@
   CLASS_NAME: "OpenLayers.Layer.Overlay"
 });
-
-var foo;
 
 // create the layer styleMap by giving the default style a context