Changeset 9358

Timestamp:

Jul 7, 2011, 7:23:54 AM (13 years ago)

Author:

rick

Message:

Starting to make production ready:

• Remove all static / references.
• Added multihost osm-proxy capacities.
• Got the osm-proxy code to a more usefull location.
• Added caching.

Location:

src/django_gheat

Files:

• settings.py (modified) (5 diffs)
• urls.py (modified) (1 diff)
• website/static/OpenStreetMap.js (modified) (4 diffs)
• website/static/heatmap_extensions.js (modified) (6 diffs)
• website/templates/home.html (modified) (1 diff)
• website/urls.py (modified) (1 diff)

src/django_gheat/settings.py

@@ -28 +28 @@
         'NAME': 'project_heatmap',
         'USER': 'root',
-        'PASSWORD': 'password',
+        'PASSWORD': '',
         'HOST': 'localhost',
         'PORT': '3306',
@@ -85 +85 @@
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
+STATIC_ROOT = 'sitestatic'
 
 # URL prefix for static files.
@@ -98 +98 @@
 # Additional locations of static files
 STATICFILES_DIRS = (
-    PROJECT_HOME + '/static',
+    # PROJECT_HOME + '/static',
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
@@ -124 +124 @@
 MIDDLEWARE_CLASSES = (
     'django.middleware.cache.UpdateCacheMiddleware',
-#    'django.middleware.common.CommonMiddleware',
-#    'django.middleware.cache.FetchFromCacheMiddleware',
-#    'django.middleware.http.ConditionalGetMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.cache.FetchFromCacheMiddleware',
+    'django.middleware.http.ConditionalGetMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -146 +146 @@
     'django.contrib.sessions',
     'django.contrib.sites',
+    'django.contrib.staticfiles',
     'django_extensions',
     'gheat',

src/django_gheat/urls.py

@@ -12 +12 @@
     (r'^admin/', include(admin.site.urls)),
 )
+
+urlpatterns += patterns('website.osm_proxy',
+    url(
+        # Example : today/fire/12/3,2.png
+        regex = r'^osm-proxy/(?P<zoom>\d+)/(?P<x>\d+),(?P<y>\d+).png$',
+        view = 'osm_proxy',
+        name = 'osm_proxy',
+       ),
+    )
+
 urlpatterns += staticfiles_urlpatterns()
 

src/django_gheat/website/static/OpenStreetMap.js

@@ -45 +45 @@
     initialize: function(name, options) {
         var url = [
-            "/website/osm-proxy/${z}/${x},${y}.png",
+            "http://a.osmproxy.wirelessleiden.nl/heatmap/osm-proxy/${z}/${x},${y}.png",
+            "http://b.osmproxy.wirelessleiden.nl/heatmap/osm-proxy/${z}/${x},${y}.png",
+            "http://c.osmproxy.wirelessleiden.nl/heatmap/osm-proxy/${z}/${x},${y}.png",
         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 19 }, options);
@@ -161 +163 @@
     initialize: function(name, options) {
         var url = [
-            "/website/tile/${z}/${x},${y}.png?colour=90,90,90"
+            "tile/${z}/${x},${y}.png?colour=90,90,90"
         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
@@ -177 +179 @@
     initialize: function(name, options) {
         var url = [
-            "/website/tile/${z}/${x},${y}.png?colour=255,0,0&accespoint__ssid__icontains=WirelessLeiden"
+            "tile/${z}/${x},${y}.png?colour=255,0,0&accespoint__ssid__icontains=WirelessLeiden"
         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
@@ -193 +195 @@
   initialize: function(name, options) {
     var url = [
-      "/website/tile/${z}/${x},${y}.png?colour=250,250,0&signaal__gte=0&signaal__lte=100"
+      "tile/${z}/${x},${y}.png?colour=250,250,0&signaal__gte=0&signaal__lte=100"
     ];
     options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);

src/django_gheat/website/static/heatmap_extensions.js

@@ -4 +4 @@
  */
 function getNodeList(zoomlevel, mousepos){
-  $.getJSON("/website/nodelist/" + zoomlevel + "," + mousepos.lat + "," + mousepos.lon, 
+  $.getJSON("nodelist/" + zoomlevel + "," + mousepos.lat + "," + mousepos.lon, 
     function(json){
       content = 'Wireless Leiden nodes on mouseposition:<br /><b>';
@@ -68 +68 @@
     stop: function(event, sig){
       signallayer = map.getLayersByName('signallayer');
-      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].setUrl("tile/${z}/${x},${y}.png?colour=250,250,0&signaal__gte=" + sig.values[0] + "&signaal__lte=" + sig.values[1]);
       signallayer[0].redraw();
     },
@@ -169 +169 @@
    * http://stackoverflow.com/questions/170986/what-is-the-best-way-to-add-options-to-a-select-from-an-array-with-jquery
    */
-  $.getJSON("/website/filters/",
+  $.getJSON("filters/",
     function(json) {
       $.each(json, function(i,json){
@@ -203 +203 @@
           initialize: function(name, options) {
             var url = [
-              "/website/tile/${z}/${x},${y}.png?&colour=" + colour + "&meetrondje__gebruiker__naam=" + user
+              "tile/${z}/${x},${y}.png?&colour=" + colour + "&meetrondje__gebruiker__naam=" + user
             ];
             options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
@@ -240 +240 @@
           initialize: function(name, options) {
             var url = [
-              "/website/tile/${z}/${x},${y}.png?&colour=" + colour + "&accespoint__ssid=" + node
+              "tile/${z}/${x},${y}.png?&colour=" + colour + "&accespoint__ssid=" + node
             ];
             options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
@@ -326 +326 @@
       initialize: function(name, options) {
         var url = [
-          "/website/tile/${z}/${x},${y}.png?&colour=" + colour + user + dataset + wlnode + start_date + end_date 
+          "tile/${z}/${x},${y}.png?&colour=" + colour + user + dataset + wlnode + start_date + end_date 
         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);

src/django_gheat/website/templates/home.html

@@ -1 +1 @@
 <html>
 <head>
-  <link href="{{ STATIC_URL }}style.css" rel="stylesheet" type="text/css" media="screen" />
+  <link type="text/css" href="{{ STATIC_URL }}style.css" rel="stylesheet" />
   <link type="text/css" href="{{ STATIC_URL }}jquery-ui-1.8.13.custom.css" rel="Stylesheet" />  
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}jquery-1.6.1.min.js"></script>

src/django_gheat/website/urls.py

@@ -20 +20 @@
     )
 
-urlpatterns += patterns('website.osm_proxy',
-    url(
-        # Example : today/fire/12/3,2.png
-        regex = r'^osm-proxy/(?P<zoom>\d+)/(?P<x>\d+),(?P<y>\d+).png$',
-        view = 'osm_proxy',
-        name = 'osm_proxy',
-       ),
-    )
-
 urlpatterns += patterns('website.nodelist',
     url(