Changeset 9544

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

Files:

• settings.py (modified) (3 diffs)
• wlheatmap/__init__.py (modified) (1 diff)
• wlheatmap/templates/home.html (modified) (1 diff)
• wlheatmap/templates/js (added)
• wlheatmap/templates/js/LayerBase.js (moved) (moved from src/django_gheat/wlheatmap/static/OpenStreetMap.js ) (6 diffs)
• wlheatmap/urls.py (modified) (1 diff)

src/django_gheat/settings.py

@@ -3 +3 @@
 import os
 PROJECT_HOME = os.path.abspath(os.path.dirname(__file__))
+
+DJANGO_PREFIX = '/d'
+DJANGO_BALANCERS = OSM_PROXY_BALANCERS = ['a','b','c','d','e','f']
+OSM_PROXY_CDN_DOMAINS = [d + '.osmproxy.wirelessleiden.nl' for d in DJANGO_BALANCERS]
+DJANGO_CDN_DOMAINS = [d + '.maps.wirelessleiden.nl' for d in DJANGO_BALANCERS]
 
 DEBUG = os.path.exists(PROJECT_HOME + '/enable-debug')
@@ -65 +70 @@
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/media/'
+MEDIA_URL = DJANGO_PREFIX + '/media/'
 
 # Absolute path to the directory static files should be collected to.
@@ -73 +78 @@
 STATIC_ROOT =  os.path.join(PROJECT_HOME,'sitestatic')
 
+
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
+STATIC_URL = DJANGO_PREFIX + '/static/'
 
 # URL prefix for admin static files -- CSS, JavaScript and images.

src/django_gheat/wlheatmap/__init__.py

@@ +1 @@
+from django.shortcuts import render_to_response
+from django.conf import settings
+
+def js_layer_base(request):
+  return render_to_response('js/LayerBase.js', {'settings' : settings },
+    mimetype='application/javascript')

src/django_gheat/wlheatmap/templates/home.html

@@ -5 +5 @@
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}jquery-1.6.2.min.js"></script>
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}OpenLayers.js"></script>
-  <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}OpenStreetMap.js"></script> 
+  <script type="text/javascript" language="Javascript" src="{% url wlheatmap.js_layer_base %}"></script> 
   <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>

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];

src/django_gheat/wlheatmap/urls.py

@@ -13 +13 @@
 urlpatterns = patterns('wlheatmap',
     url(r'^$', direct_to_template, {'template' : 'home.html'}),
+    url(r'^js/LayerBase.js$', 'js_layer_base'),
     url(r'^tile/(?P<zoom>\d+)/(?P<x>\d+),(?P<y>\d+).png$', 'tile.serve_tile'),
     url(r'^nodelist/(?P<zoom>\d+),(?P<lat>[0-9.]+),(?P<lon>[0-9.]+)$', 'nodelist.serve_nodelist'),