renamed _6_ to _5_, working on fixes and cleanup

Chapters6and7/spec/singleview_6_2_clustered-bar.vl.json → Chapters6and7/spec/singleview_5_2_clustered-bar.vl.json

@@ -4,13 +4,13 @@
   "mark": "bar",
   "data": {"url": "data/complaints.csv", "format": {"type": "csv"}},
   "transform": [{
-    "as": "relief",
+    "as": "Relief",
     "calculate": "indexof(datum['Company response to consumer'], 'relief') >= 0"
   }],
   "encoding": {
     "column": {"field": "Product", "type": "nominal", "header": {"title": ""}},
     "y": {"aggregate": "count", "type": "quantitative"},
-    "x": {"field": "relief", "type": "nominal"},
+    "x": {"field": "Relief", "type": "nominal"},
     "color": {"field": "Product", "type": "nominal"}
   }
 }

Chapters6and7/spec/singleview_6_3_clustered-bar-2.vl.json → Chapters6and7/spec/singleview_5_3_clustered-bar-2.vl.json

@@ -4,11 +4,11 @@
   "mark": "bar",
   "data": {"url": "data/complaints.csv", "format": {"type": "csv"}},
   "transform": [{
-    "as": "relief",
+    "as": "Relief",
     "calculate": "indexof(datum['Company response to consumer'], 'relief') >= 0"
   }],
   "encoding": {
-    "column": {"field": "relief", "type": "nominal" },
+    "column": {"field": "Relief", "type": "nominal" },
     "y": {"aggregate": "count", "type": "quantitative"},
     "x": {"field": "Product", "type": "nominal", "axis": {"labels": false}},
     "color": {"field": "Product", "type": "nominal"}

Chapters6and7/spec/singleview_6_4_stacked.vl.json → Chapters6and7/spec/singleview_5_4_stacked.vl.json

@@ -4,12 +4,12 @@
   "mark": "bar",
   "data": {"url": "data/complaints.csv", "format": {"type": "csv"}},
   "transform": [{
-    "as": "relief",
+    "as": "Relief",
     "calculate": "indexof(datum['Company response to consumer'], 'relief') >= 0"
   }],
   "encoding": {
     "y": {"field": "Product", "type": "nominal"},
     "x": {"aggregate": "count",  "type": "quantitative"},
-    "color": {"field": "relief", "type": "nominal"}
+    "color": {"field": "Relief", "type": "nominal"}
   }
 }

Chapters6and7/spec/singleview_6_6_hist-cat.vl.json → Chapters6and7/spec/singleview_5_6_hist-cat.vl.json

@@ -7,7 +7,8 @@
       },
   "mark": "bar",
   "encoding": {
-    "x": {
+    "x": { "type": "quantitative", "aggregate": "count"},
+    "y": {
       "field": "body-style", 
       "type": "nominal", 
       "axis": {"title": "Body Style"},
@@ -16,7 +17,6 @@
         "op": "count",
         "order": "descending" 
         }      
-      },
-    "y": { "type": "quantitative", "aggregate": "count"}
+      }
   }
 }
\ No newline at end of file

Chapters6and7/spec/singleview_6_9_box-plot.vl.json → Chapters6and7/spec/singleview_5_9_box-plot.vl.json

@@ -6,14 +6,16 @@
     {
       "mark": "rule",
       "encoding": {
-        "x": {"field": "body-style", "type": "nominal"},
-        "y": {
+        "y": {"field": "body-style", "type": "nominal",
+          "axis": { "title": "Body Style"}
+        },
+        "x": {
           "aggregate": "min",
           "field": "city-mpg",
           "type": "quantitative",
           "axis": {"title": "City MPG"}
         },
-        "y2": {
+        "x2": {
           "aggregate": "max",
           "field": "city-mpg",
           "type": "quantitative"
@@ -23,8 +25,8 @@
     {
       "mark": "tick",
       "encoding": {
-        "x": {"field": "body-style", "type": "nominal"},
-        "y": {
+        "y": {"field": "body-style", "type": "nominal"},
+        "x": {
           "aggregate": "min",
           "field": "city-mpg",
           "type": "quantitative"
@@ -35,8 +37,8 @@
     {
       "mark": "tick",
       "encoding": {
-        "x": {"field": "body-style", "type": "nominal"},
-        "y": {
+        "y": {"field": "body-style", "type": "nominal"},
+        "x": {
           "aggregate": "max",
           "field": "city-mpg",
           "type": "quantitative"
@@ -47,13 +49,13 @@
     {
       "mark": "bar",
       "encoding": {
-        "x": {"field": "body-style", "type": "nominal"},
-        "y": {
+        "y": {"field": "body-style", "type": "nominal"},
+        "x": {
           "aggregate": "q1",
           "field": "city-mpg",
           "type": "quantitative"
         },
-        "y2": {
+        "x2": {
           "aggregate": "q3",
           "field": "city-mpg",
           "type": "quantitative"
@@ -64,8 +66,8 @@
     {
       "mark": "tick",
       "encoding": {
-        "x": {"field": "body-style", "type": "nominal"},
-        "y": {
+        "y": {"field": "body-style", "type": "nominal"},
+        "x": {
           "aggregate": "median",
           "field": "city-mpg",
           "type": "quantitative"

Chapters6and7/specs.json

@@ -8,33 +8,33 @@
   "multiview_9_dashboard.vl.json",
   "multiview_10_crossfilter.vl.json",
   "multiview_12_dual-axis.vl.json",
-  "singleview_6_1_scatter.vl.json",
-  "singleview_6_2_clustered-bar.vl.json",
-  "singleview_6_3_clustered-bar-2.vl.json",
-  "singleview_6_4_stacked.vl.json",
-  "singleview_6_6_hist-cat.vl.json",
-  "singleview_6_7_hist-quant.vl.json",
-  "singleview_6_8_fixed_smoothed.vg.json",
-  "singleview_6_9_box-plot.vl.json",
-  "singleview_6_10_density-cat.vl.json",
-  "singleview_6_11_density-cont.vl.json",
-  "singleview_6_12_bar-chart.vl.json",
-  "singleview_6_13_clustered-bar-chart.vl.json",
-  "singleview_6_14_justone_pie.vg.json",
-  "singleview_6_15_heatmap.vl.json",
-  "singleview_6_16_scatterplot.vl.json",
-  "singleview_6_17_line.vl.json",
-  "singleview_6_18_area-stacked.vl.json",
-  "singleview_6_19_force.vg.json",
-  "singleview_6_20_circular.vg.json",
-  "singleview_6_21_adjacency_noninteractive.vg.json",
-  "singleview_6_21a_adjacency.vg.json",
-  "singleview_6_22_treeview.vg.json",
-  "singleview_6_23_treemap.vg.json",
-  "singleview_6_24_sunburst.vg.json",
-  "singleview_6_25_map.vg.json",
-  "singleview_6_26_zip.vg.json",
-  "singleview_6_27_wordcloud.vg.json",  
+  "singleview_5_1_scatter.vl.json",
+  "singleview_5_2_clustered-bar.vl.json",
+  "singleview_5_3_clustered-bar-2.vl.json",
+  "singleview_5_4_stacked.vl.json",
+  "singleview_5_6_hist-cat.vl.json",
+  "singleview_5_7_hist-quant.vl.json",
+  "singleview_5_8_fixed_smoothed.vg.json",
+  "singleview_5_9_box-plot.vl.json",
+  "singleview_5_10_density-cat.vl.json",
+  "singleview_5_11_density-cont.vl.json",
+  "singleview_5_12_bar-chart.vl.json",
+  "singleview_5_13_clustered-bar-chart.vl.json",
+  "singleview_5_14_justone_pie.vg.json",
+  "singleview_5_15_heatmap.vl.json",
+  "singleview_5_16_scatterplot.vl.json",
+  "singleview_5_17_line.vl.json",
+  "singleview_5_18_area-stacked.vl.json",
+  "singleview_5_19_force.vg.json",
+  "singleview_5_20_circular.vg.json",
+  "singleview_5_21_adjacency_noninteractive.vg.json",
+  "singleview_5_21a_adjacency.vg.json",
+  "singleview_5_22_treeview.vg.json",
+  "singleview_5_23_treemap.vg.json",
+  "singleview_5_24_sunburst.vg.json",
+  "singleview_5_25_map.vg.json",
+  "singleview_5_26_zip.vg.json",
+  "singleview_5_27_wordcloud.vg.json",  
   "singleview_2a-multi-histogram.vl.json",
   "singleview_2b-bar.vl.json",
   "singleview_2c-box-plot.vl.json",