Changeset 9544 for src/django_gheat/wlheatmap/templates/js/LayerBase.js

Timestamp:

Aug 23, 2011, 10:11:58 AM (13 years ago)

Author:

rick

Message:

Make the path and CDN domain settings transparent.

Location:

src/django_gheat/wlheatmap/templates/js

Files:

• . (added)
• LayerBase.js (moved) (moved from src/django_gheat/wlheatmap/static/OpenStreetMap.js ) (6 diffs)

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

@@ -29 +29 @@
 };
 
-var wl_balancers = ['a','b','c','d','e','f'];
 function get_balanced_urls(prefix, balancers, suffix) {
   var urls = [];
-  for (i=0 ; i < balancers.length; i++) {
+  for (var i=0; i < balancers.length; i++) {
     urls.push(prefix + balancers[i] + suffix);
   };
@@ -39 +38 @@
 
 
+
 /**
  * Class: OpenLayers.Layer.OSM.Mapnik
@@ -54 +54 @@
      */
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', wl_balancers, '.osmproxy.wirelessleiden.nl/heatmap/osm-proxy/${z}/${x},${y}.png');
+        var url = get_balanced_urls('http://', {{ settings.OSM_PROXY_CDN_DOMAINS|safe }}, '{{ settings.DJANGO_PREFIX }}/osm-proxy/${z}/${x},${y}.png');
         options = OpenLayers.Util.extend({ numZoomLevels: 19 }, options);
         var newArguments = [name, url, options];
@@ -168 +168 @@
 OpenLayers.Layer.OSM.Overlay2 = OpenLayers.Class(OpenLayers.Layer.OSM, {
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', wl_balancers, '.maps.wirelessleiden.nl/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 +182 @@
 OpenLayers.Layer.OSM.Overlay3 = OpenLayers.Class(OpenLayers.Layer.OSM, {
     initialize: function(name, options) {
-        var url = get_balanced_urls('http://', wl_balancers, '.maps.wirelessleiden.nl/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__ssid__icontains=WirelessLeiden');
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
         var newArguments = [name, url, options];
@@ -196 +196 @@
 OpenLayers.Layer.OSM.Overlay4 = OpenLayers.Class(OpenLayers.Layer.OSM, {
   initialize: function(name, options) {
-    var url = get_balanced_urls('http://', wl_balancers, '.maps.wirelessleiden.nl/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];