chore: update examples [CI]

vega · Apr 7, 2022 · 923b0e3 · 923b0e3
1 parent 4eb4972
commit 923b0e3
Show file tree

Hide file tree

Showing 91 changed files with 648 additions and 372 deletions.
diff --git a/examples/compiled/airport_connections.vg.json b/examples/compiled/airport_connections.vg.json
@@ -144,7 +144,10 @@
         {"events": [{"source": "view", "type": "dblclick"}], "update": "null"}
       ]
     },
-    {"name": "org_tuple_fields", "value": [{"type": "E", "field": "origin"}]},
+    {
+      "name": "org_tuple_fields",
+      "value": [{"type": "E", "field": "origin", "index": 0}]
+    },
     {
       "name": "org_toggle",
       "value": false,

diff --git a/examples/compiled/bar_count_minimap.vg.json b/examples/compiled/bar_count_minimap.vg.json
@@ -219,7 +219,7 @@
         },
         {
           "name": "brush_tuple_fields",
-          "value": [{"field": "Name", "channel": "y", "type": "E"}]
+          "value": [{"field": "Name", "channel": "y", "type": "E", "index": 0}]
         },
         {
           "name": "brush_translate_anchor",

diff --git a/examples/compiled/brush_table.vg.json b/examples/compiled/brush_table.vg.json
@@ -236,8 +236,13 @@
         {
           "name": "brush_tuple_fields",
           "value": [
-            {"field": "Horsepower", "channel": "x", "type": "R"},
-            {"field": "Miles_per_Gallon", "channel": "y", "type": "R"}
+            {"field": "Horsepower", "channel": "x", "type": "R", "index": 0},
+            {
+              "field": "Miles_per_Gallon",
+              "channel": "y",
+              "type": "R",
+              "index": 1
+            }
           ]
         },
         {

diff --git a/examples/compiled/circle_bubble_health_income.vg.json b/examples/compiled/circle_bubble_health_income.vg.json
@@ -69,8 +69,8 @@
     {
       "name": "view_tuple_fields",
       "value": [
-        {"field": "income", "channel": "x", "type": "R"},
-        {"field": "health", "channel": "y", "type": "R"}
+        {"field": "income", "channel": "x", "type": "R", "index": 0},
+        {"field": "health", "channel": "y", "type": "R", "index": 1}
       ]
     },
     {

diff --git a/examples/compiled/concat_bar_layer_circle.vg.json b/examples/compiled/concat_bar_layer_circle.vg.json
@@ -268,7 +268,9 @@
         },
         {
           "name": "pts_tuple_fields",
-          "value": [{"field": "Major Genre", "channel": "x", "type": "E"}]
+          "value": [
+            {"field": "Major Genre", "channel": "x", "type": "E", "index": 0}
+          ]
         },
         {
           "name": "pts_toggle",

diff --git a/examples/compiled/concat_hover.vg.json b/examples/compiled/concat_hover.vg.json
@@ -5,7 +5,10 @@
   "padding": 5,
   "height": 200,
   "data": [
-    {"name": "hover_store"},
+    {
+      "name": "hover_store",
+      "transform": [{"type": "collect", "sort": {"field": "_vgsid_"}}]
+    },
     {
       "name": "source_0",
       "url": "data/cars.json",
@@ -65,7 +68,7 @@
           "on": [
             {
               "events": [{"source": "scope", "type": "mouseover"}],
-              "update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_0\", fields: hover_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]]} : null",
+              "update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_0\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null",
               "force": true
             },
             {
@@ -74,10 +77,6 @@
             }
           ]
         },
-        {
-          "name": "hover_tuple_fields",
-          "value": [{"type": "E", "field": "_vgsid_"}]
-        },
         {
           "name": "hover_toggle",
           "value": false,
@@ -115,7 +114,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)",
+                  "test": "length(data(\"hover_store\")) && vlSelectionIdTest(\"hover_store\", datum)",
                   "scale": "color",
                   "field": "Cylinders"
                 },
@@ -197,7 +196,7 @@
           "on": [
             {
               "events": [{"source": "scope", "type": "mouseover"}],
-              "update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_1\", fields: hover_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]]} : null",
+              "update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_1\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null",
               "force": true
             },
             {
@@ -206,10 +205,6 @@
             }
           ]
         },
-        {
-          "name": "hover_tuple_fields",
-          "value": [{"type": "E", "field": "_vgsid_"}]
-        },
         {
           "name": "hover_toggle",
           "value": false,
@@ -247,7 +242,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)",
+                  "test": "length(data(\"hover_store\")) && vlSelectionIdTest(\"hover_store\", datum)",
                   "scale": "color",
                   "field": "Cylinders"
                 },

diff --git a/examples/compiled/concat_hover_filter.vg.json b/examples/compiled/concat_hover_filter.vg.json
@@ -5,7 +5,10 @@
   "padding": 5,
   "height": 200,
   "data": [
-    {"name": "hover_store"},
+    {
+      "name": "hover_store",
+      "transform": [{"type": "collect", "sort": {"field": "_vgsid_"}}]
+    },
     {
       "name": "source_0",
       "url": "data/cars.json",
@@ -28,7 +31,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)"
+          "expr": "length(data(\"hover_store\")) && vlSelectionIdTest(\"hover_store\", datum)"
         }
       ]
     },
@@ -95,7 +98,7 @@
           "on": [
             {
               "events": [{"source": "scope", "type": "mouseover"}],
-              "update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_0_layer_0\", fields: hover_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]]} : null",
+              "update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_0_layer_0\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null",
               "force": true
             },
             {
@@ -104,10 +107,6 @@
             }
           ]
         },
-        {
-          "name": "hover_tuple_fields",
-          "value": [{"type": "E", "field": "_vgsid_"}]
-        },
         {
           "name": "hover_toggle",
           "value": false,
@@ -240,7 +239,7 @@
           "on": [
             {
               "events": [{"source": "scope", "type": "mouseover"}],
-              "update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_1_layer_0\", fields: hover_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]]} : null",
+              "update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_1_layer_0\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null",
               "force": true
             },
             {
@@ -249,10 +248,6 @@
             }
           ]
         },
-        {
-          "name": "hover_tuple_fields",
-          "value": [{"type": "E", "field": "_vgsid_"}]
-        },
         {
           "name": "hover_toggle",
           "value": false,

diff --git a/examples/compiled/interactive_area_brush.vg.json b/examples/compiled/interactive_area_brush.vg.json
@@ -143,7 +143,9 @@
     },
     {
       "name": "brush_tuple_fields",
-      "value": [{"field": "yearmonth_date", "channel": "x", "type": "R"}]
+      "value": [
+        {"field": "yearmonth_date", "channel": "x", "type": "R", "index": 0}
+      ]
     },
     {
       "name": "brush_translate_anchor",

diff --git a/examples/compiled/interactive_bar_select_highlight.vg.json b/examples/compiled/interactive_bar_select_highlight.vg.json
@@ -6,8 +6,14 @@
   "height": 200,
   "style": "cell",
   "data": [
-    {"name": "highlight_store"},
-    {"name": "select_store"},
+    {
+      "name": "highlight_store",
+      "transform": [{"type": "collect", "sort": {"field": "_vgsid_"}}]
+    },
+    {
+      "name": "select_store",
+      "transform": [{"type": "collect", "sort": {"field": "_vgsid_"}}]
+    },
     {
       "name": "source_0",
       "values": [
@@ -68,16 +74,12 @@
       "on": [
         {
           "events": [{"source": "scope", "type": "mouseover"}],
-          "update": "datum && item().mark.marktype !== 'group' ? {unit: \"\", fields: highlight_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]]} : null",
+          "update": "datum && item().mark.marktype !== 'group' ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null",
           "force": true
         },
         {"events": [{"source": "view", "type": "dblclick"}], "update": "null"}
       ]
     },
-    {
-      "name": "highlight_tuple_fields",
-      "value": [{"type": "E", "field": "_vgsid_"}]
-    },
     {
       "name": "highlight_toggle",
       "value": false,
@@ -103,16 +105,12 @@
       "on": [
         {
           "events": [{"source": "scope", "type": "click"}],
-          "update": "datum && item().mark.marktype !== 'group' ? {unit: \"\", fields: select_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]]} : null",
+          "update": "datum && item().mark.marktype !== 'group' ? {unit: \"\", _vgsid_: (item().isVoronoi ? datum.datum : datum)[\"_vgsid_\"]} : null",
           "force": true
         },
         {"events": [{"source": "view", "type": "dblclick"}], "update": "null"}
       ]
     },
-    {
-      "name": "select_tuple_fields",
-      "value": [{"type": "E", "field": "_vgsid_"}]
-    },
     {
       "name": "select_toggle",
       "value": false,
@@ -148,18 +146,18 @@
           "cursor": {"value": "pointer"},
           "fillOpacity": [
             {
-              "test": "!length(data(\"select_store\")) || vlSelectionTest(\"select_store\", datum)",
+              "test": "!length(data(\"select_store\")) || vlSelectionIdTest(\"select_store\", datum)",
               "value": 1
             },
             {"value": 0.3}
           ],
           "strokeWidth": [
             {
-              "test": "length(data(\"select_store\")) && vlSelectionTest(\"select_store\", datum)",
+              "test": "length(data(\"select_store\")) && vlSelectionIdTest(\"select_store\", datum)",
               "value": 2
             },
             {
-              "test": "length(data(\"highlight_store\")) && vlSelectionTest(\"highlight_store\", datum)",
+              "test": "length(data(\"highlight_store\")) && vlSelectionIdTest(\"highlight_store\", datum)",
               "value": 1
             },
             {"value": 0}

diff --git a/examples/compiled/interactive_bin_extent.vg.json b/examples/compiled/interactive_bin_extent.vg.json
@@ -194,7 +194,7 @@
         },
         {
           "name": "brush_tuple_fields",
-          "value": [{"field": "time", "channel": "x", "type": "R"}]
+          "value": [{"field": "time", "channel": "x", "type": "R", "index": 0}]
         },
         {
           "name": "brush_translate_anchor",

diff --git a/examples/compiled/interactive_bin_extent_bottom.vg.json b/examples/compiled/interactive_bin_extent_bottom.vg.json
@@ -271,7 +271,7 @@
         },
         {
           "name": "brush_tuple_fields",
-          "value": [{"field": "time", "channel": "x", "type": "R"}]
+          "value": [{"field": "time", "channel": "x", "type": "R", "index": 0}]
         },
         {
           "name": "brush_translate_anchor",

diff --git a/examples/compiled/interactive_brush.vg.json b/examples/compiled/interactive_brush.vg.json
@@ -13,8 +13,13 @@
         {
           "unit": "",
           "fields": [
-            {"field": "Horsepower", "channel": "x", "type": "R"},
-            {"field": "Miles_per_Gallon", "channel": "y", "type": "R"}
+            {"field": "Horsepower", "channel": "x", "type": "R", "index": 0},
+            {
+              "field": "Miles_per_Gallon",
+              "channel": "y",
+              "type": "R",
+              "index": 1
+            }
           ],
           "values": [[55, 160], [13, 37]]
         }
@@ -187,8 +192,8 @@
     {
       "name": "brush_tuple_fields",
       "value": [
-        {"field": "Horsepower", "channel": "x", "type": "R"},
-        {"field": "Miles_per_Gallon", "channel": "y", "type": "R"}
+        {"field": "Horsepower", "channel": "x", "type": "R", "index": 0},
+        {"field": "Miles_per_Gallon", "channel": "y", "type": "R", "index": 1}
       ]
     },
     {

diff --git a/examples/compiled/interactive_concat_layer.vg.json b/examples/compiled/interactive_concat_layer.vg.json
@@ -270,7 +270,9 @@
         },
         {
           "name": "pts_tuple_fields",
-          "value": [{"field": "Major Genre", "channel": "x", "type": "E"}]
+          "value": [
+            {"field": "Major Genre", "channel": "x", "type": "E", "index": 0}
+          ]
         },
         {
           "name": "pts_toggle",

diff --git a/examples/compiled/interactive_dashboard_europe_pop.vg.json b/examples/compiled/interactive_dashboard_europe_pop.vg.json
@@ -471,7 +471,9 @@
         },
         {
           "name": "brush_tuple_fields",
-          "value": [{"field": "Country", "channel": "y", "type": "E"}]
+          "value": [
+            {"field": "Country", "channel": "y", "type": "E", "index": 0}
+          ]
         },
         {
           "name": "brush_translate_anchor",
@@ -795,7 +797,9 @@
         },
         {
           "name": "brush_tuple_fields",
-          "value": [{"field": "Country", "channel": "y", "type": "E"}]
+          "value": [
+            {"field": "Country", "channel": "y", "type": "E", "index": 0}
+          ]
         },
         {
           "name": "brush_translate_anchor",
@@ -1189,12 +1193,14 @@
             {
               "field": "Population_ages_65_and_above_of_total",
               "channel": "x",
-              "type": "R"
+              "type": "R",
+              "index": 0
             },
             {
               "field": "Population_ages_15_64_of_total",
               "channel": "y",
-              "type": "R"
+              "type": "R",
+              "index": 1
             }
           ]
         },