From 0ee67e3e9251515d94a2f40858ed4fdd7398e104 Mon Sep 17 00:00:00 2001
From: Kevin Schneider <schneider.kev@outlook.de>
Date: Thu, 9 Feb 2023 08:11:50 +0100
Subject: [PATCH] plotlyjs v2.16: Add clustering options to scattermapbox
 (https://github.com/plotly/plotly.js/pull/5827), add top level args for
 clustering

---
 src/Plotly.NET/ChartAPI/ChartMap.fs           | 30 +++++++
 src/Plotly.NET/ChartAPI/GenericChart.fs       |  4 +-
 .../ObjectAbstractions/Map/MapboxCluster.fs   | 79 +++++++++++++++++++
 src/Plotly.NET/Plotly.NET.fsproj              |  1 +
 src/Plotly.NET/Traces/TraceMapbox.fs          |  3 +
 .../HtmlCodegen/ChartLayout.fs                |  4 +-
 .../HtmlCodegen/MapboxMapCharts.fs            |  6 +-
 .../HtmlCodegen/SimpleTests.fs                |  4 +-
 8 files changed, 122 insertions(+), 9 deletions(-)
 create mode 100644 src/Plotly.NET/Layout/ObjectAbstractions/Map/MapboxCluster.fs

diff --git a/src/Plotly.NET/ChartAPI/ChartMap.fs b/src/Plotly.NET/ChartAPI/ChartMap.fs
index 4e77d6cc0..fe0031a3b 100644
--- a/src/Plotly.NET/ChartAPI/ChartMap.fs
+++ b/src/Plotly.NET/ChartAPI/ChartMap.fs
@@ -1183,6 +1183,8 @@ module ChartMap =
         /// <param name="LineDash">sets the drawing style of the line</param>
         /// <param name="Line">Sets the line (use this for more finegrained control than the other line-associated arguments)</param>
         /// <param name="Below">Determines if this scattermapbox trace's layers are to be inserted before the layer with the specified ID. By default, scattermapbox layers are inserted above all the base layers. To place the scattermapbox layers above every other layer, set `below` to "''".</param>
+        /// <param name="EnableClustering">Wether or not to enable clustering for points</param>
+        /// <param name="Cluster">Sets the clustering options (use this for more finegrained control than the other cluster-associated arguments)</param>
         /// <param name="UseDefaults">If set to false, ignore the global default settings set in `Defaults`</param>
         [<Extension>]
         static member ScatterMapbox
@@ -1210,6 +1212,8 @@ module ChartMap =
                 [<Optional; DefaultParameterValue(null)>] ?LineDash: StyleParam.DrawingStyle,
                 [<Optional; DefaultParameterValue(null)>] ?Line: Line,
                 [<Optional; DefaultParameterValue(null)>] ?Below: string,
+                [<Optional; DefaultParameterValue(true)>] ?EnableClustering: bool,
+                [<Optional; DefaultParameterValue(true)>] ?Cluster: MapboxCluster,
                 [<Optional; DefaultParameterValue(true)>] ?UseDefaults: bool
             ) =
 
@@ -1239,11 +1243,18 @@ module ChartMap =
                     ?Width = LineWidth
                 )
 
+            let cluster =
+                Cluster
+                |> Option.defaultValue (MapboxCluster.init ())
+                |> MapboxCluster.style(
+                    ?Enabled = EnableClustering
+                )
 
             TraceMapbox.initScatterMapbox (
                 TraceMapboxStyle.ScatterMapbox(
                     Lon = longitudes,
                     Lat = latitudes,
+                    Cluster = cluster,
                     Mode = mode,
                     Marker = marker,
                     Line = line,
@@ -1291,6 +1302,8 @@ module ChartMap =
         /// <param name="LineDash">sets the drawing style of the line</param>
         /// <param name="Line">Sets the line (use this for more finegrained control than the other line-associated arguments)</param>
         /// <param name="Below">Determines if this scattermapbox trace's layers are to be inserted before the layer with the specified ID. By default, scattermapbox layers are inserted above all the base layers. To place the scattermapbox layers above every other layer, set `below` to "''".</param>
+        /// <param name="EnableClustering">Wether or not to enable clustering for points</param>
+        /// <param name="Cluster">Sets the clustering options (use this for more finegrained control than the other cluster-associated arguments)</param>
         /// <param name="UseDefaults">If set to false, ignore the global default settings set in `Defaults`</param>
         [<Extension>]
         static member ScatterMapbox
@@ -1317,6 +1330,8 @@ module ChartMap =
                 [<Optional; DefaultParameterValue(null)>] ?LineDash: StyleParam.DrawingStyle,
                 [<Optional; DefaultParameterValue(null)>] ?Line: Line,
                 [<Optional; DefaultParameterValue(null)>] ?Below: string,
+                [<Optional; DefaultParameterValue(true)>] ?EnableClustering: bool,
+                [<Optional; DefaultParameterValue(true)>] ?Cluster: MapboxCluster,
                 [<Optional; DefaultParameterValue(true)>] ?UseDefaults: bool
             ) =
 
@@ -1346,6 +1361,8 @@ module ChartMap =
                 ?LineDash = LineDash,
                 ?Line = Line,
                 ?Below = Below,
+                ?EnableClustering = EnableClustering,
+                ?Cluster = Cluster,
                 ?UseDefaults = UseDefaults
             )
 
@@ -1373,6 +1390,8 @@ module ChartMap =
         /// <param name="MultiMarkerSymbol">Sets the marker symbol for each individual datum</param>
         /// <param name="Marker">Sets the marker (use this for more finegrained control than the other marker-associated arguments)</param>
         /// <param name="Below">Determines if this scattermapbox trace's layers are to be inserted before the layer with the specified ID. By default, scattermapbox layers are inserted above all the base layers. To place the scattermapbox layers above every other layer, set `below` to "''".</param>
+        /// <param name="EnableClustering">Wether or not to enable clustering for points</param>
+        /// <param name="Cluster">Sets the clustering options (use this for more finegrained control than the other cluster-associated arguments)</param>
         /// <param name="UseDefaults">If set to false, ignore the global default settings set in `Defaults`</param>
         [<Extension>]
         static member PointMapbox
@@ -1394,6 +1413,8 @@ module ChartMap =
                 [<Optional; DefaultParameterValue(null)>] ?MultiMarkerSymbol: seq<StyleParam.MarkerSymbol>,
                 [<Optional; DefaultParameterValue(null)>] ?Marker: Marker,
                 [<Optional; DefaultParameterValue(null)>] ?Below: string,
+                [<Optional; DefaultParameterValue(true)>] ?EnableClustering: bool,
+                [<Optional; DefaultParameterValue(true)>] ?Cluster: MapboxCluster,
                 [<Optional; DefaultParameterValue(true)>] ?UseDefaults: bool
             ) =
 
@@ -1419,6 +1440,8 @@ module ChartMap =
                 ?MultiMarkerSymbol = MultiMarkerSymbol,
                 ?Marker = Marker,
                 ?Below = Below,
+                ?EnableClustering = EnableClustering,
+                ?Cluster = Cluster,
                 ?UseDefaults = UseDefaults
 
             )
@@ -1446,6 +1469,8 @@ module ChartMap =
         /// <param name="MultiMarkerSymbol">Sets the marker symbol for each individual datum</param>
         /// <param name="Marker">Sets the marker (use this for more finegrained control than the other marker-associated arguments)</param>
         /// <param name="Below">Determines if this scattermapbox trace's layers are to be inserted before the layer with the specified ID. By default, scattermapbox layers are inserted above all the base layers. To place the scattermapbox layers above every other layer, set `below` to "''".</param>
+        /// <param name="EnableClustering">Wether or not to enable clustering for points</param>
+        /// <param name="Cluster">Sets the clustering options (use this for more finegrained control than the other cluster-associated arguments)</param>
         /// <param name="UseDefaults">If set to false, ignore the global default settings set in `Defaults`</param>
         [<Extension>]
         static member PointMapbox
@@ -1466,6 +1491,8 @@ module ChartMap =
                 [<Optional; DefaultParameterValue(null)>] ?MultiMarkerSymbol: seq<StyleParam.MarkerSymbol>,
                 [<Optional; DefaultParameterValue(null)>] ?Marker: Marker,
                 [<Optional; DefaultParameterValue(null)>] ?Below: string,
+                [<Optional; DefaultParameterValue(true)>] ?EnableClustering: bool,
+                [<Optional; DefaultParameterValue(true)>] ?Cluster: MapboxCluster,
                 [<Optional; DefaultParameterValue(true)>] ?UseDefaults: bool
             ) =
 
@@ -1489,6 +1516,8 @@ module ChartMap =
                 ?MultiMarkerSymbol = MultiMarkerSymbol,
                 ?Marker = Marker,
                 ?Below = Below,
+                ?EnableClustering = EnableClustering,
+                ?Cluster = Cluster,
                 ?UseDefaults = UseDefaults
             )
 
@@ -1723,6 +1752,7 @@ module ChartMap =
                 [<Optional; DefaultParameterValue(null)>] ?MultiMarkerSymbol: seq<StyleParam.MarkerSymbol>,
                 [<Optional; DefaultParameterValue(null)>] ?Marker: Marker,
                 [<Optional; DefaultParameterValue(null)>] ?Below: string,
+
                 [<Optional; DefaultParameterValue(true)>] ?UseDefaults: bool
             ) =
 
diff --git a/src/Plotly.NET/ChartAPI/GenericChart.fs b/src/Plotly.NET/ChartAPI/GenericChart.fs
index 52dd7d605..d1ec7e1f0 100644
--- a/src/Plotly.NET/ChartAPI/GenericChart.fs
+++ b/src/Plotly.NET/ChartAPI/GenericChart.fs
@@ -15,7 +15,7 @@ module HTML =
     <head>
         <!-- Plotly.js -->
         <meta http-equiv="X-UA-Compatible" content="IE=11" >
-        <script src="https://cdn.plot.ly/plotly-2.15.1.min.js"></script>
+        <script src="https://cdn.plot.ly/plotly-2.16.5.min.js"></script>
         [ADDITIONAL_HEAD_TAGS]
         <style>
         .container {
@@ -58,7 +58,7 @@ module HTML =
         newScript.AppendLine(
             @"
             var renderPlotly_[SCRIPTID] = function() {
-            var fsharpPlotlyRequire = requirejs.config({context:'fsharp-plotly',paths:{plotly:'https://cdn.plot.ly/plotly-2.15.1.min'}}) || require;
+            var fsharpPlotlyRequire = requirejs.config({context:'fsharp-plotly',paths:{plotly:'https://cdn.plot.ly/plotly-2.16.5.min'}}) || require;
             fsharpPlotlyRequire(['plotly'], function(Plotly) {"
         )
         |> ignore
diff --git a/src/Plotly.NET/Layout/ObjectAbstractions/Map/MapboxCluster.fs b/src/Plotly.NET/Layout/ObjectAbstractions/Map/MapboxCluster.fs
new file mode 100644
index 000000000..d5f971642
--- /dev/null
+++ b/src/Plotly.NET/Layout/ObjectAbstractions/Map/MapboxCluster.fs
@@ -0,0 +1,79 @@
+namespace Plotly.NET.LayoutObjects
+
+open Plotly.NET
+open DynamicObj
+open System
+open System.Runtime.InteropServices
+
+/// <summary>Clustering options for points on mapbox traces</summary>
+type MapboxCluster() =
+
+    inherit DynamicObj()
+
+    /// <summary>
+    /// Returns a new MapboxCluster object with the given styles
+    /// </summary
+    /// <param name="Color">Sets the color for each cluster step.</param>
+    /// <param name="Enabled">Determines whether clustering is enabled or disabled.</param>
+    /// <param name="MaxZoom">Sets the maximum zoom level. At zoom levels equal to or greater than this, points will never be clustered.</param>
+    /// <param name="Opacity">Sets the marker opacity.</param>
+    /// <param name="Size">Sets the size for each cluster step.</param>
+    /// <param name="MultiSize">Sets the size for each cluster step.</param>
+    /// <param name="Step">Sets how many points it takes to create a cluster or advance to the next cluster step. Use this in conjunction with arrays for `size` and / or `color`. If an integer, steps start at multiples of this number. If an array, each step extends from the given value until one less than the next value.</param>
+    /// <param name="MultiStep">Sets how many points it takes to create a cluster or advance to the next cluster step. Use this in conjunction with arrays for `size` and / or `color`. If an integer, steps start at multiples of this number. If an array, each step extends from the given value until one less than the next value.</param>
+    static member init
+        (
+            [<Optional; DefaultParameterValue(null)>] ?Color: Color,
+            [<Optional; DefaultParameterValue(null)>] ?Enabled: bool,
+            [<Optional; DefaultParameterValue(null)>] ?MaxZoom: float,
+            [<Optional; DefaultParameterValue(null)>] ?Opacity: float,
+            [<Optional; DefaultParameterValue(null)>] ?Size: int,
+            [<Optional; DefaultParameterValue(null)>] ?MultiSize: seq<int>,
+            [<Optional; DefaultParameterValue(null)>] ?Step: int,
+            [<Optional; DefaultParameterValue(null)>] ?MultiStep: seq<int>
+        ) =
+        MapboxCluster()
+        |> MapboxCluster.style (
+            ?Color     = Color     ,
+            ?Enabled   = Enabled   ,
+            ?MaxZoom   = MaxZoom   ,
+            ?Opacity   = Opacity   ,
+            ?Size      = Size      ,
+            ?MultiSize = MultiSize ,
+            ?Step      = Step      ,
+            ?MultiStep = MultiStep 
+        )
+
+    /// <summary>
+    /// Returns a function that applies the given styles to a MapboxCluster object.
+    /// </summary>
+    /// <param name="Color">Sets the color for each cluster step.</param>
+    /// <param name="Enabled">Determines whether clustering is enabled or disabled.</param>
+    /// <param name="MaxZoom">Sets the maximum zoom level. At zoom levels equal to or greater than this, points will never be clustered.</param>
+    /// <param name="Opacity">Sets the marker opacity.</param>
+    /// <param name="Size">Sets the size for each cluster step.</param>
+    /// <param name="MultiSize">Sets the size for each cluster step.</param>
+    /// <param name="Step">Sets how many points it takes to create a cluster or advance to the next cluster step. Use this in conjunction with arrays for `size` and / or `color`. If an integer, steps start at multiples of this number. If an array, each step extends from the given value until one less than the next value.</param>
+    /// <param name="MultiStep">Sets how many points it takes to create a cluster or advance to the next cluster step. Use this in conjunction with arrays for `size` and / or `color`. If an integer, steps start at multiples of this number. If an array, each step extends from the given value until one less than the next value.</param>
+    static member style
+        (
+            [<Optional; DefaultParameterValue(null)>] ?Color: Color,
+            [<Optional; DefaultParameterValue(null)>] ?Enabled: bool,
+            [<Optional; DefaultParameterValue(null)>] ?MaxZoom: float,
+            [<Optional; DefaultParameterValue(null)>] ?Opacity: float,
+            [<Optional; DefaultParameterValue(null)>] ?Size: int,
+            [<Optional; DefaultParameterValue(null)>] ?MultiSize: seq<int>,
+            [<Optional; DefaultParameterValue(null)>] ?Step: int,
+            [<Optional; DefaultParameterValue(null)>] ?MultiStep: seq<int>
+
+        ) =
+        (fun (mapboxCluster: MapboxCluster) ->
+
+            Color   |> DynObj.setValueOpt mapboxCluster "color"
+            Enabled |> DynObj.setValueOpt mapboxCluster "enabled"
+            MaxZoom |> DynObj.setValueOpt mapboxCluster "maxzoom"
+            Opacity |> DynObj.setValueOpt mapboxCluster "opacity"
+            (Size, MultiSize) |> DynObj.setSingleOrMultiOpt mapboxCluster "size"
+            (Step, MultiStep) |> DynObj.setSingleOrMultiOpt mapboxCluster "step"
+
+            mapboxCluster)
diff --git a/src/Plotly.NET/Plotly.NET.fsproj b/src/Plotly.NET/Plotly.NET.fsproj
index 92d48049e..552905fb0 100644
--- a/src/Plotly.NET/Plotly.NET.fsproj
+++ b/src/Plotly.NET/Plotly.NET.fsproj
@@ -79,6 +79,7 @@
     <Compile Include="Layout\ObjectAbstractions\Map\Geo.fs" />
     <Compile Include="Layout\ObjectAbstractions\Map\MapboxLayerSymbol.fs" />
     <Compile Include="Layout\ObjectAbstractions\Map\MapboxLayer.fs" />
+    <Compile Include="Layout\ObjectAbstractions\Map\MapboxCluster.fs" />
     <Compile Include="Layout\ObjectAbstractions\Map\Mapbox.fs" />
     <Compile Include="Layout\ObjectAbstractions\Ternary\Ternary.fs" />
     <Compile Include="Layout\ObjectAbstractions\3D\Camera.fs" />
diff --git a/src/Plotly.NET/Traces/TraceMapbox.fs b/src/Plotly.NET/Traces/TraceMapbox.fs
index 815b06639..09b7ce5f6 100644
--- a/src/Plotly.NET/Traces/TraceMapbox.fs
+++ b/src/Plotly.NET/Traces/TraceMapbox.fs
@@ -65,6 +65,7 @@ type TraceMapboxStyle() =
     /// <param name="Ids">Assigns id labels to each datum. These ids for object constancy of data points during animation. Should be an array of strings, not numbers or any other type.</param>
     /// <param name="Lat">Sets the latitude coordinates (in degrees North).</param>
     /// <param name="Lon">Sets the longitude coordinates (in degrees East).</param>
+    /// <param name="Cluster">Sets the clustering options for points on this trace.</param>
     /// <param name="Text">Sets text elements associated with each (x,y) pair. If a single string, the same string appears over all the data points. If an array of string, the items are mapped in order to the this trace's (x,y) coordinates. If trace `hoverinfo` contains a "text" flag and "hovertext" is not set, these elements will be seen in the hover labels.</param>
     /// <param name="MultiText">Sets text elements associated with each (x,y) pair. If a single string, the same string appears over all the data points. If an array of string, the items are mapped in order to the this trace's (x,y) coordinates. If trace `hoverinfo` contains a "text" flag and "hovertext" is not set, these elements will be seen in the hover labels.</param>
     /// <param name="TextPosition">Sets the positions of the `text` elements with respects to the (x,y) coordinates.</param>
@@ -104,6 +105,7 @@ type TraceMapboxStyle() =
             [<Optional; DefaultParameterValue(null)>] ?Ids: seq<#IConvertible>,
             [<Optional; DefaultParameterValue(null)>] ?Lat: #IConvertible seq,
             [<Optional; DefaultParameterValue(null)>] ?Lon: #IConvertible seq,
+            [<Optional; DefaultParameterValue(null)>] ?Cluster: MapboxCluster,
             [<Optional; DefaultParameterValue(null)>] ?Text: #IConvertible,
             [<Optional; DefaultParameterValue(null)>] ?MultiText: seq<#IConvertible>,
             [<Optional; DefaultParameterValue(null)>] ?TextPosition: StyleParam.TextPosition,
@@ -144,6 +146,7 @@ type TraceMapboxStyle() =
             Ids |> DynObj.setValueOpt trace "ids"
             Lat |> DynObj.setValueOpt trace "lat"
             Lon |> DynObj.setValueOpt trace "lon"
+            Cluster |> DynObj.setValueOpt trace "cluster"
             (Text, MultiText) |> DynObj.setSingleOrMultiOpt trace "text"
 
             (TextPosition, MultiTextPosition)
diff --git a/tests/Plotly.NET.Tests/HtmlCodegen/ChartLayout.fs b/tests/Plotly.NET.Tests/HtmlCodegen/ChartLayout.fs
index e9cc18518..ce489dd7f 100644
--- a/tests/Plotly.NET.Tests/HtmlCodegen/ChartLayout.fs
+++ b/tests/Plotly.NET.Tests/HtmlCodegen/ChartLayout.fs
@@ -255,7 +255,7 @@ let ``Multicharts and subplots`` =
             |> chartGeneratedContains subPlotChart
         );        
         testCase "MultiTrace Subplot grid data" ( fun () ->
-            """var data = [{"type":"scatter","name":"2D Cartesian","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"line":{},"xaxis":"x","yaxis":"y"},{"type":"scatter3d","name":"3D Cartesian","mode":"markers","x":[1],"y":[3],"z":[2],"marker":{},"line":{},"scene":"scene2"},{"type":"scatterpolar","name":"Polar","mode":"markers","r":[10],"theta":[20],"marker":{},"subplot":"polar3"},{"type":"scattergeo","name":"Geo","mode":"markers","lat":[2],"lon":[1],"marker":{},"line":{},"geo":"geo4"},{"type":"scattermapbox","name":"MapBox","mode":"markers","lat":[2],"lon":[1],"marker":{},"line":{},"subplot":"mapbox5"},{"type":"scatterternary","name":"Ternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"line":{},"subplot":"ternary6"},{"type":"carpet","opacity":0.75,"x":[2.0,3.0,4.0,5.0,2.2,3.1,4.1,5.1,1.5,2.5,3.5,4.5],"y":[1.0,1.4,1.6,1.75,2.0,2.5,2.7,2.75,3.0,3.5,3.7,3.75],"a":[0.0,1.0,2.0,3.0,0.0,1.0,2.0,3.0,0.0,1.0,2.0,3.0],"b":[4.0,4.0,4.0,4.0,5.0,5.0,5.0,5.0,6.0,6.0,6.0,6.0],"aaxis":{"type":"linear","tickprefix":"a = ","minorgridcount":9,"smoothing":0.0},"baxis":{"type":"linear","tickprefix":"b = ","minorgridcount":9,"smoothing":0.0},"carpet":"contour","xaxis":"x7","yaxis":"y7"},{"type":"contourcarpet","z":[1.0,1.96,2.56,3.0625,4.0,5.0625,1.0,7.5625,9.0,12.25,15.21,14.0625],"a":[0,1,2,3,0,1,2,3,0,1,2,3],"b":[4,4,4,4,5,5,5,5,6,6,6,6],"line":{"color":"rgba(255, 255, 255, 1.0)"},"showscale":false,"carpet":"contour","contours":{"showlabels":true}},{"type":"pie","name":"Domain","values":[10,40,50],"marker":{"line":{}},"domain":{"row":2,"column":1}},{"type":"scattersmith","name":"Smith","mode":"markers+text","imag":[0.5,1.0,2.0,3.0],"real":[0.5,1.0,2.0,3.0],"text":["one","two","three","four","five","six","seven"],"textposition":"top center","marker":{"size":[10,20,30,40]},"line":{},"subplot":"smith9"},{"type":"box","name":"Combined 1","x":"y","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x10","yaxis":"y10"},{"type":"box","name":"Combined 2","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x10","yaxis":"y10"}];"""
+            """var data = [{"type":"scatter","name":"2D Cartesian","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"line":{},"xaxis":"x","yaxis":"y"},{"type":"scatter3d","name":"3D Cartesian","mode":"markers","x":[1],"y":[3],"z":[2],"marker":{},"line":{},"scene":"scene2"},{"type":"scatterpolar","name":"Polar","mode":"markers","r":[10],"theta":[20],"marker":{},"subplot":"polar3"},{"type":"scattergeo","name":"Geo","mode":"markers","lat":[2],"lon":[1],"marker":{},"line":{},"geo":"geo4"},{"type":"scattermapbox","name":"MapBox","mode":"markers","lat":[2],"lon":[1],"cluster":{},"marker":{},"line":{},"subplot":"mapbox5"},{"type":"scatterternary","name":"Ternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"line":{},"subplot":"ternary6"},{"type":"carpet","opacity":0.75,"x":[2.0,3.0,4.0,5.0,2.2,3.1,4.1,5.1,1.5,2.5,3.5,4.5],"y":[1.0,1.4,1.6,1.75,2.0,2.5,2.7,2.75,3.0,3.5,3.7,3.75],"a":[0.0,1.0,2.0,3.0,0.0,1.0,2.0,3.0,0.0,1.0,2.0,3.0],"b":[4.0,4.0,4.0,4.0,5.0,5.0,5.0,5.0,6.0,6.0,6.0,6.0],"aaxis":{"type":"linear","tickprefix":"a = ","minorgridcount":9,"smoothing":0.0},"baxis":{"type":"linear","tickprefix":"b = ","minorgridcount":9,"smoothing":0.0},"carpet":"contour","xaxis":"x7","yaxis":"y7"},{"type":"contourcarpet","z":[1.0,1.96,2.56,3.0625,4.0,5.0625,1.0,7.5625,9.0,12.25,15.21,14.0625],"a":[0,1,2,3,0,1,2,3,0,1,2,3],"b":[4,4,4,4,5,5,5,5,6,6,6,6],"line":{"color":"rgba(255, 255, 255, 1.0)"},"showscale":false,"carpet":"contour","contours":{"showlabels":true}},{"type":"pie","name":"Domain","values":[10,40,50],"marker":{"line":{}},"domain":{"row":2,"column":1}},{"type":"scattersmith","name":"Smith","mode":"markers+text","imag":[0.5,1.0,2.0,3.0],"real":[0.5,1.0,2.0,3.0],"text":["one","two","three","four","five","six","seven"],"textposition":"top center","marker":{"size":[10,20,30,40]},"line":{},"subplot":"smith9"},{"type":"box","name":"Combined 1","x":"y","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x10","yaxis":"y10"},{"type":"box","name":"Combined 2","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x10","yaxis":"y10"}];"""
             |> chartGeneratedContains multiTraceGrid
         );
         testCase "MultiTrace Subplot grid layout" ( fun () ->
@@ -272,7 +272,7 @@ let ``Multicharts and subplots`` =
         );        
         
         testCase "MultiTrace Single Stack data" ( fun () -> 
-            """var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"line":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"line":{},"subplot":"ternary2"},{"type":"heatmap","z":[[1,2],[3,4]],"showscale":false,"xaxis":"x3","yaxis":"y3"},{"type":"scatter3d","mode":"markers","x":[1],"y":[3],"z":[2],"marker":{},"line":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lat":[2],"lon":[1],"marker":{},"line":{},"subplot":"mapbox5"},{"type":"box","name":"bin1","x":"y","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x6","yaxis":"y6"},{"type":"box","name":"bin2","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x6","yaxis":"y6"}];"""
+            """var data = [{"type":"scatter","mode":"markers","x":[1,2],"y":[2,3],"marker":{},"line":{},"xaxis":"x","yaxis":"y"},{"type":"scatterternary","mode":"markers","a":[1,2],"b":[2,3],"c":[3,4],"marker":{},"line":{},"subplot":"ternary2"},{"type":"heatmap","z":[[1,2],[3,4]],"showscale":false,"xaxis":"x3","yaxis":"y3"},{"type":"scatter3d","mode":"markers","x":[1],"y":[3],"z":[2],"marker":{},"line":{},"scene":"scene4"},{"type":"scattermapbox","mode":"markers","lat":[2],"lon":[1],"cluster":{},"marker":{},"line":{},"subplot":"mapbox5"},{"type":"box","name":"bin1","x":"y","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x6","yaxis":"y6"},{"type":"box","name":"bin2","x":"y'","y":[2.0,1.5,5.0,1.5,2.0,2.5,2.1,2.5,1.5,1.0,2.0,1.5,5.0,1.5,3.0,2.5,2.5,1.5,3.5,1.0],"marker":{},"line":{},"boxpoints":"all","jitter":0.1,"xaxis":"x6","yaxis":"y6"}];"""
             |> chartGeneratedContains multiTraceSingleStack
         );
         testCase "MultiTrace Single Stack layout" ( fun () -> 
diff --git a/tests/Plotly.NET.Tests/HtmlCodegen/MapboxMapCharts.fs b/tests/Plotly.NET.Tests/HtmlCodegen/MapboxMapCharts.fs
index 205083ca9..35d46dffd 100644
--- a/tests/Plotly.NET.Tests/HtmlCodegen/MapboxMapCharts.fs
+++ b/tests/Plotly.NET.Tests/HtmlCodegen/MapboxMapCharts.fs
@@ -22,7 +22,7 @@ let baseLayerOnlyChart =
 let ``Mapbox charts`` =
     testList "MapboxMapCharts.Mapbox charts" [
         testCase "Base layout only data" ( fun () ->
-            """var data = [{"type":"scattermapbox","mode":"markers","lat":[],"lon":[],"marker":{},"line":{}}];"""
+            """var data = [{"type":"scattermapbox","mode":"markers","lat":[],"lon":[],"cluster":{},"marker":{},"line":{}}];"""
             |> chartGeneratedContains baseLayerOnlyChart
         );
         testCase "Base layour only layout" ( fun () ->
@@ -108,7 +108,7 @@ let flightsChart =
 let ``Scatter and line plots on Mapbox maps charts`` =
     testList "MapboxMapCharts.Scatter and line plots on Mapbox maps charts" [
         testCase "Point mapbox data" ( fun () ->
-            """var data = [{"type":"scattermapbox","mode":"markers+text","lat":[45.5,43.4,49.13,51.1,53.34,45.24,44.64,48.25,49.89,50.45],"lon":[-73.57,-79.24,-123.06,-114.1,-113.28,-75.43,-63.57,-123.21,-97.13,-104.6],"text":["Montreal","Toronto","Vancouver","Calgary","Edmonton","Ottawa","Halifax","Victoria","Winnepeg","Regina"],"textposition":"top center","marker":{},"line":{}}];"""
+            """var data = [{"type":"scattermapbox","mode":"markers+text","lat":[45.5,43.4,49.13,51.1,53.34,45.24,44.64,48.25,49.89,50.45],"lon":[-73.57,-79.24,-123.06,-114.1,-113.28,-75.43,-63.57,-123.21,-97.13,-104.6],"cluster":{},"text":["Montreal","Toronto","Vancouver","Calgary","Edmonton","Ottawa","Halifax","Victoria","Winnepeg","Regina"],"textposition":"top center","marker":{},"line":{}}];"""
             |> chartGeneratedContains pointMapboxChart
         );
         testCase "Point mapbox layout" ( fun () ->
@@ -116,7 +116,7 @@ let ``Scatter and line plots on Mapbox maps charts`` =
             |> chartGeneratedContains pointMapboxChart
         );
         testCase "Flights mapbox data" ( fun () ->
-            """var data = [{"type":"scattermapbox","opacity":1.0,"mode":"lines","lat":[32.89595056,35.04022222],"lon":[-97.0372,-106.6091944],"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.3738738738738739,"mode":"lines","lat":[41.979595,30.19453278],"lon":[-87.90446417,-97.66987194],"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.36486486486486486,"mode":"lines","lat":[32.89595056,41.93887417],"lon":[-97.0372,-72.68322833],"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.12612612612612611,"mode":"lines","lat":[18.43941667,41.93887417],"lon":[-66.00183333,-72.68322833],"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.3783783783783784,"mode":"lines","lat":[32.89595056,33.56294306],"lon":[-97.0372,-86.75354972],"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.12612612612612611,"mode":"lines","lat":[25.79325,36.12447667],"lon":[-80.29055556,-86.67818222],"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.9504504504504504,"mode":"lines","lat":[32.89595056,42.3643475],"lon":[-97.0372,-71.00517917],"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.8828828828828829,"mode":"lines","lat":[25.79325,42.3643475],"lon":[-80.29055556,-71.00517917],"marker":{},"line":{"color":"red"}}];"""
+            """var data = [{"type":"scattermapbox","opacity":1.0,"mode":"lines","lat":[32.89595056,35.04022222],"lon":[-97.0372,-106.6091944],"cluster":{},"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.3738738738738739,"mode":"lines","lat":[41.979595,30.19453278],"lon":[-87.90446417,-97.66987194],"cluster":{},"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.36486486486486486,"mode":"lines","lat":[32.89595056,41.93887417],"lon":[-97.0372,-72.68322833],"cluster":{},"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.12612612612612611,"mode":"lines","lat":[18.43941667,41.93887417],"lon":[-66.00183333,-72.68322833],"cluster":{},"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.3783783783783784,"mode":"lines","lat":[32.89595056,33.56294306],"lon":[-97.0372,-86.75354972],"cluster":{},"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.12612612612612611,"mode":"lines","lat":[25.79325,36.12447667],"lon":[-80.29055556,-86.67818222],"cluster":{},"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.9504504504504504,"mode":"lines","lat":[32.89595056,42.3643475],"lon":[-97.0372,-71.00517917],"cluster":{},"marker":{},"line":{"color":"red"}},{"type":"scattermapbox","opacity":0.8828828828828829,"mode":"lines","lat":[25.79325,42.3643475],"lon":[-80.29055556,-71.00517917],"cluster":{},"marker":{},"line":{"color":"red"}}];"""
             |> chartGeneratedContains flightsChart
         );
         testCase "Flights mapbox layout" ( fun () ->
diff --git a/tests/Plotly.NET.Tests/HtmlCodegen/SimpleTests.fs b/tests/Plotly.NET.Tests/HtmlCodegen/SimpleTests.fs
index 10ebaab25..25a3b95db 100644
--- a/tests/Plotly.NET.Tests/HtmlCodegen/SimpleTests.fs
+++ b/tests/Plotly.NET.Tests/HtmlCodegen/SimpleTests.fs
@@ -20,7 +20,7 @@ let simpleChart =
 let ``Html layout tests`` =
     testList "SimpleTests.Simple tests" [
         testCase "Expecting plotly js" ( fun () ->
-            "https://cdn.plot.ly/plotly-2.15.1.min"
+            "https://cdn.plot.ly/plotly-2.16.5.min"
             |> chartGeneratedContains simpleChart
         );
         testCase "Expecting data" ( fun () ->
@@ -36,7 +36,7 @@ let ``Html layout tests`` =
             |> chartGeneratedContains simpleChart
         );
         testCase "Expecting require config" (fun () ->
-            "var fsharpPlotlyRequire = requirejs.config({context:'fsharp-plotly',paths:{plotly:'https://cdn.plot.ly/plotly-2.15.1.min'}}) || require;"
+            "var fsharpPlotlyRequire = requirejs.config({context:'fsharp-plotly',paths:{plotly:'https://cdn.plot.ly/plotly-2.16.5.min'}}) || require;"
             |> chartGeneratedContains simpleChart
         );
         testCase "Expecting html tags in embedded page only" (fun () ->