Merge pull request #133 from Esri/support/vega2

Upgraded to Vega2
Esri · Jul 14, 2015 · aa0f7c9 · aa0f7c9
2 parents a2eba51 + 2a53db0
commit aa0f7c9
Show file tree

Hide file tree

Showing 39 changed files with 309 additions and 474 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,13 @@ language: node_js
 node_js:
 - "0.10"
 before_script:
+  - npm update -q
   - gem install sass
   - npm install -g grunt-cli
   - npm install -g bower
   - bower install
+install:
+  - sudo apt-get install libgif-dev
 script: bash ./deploy.sh
 env:
   global:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,20 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Upcoming
+
 ### Added
 - Sparkline chart type
 - JSDoc documentation
 
 ### Changed
+- Upgraded to Vega2
+- Tooltip demo improvements
 - Homepage improvements
+
+## v0.1
+
+Baseline version.
+
+- Types: Bar, Horizontal, Pie, Scatter, Bubble, Time line
+- Basic interaction events: on, off, clicked
+- Map to Chart interaction demos
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -9,19 +9,7 @@ module.exports = function(grunt) {
   //                 '*   Apache License' +
   //                 '*/\n';
 
-  var cedar_vega_d3 = [
-    'bower_components/d3/d3.js',
-    'bower_components/vega/vega.js',
-    'src/cedar.js'
-  ];
-
-  var cedar_vega = [
-    'bower_components/vega/vega.js',
-    'src/cedar.js'
-  ];
-
-  //core is just cedar
-  var core = [
+  var cedar_core = [
     'src/cedar.js',
   ];
 
@@ -130,16 +118,8 @@ module.exports = function(grunt) {
         sourceMap: true,
         separator: '\n\n'
       },
-      cedar_vega_d3: {
-        src: cedar_vega_d3,
-        dest: 'dist/builds/cedar-vega-d3.js'
-      },
-      cedar_vega: {
-        src: cedar_vega,
-        dest: 'dist/builds/cedar-vega.js'
-      },
       core: {
-        src: core,
+        src: cedar_core,
         dest: 'dist/builds/cedar.js'
       }
     },
@@ -150,17 +130,12 @@ module.exports = function(grunt) {
         sourceMapIncludeSources: true,
         wrap: false,
         mangle:true,
-        // mangle: {
-        //    except: ['d3', 'vg', 'cedar']
-        // },
         preserveComments: 'some',
         report: 'gzip'
       },
       dist: {
         files: {
-          'dist/builds/cedar-vega-d3.min.js': cedar_vega_d3,
-          'dist/builds/cedar-vega.min.js': cedar_vega,
-          'dist/builds/cedar.min.js': core
+          'dist/builds/cedar.min.js': cedar_core
         }
       }
     },
@@ -254,6 +229,8 @@ module.exports = function(grunt) {
       scripts: {
         files: [
           { expand: true, cwd: 'dist/builds', src: '*.js*', dest: 'site/build/js/'},
+          { expand: true, cwd: 'node_modules/d3', src: 'd3.min.js', dest: 'site/build/js/'},
+          { expand: true, cwd: 'node_modules/vega', src: 'vega.min.js', dest: 'site/build/js/'}
         ]
       },
       specs: {

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ You can load Cedar and its dependencies by including script tags. This will make
 
 ```html
 <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
-<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/vega/1.4.3/vega.min.js"></script>
+<script type="text/javascript" src="http://vega.github.io/vega/vega.min.js"></script>
 <script type="text/javascript" src="https://rawgit.com/Esri/cedar/master/src/cedar.js"></script>
 <script>
   var chart = new Cedar({"type": "bar"});
@@ -46,7 +46,7 @@ Altenatively, you can use Dojo loader that is bundled with the [ArcGIS API for J
         main: 'topojson.min'
       }, {
         name: 'vega',
-        location: 'http://cdnjs.cloudflare.com/ajax/libs/vega/1.4.3',
+        location: 'http://vega.github.io/vega/',
         main: 'vega.min'
       }, {
         name: 'cedar',
@@ -136,7 +136,7 @@ Make sure you have the [Grunt CLI](http://gruntjs.com/getting-started) installed
 ### Dependencies
 
 * [D3](http://d3js.org/) version 3 or higher is required but the latest version is recommended.
-* [Vega](http://trifacta.github.io/vega/)
+* [Vega](http://vega.github.io/vega/)
 
 ### Versioning
 

diff --git a/bower.json b/bower.json
@@ -28,11 +28,10 @@
     "package.json"
   ],
   "dependencies": {
-    "d3": "~3.5.2",
-    "vega": "~1.4.3"
+    "d3": "~3.5.6"
   },
   "resolutions": {
-    "d3": "~3.5.2"
+    "d3": "~3.5.6"
   },
   "devDependencies": {
     "bootstrap-sass-official": "~3.3.4"

diff --git a/deploy.sh b/deploy.sh
@@ -6,7 +6,7 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
 	rm -rf site/build || exit 0;
 	mkdir -p site/build;
 
-	bower install
+	npm install
 	# run our compile script, discussed above
 	grunt docs:build
 

diff --git a/package.json b/package.json
@@ -58,6 +58,8 @@
     "browserify": "~8.0.2"
   },
   "dependencies": {
-    "underscore": "~1.7.0"
+    "d3": "~3.5.6",
+    "underscore": "~1.7.0",
+    "vega": "~2.0.1"
   }
 }
diff --git a/site/source/data/definitions/dc-schools-scatter-chart.json b/site/source/data/definitions/dc-schools-scatter-chart.json
@@ -32,7 +32,7 @@
           "range": "width",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{x.field}"
+            "field": "attributes.{x.field}"
           }
         },
         {
@@ -41,15 +41,15 @@
           "range": "height",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{y.field}"
+            "field": "attributes.{y.field}"
           }
         },
         {
           "name": "c",
           "type": "ordinal",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{color.field}"
+            "field": "attributes.{color.field}"
           },
           "range": [
             "#800",
@@ -102,15 +102,15 @@
             "enter": {
               "x": {
                 "scale": "x",
-                "field": "data.attributes.{x.field}"
+                "field": "attributes.{x.field}"
               },
               "y": {
                 "scale": "y",
-                "field": "data.attributes.{y.field}"
+                "field": "attributes.{y.field}"
               },
               "fill": {
                 "scale": "c",
-                "field": "data.attributes.{color.field}"
+                "field": "attributes.{color.field}"
               },
               "fillOpacity": {
                 "value": 0.5

diff --git a/site/source/data/definitions/home-scatter-chart.json b/site/source/data/definitions/home-scatter-chart.json
@@ -33,7 +33,7 @@
           "range": "width",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{x.field}"
+            "field": "attributes.{x.field}"
           }
         },
         {
@@ -42,15 +42,15 @@
           "range": "height",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{y.field}"
+            "field": "attributes.{y.field}"
           }
         },
         {
           "name": "c",
           "type": "ordinal",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{color.field}"
+            "field": "attributes.{color.field}"
           },
           "range": [
             "#800",
@@ -103,15 +103,15 @@
             "enter": {
               "x": {
                 "scale": "x",
-                "field": "data.attributes.{x.field}"
+                "field": "attributes.{x.field}"
               },
               "y": {
                 "scale": "y",
-                "field": "data.attributes.{y.field}"
+                "field": "attributes.{y.field}"
               },
               "fill": {
                 "scale": "c",
-                "field": "data.attributes.{color.field}"
+                "field": "attributes.{color.field}"
               },
               "fillOpacity": {
                 "value": 0.5

diff --git a/site/source/data/definitions/scatter-events.json b/site/source/data/definitions/scatter-events.json
@@ -33,7 +33,7 @@
           "range": "width",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{x.field}"
+            "field": "attributes.{x.field}"
           }
         },
         {
@@ -42,15 +42,15 @@
           "range": "height",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{y.field}"
+            "field": "attributes.{y.field}"
           }
         },
         {
           "name": "c",
           "type": "ordinal",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{color.field}"
+            "field": "attributes.{color.field}"
           },
           "range": [
             "#800",
@@ -86,15 +86,15 @@
             "enter": {
               "x": {
                 "scale": "x",
-                "field": "data.attributes.{x.field}"
+                "field": "attributes.{x.field}"
               },
               "y": {
                 "scale": "y",
-                "field": "data.attributes.{y.field}"
+                "field": "attributes.{y.field}"
               },
               "fill": {
                 "scale": "c",
-                "field": "data.attributes.{color.field}"
+                "field": "attributes.{color.field}"
               },
               "fillOpacity": {
                 "value": 0.5

diff --git a/site/source/data/examples/chart.json b/site/source/data/examples/chart.json
@@ -94,7 +94,7 @@
           "range": "width",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{x.field}"
+            "field": "attributes.{x.field}"
           }
         },
         {
@@ -103,15 +103,15 @@
           "range": "height",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{y.field}"
+            "field": "attributes.{y.field}"
           }
         },
         {
           "name": "c",
           "type": "ordinal",
           "domain": {
             "data": "iris",
-            "field": "data.attributes.{color.field}"
+            "field": "attributes.{color.field}"
           },
           "range": [
             "#800",
@@ -163,15 +163,15 @@
             "enter": {
               "x": {
                 "scale": "x",
-                "field": "data.attributes.{x.field}"
+                "field": "attributes.{x.field}"
               },
               "y": {
                 "scale": "y",
-                "field": "data.attributes.{y.field}"
+                "field": "attributes.{y.field}"
               },
               "fill": {
                 "scale": "c",
-                "field": "data.attributes.{color.field}"
+                "field": "attributes.{color.field}"
               },
               "fillOpacity": {
                 "value": 0.5

diff --git a/site/source/data/read-only-charts/dc-schools-scatter-chart.json b/site/source/data/read-only-charts/dc-schools-scatter-chart.json
@@ -17,7 +17,7 @@
       "range": "width",
       "domain": {
         "data": "iris",
-        "field": "data.attributes.POPULATION_ENROLLED_2008"
+        "field": "attributes.POPULATION_ENROLLED_2008"
       }
     },
     {
@@ -26,15 +26,15 @@
       "range": "height",
       "domain": {
         "data": "iris",
-        "field": "data.attributes.SQUARE_FOOTAGE"
+        "field": "attributes.SQUARE_FOOTAGE"
       }
     },
     {
       "name": "c",
       "type": "ordinal",
       "domain": {
         "data": "iris",
-        "field": "data.attributes.FACUSE"
+        "field": "attributes.FACUSE"
       },
       "range": [
         "#800",
@@ -69,15 +69,15 @@
         "enter": {
           "x": {
             "scale": "x",
-            "field": "data.attributes.POPULATION_ENROLLED_2008"
+            "field": "attributes.POPULATION_ENROLLED_2008"
           },
           "y": {
             "scale": "y",
-            "field": "data.attributes.SQUARE_FOOTAGE"
+            "field": "attributes.SQUARE_FOOTAGE"
           },
           "fill": {
             "scale": "c",
-            "field": "data.attributes.FACUSE"
+            "field": "attributes.FACUSE"
           },
           "fillOpacity": {
             "value": 0.5