Changeset 9147

Timestamp:

May 4, 2011, 8:42:36 PM (14 years ago)

Author:

rick

Message:

Alternative heatmap generation 'framework'. Simple/Single file with no
persistent storage, making debugging easy.

This proves that the heatmap code itself is not causing the issues, but the
image manipulation PIL is not so fast (or properly utilized). Might want to
consider a more advanced image generation toolkit. (2000 entries: 5+ secs).

Also loading a large dataset into Objects seems to be very slow. The database
call is effient (just a single one), but building all the related objects,
makes is slow (2000 entries: 1+ sec). Might want to check if raw queries suit
to avoid conversion our needs:

​http://docs.djangoproject.com/en/dev/topics/db/sql/

Location:

src/django_gheat/website

Files:

• static/OpenStreetMap.js (modified) (1 diff)
• static/heatmap.js (modified) (1 diff)
• tile.py (added)
• urls.py (modified) (1 diff)

src/django_gheat/website/static/OpenStreetMap.js

@@ -154 +154 @@
     CLASS_NAME: "OpenLayers.Layer.Overlay1"
 });
+
+OpenLayers.Layer.OSM.Overlay2 = OpenLayers.Class(OpenLayers.Layer.OSM, {
+    initialize: function(name, options) {
+        var url = [
+            "/website/tile/${z}/${x},${y}.png"
+        ];
+        options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
+        var newArguments = [name, url, options];
+        OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+    },
+
+    CLASS_NAME: "OpenLayers.Layer.Overlay2"
+});

src/django_gheat/website/static/heatmap.js

@@ -23 +23 @@
         layerHeatmap = new OpenLayers.Layer.OSM.Overlay1("Overlay 1", {isBaseLayer: false, visibility: true});
         map.addLayer(layerHeatmap);
+
+        layerHeatmap2 = new OpenLayers.Layer.OSM.Overlay2("Overlay 2", {isBaseLayer: false, visibility: false});
+        map.addLayer(layerHeatmap2);
         
         var lon   = 4.48907;

src/django_gheat/website/urls.py

@@ -10 +10 @@
     ('^$', HomeView.as_view())
 )
+
+urlpatterns += patterns('website.tile',
+    url(
+        # Example : today/fire/12/3,2.png
+        regex = r'^tile/(?P<zoom>\d+)/(?P<x>\d+),(?P<y>\d+).png$',
+        view = 'serve_tile',
+        name = 'serve_tile',
+       ),
+    )