Finish Geo choropleth trace and chart, tests, and docs

Author: kMutagene

docs/05_0_geo-vs-mapbox.fsx

@@ -50,7 +50,7 @@ In the default plotly template, a map frame and physical features such as a coas
 open Plotly.NET
 
 let baseMapOnly = 
-    Chart.PointGeo([]) // deliberately empty chart to show the base map only
+    Chart.PointGeo(locations = []) // deliberately empty chart to show the base map only
     |> Chart.withMarginSize(0,0,0,0)
 
 (*** condition: ipynb ***)
@@ -84,7 +84,7 @@ let myGeo =
     )
 
 let moreFeaturesBaseMap =
-    Chart.PointGeo([])
+    Chart.PointGeo(locations = [])
     |> Chart.withGeo myGeo
     |> Chart.withMarginSize(0,0,0,0)
 
@@ -119,7 +119,7 @@ let countryGeo =
 
 
 let countryBaseMap =
-    Chart.PointGeo([])
+    Chart.PointGeo(locations = [])
     |> Chart.withGeo countryGeo
     |> Chart.withMarginSize(0,0,0,0)
 

docs/05_1_geo-plots.fsx

@@ -58,7 +58,7 @@ let pointGeo =
     Chart.PointGeo(
         lon,
         lat,
-        Labels=cityNames,
+        MultiText=cityNames,
         TextPosition=StyleParam.TextPosition.TopCenter
     )
     |> Chart.withGeoStyle(
@@ -106,7 +106,7 @@ let flights =
         Chart.LineGeo(
             [startCoords; endCoords],
             Opacity = opacityVals.[i],
-            Color = Color.fromString "red"
+            MarkerColor = Color.fromString "red"
         )
     )
     |> Chart.combine

src/Plotly.NET/ChartAPI/ChartMap.fs

@@ -23,35 +23,39 @@ module ChartMap =
         static member ChoroplethMap
             (
                 locations,z,
-                [<Optional;DefaultParameterValue(null)>] ?Text,
-                [<Optional;DefaultParameterValue(null)>] ?Locationmode,
-                [<Optional;DefaultParameterValue(null)>] ?Autocolorscale,
-                [<Optional;DefaultParameterValue(null)>] ?Colorscale,
-                [<Optional;DefaultParameterValue(null)>] ?ColorBar,
-                [<Optional;DefaultParameterValue(null)>] ?Marker,
-                [<Optional;DefaultParameterValue(null)>] ?GeoJson,
-                [<Optional;DefaultParameterValue(null)>] ?FeatureIdKey: string,
-                [<Optional;DefaultParameterValue(null)>] ?Zmin,
-                [<Optional;DefaultParameterValue(null)>] ?Zmax,
-                [<Optional;DefaultParameterValue(true)>] ?UseDefaults : bool
+                [<Optional;DefaultParameterValue(null)>] ?Name              : string,
+                [<Optional;DefaultParameterValue(null)>] ?ShowLegend        : bool,
+                [<Optional;DefaultParameterValue(null)>] ?GeoJson           : obj,
+                [<Optional;DefaultParameterValue(null)>] ?FeatureIdKey      : string,
+                [<Optional;DefaultParameterValue(null)>] ?Text              : #IConvertible,
+                [<Optional;DefaultParameterValue(null)>] ?MultiText         : seq<#IConvertible>,
+                [<Optional;DefaultParameterValue(null)>] ?ColorBar          : ColorBar,
+                [<Optional;DefaultParameterValue(null)>] ?AutoColorScale    : bool,
+                [<Optional;DefaultParameterValue(null)>] ?ColorScale        : StyleParam.Colorscale,
+                [<Optional;DefaultParameterValue(null)>] ?ShowScale         : bool,
+                [<Optional;DefaultParameterValue(null)>] ?ReverseScale      : bool,
+                [<Optional;DefaultParameterValue(null)>] ?LocationMode      : StyleParam.LocationFormat,
+                [<Optional;DefaultParameterValue(true)>] ?UseDefaults       : bool
             ) = 
 
                 let useDefaults = defaultArg UseDefaults true
 
                 TraceGeo.initChoroplethMap (
                     TraceGeoStyle.ChoroplethMap(
-                        Locations=locations,
-                        Z=z,
-                        ?Text=Text,
-                        ?Locationmode=Locationmode,
-                        ?Autocolorscale=Autocolorscale,
-                        ?Colorscale=Colorscale,
-                        ?ColorBar=ColorBar,
-                        ?Marker=Marker,
-                        ?Zmin=Zmin,
-                        ?Zmax=Zmax,
-                        ?GeoJson=GeoJson,
-                        ?FeatureIdKey=FeatureIdKey
+                        Locations       = locations     ,
+                        Z               = z             ,
+                        ?Name           = Name          ,
+                        ?ShowLegend     = ShowLegend    ,
+                        ?GeoJson        = GeoJson       ,
+                        ?FeatureIdKey   = FeatureIdKey  ,
+                        ?Text           = Text          ,
+                        ?MultiText      = MultiText     ,
+                        ?ColorBar       = ColorBar      ,
+                        ?AutoColorScale = AutoColorScale,
+                        ?ColorScale     = ColorScale    ,
+                        ?ShowScale      = ShowScale     ,
+                        ?ReverseScale   = ReverseScale  ,
+                        ?LocationMode   = LocationMode  
                     )              
                 )
                 |> GenericChart.ofTraceObject useDefaults

src/Plotly.NET/Templates/ChartTemplates.fs

@@ -396,12 +396,23 @@ module ChartTemplates =
                 )
             ))
 
-            TraceGeo.initChoroplethMap(TraceGeoStyle.ChoroplethMap(
-                ColorBar = ColorBar.init(
-                    OutlineWidth = 0., Ticks = StyleParam.TickOptions.Empty
+            TraceGeo.initChoroplethMap(
+                TraceGeoStyle.ChoroplethMap(
+                    ColorBar = ColorBar.init(OutlineWidth = 0., Ticks = StyleParam.TickOptions.Empty),
+                    ColorScale = StyleParam.Colorscale.Custom [
+                        0.0                , "#0d0887"
+                        0.1111111111111111 , "#46039f"
+                        0.2222222222222222 , "#7201a8"
+                        0.3333333333333333 , "#9c179e"
+                        0.4444444444444444 , "#bd3786"
+                        0.5555555555555556 , "#d8576b"
+                        0.6666666666666666 , "#ed7953"
+                        0.7777777777777778 , "#fb9f3a"
+                        0.8888888888888888 , "#fdca26"
+                        1.0                , "#f0f921"
+                    ]
                 )
-            ))
-
+            )
             Trace2D.initContour(Trace2DStyle.Contour(
                 ColorBar = ColorBar.init(
                     OutlineWidth = 0., Ticks = StyleParam.TickOptions.Empty