vl-convert-python 1.5.1__tar.gz → 1.6.0__tar.gz

{vl_convert_python-1.5.1 → vl_convert_python-1.6.0}/Cargo.lock

@@ -6863,7 +6863,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vl-convert"
-version = "1.5.1"
+version = "1.6.0"
 dependencies = [
  "assert_cmd",
  "clap",
@@ -6880,7 +6880,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-python"
-version = "1.5.1"
+version = "1.6.0"
 dependencies = [
  "futures",
  "lazy_static",
@@ -6892,7 +6892,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-rs"
-version = "1.5.1"
+version = "1.6.0"
 dependencies = [
  "deno_core",
  "deno_emit",
@@ -6924,7 +6924,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-vendor"
-version = "1.5.1"
+version = "1.6.0"
 dependencies = [
  "anyhow",
  "dircpy",

{vl_convert_python-1.5.1 → vl_convert_python-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: vl-convert-python
-Version: 1.5.1
+Version: 1.6.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 License-File: LICENSE

{vl_convert_python-1.5.1 → vl_convert_python-1.6.0}/vl-convert-python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-python"
-version = "1.5.1"
+version = "1.6.0"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"

{vl_convert_python-1.5.1 → vl_convert_python-1.6.0}/vl-convert-python/tests/test_specs.py

@@ -72,7 +72,7 @@ def load_expected_png(name, vl_version, theme=None):
 @pytest.mark.parametrize("name", ["circle_binned", "seattle-weather", "stacked_bar_h"])
 @pytest.mark.parametrize(
     "vl_version",
-    ["v5_8", "v5_12", "v5_13", "v5_14", "v5_15", "v5_16", "v5_17", "v5_18", "v5_19"],
+    ["v5_8", "v5_13", "v5_14", "v5_15", "v5_16", "v5_17", "v5_18", "v5_19", "v5_20"],
 )
 @pytest.mark.parametrize("as_dict", [False, True])
 def test_vega(name, vl_version, as_dict):
@@ -96,7 +96,6 @@ def test_vega(name, vl_version, as_dict):
     "vl_version",
     [
         "5.8",
-        "5.12",
         "5.13",
         "5.14",
         "5.15",
@@ -104,6 +103,7 @@ def test_vega(name, vl_version, as_dict):
         "5.17",
         "5.18",
         "5.19",
+        "5.20",
     ],
 )
 def test_vegalite_to_html_no_bundle(name, vl_version):
@@ -132,7 +132,6 @@ def test_vegalite_to_html_no_bundle(name, vl_version):
     "vl_version",
     [
         "5.8",
-        "5.12",
         "5.13",
         "5.14",
         "5.15",
@@ -140,6 +139,7 @@ def test_vegalite_to_html_no_bundle(name, vl_version):
         "5.17",
         "5.18",
         "5.19",
+        "5.20",
     ],
 )
 def test_vegalite_to_html_bundle(name, vl_version):

{vl_convert_python-1.5.1 → vl_convert_python-1.6.0}/vl-convert-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-rs"
-version = "1.5.1"
+version = "1.6.0"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"

{vl_convert_python-1.5.1 → vl_convert_python-1.6.0}/vl-convert-rs/src/module_loader/import_map.rs

@@ -10,9 +10,9 @@ pub const SKYPACK_URL: &str = "https://cdn.skypack.dev";
 pub const VEGA_PATH: &str =
     "/pin/vega@v5.30.0-fYDVG3pUN16BiGmbVNdw/mode=imports,min/optimized/vega.js";
 pub const VEGA_THEMES_PATH: &str =
-    "/pin/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/mode=imports,min/optimized/vega-themes.js";
+    "/pin/vega-themes@v2.15.0-wV2Z38N5Dk8FL05cPDbE/mode=imports,min/optimized/vega-themes.js";
 pub const VEGA_EMBED_PATH: &str =
-    "/pin/vega-embed@v6.25.0-3T3K5LYNFrLq0n1oBsLI/mode=imports,min/optimized/vega-embed.js";
+    "/pin/vega-embed@v6.26.0-0yAdpZbj3i4rRevkUMhK/mode=imports,min/optimized/vega-embed.js";
 pub const DEBOUNCE_PATH: &str = "/pin/lodash.debounce@v4.0.8-aOLIwnE2RethWPrEzTeR/mode=imports,min/optimized/lodash.debounce.js";
 
 pub fn url_for_path(path: &str) -> String {
@@ -31,7 +31,6 @@ pub fn vega_themes_url() -> String {
 #[allow(non_camel_case_types)]
 pub enum VlVersion {
     v5_8,
-    v5_12,
     v5_13,
     v5_14,
     v5_15,
@@ -39,6 +38,7 @@ pub enum VlVersion {
     v5_17,
     v5_18,
     v5_19,
+    v5_20,
 }
 
 impl VlVersion {
@@ -46,14 +46,14 @@ impl VlVersion {
         use VlVersion::*;
         let path = match self {
             v5_8 => "/pin/vega-lite@v5.8.0-4snbURNltT4se5LjMOKF/mode=imports,min/optimized/vega-lite.js",
-            v5_12 => "/pin/vega-lite@v5.12.0-ujK64YZaLHcwzRN5lx1E/mode=imports,min/optimized/vega-lite.js",
             v5_13 => "/pin/vega-lite@v5.13.0-GkFo6HVxfKtvVL5RV8aE/mode=imports,min/optimized/vega-lite.js",
             v5_14 => "/pin/vega-lite@v5.14.1-0IRM1VigcIVzRzBRoLFR/mode=imports,min/optimized/vega-lite.js",
             v5_15 => "/pin/vega-lite@v5.15.1-lQeQs8sDPgFa9d7Jm3sd/mode=imports,min/optimized/vega-lite.js",
             v5_16 => "/pin/vega-lite@v5.16.3-Hw7pZxUuaiVgThsNMjY9/mode=imports,min/optimized/vega-lite.js",
             v5_17 => "/pin/vega-lite@v5.17.0-jkfrfJOQ30TsVIlEEbKQ/mode=imports,min/optimized/vega-lite.js",
             v5_18 => "/pin/vega-lite@v5.18.1-CIbWw1F4YnIlhO9UCtHA/mode=imports,min/optimized/vega-lite.js",
-            v5_19 => "/pin/vega-lite@v5.19.0-4m5nwXbwdKW9Bc7adV02/mode=imports,min/optimized/vega-lite.js"
+            v5_19 => "/pin/vega-lite@v5.19.0-4m5nwXbwdKW9Bc7adV02/mode=imports,min/optimized/vega-lite.js",
+            v5_20 => "/pin/vega-lite@v5.20.1-5FloWSAHKfabpxOoogY3/mode=imports,min/optimized/vega-lite.js"
         };
         path.to_string()
     }
@@ -66,7 +66,6 @@ impl VlVersion {
         use VlVersion::*;
         match self {
             v5_8 => "5.8",
-            v5_12 => "5.12",
             v5_13 => "5.13",
             v5_14 => "5.14",
             v5_15 => "5.15",
@@ -74,13 +73,14 @@ impl VlVersion {
             v5_17 => "5.17",
             v5_18 => "5.18",
             v5_19 => "5.19",
+            v5_20 => "5.20",
         }
     }
 }
 
 impl Default for VlVersion {
     fn default() -> Self {
-        VlVersion::from_str("5.19").unwrap()
+        VlVersion::from_str("5.20").unwrap()
     }
 }
 
@@ -90,7 +90,6 @@ impl FromStr for VlVersion {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(match s {
             "5.8" | "v5.8" | "5_8" | "v5_8" => Self::v5_8,
-            "5.12" | "v5.12" | "5_12" | "v5_12" => Self::v5_12,
             "5.13" | "v5.13" | "5_13" | "v5_13" => Self::v5_13,
             "5.14" | "v5.14" | "5_14" | "v5_14" => Self::v5_14,
             "5.15" | "v5.15" | "5_15" | "v5_15" => Self::v5_15,
@@ -98,6 +97,7 @@ impl FromStr for VlVersion {
             "5.17" | "v5.17" | "5_17" | "v5_17" => Self::v5_17,
             "5.18" | "v5.18" | "5_18" | "v5_18" => Self::v5_18,
             "5.19" | "v5.19" | "5_19" | "v5_19" => Self::v5_19,
+            "5.20" | "v5.20" | "5_20" | "v5_20" => Self::v5_20,
             _ => bail!("Unsupported Vega-Lite version string {}", s),
         })
     }
@@ -105,7 +105,6 @@ impl FromStr for VlVersion {
 
 pub const VL_VERSIONS: &[VlVersion] = &[
     VlVersion::v5_8,
-    VlVersion::v5_12,
     VlVersion::v5_13,
     VlVersion::v5_14,
     VlVersion::v5_15,
@@ -113,6 +112,7 @@ pub const VL_VERSIONS: &[VlVersion] = &[
     VlVersion::v5_17,
     VlVersion::v5_18,
     VlVersion::v5_19,
+    VlVersion::v5_20,
 ];
 
 pub fn build_import_map() -> HashMap<String, String> {
@@ -149,7 +149,7 @@ pub fn build_import_map() -> HashMap<String, String> {
     m.insert("/-/vega-canvas@v1.2.7-hCEcvULuKIOqBVGX1Tn8/dist=es2020,mode=imports,min/optimized/vega-canvas.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-canvas@v1.2.7-hCEcvULuKIOqBVGX1Tn8/dist=es2020,mode=imports,min/optimized/vega-canvas.js").to_string());
     m.insert("/-/vega-crossfilter@v4.1.2-4tsGV0HzWFU39iiKcBjX/dist=es2020,mode=imports,min/optimized/vega-crossfilter.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-crossfilter@v4.1.2-4tsGV0HzWFU39iiKcBjX/dist=es2020,mode=imports,min/optimized/vega-crossfilter.js").to_string());
     m.insert("/-/vega-dataflow@v5.7.6-WDoszrJUyhTwz7sPwzda/dist=es2020,mode=imports,min/optimized/vega-dataflow.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-dataflow@v5.7.6-WDoszrJUyhTwz7sPwzda/dist=es2020,mode=imports,min/optimized/vega-dataflow.js").to_string());
-    m.insert("/-/vega-embed@v6.25.0-3T3K5LYNFrLq0n1oBsLI/dist=es2020,mode=imports,min/optimized/vega-embed.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-embed@v6.25.0-3T3K5LYNFrLq0n1oBsLI/dist=es2020,mode=imports,min/optimized/vega-embed.js").to_string());
+    m.insert("/-/vega-embed@v6.26.0-0yAdpZbj3i4rRevkUMhK/dist=es2020,mode=imports,min/optimized/vega-embed.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-embed@v6.26.0-0yAdpZbj3i4rRevkUMhK/dist=es2020,mode=imports,min/optimized/vega-embed.js").to_string());
     m.insert("/-/vega-encode@v4.10.1-Pg43i2sI9rM8xoeOkJ8i/dist=es2020,mode=imports,min/optimized/vega-encode.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-encode@v4.10.1-Pg43i2sI9rM8xoeOkJ8i/dist=es2020,mode=imports,min/optimized/vega-encode.js").to_string());
     m.insert("/-/vega-event-selector@v3.0.1-UgiEAWJA4WQL4DTKnV4R/dist=es2020,mode=imports,min/optimized/vega-event-selector.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-event-selector@v3.0.1-UgiEAWJA4WQL4DTKnV4R/dist=es2020,mode=imports,min/optimized/vega-event-selector.js").to_string());
     m.insert("/-/vega-expression@v5.1.1-K4clrYr2THuj5KncykTn/dist=es2020,mode=imports,min/optimized/vega-expression.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-expression@v5.1.1-K4clrYr2THuj5KncykTn/dist=es2020,mode=imports,min/optimized/vega-expression.js").to_string());
@@ -160,15 +160,14 @@ pub fn build_import_map() -> HashMap<String, String> {
     m.insert("/-/vega-hierarchy@v4.1.2-3wVtPHq13u3t0KUNwYDf/dist=es2020,mode=imports,min/optimized/vega-hierarchy.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-hierarchy@v4.1.2-3wVtPHq13u3t0KUNwYDf/dist=es2020,mode=imports,min/optimized/vega-hierarchy.js").to_string());
     m.insert("/-/vega-interpreter@v1.0.5-xGayK8haM1EVgaoW7oOi/dist=es2020,mode=imports,min/optimized/vega-interpreter.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-interpreter@v1.0.5-xGayK8haM1EVgaoW7oOi/dist=es2020,mode=imports,min/optimized/vega-interpreter.js").to_string());
     m.insert("/-/vega-label@v1.3.0-9aipnSY6IQFGc3Lm2JSc/dist=es2020,mode=imports,min/optimized/vega-label.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-label@v1.3.0-9aipnSY6IQFGc3Lm2JSc/dist=es2020,mode=imports,min/optimized/vega-label.js").to_string());
-    m.insert("/-/vega-lite@v5.12.0-ujK64YZaLHcwzRN5lx1E/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.12.0-ujK64YZaLHcwzRN5lx1E/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.13.0-GkFo6HVxfKtvVL5RV8aE/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.13.0-GkFo6HVxfKtvVL5RV8aE/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.14.1-0IRM1VigcIVzRzBRoLFR/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.14.1-0IRM1VigcIVzRzBRoLFR/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.15.1-lQeQs8sDPgFa9d7Jm3sd/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.15.1-lQeQs8sDPgFa9d7Jm3sd/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.16.3-Hw7pZxUuaiVgThsNMjY9/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.16.3-Hw7pZxUuaiVgThsNMjY9/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.17.0-jkfrfJOQ30TsVIlEEbKQ/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.17.0-jkfrfJOQ30TsVIlEEbKQ/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
-    m.insert("/-/vega-lite@v5.18.0-FtLrd9Ks5cFttxoTAph7/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.18.0-FtLrd9Ks5cFttxoTAph7/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.18.1-CIbWw1F4YnIlhO9UCtHA/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.18.1-CIbWw1F4YnIlhO9UCtHA/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.19.0-4m5nwXbwdKW9Bc7adV02/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.19.0-4m5nwXbwdKW9Bc7adV02/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
+    m.insert("/-/vega-lite@v5.20.1-5FloWSAHKfabpxOoogY3/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.20.1-5FloWSAHKfabpxOoogY3/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-lite@v5.8.0-4snbURNltT4se5LjMOKF/dist=es2020,mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-lite@v5.8.0-4snbURNltT4se5LjMOKF/dist=es2020,mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/-/vega-loader@v4.5.2-1ImBl2TigOVzvurACWyz/dist=es2020,mode=imports,min/optimized/vega-loader.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-loader@v4.5.2-1ImBl2TigOVzvurACWyz/dist=es2020,mode=imports,min/optimized/vega-loader.js").to_string());
     m.insert("/-/vega-parser@v6.4.0-nwGMLAa2L4N1N7f1iRh9/dist=es2020,mode=imports,min/optimized/vega-parser.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-parser@v6.4.0-nwGMLAa2L4N1N7f1iRh9/dist=es2020,mode=imports,min/optimized/vega-parser.js").to_string());
@@ -180,7 +179,7 @@ pub fn build_import_map() -> HashMap<String, String> {
     m.insert("/-/vega-schema-url-parser@v2.2.0-YmXJGRcKOXOac3VG4xfw/dist=es2020,mode=imports,min/optimized/vega-schema-url-parser.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-schema-url-parser@v2.2.0-YmXJGRcKOXOac3VG4xfw/dist=es2020,mode=imports,min/optimized/vega-schema-url-parser.js").to_string());
     m.insert("/-/vega-selections@v5.4.2-kOpqaoZxiZQE5rKxTnvY/dist=es2020,mode=imports,min/optimized/vega-selections.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-selections@v5.4.2-kOpqaoZxiZQE5rKxTnvY/dist=es2020,mode=imports,min/optimized/vega-selections.js").to_string());
     m.insert("/-/vega-statistics@v1.9.0-Qw8CjSQVQOg2M6VMgsme/dist=es2020,mode=imports,min/optimized/vega-statistics.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-statistics@v1.9.0-Qw8CjSQVQOg2M6VMgsme/dist=es2020,mode=imports,min/optimized/vega-statistics.js").to_string());
-    m.insert("/-/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/dist=es2020,mode=imports,min/optimized/vega-themes.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/dist=es2020,mode=imports,min/optimized/vega-themes.js").to_string());
+    m.insert("/-/vega-themes@v2.15.0-wV2Z38N5Dk8FL05cPDbE/dist=es2020,mode=imports,min/optimized/vega-themes.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-themes@v2.15.0-wV2Z38N5Dk8FL05cPDbE/dist=es2020,mode=imports,min/optimized/vega-themes.js").to_string());
     m.insert("/-/vega-time@v2.1.2-0zBPNlF5GMoxR6YChBaP/dist=es2020,mode=imports,min/optimized/vega-time.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-time@v2.1.2-0zBPNlF5GMoxR6YChBaP/dist=es2020,mode=imports,min/optimized/vega-time.js").to_string());
     m.insert("/-/vega-tooltip@v0.34.0-YVV3uKnnOnCt2kW7Vclb/dist=es2020,mode=imports,min/optimized/vega-tooltip.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-tooltip@v0.34.0-YVV3uKnnOnCt2kW7Vclb/dist=es2020,mode=imports,min/optimized/vega-tooltip.js").to_string());
     m.insert("/-/vega-transforms@v4.12.0-yproJe1RDXbiUml7qQ0X/dist=es2020,mode=imports,min/optimized/vega-transforms.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-transforms@v4.12.0-yproJe1RDXbiUml7qQ0X/dist=es2020,mode=imports,min/optimized/vega-transforms.js").to_string());
@@ -191,8 +190,7 @@ pub fn build_import_map() -> HashMap<String, String> {
     m.insert("/-/vega-wordcloud@v4.1.5-5xdRMt86NkNNCDjMSy6z/dist=es2020,mode=imports,min/optimized/vega-wordcloud.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega-wordcloud@v4.1.5-5xdRMt86NkNNCDjMSy6z/dist=es2020,mode=imports,min/optimized/vega-wordcloud.js").to_string());
     m.insert("/-/vega@v5.30.0-fYDVG3pUN16BiGmbVNdw/dist=es2020,mode=imports,min/optimized/vega.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/-/vega@v5.30.0-fYDVG3pUN16BiGmbVNdw/dist=es2020,mode=imports,min/optimized/vega.js").to_string());
     m.insert("/pin/lodash.debounce@v4.0.8-aOLIwnE2RethWPrEzTeR/mode=imports,min/optimized/lodash.debounce.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/lodash.debounce@v4.0.8-aOLIwnE2RethWPrEzTeR/mode=imports,min/optimized/lodash.debounce.js").to_string());
-    m.insert("/pin/vega-embed@v6.25.0-3T3K5LYNFrLq0n1oBsLI/mode=imports,min/optimized/vega-embed.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-embed@v6.25.0-3T3K5LYNFrLq0n1oBsLI/mode=imports,min/optimized/vega-embed.js").to_string());
-    m.insert("/pin/vega-lite@v5.12.0-ujK64YZaLHcwzRN5lx1E/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.12.0-ujK64YZaLHcwzRN5lx1E/mode=imports,min/optimized/vega-lite.js").to_string());
+    m.insert("/pin/vega-embed@v6.26.0-0yAdpZbj3i4rRevkUMhK/mode=imports,min/optimized/vega-embed.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-embed@v6.26.0-0yAdpZbj3i4rRevkUMhK/mode=imports,min/optimized/vega-embed.js").to_string());
     m.insert("/pin/vega-lite@v5.13.0-GkFo6HVxfKtvVL5RV8aE/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.13.0-GkFo6HVxfKtvVL5RV8aE/mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/pin/vega-lite@v5.14.1-0IRM1VigcIVzRzBRoLFR/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.14.1-0IRM1VigcIVzRzBRoLFR/mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/pin/vega-lite@v5.15.1-lQeQs8sDPgFa9d7Jm3sd/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.15.1-lQeQs8sDPgFa9d7Jm3sd/mode=imports,min/optimized/vega-lite.js").to_string());
@@ -200,8 +198,9 @@ pub fn build_import_map() -> HashMap<String, String> {
     m.insert("/pin/vega-lite@v5.17.0-jkfrfJOQ30TsVIlEEbKQ/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.17.0-jkfrfJOQ30TsVIlEEbKQ/mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/pin/vega-lite@v5.18.1-CIbWw1F4YnIlhO9UCtHA/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.18.1-CIbWw1F4YnIlhO9UCtHA/mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/pin/vega-lite@v5.19.0-4m5nwXbwdKW9Bc7adV02/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.19.0-4m5nwXbwdKW9Bc7adV02/mode=imports,min/optimized/vega-lite.js").to_string());
+    m.insert("/pin/vega-lite@v5.20.1-5FloWSAHKfabpxOoogY3/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.20.1-5FloWSAHKfabpxOoogY3/mode=imports,min/optimized/vega-lite.js").to_string());
     m.insert("/pin/vega-lite@v5.8.0-4snbURNltT4se5LjMOKF/mode=imports,min/optimized/vega-lite.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-lite@v5.8.0-4snbURNltT4se5LjMOKF/mode=imports,min/optimized/vega-lite.js").to_string());
-    m.insert("/pin/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/mode=imports,min/optimized/vega-themes.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-themes@v2.14.0-RvUmNETlVH2y3yQM1y36/mode=imports,min/optimized/vega-themes.js").to_string());
+    m.insert("/pin/vega-themes@v2.15.0-wV2Z38N5Dk8FL05cPDbE/mode=imports,min/optimized/vega-themes.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega-themes@v2.15.0-wV2Z38N5Dk8FL05cPDbE/mode=imports,min/optimized/vega-themes.js").to_string());
     m.insert("/pin/vega@v5.30.0-fYDVG3pUN16BiGmbVNdw/mode=imports,min/optimized/vega.js".to_string(), include_str!("../../vendor/cdn.skypack.dev/pin/vega@v5.30.0-fYDVG3pUN16BiGmbVNdw/mode=imports,min/optimized/vega.js").to_string());
     m
 }

{vl_convert_python-1.5.1 → vl_convert_python-1.6.0}/vl-convert-rs/tests/test_specs.rs

@@ -316,7 +316,6 @@ mod test_vegalite_to_vega {
     fn test(
         #[values(
             VlVersion::v5_8,
-            VlVersion::v5_12,
             VlVersion::v5_13,
             VlVersion::v5_14,
             VlVersion::v5_15,
@@ -324,6 +323,7 @@ mod test_vegalite_to_vega {
             VlVersion::v5_17,
             VlVersion::v5_18,
             VlVersion::v5_19,
+            VlVersion::v5_20,
         )]
         vl_version: VlVersion,
 
@@ -361,7 +361,6 @@ mod test_vegalite_to_html_no_bundle {
     fn test(
         #[values(
             VlVersion::v5_8,
-            VlVersion::v5_12,
             VlVersion::v5_13,
             VlVersion::v5_14,
             VlVersion::v5_15,
@@ -369,6 +368,7 @@ mod test_vegalite_to_html_no_bundle {
             VlVersion::v5_17,
             VlVersion::v5_18,
             VlVersion::v5_19,
+            VlVersion::v5_20,
         )]
         vl_version: VlVersion,
 
@@ -409,7 +409,6 @@ mod test_vegalite_to_html_bundle {
     fn test(
         #[values(
             VlVersion::v5_8,
-            VlVersion::v5_12,
             VlVersion::v5_13,
             VlVersion::v5_14,
             VlVersion::v5_15,
@@ -417,6 +416,7 @@ mod test_vegalite_to_html_bundle {
             VlVersion::v5_17,
             VlVersion::v5_18,
             VlVersion::v5_19,
+            VlVersion::v5_20,
         )]
         vl_version: VlVersion,
 

vl_convert_python-1.6.0/vl-convert-rs/tests/vl-specs/expected/v5_20/circle_binned.vg.json

@@ -0,0 +1 @@
+{"$schema":"https://vega.github.io/schema/vega/v5.json","background":"white","padding":5,"width":200,"height":200,"style":"cell","data":[{"name":"source_0","url":"https://raw.githubusercontent.com/vega/vega-datasets/next/data/movies.json","format":{"type":"json"},"transform":[{"type":"extent","field":"IMDB Rating","signal":"bin_maxbins_10_IMDB_Rating_extent"},{"type":"bin","field":"IMDB Rating","as":["bin_maxbins_10_IMDB Rating","bin_maxbins_10_IMDB Rating_end"],"signal":"bin_maxbins_10_IMDB_Rating_bins","extent":{"signal":"bin_maxbins_10_IMDB_Rating_extent"},"maxbins":10},{"type":"extent","field":"Rotten Tomatoes Rating","signal":"bin_maxbins_10_Rotten_Tomatoes_Rating_extent"},{"type":"bin","field":"Rotten Tomatoes Rating","as":["bin_maxbins_10_Rotten Tomatoes Rating","bin_maxbins_10_Rotten Tomatoes Rating_end"],"signal":"bin_maxbins_10_Rotten_Tomatoes_Rating_bins","extent":{"signal":"bin_maxbins_10_Rotten_Tomatoes_Rating_extent"},"maxbins":10},{"type":"aggregate","groupby":["bin_maxbins_10_IMDB Rating","bin_maxbins_10_IMDB Rating_end","bin_maxbins_10_Rotten Tomatoes Rating","bin_maxbins_10_Rotten Tomatoes Rating_end"],"ops":["count"],"fields":[null],"as":["__count"]},{"type":"filter","expr":"isValid(datum[\"bin_maxbins_10_IMDB Rating\"]) && isFinite(+datum[\"bin_maxbins_10_IMDB Rating\"]) && isValid(datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"]) && isFinite(+datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"])"}]}],"marks":[{"name":"marks","type":"symbol","style":["circle"],"from":{"data":"source_0"},"encode":{"update":{"fill":{"value":"#4c78a8"},"ariaRoleDescription":{"value":"circle"},"description":{"signal":"\"IMDB Rating (binned): \" + (!isValid(datum[\"bin_maxbins_10_IMDB Rating\"]) || !isFinite(+datum[\"bin_maxbins_10_IMDB Rating\"]) ? \"null\" : format(datum[\"bin_maxbins_10_IMDB Rating\"], \"\") + \" – \" + format(datum[\"bin_maxbins_10_IMDB Rating_end\"], \"\")) + \"; Rotten Tomatoes Rating (binned): \" + (!isValid(datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"]) || !isFinite(+datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"]) ? \"null\" : format(datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"], \"\") + \" – \" + format(datum[\"bin_maxbins_10_Rotten Tomatoes Rating_end\"], \"\")) + \"; Count of Records: \" + (format(datum[\"__count\"], \"\"))"},"x":{"signal":"scale(\"x\", 0.5 * datum[\"bin_maxbins_10_IMDB Rating\"] + 0.5 * datum[\"bin_maxbins_10_IMDB Rating_end\"])"},"y":{"signal":"scale(\"y\", 0.5 * datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"] + 0.5 * datum[\"bin_maxbins_10_Rotten Tomatoes Rating_end\"])"},"size":{"scale":"size","field":"__count"},"shape":{"value":"circle"}}}}],"scales":[{"name":"x","type":"linear","domain":{"signal":"[bin_maxbins_10_IMDB_Rating_bins.start, bin_maxbins_10_IMDB_Rating_bins.stop]"},"range":[0,{"signal":"width"}],"bins":{"signal":"bin_maxbins_10_IMDB_Rating_bins"},"zero":false},{"name":"y","type":"linear","domain":{"signal":"[bin_maxbins_10_Rotten_Tomatoes_Rating_bins.start, bin_maxbins_10_Rotten_Tomatoes_Rating_bins.stop]"},"range":[{"signal":"height"},0],"bins":{"signal":"bin_maxbins_10_Rotten_Tomatoes_Rating_bins"},"zero":false},{"name":"size","type":"linear","domain":{"data":"source_0","field":"__count"},"range":[4,{"signal":"pow(0.95 * min(width / ((bin_maxbins_10_IMDB_Rating_bins.stop - bin_maxbins_10_IMDB_Rating_bins.start) / bin_maxbins_10_IMDB_Rating_bins.step), height / ((bin_maxbins_10_Rotten_Tomatoes_Rating_bins.stop - bin_maxbins_10_Rotten_Tomatoes_Rating_bins.start) / bin_maxbins_10_Rotten_Tomatoes_Rating_bins.step)), 2)"}],"zero":true}],"axes":[{"scale":"x","orient":"bottom","grid":false,"title":"IMDB Rating (binned)","labelFlush":true,"labelOverlap":true,"tickCount":{"signal":"ceil(width/10)"},"zindex":0},{"scale":"y","orient":"left","grid":false,"title":"Rotten Tomatoes Rating (binned)","labelOverlap":true,"tickCount":{"signal":"ceil(height/10)"},"zindex":0}],"legends":[{"size":"size","symbolType":"circle","title":"Count of Records","encode":{"symbols":{"update":{"fill":{"value":"#4c78a8"},"stroke":{"value":"transparent"}}}}}]}

vl_convert_python-1.6.0/vl-convert-rs/tests/vl-specs/expected/v5_20/circle_binned.vg.pretty.json

@@ -0,0 +1,210 @@
+{
+  "$schema": "https://vega.github.io/schema/vega/v5.json",
+  "background": "white",
+  "padding": 5,
+  "width": 200,
+  "height": 200,
+  "style": "cell",
+  "data": [
+    {
+      "name": "source_0",
+      "url": "https://raw.githubusercontent.com/vega/vega-datasets/next/data/movies.json",
+      "format": {
+        "type": "json"
+      },
+      "transform": [
+        {
+          "type": "extent",
+          "field": "IMDB Rating",
+          "signal": "bin_maxbins_10_IMDB_Rating_extent"
+        },
+        {
+          "type": "bin",
+          "field": "IMDB Rating",
+          "as": [
+            "bin_maxbins_10_IMDB Rating",
+            "bin_maxbins_10_IMDB Rating_end"
+          ],
+          "signal": "bin_maxbins_10_IMDB_Rating_bins",
+          "extent": {
+            "signal": "bin_maxbins_10_IMDB_Rating_extent"
+          },
+          "maxbins": 10
+        },
+        {
+          "type": "extent",
+          "field": "Rotten Tomatoes Rating",
+          "signal": "bin_maxbins_10_Rotten_Tomatoes_Rating_extent"
+        },
+        {
+          "type": "bin",
+          "field": "Rotten Tomatoes Rating",
+          "as": [
+            "bin_maxbins_10_Rotten Tomatoes Rating",
+            "bin_maxbins_10_Rotten Tomatoes Rating_end"
+          ],
+          "signal": "bin_maxbins_10_Rotten_Tomatoes_Rating_bins",
+          "extent": {
+            "signal": "bin_maxbins_10_Rotten_Tomatoes_Rating_extent"
+          },
+          "maxbins": 10
+        },
+        {
+          "type": "aggregate",
+          "groupby": [
+            "bin_maxbins_10_IMDB Rating",
+            "bin_maxbins_10_IMDB Rating_end",
+            "bin_maxbins_10_Rotten Tomatoes Rating",
+            "bin_maxbins_10_Rotten Tomatoes Rating_end"
+          ],
+          "ops": [
+            "count"
+          ],
+          "fields": [
+            null
+          ],
+          "as": [
+            "__count"
+          ]
+        },
+        {
+          "type": "filter",
+          "expr": "isValid(datum[\"bin_maxbins_10_IMDB Rating\"]) && isFinite(+datum[\"bin_maxbins_10_IMDB Rating\"]) && isValid(datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"]) && isFinite(+datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"])"
+        }
+      ]
+    }
+  ],
+  "marks": [
+    {
+      "name": "marks",
+      "type": "symbol",
+      "style": [
+        "circle"
+      ],
+      "from": {
+        "data": "source_0"
+      },
+      "encode": {
+        "update": {
+          "fill": {
+            "value": "#4c78a8"
+          },
+          "ariaRoleDescription": {
+            "value": "circle"
+          },
+          "description": {
+            "signal": "\"IMDB Rating (binned): \" + (!isValid(datum[\"bin_maxbins_10_IMDB Rating\"]) || !isFinite(+datum[\"bin_maxbins_10_IMDB Rating\"]) ? \"null\" : format(datum[\"bin_maxbins_10_IMDB Rating\"], \"\") + \" – \" + format(datum[\"bin_maxbins_10_IMDB Rating_end\"], \"\")) + \"; Rotten Tomatoes Rating (binned): \" + (!isValid(datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"]) || !isFinite(+datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"]) ? \"null\" : format(datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"], \"\") + \" – \" + format(datum[\"bin_maxbins_10_Rotten Tomatoes Rating_end\"], \"\")) + \"; Count of Records: \" + (format(datum[\"__count\"], \"\"))"
+          },
+          "x": {
+            "signal": "scale(\"x\", 0.5 * datum[\"bin_maxbins_10_IMDB Rating\"] + 0.5 * datum[\"bin_maxbins_10_IMDB Rating_end\"])"
+          },
+          "y": {
+            "signal": "scale(\"y\", 0.5 * datum[\"bin_maxbins_10_Rotten Tomatoes Rating\"] + 0.5 * datum[\"bin_maxbins_10_Rotten Tomatoes Rating_end\"])"
+          },
+          "size": {
+            "scale": "size",
+            "field": "__count"
+          },
+          "shape": {
+            "value": "circle"
+          }
+        }
+      }
+    }
+  ],
+  "scales": [
+    {
+      "name": "x",
+      "type": "linear",
+      "domain": {
+        "signal": "[bin_maxbins_10_IMDB_Rating_bins.start, bin_maxbins_10_IMDB_Rating_bins.stop]"
+      },
+      "range": [
+        0,
+        {
+          "signal": "width"
+        }
+      ],
+      "bins": {
+        "signal": "bin_maxbins_10_IMDB_Rating_bins"
+      },
+      "zero": false
+    },
+    {
+      "name": "y",
+      "type": "linear",
+      "domain": {
+        "signal": "[bin_maxbins_10_Rotten_Tomatoes_Rating_bins.start, bin_maxbins_10_Rotten_Tomatoes_Rating_bins.stop]"
+      },
+      "range": [
+        {
+          "signal": "height"
+        },
+        0
+      ],
+      "bins": {
+        "signal": "bin_maxbins_10_Rotten_Tomatoes_Rating_bins"
+      },
+      "zero": false
+    },
+    {
+      "name": "size",
+      "type": "linear",
+      "domain": {
+        "data": "source_0",
+        "field": "__count"
+      },
+      "range": [
+        4,
+        {
+          "signal": "pow(0.95 * min(width / ((bin_maxbins_10_IMDB_Rating_bins.stop - bin_maxbins_10_IMDB_Rating_bins.start) / bin_maxbins_10_IMDB_Rating_bins.step), height / ((bin_maxbins_10_Rotten_Tomatoes_Rating_bins.stop - bin_maxbins_10_Rotten_Tomatoes_Rating_bins.start) / bin_maxbins_10_Rotten_Tomatoes_Rating_bins.step)), 2)"
+        }
+      ],
+      "zero": true
+    }
+  ],
+  "axes": [
+    {
+      "scale": "x",
+      "orient": "bottom",
+      "grid": false,
+      "title": "IMDB Rating (binned)",
+      "labelFlush": true,
+      "labelOverlap": true,
+      "tickCount": {
+        "signal": "ceil(width/10)"
+      },
+      "zindex": 0
+    },
+    {
+      "scale": "y",
+      "orient": "left",
+      "grid": false,
+      "title": "Rotten Tomatoes Rating (binned)",
+      "labelOverlap": true,
+      "tickCount": {
+        "signal": "ceil(height/10)"
+      },
+      "zindex": 0
+    }
+  ],
+  "legends": [
+    {
+      "size": "size",
+      "symbolType": "circle",
+      "title": "Count of Records",
+      "encode": {
+        "symbols": {
+          "update": {
+            "fill": {
+              "value": "#4c78a8"
+            },
+            "stroke": {
+              "value": "transparent"
+            }
+          }
+        }
+      }
+    }
+  ]
+}

vl_convert_python-1.6.0/vl-convert-rs/tests/vl-specs/expected/v5_20/seattle-weather.vg.json

@@ -0,0 +1 @@
+{"$schema":"https://vega.github.io/schema/vega/v5.json","background":"white","padding":5,"width":600,"title":{"text":"Seattle Weather, 2012-2015","anchor":"start"},"data":[{"name":"brush_store"},{"name":"click_store"},{"name":"source_0","url":"https://raw.githubusercontent.com/vega/vega-datasets/next/data/seattle-weather.csv","format":{"type":"csv","parse":{"date":"date"}}},{"name":"data_0","source":"source_0","transform":[{"type":"filter","expr":"!length(data(\"click_store\")) || vlSelectionTest(\"click_store\", datum)"},{"field":"date","type":"timeunit","units":["month","date"],"as":["monthdate_date","monthdate_date_end"]},{"type":"filter","expr":"(isDate(datum[\"monthdate_date\"]) || (isValid(datum[\"monthdate_date\"]) && isFinite(+datum[\"monthdate_date\"]))) && isValid(datum[\"temp_max\"]) && isFinite(+datum[\"temp_max\"]) && isValid(datum[\"precipitation\"]) && isFinite(+datum[\"precipitation\"])"}]},{"name":"data_1","source":"source_0","transform":[{"field":"date","type":"timeunit","units":["month","date"],"as":["monthdate_date","monthdate_date_end"]},{"type":"filter","expr":"!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"},{"type":"aggregate","groupby":["weather"],"ops":["count"],"fields":[null],"as":["__count"]}]}],"signals":[{"name":"concat_0_height","value":300},{"name":"concat_1_y_step","value":20},{"name":"concat_1_height","update":"bandspace(domain('concat_1_y').length, 0.1, 0.05) * concat_1_y_step"},{"name":"unit","value":{},"on":[{"events":"pointermove","update":"isTuple(group()) ? group() : unit"}]},{"name":"brush","update":"vlSelectionResolve(\"brush_store\", \"union\")"},{"name":"click","update":"vlSelectionResolve(\"click_store\", \"union\", true, true)"}],"layout":{"padding":20,"columns":1,"bounds":"full","align":"each"},"marks":[{"type":"group","name":"concat_0_group","style":"cell","encode":{"update":{"width":{"signal":"width"},"height":{"signal":"concat_0_height"}}},"signals":[{"name":"brush_x","value":[],"on":[{"events":{"source":"scope","type":"pointerdown","filter":["!event.item || event.item.mark.name !== \"brush_brush\""]},"update":"[x(unit), x(unit)]"},{"events":{"source":"window","type":"pointermove","consume":true,"between":[{"source":"scope","type":"pointerdown","filter":["!event.item || event.item.mark.name !== \"brush_brush\""]},{"source":"window","type":"pointerup"}]},"update":"[brush_x[0], clamp(x(unit), 0, width)]"},{"events":{"signal":"brush_scale_trigger"},"update":"[scale(\"concat_0_x\", brush_monthdate_date[0]), scale(\"concat_0_x\", brush_monthdate_date[1])]"},{"events":[{"source":"view","type":"dblclick"}],"update":"[0, 0]"},{"events":{"signal":"brush_translate_delta"},"update":"clampRange(panLinear(brush_translate_anchor.extent_x, brush_translate_delta.x / span(brush_translate_anchor.extent_x)), 0, width)"},{"events":{"signal":"brush_zoom_delta"},"update":"clampRange(zoomLinear(brush_x, brush_zoom_anchor.x, brush_zoom_delta), 0, width)"}]},{"name":"brush_monthdate_date","on":[{"events":{"signal":"brush_x"},"update":"brush_x[0] === brush_x[1] ? null : invert(\"concat_0_x\", brush_x)"}]},{"name":"brush_scale_trigger","value":{},"on":[{"events":[{"scale":"concat_0_x"}],"update":"(!isArray(brush_monthdate_date) || (+invert(\"concat_0_x\", brush_x)[0] === +brush_monthdate_date[0] && +invert(\"concat_0_x\", brush_x)[1] === +brush_monthdate_date[1])) ? brush_scale_trigger : {}"}]},{"name":"brush_tuple","on":[{"events":[{"signal":"brush_monthdate_date"}],"update":"brush_monthdate_date ? {unit: \"concat_0\", fields: brush_tuple_fields, values: [brush_monthdate_date]} : null"}]},{"name":"brush_tuple_fields","value":[{"field":"monthdate_date","channel":"x","type":"R"}]},{"name":"brush_translate_anchor","value":{},"on":[{"events":[{"source":"scope","type":"pointerdown","markname":"brush_brush"}],"update":"{x: x(unit), y: y(unit), extent_x: slice(brush_x)}"}]},{"name":"brush_translate_delta","value":{},"on":[{"events":[{"source":"window","type":"pointermove","consume":true,"between":[{"source":"scope","type":"pointerdown","markname":"brush_brush"},{"source":"window","type":"pointerup"}]}],"update":"{x: brush_translate_anchor.x - x(unit), y: brush_translate_anchor.y - y(unit)}"}]},{"name":"brush_zoom_anchor","on":[{"events":[{"source":"scope","type":"wheel","consume":true,"markname":"brush_brush"}],"update":"{x: x(unit), y: y(unit)}"}]},{"name":"brush_zoom_delta","on":[{"events":[{"source":"scope","type":"wheel","consume":true,"markname":"brush_brush"}],"force":true,"update":"pow(1.001, event.deltaY * pow(16, event.deltaMode))"}]},{"name":"brush_modify","on":[{"events":{"signal":"brush_tuple"},"update":"modify(\"brush_store\", brush_tuple, true)"}]}],"marks":[{"name":"brush_brush_bg","type":"rect","clip":true,"encode":{"enter":{"fill":{"value":"#333"},"fillOpacity":{"value":0.125}},"update":{"x":[{"test":"data(\"brush_store\").length && data(\"brush_store\")[0].unit === \"concat_0\"","signal":"brush_x[0]"},{"value":0}],"y":[{"test":"data(\"brush_store\").length && data(\"brush_store\")[0].unit === \"concat_0\"","value":0},{"value":0}],"x2":[{"test":"data(\"brush_store\").length && data(\"brush_store\")[0].unit === \"concat_0\"","signal":"brush_x[1]"},{"value":0}],"y2":[{"test":"data(\"brush_store\").length && data(\"brush_store\")[0].unit === \"concat_0\"","field":{"group":"height"}},{"value":0}]}}},{"name":"concat_0_marks","type":"symbol","style":["point"],"interactive":true,"from":{"data":"data_0"},"encode":{"update":{"opacity":{"value":0.7},"fill":{"value":"transparent"},"stroke":[{"test":"!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)","scale":"color","field":"weather"},{"value":"lightgray"}],"ariaRoleDescription":{"value":"point"},"description":{"signal":"\"Date: \" + (timeFormat(datum[\"monthdate_date\"], '%b')) + \"; Maximum Daily Temperature (C): \" + (format(datum[\"temp_max\"], \"\")) + \"; Weather: \" + (isValid(datum[\"weather\"]) ? datum[\"weather\"] : \"\"+datum[\"weather\"]) + \"; Precipitation: \" + (format(datum[\"precipitation\"], \"\"))"},"x":{"scale":"concat_0_x","field":"monthdate_date"},"y":{"scale":"concat_0_y","field":"temp_max"},"size":{"scale":"size","field":"precipitation"}}}},{"name":"brush_brush","type":"rect","clip":true,"encode":{"enter":{"cursor":{"value":"move"},"fill":{"value":"transparent"}},"update":{"x":[{"test":"data(\"brush_store\").length && data(\"brush_store\")[0].unit === \"concat_0\"","signal":"brush_x[0]"},{"value":0}],"y":[{"test":"data(\"brush_store\").length && data(\"brush_store\")[0].unit === \"concat_0\"","value":0},{"value":0}],"x2":[{"test":"data(\"brush_store\").length && data(\"brush_store\")[0].unit === \"concat_0\"","signal":"brush_x[1]"},{"value":0}],"y2":[{"test":"data(\"brush_store\").length && data(\"brush_store\")[0].unit === \"concat_0\"","field":{"group":"height"}},{"value":0}],"stroke":[{"test":"brush_x[0] !== brush_x[1]","value":"white"},{"value":null}]}}}],"axes":[{"scale":"concat_0_x","orient":"bottom","gridScale":"concat_0_y","grid":true,"tickCount":{"signal":"ceil(width/40)"},"tickMinStep":{"signal":"datetime(2001, 0, 2, 0, 0, 0, 0) - datetime(2001, 0, 1, 0, 0, 0, 0)"},"domain":false,"labels":false,"aria":false,"maxExtent":0,"minExtent":0,"ticks":false,"zindex":0},{"scale":"concat_0_y","orient":"left","gridScale":"concat_0_x","grid":true,"tickCount":{"signal":"ceil(concat_0_height/40)"},"domain":false,"labels":false,"aria":false,"maxExtent":0,"minExtent":0,"ticks":false,"zindex":0},{"scale":"concat_0_x","orient":"bottom","grid":false,"title":"Date","format":"%b","labelFlush":true,"labelOverlap":true,"tickCount":{"signal":"ceil(width/40)"},"tickMinStep":{"signal":"datetime(2001, 0, 2, 0, 0, 0, 0) - datetime(2001, 0, 1, 0, 0, 0, 0)"},"zindex":0},{"scale":"concat_0_y","orient":"left","grid":false,"title":"Maximum Daily Temperature (C)","labelOverlap":true,"tickCount":{"signal":"ceil(concat_0_height/40)"},"zindex":0}]},{"type":"group","name":"concat_1_group","style":"cell","encode":{"update":{"width":{"signal":"width"},"height":{"signal":"concat_1_height"}}},"signals":[{"name":"click_tuple","on":[{"events":[{"source":"scope","type":"click"}],"update":"datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0 ? {unit: \"concat_1\", fields: click_tuple_fields, values: [(item().isVoronoi ? datum.datum : datum)[\"weather\"]]} : null","force":true},{"events":[{"source":"view","type":"dblclick"}],"update":"null"}]},{"name":"click_tuple_fields","value":[{"field":"weather","channel":"color","type":"E"}]},{"name":"click_toggle","value":false,"on":[{"events":[{"source":"scope","type":"click"}],"update":"event.shiftKey"},{"events":[{"source":"view","type":"dblclick"}],"update":"false"}]},{"name":"click_modify","on":[{"events":{"signal":"click_tuple"},"update":"modify(\"click_store\", click_toggle ? null : click_tuple, click_toggle ? null : true, click_toggle ? click_tuple : null)"}]}],"marks":[{"name":"concat_1_marks","type":"rect","style":["bar"],"interactive":true,"from":{"data":"data_1"},"encode":{"update":{"fill":[{"test":"!length(data(\"click_store\")) || vlSelectionTest(\"click_store\", datum)","scale":"color","field":"weather"},{"value":"lightgray"}],"ariaRoleDescription":{"value":"bar"},"description":{"signal":"\"Count of Records: \" + (format(datum[\"__count\"], \"\")) + \"; Weather: \" + (isValid(datum[\"weather\"]) ? datum[\"weather\"] : \"\"+datum[\"weather\"]) + \"; weather: \" + (isValid(datum[\"weather\"]) ? datum[\"weather\"] : \"\"+datum[\"weather\"])"},"x":{"scale":"concat_1_x","field":"__count"},"x2":{"scale":"concat_1_x","value":0},"y":{"scale":"concat_1_y","field":"weather"},"height":{"signal":"max(0.25, bandwidth('concat_1_y'))"}}}}],"axes":[{"scale":"concat_1_x","orient":"bottom","gridScale":"concat_1_y","grid":true,"tickCount":{"signal":"ceil(width/40)"},"domain":false,"labels":false,"aria":false,"maxExtent":0,"minExtent":0,"ticks":false,"zindex":0},{"scale":"concat_1_x","orient":"bottom","grid":false,"title":"Count of Records","labelFlush":true,"labelOverlap":true,"tickCount":{"signal":"ceil(width/40)"},"zindex":0},{"scale":"concat_1_y","orient":"left","grid":false,"title":"Weather","zindex":0}]}],"scales":[{"name":"color","type":"ordinal","domain":["sun","fog","drizzle","rain","snow"],"range":["#e7ba52","#a7a7a7","#aec7e8","#1f77b4","#9467bd"]},{"name":"size","type":"linear","domain":[-1,50],"range":[4,361],"zero":true},{"name":"concat_0_x","type":"time","domain":{"data":"data_0","field":"monthdate_date"},"range":[0,{"signal":"width"}]},{"name":"concat_0_y","type":"linear","domain":[-5,40],"range":[{"signal":"concat_0_height"},0],"zero":true},{"name":"concat_1_x","type":"linear","domain":{"data":"data_1","field":"__count"},"range":[0,{"signal":"width"}],"nice":true,"zero":true},{"name":"concat_1_y","type":"band","domain":{"data":"data_1","field":"weather","sort":true},"range":{"step":{"signal":"concat_1_y_step"}},"paddingInner":0.1,"paddingOuter":0.05}],"legends":[{"title":"Weather","stroke":"color","symbolType":"circle","encode":{"symbols":{"update":{"opacity":{"value":0.7}}}},"fill":"color"},{"title":"Precipitation","size":"size","symbolType":"circle","encode":{"symbols":{"update":{"fill":{"value":"transparent"},"stroke":{"value":"lightgray"},"opacity":{"value":0.7}}}}}]}