Merge remote-tracking branch 'origin/main' into sebdotv/mapbox-domain

Signed-off-by: Andrei Gherghescu <[email protected]>

Author: andrei-ng

Diff for: .github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+  - package-ecosystem: cargo
+    directory: /
+    schedule:
+      interval: daily

Diff for: .github/workflows/ci.yml

@@ -3,9 +3,9 @@ name: CI
 on:
   workflow_dispatch:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 # Cancel any in-flight jobs for the same PR/branch so there's only one active
 # at a time
@@ -27,7 +27,7 @@ jobs:
           components: rustfmt
       - run: cargo fmt --all -- --check
       - run: cd ${{ github.workspace }}/examples && cargo fmt --all -- --check
-    
+
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
@@ -57,7 +57,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo test --features plotly_ndarray,plotly_image,kaleido
-  
+      - if: ${{ matrix.os == 'windows-latest' }}
+        run: gci -recurse -filter "*example*"
+
   code-coverage:
     name: Code Coverage
     runs-on: ubuntu-latest
@@ -70,7 +72,7 @@ jobs:
       # we are skipping anything to do with wasm here
       - run: cargo llvm-cov --workspace --features plotly_ndarray,plotly_image,kaleido --lcov --output-path lcov.info
       - uses: codecov/codecov-action@v3
-      
+
   build_examples:
     name: Build Examples
     strategy:
@@ -94,7 +96,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
       - run: cd ${{ github.workspace }}/examples/${{ matrix.example }} && cargo build
-  
+
   build_wasm_examples:
     name: Build Wasm Examples
     strategy:

Diff for: CHANGELOG.md

@@ -3,9 +3,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.8.5] - 2023-xx-xx
+## [0.8.5] - 2024-xx-xx
 ### Added
-- [[#153](https://github.com/igiagkiozis/plotly/pull/153)] Added `LayoutScene`
+- [[#181](https://github.com/igiagkiozis/plotly/pull/181)] Fix compilation error when mixing the crate with `askama/with-axum` by adding `with-axum` feature.
+- [[#163](https://github.com/plotly/plotly.rs/pull/163)] Added `DensityMapbox`.
+- [[#153](https://github.com/igiagkiozis/plotly/pull/153)] Added `LayoutScene`.
 
 ## [0.8.4] - 2023-07-09
 ### Added
@@ -46,8 +48,7 @@ Version 0.8.0 represents a significant release which refactors a lot of the code
 - Support for `Sankey` diagrams
 - Support for `Plot3D` - 3D plots for scatter, line and surface data
 ### Changed
-- Improve implementation of `private::NumOrString` to support more primitive types ([Issue 
-#47](https://github.com/igiagkiozis/plotly/issues/47))
+- Improve implementation of `private::NumOrString` to support more primitive types ([Issue #47](https://github.com/igiagkiozis/plotly/issues/47))
 - Remove `private::TruthyEnum` in favour of a more robust way of serializing to `String` or `bool`
 - Refactor `Color` module
 - Refactored HTML templates with cleaner Javascript code

Diff for: examples/maps/src/main.rs

@@ -3,7 +3,7 @@
 use plotly::{
     common::Marker,
     layout::{Center, DragMode, Mapbox, MapboxStyle, Margin},
-    Layout, Plot, ScatterMapbox,
+    DensityMapbox, Layout, Plot, ScatterMapbox,
 };
 
 fn scatter_mapbox() {
@@ -27,8 +27,29 @@ fn scatter_mapbox() {
     plot.show();
 }
 
+fn density_mapbox() {
+    let trace = DensityMapbox::new(vec![45.5017], vec![-73.5673], vec![0.75]).zauto(true);
+
+    let layout = Layout::new()
+        .drag_mode(DragMode::Zoom)
+        .margin(Margin::new().top(0).left(0).bottom(0).right(0))
+        .mapbox(
+            Mapbox::new()
+                .style(MapboxStyle::OpenStreetMap)
+                .center(Center::new(45.5017, -73.5673))
+                .zoom(5),
+        );
+
+    let mut plot = Plot::new();
+    plot.add_trace(trace);
+    plot.set_layout(layout);
+
+    plot.show();
+}
+
 fn main() {
     // Uncomment any of these lines to display the example.
 
     // scatter_mapbox();
+    // density_mapbox();
 }

Diff for: examples/statistical_charts/src/main.rs

@@ -345,7 +345,7 @@ fn fully_styled_box_plot() {
         v
     };
 
-    let x_data = vec![
+    let x_data = [
         "Carmelo<br>Anthony",
         "Dwyane<br>Wade",
         "Deron<br>Williams",

Diff for: plotly/Cargo.toml

@@ -18,13 +18,15 @@ kaleido = ["plotly_kaleido"]
 plotly_ndarray = ["ndarray"]
 plotly_image = ["image"]
 wasm = ["getrandom", "js-sys", "wasm-bindgen", "wasm-bindgen-futures"]
+with-axum = ["askama/with-axum", "askama_axum"]
 
 [dependencies]
 askama = { version = ">=0.11.0, <0.13.0", features = ["serde-json"] }
+askama_axum = { version = "0.4.0", optional = true }
 dyn-clone = "1"
-erased-serde = "0.3"
+erased-serde = "0.4"
 getrandom = { version = "0.2", features = ["js"], optional = true }
-image = { version = "0.24.2", optional = true }
+image = { version = "0.24", optional = true }
 js-sys = { version = "0.3", optional = true }
 plotly_derive = { version = "0.8.4", path = "../plotly_derive" }
 plotly_kaleido = { version = "0.8.4", path = "../plotly_kaleido", optional = true }
@@ -33,15 +35,15 @@ once_cell = "1"
 serde = { version = "1.0.132", features = ["derive"] }
 serde_json = "1.0.73"
 serde_repr = "0.1"
-serde_with = "2"
+serde_with = ">=2, <4"
 rand = "0.8"
 wasm-bindgen = { version = "0.2", optional = true }
 wasm-bindgen-futures = { version = "0.4", optional = true }
 
 [dev-dependencies]
 csv = "1.1.6"
-image = "0.24.4"
-itertools = "0.10.3"
+image = "0.24"
+itertools = ">=0.10, <0.13"
 itertools-num = "0.1.3"
 ndarray = "0.15.4"
 plotly_kaleido = { version = "0.8.4", path = "../plotly_kaleido" }

Diff for: plotly/src/common/mod.rs

@@ -201,6 +201,7 @@ pub enum PlotType {
     Ohlc,
     Sankey,
     Surface,
+    DensityMapbox,
 }
 
 #[derive(Serialize, Clone, Debug)]

Diff for: plotly/src/layout/update_menu.rs

@@ -100,7 +100,7 @@ impl ButtonBuilder {
     pub fn new() -> Self {
         Default::default()
     }
-    pub fn push_restyle(mut self, restyle: impl Restyle + Serialize) -> Self {
+    pub fn push_restyle(mut self, restyle: impl Restyle) -> Self {
         let restyle = serde_json::to_value(&restyle).unwrap();
         for (k, v) in restyle.as_object().unwrap() {
             self.restyles.insert(k.clone(), v.clone());

Diff for: plotly/src/lib.rs

@@ -33,8 +33,8 @@ pub use plot::{ImageFormat, Plot, Trace};
 pub use traces::{box_plot, contour, histogram, image, mesh3d, sankey, scatter_mapbox, surface};
 // Bring the different trace types into the top-level scope
 pub use traces::{
-    Bar, BoxPlot, Candlestick, Contour, HeatMap, Histogram, Image, Mesh3D, Ohlc, Sankey, Scatter,
-    Scatter3D, ScatterMapbox, ScatterPolar, Surface,
+    Bar, BoxPlot, Candlestick, Contour, DensityMapbox, HeatMap, Histogram, Image, Mesh3D, Ohlc,
+    Sankey, Scatter, Scatter3D, ScatterMapbox, ScatterPolar, Surface,
 };
 
 pub trait Restyle: serde::Serialize {}

Diff for: plotly/src/plot.rs

@@ -20,6 +20,7 @@ struct PlotTemplate<'a> {
 
 #[derive(Template)]
 #[template(path = "static_plot.html", escape = "none")]
+#[cfg(not(target_family = "wasm"))]
 struct StaticPlotTemplate<'a> {
     plot: &'a Plot,
     format: ImageFormat,
@@ -162,7 +163,7 @@ impl Traces {
 ///
 ///     let layout = Layout::new().title("<b>Line and Scatter Plot</b>".into());
 ///     plot.set_layout(layout);
-///     
+///
 ///     # if false {  // We don't actually want to try and display the plot in a browser when running a doctest.
 ///     plot.show();
 ///     # }
@@ -650,6 +651,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_png() {
@@ -661,6 +663,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_jpeg() {
@@ -672,6 +675,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_svg() {
@@ -695,6 +699,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_pdf() {
@@ -706,6 +711,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_webp() {

Diff for: plotly/src/traces/density_mapbox.rs

@@ -0,0 +1,146 @@
+//! Density mapbox scatter plot
+
+use plotly_derive::FieldSetter;
+use serde::Serialize;
+
+use crate::common::{LegendGroupTitle, Line, PlotType, Visible};
+use crate::Trace;
+
+#[serde_with::skip_serializing_none]
+#[derive(Serialize, Clone, Debug, FieldSetter)]
+#[field_setter(box_self, kind = "trace")]
+pub struct DensityMapbox<Lat, Lon, Z>
+where
+    Lat: Serialize + Clone,
+    Lon: Serialize + Clone,
+    Z: Serialize + Clone,
+{
+    #[field_setter(default = "PlotType::DensityMapbox")]
+    r#type: PlotType,
+    /// Sets the trace name. The trace name appear as the legend item and on
+    /// hover.
+    name: Option<String>,
+    /// Determines whether or not this trace is visible. If
+    /// `Visible::LegendOnly`, the trace is not drawn, but can appear as a
+    /// legend item (provided that the legend itself is visible).
+    visible: Option<Visible>,
+
+    /// Determines whether or not an item corresponding to this trace is shown
+    /// in the legend.
+    #[serde(rename = "showlegend")]
+    show_legend: Option<bool>,
+
+    /// Sets the legend rank for this trace. Items and groups with smaller ranks
+    /// are presented on top/left side while with `"reversed"
+    /// `legend.trace_order` they are on bottom/right side. The default
+    /// legendrank is 1000, so that you can use ranks less than 1000 to
+    /// place certain items before all unranked items, and ranks greater
+    /// than 1000 to go after all unranked items.
+    #[serde(rename = "legendrank")]
+    legend_rank: Option<usize>,
+    /// Sets the legend group for this trace. Traces part of the same legend
+    /// group show/hide at the same time when toggling legend items.
+    #[serde(rename = "legendgroup")]
+    legend_group: Option<String>,
+    /// Set and style the title to appear for the legend group.
+    #[serde(rename = "legendgrouptitle")]
+    legend_group_title: Option<LegendGroupTitle>,
+
+    /// Line display properties.
+    line: Option<Line>,
+
+    lat: Option<Vec<Lat>>,
+    lon: Option<Vec<Lon>>,
+    z: Option<Vec<Z>>,
+
+    /// Sets the opacity of the trace.
+    opacity: Option<f64>,
+
+    /// Sets a reference between this trace's data coordinates and a mapbox
+    /// subplot. If "mapbox" (the default value), the data refer to
+    /// `layout.mapbox`. If "mapbox2", the data refer to `layout.mapbox2`, and
+    /// so on.
+    subplot: Option<String>,
+
+    /// Determines whether or not the color domain is computed
+    /// with respect to the input data (here in `z`) or the bounds set
+    /// in `zmin` and `zmax`. Defaults to false when `zmin` and `zmax` are
+    /// set by the user.
+    zauto: Option<bool>,
+
+    /// Sets the upper bound of the color domain. Value should have the
+    /// same units as in `z` and if set, `zmin` must be set as well.
+    zmax: Option<Z>,
+
+    zmid: Option<Z>,
+
+    zmin: Option<Z>,
+
+    zoom: Option<u8>,
+
+    radius: Option<u8>,
+    //color_continuous_scale: Option<HashMap<Z, NamedColor>>,
+    //color_continuous_midpoint: Option<ContinuousColorScale>,
+}
+
+impl<Lat, Lon, Z> DensityMapbox<Lat, Lon, Z>
+where
+    Lat: Serialize + Clone + std::default::Default, // TODO why is "+ Default" necessary?
+    Lon: Serialize + Clone + std::default::Default,
+    Z: Serialize + Clone + std::default::Default,
+{
+    pub fn new(lat: Vec<Lat>, lon: Vec<Lon>, z: Vec<Z>) -> Box<Self> {
+        Box::new(Self {
+            lat: Some(lat),
+            lon: Some(lon),
+            z: Some(z),
+            ..Default::default()
+        })
+    }
+}
+
+impl<Lat, Lon, Z> Trace for DensityMapbox<Lat, Lon, Z>
+where
+    Lat: Serialize + Clone,
+    Lon: Serialize + Clone,
+    Z: Serialize + Clone,
+{
+    fn to_json(&self) -> String {
+        serde_json::to_string(&self).unwrap()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::{json, to_value};
+
+    use super::*;
+
+    #[test]
+    fn test_serialize_density_mapbox() {
+        let density_mapbox = DensityMapbox::new(vec![45.5017], vec![-73.5673], vec![1.0])
+            .name("name")
+            .visible(Visible::True)
+            .show_legend(true)
+            .legend_rank(1000)
+            .legend_group("legend group")
+            .zoom(5)
+            .radius(20)
+            .opacity(0.5);
+        let expected = json!({
+            "type": "densitymapbox",
+            "lat": [45.5017],
+            "lon": [-73.5673],
+            "z": [1.0],
+            "name": "name",
+            "visible": true,
+            "showlegend": true,
+            "legendrank": 1000,
+            "legendgroup": "legend group",
+            "opacity": 0.5,
+            "zoom": 5,
+            "radius": 20,
+        });
+        assert_eq!(to_value(density_mapbox.clone()).unwrap(), expected);
+    }
+}