uniformize layout and layouttemplate

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

Author: andrei-ng

plotly/src/layout/mapbox.rs

@@ -40,6 +40,7 @@ pub enum MapboxStyle {
     SatelliteStreets,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, FieldSetter)]
 pub struct Mapbox {
     /// Sets the mapbox access token to be used for this mapbox map. Note that

plotly/src/layout/mod.rs

@@ -226,34 +226,57 @@ pub struct LayoutTemplate {
     x_axis: Option<Box<Axis>>,
     #[serde(rename = "yaxis")]
     y_axis: Option<Box<Axis>>,
+    #[serde(rename = "zaxis")]
+    z_axis: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis2")]
     x_axis2: Option<Box<Axis>>,
     #[serde(rename = "yaxis2")]
     y_axis2: Option<Box<Axis>>,
+    #[serde(rename = "zaxis2")]
+    z_axis2: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis3")]
     x_axis3: Option<Box<Axis>>,
     #[serde(rename = "yaxis3")]
     y_axis3: Option<Box<Axis>>,
+    #[serde(rename = "zaxis3")]
+    z_axis3: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis4")]
     x_axis4: Option<Box<Axis>>,
     #[serde(rename = "yaxis4")]
     y_axis4: Option<Box<Axis>>,
+    #[serde(rename = "zaxis4")]
+    z_axis4: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis5")]
     x_axis5: Option<Box<Axis>>,
     #[serde(rename = "yaxis5")]
     y_axis5: Option<Box<Axis>>,
+    #[serde(rename = "zaxis5")]
+    z_axis5: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis6")]
     x_axis6: Option<Box<Axis>>,
     #[serde(rename = "yaxis6")]
     y_axis6: Option<Box<Axis>>,
+    #[serde(rename = "zaxis6")]
+    z_axis6: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis7")]
     x_axis7: Option<Box<Axis>>,
     #[serde(rename = "yaxis7")]
     y_axis7: Option<Box<Axis>>,
+    #[serde(rename = "zaxis7")]
+    z_axis7: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis8")]
     x_axis8: Option<Box<Axis>>,
     #[serde(rename = "yaxis8")]
     y_axis8: Option<Box<Axis>>,
+    #[serde(rename = "zaxis8")]
+    z_axis8: Option<Box<Axis>>,
 
     // ternary: Option<LayoutTernary>,
     scene: Option<LayoutScene>,
@@ -304,6 +327,11 @@ pub struct LayoutTemplate {
     sunburst_colorway: Option<Vec<Box<dyn Color>>>,
     #[serde(rename = "extendsunburstcolors")]
     extend_sunburst_colors: Option<bool>,
+
+    mapbox: Option<Mapbox>,
+
+    #[serde(rename = "updatemenus")]
+    update_menus: Option<Vec<UpdateMenu>>,
 }
 
 impl LayoutTemplate {
@@ -402,37 +430,43 @@ pub struct Layout {
     y_axis2: Option<Box<Axis>>,
     #[serde(rename = "zaxis2")]
     z_axis2: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis3")]
     x_axis3: Option<Box<Axis>>,
     #[serde(rename = "yaxis3")]
     y_axis3: Option<Box<Axis>>,
     #[serde(rename = "zaxis3")]
     z_axis3: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis4")]
     x_axis4: Option<Box<Axis>>,
     #[serde(rename = "yaxis4")]
     y_axis4: Option<Box<Axis>>,
     #[serde(rename = "zaxis4")]
     z_axis4: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis5")]
     x_axis5: Option<Box<Axis>>,
     #[serde(rename = "yaxis5")]
     y_axis5: Option<Box<Axis>>,
     #[serde(rename = "zaxis5")]
     z_axis5: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis6")]
     x_axis6: Option<Box<Axis>>,
     #[serde(rename = "yaxis6")]
     y_axis6: Option<Box<Axis>>,
     #[serde(rename = "zaxis6")]
     z_axis6: Option<Box<Axis>>,
+
     #[serde(rename = "xaxis7")]
     x_axis7: Option<Box<Axis>>,
     #[serde(rename = "yaxis7")]
     y_axis7: Option<Box<Axis>>,
     #[serde(rename = "zaxis7")]
     z_axis7: Option<Box<Axis>>,
     #[serde(rename = "xaxis8")]
+
     x_axis8: Option<Box<Axis>>,
     #[serde(rename = "yaxis8")]
     y_axis8: Option<Box<Axis>>,
@@ -660,6 +694,14 @@ mod tests {
             .y_axis6(Axis::new())
             .y_axis7(Axis::new())
             .y_axis8(Axis::new())
+            .z_axis(Axis::new())
+            .z_axis2(Axis::new())
+            .z_axis3(Axis::new())
+            .z_axis4(Axis::new())
+            .z_axis5(Axis::new())
+            .z_axis6(Axis::new())
+            .z_axis7(Axis::new())
+            .z_axis8(Axis::new())
             .annotations(vec![Annotation::new()])
             .shapes(vec![Shape::new()])
             .new_shape(NewShape::new())
@@ -680,7 +722,9 @@ mod tests {
             .pie_colorway(vec!["#789789"])
             .extend_pie_colors(true)
             .sunburst_colorway(vec!["#654654"])
-            .extend_sunburst_colors(false);
+            .extend_sunburst_colors(false)
+            .mapbox(Mapbox::new())
+            .update_menus(vec![UpdateMenu::new()]);
 
         let expected = json!({
             "title": {"text": "Title"},
@@ -724,6 +768,14 @@ mod tests {
             "yaxis6": {},
             "yaxis7": {},
             "yaxis8": {},
+            "zaxis": {},
+            "zaxis2": {},
+            "zaxis3": {},
+            "zaxis4": {},
+            "zaxis5": {},
+            "zaxis6": {},
+            "zaxis7": {},
+            "zaxis8": {},
             "annotations": [{}],
             "shapes": [{}],
             "newshape": {},
@@ -745,6 +797,8 @@ mod tests {
             "extendpiecolors": true,
             "sunburstcolorway": ["#654654"],
             "extendsunburstcolors": false,
+            "mapbox": {},
+            "updatemenus": [{}],
         });
 
         assert_eq!(to_value(layout_template).unwrap(), expected);