From f6c2be4c8e7d4dfe73217b5eec4ec4c5b01d38ab Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Mon, 9 Jul 2012 01:50:58 +0100
Subject: [PATCH] [demos/multiview][s]: refactor to have demo dataset in the
 app.js (more explicit and removes dependency on test/base.js which seems
 odd).

---
 demos/multiview/app.js     | 30 +++++++++++++++++++++++-------
 demos/multiview/index.html |  1 -
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/demos/multiview/app.js b/demos/multiview/app.js
index ffe56255..b9f99442 100755
--- a/demos/multiview/app.js
+++ b/demos/multiview/app.js
@@ -21,7 +21,29 @@ jQuery(function($) {
   if (state.dataset || state.url) {
     dataset = recline.Model.Dataset.restore(state);
   } else {
-    dataset = localDataset();
+    var dataset = new recline.Model.Dataset({
+      records: [
+        {id: 0, date: '2011-01-01', x: 1, y: 2, z: 3, country: 'DE', title: 'first', lat:52.56, lon:13.40},
+        {id: 1, date: '2011-02-02', x: 2, y: 4, z: 24, country: 'UK', title: 'second', lat:54.97, lon:-1.60},
+        {id: 2, date: '2011-03-03', x: 3, y: 6, z: 9, country: 'US', title: 'third', lat:40.00, lon:-75.5},
+        {id: 3, date: '2011-04-04', x: 4, y: 8, z: 6, country: 'UK', title: 'fourth', lat:57.27, lon:-6.20},
+        {id: 4, date: '2011-05-04', x: 5, y: 10, z: 15, country: 'UK', title: 'fifth', lat:51.58, lon:0},
+        {id: 5, date: '2011-06-02', x: 6, y: 12, z: 18, country: 'DE', title: 'sixth', lat:51.04, lon:7.9}
+      ],
+      // let's be really explicit about fields
+      // Plus take opportunity to set date to be a date field and set some labels
+      fields: [
+        {id: 'id'},
+        {id: 'date', type: 'date'},
+        {id: 'x'},
+        {id: 'y'},
+        {id: 'z'},
+        {id: 'country', 'label': 'Country'},
+        {id: 'title', 'label': 'Title'},
+        {id: 'lat'},
+        {id: 'lon'}
+      ]
+    });
   }
   createExplorer(dataset, state);
 });
@@ -79,9 +101,3 @@ var createExplorer = function(dataset, state) {
   });
 }
 
-// provide a demonstration in memory dataset
-function localDataset() {
-  var dataset = Fixture.getDataset();
-  return dataset;
-}
-
diff --git a/demos/multiview/index.html b/demos/multiview/index.html
index 3faa1eb8..e33203a7 100644
--- a/demos/multiview/index.html
+++ b/demos/multiview/index.html
@@ -19,6 +19,5 @@ root: ../../
 
 <div style="clear: both;"></div>
 
-<script type="text/javascript" src="{{page.root}}/test/base.js"></script>
 <script type="text/javascript" src="app.js"></script>