Skip to content

Commit 81bd99f

Browse files
kMutagenekMutagene
committed
Add encoded subplot trace fields (part 1)
Summary: - add encoded typed-array support for polar, geo, mapbox, ternary, and smith subplot traces in the first slice of the remaining subplot/domain work - wire encoded Ids, coordinate/value arrays, per-point text, customdata, and selectedpoints fields where those traces expose arrayOk properties - add encoded width/offset support for BarPolar and encoded meta support where the underlying trace already accepts meta arrays - extend the FSharpConsole manual playground with encoded scatterpolar, scattergeo, scattermapbox, scatterternary, and scattersmith samples Verification: - .\\build.cmd runTestsCore - 780 tests passed - Plotly.NET build succeeded - this partial package currently introduces F# XML-doc warnings for newly added encoded parameters that will be cleaned up in the remaining subplot/domain work
1 parent 343e31e commit 81bd99f

File tree

6 files changed

+201
-1
lines changed

6 files changed

+201
-1
lines changed

‎src/Plotly.NET/Traces/TraceGeo.fs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,23 @@ type TraceGeoStyle() =
9595
?LegendGroup: string,
9696
?LegendGroupTitle: Title,
9797
?Ids: seq<#IConvertible>,
98+
?IdsEncoded: EncodedTypedArray,
9899
?Z: seq<#IConvertible>,
100+
?ZEncoded: EncodedTypedArray,
99101
?GeoJson: obj,
100102
?FeatureIdKey: string,
101103
?Locations: seq<string>,
102104
?Text: #IConvertible,
103105
?MultiText: seq<#IConvertible>,
106+
?MultiTextEncoded: EncodedTypedArray,
104107
?HoverText: string,
105108
?MultiHoverText: seq<string>,
106109
?HoverInfo: StyleParam.HoverInfo,
107110
?HoverTemplate: string,
108111
?MultiHoverTemplate: seq<string>,
109112
?Meta: string,
110113
?CustomData: seq<#IConvertible>,
114+
?CustomDataEncoded: EncodedTypedArray,
111115
?Geo: StyleParam.SubPlotId,
112116
?ColorAxis: StyleParam.SubPlotId,
113117
?Marker: Marker,
@@ -121,6 +125,7 @@ type TraceGeoStyle() =
121125
?Zmid: float,
122126
?Zmax: float,
123127
?SelectedPoints: seq<#IConvertible>,
128+
?SelectedPointsEncoded: EncodedTypedArray,
124129
?Selected: TraceSelection,
125130
?Unselected: TraceSelection,
126131
?HoverLabel: Hoverlabel,
@@ -138,16 +143,20 @@ type TraceGeoStyle() =
138143
|> DynObj.withOptionalProperty "legendgroup" LegendGroup
139144
|> DynObj.withOptionalProperty "legendgrouptitle"LegendGroupTitle
140145
|> DynObj.withOptionalProperty "ids" Ids
146+
|> DynObj.withOptionalProperty "ids" IdsEncoded
141147
|> DynObj.withOptionalProperty "z" Z
148+
|> DynObj.withOptionalProperty "z" ZEncoded
142149
|> DynObj.withOptionalProperty "geojson" GeoJson
143150
|> DynObj.withOptionalProperty "featureidkey" FeatureIdKey
144151
|> DynObj.withOptionalProperty "locations" Locations
145152
|> DynObj.withOptionalSingleOrMultiProperty "text" (Text, MultiText)
153+
|> DynObj.withOptionalProperty "text" MultiTextEncoded
146154
|> DynObj.withOptionalSingleOrMultiProperty "hovertext" (HoverText, MultiHoverText)
147155
|> DynObj.withOptionalPropertyBy "hoverinfo" HoverInfo StyleParam.HoverInfo.convert
148156
|> DynObj.withOptionalSingleOrMultiProperty "hovertemplate" (HoverTemplate, MultiHoverTemplate)
149157
|> DynObj.withOptionalProperty "meta" Meta
150158
|> DynObj.withOptionalProperty "customdata" CustomData
159+
|> DynObj.withOptionalProperty "customdata" CustomDataEncoded
151160
|> DynObj.withOptionalPropertyBy "geo" Geo StyleParam.SubPlotId.convert
152161
|> DynObj.withOptionalPropertyBy "coloraxis" ColorAxis StyleParam.SubPlotId.convert
153162
|> DynObj.withOptionalProperty "marker" Marker
@@ -161,6 +170,7 @@ type TraceGeoStyle() =
161170
|> DynObj.withOptionalProperty "zmid" Zmid
162171
|> DynObj.withOptionalProperty "zmax" Zmax
163172
|> DynObj.withOptionalProperty "selectedpoints" SelectedPoints
173+
|> DynObj.withOptionalProperty "selectedpoints" SelectedPointsEncoded
164174
|> DynObj.withOptionalProperty "selected" Selected
165175
|> DynObj.withOptionalProperty "unselected" Unselected
166176
|> DynObj.withOptionalProperty "hoverlabel" HoverLabel
@@ -223,13 +233,17 @@ type TraceGeoStyle() =
223233
?Opacity: float,
224234
?Mode: StyleParam.Mode,
225235
?Ids: seq<#IConvertible>,
236+
?IdsEncoded: EncodedTypedArray,
226237
?Lat: #IConvertible seq,
238+
?LatEncoded: EncodedTypedArray,
227239
?GeoJson: obj,
228240
?FeatureIdKey: string,
229241
?Locations: seq<string>,
230242
?Lon: #IConvertible seq,
243+
?LonEncoded: EncodedTypedArray,
231244
?Text: #IConvertible,
232245
?MultiText: seq<#IConvertible>,
246+
?MultiTextEncoded: EncodedTypedArray,
233247
?TextPosition: StyleParam.TextPosition,
234248
?MultiTextPosition: seq<StyleParam.TextPosition>,
235249
?TextTemplate: string,
@@ -241,11 +255,13 @@ type TraceGeoStyle() =
241255
?MultiHoverTemplate: seq<string>,
242256
?Meta: string,
243257
?CustomData: seq<#IConvertible>,
258+
?CustomDataEncoded: EncodedTypedArray,
244259
?Geo: StyleParam.SubPlotId,
245260
?Marker: Marker,
246261
?Line: Line,
247262
?TextFont: Font,
248263
?SelectedPoints: seq<#IConvertible>,
264+
?SelectedPointsEncoded: EncodedTypedArray,
249265
?Selected: TraceSelection,
250266
?Unselected: TraceSelection,
251267
?ConnectGaps: bool,
@@ -268,24 +284,30 @@ type TraceGeoStyle() =
268284
|> DynObj.withOptionalProperty "opacity" Opacity
269285
|> DynObj.withOptionalPropertyBy "mode" Mode StyleParam.Mode.convert
270286
|> DynObj.withOptionalProperty "ids" Ids
287+
|> DynObj.withOptionalProperty "ids" IdsEncoded
271288
|> DynObj.withOptionalProperty "lat" Lat
289+
|> DynObj.withOptionalProperty "lat" LatEncoded
272290
|> DynObj.withOptionalProperty "geojson" GeoJson
273291
|> DynObj.withOptionalProperty "featureidkey" FeatureIdKey
274292
|> DynObj.withOptionalProperty "locations" Locations
275293
|> DynObj.withOptionalProperty "lon" Lon
294+
|> DynObj.withOptionalProperty "lon" LonEncoded
276295
|> DynObj.withOptionalSingleOrMultiProperty "text" (Text, MultiText)
296+
|> DynObj.withOptionalProperty "text" MultiTextEncoded
277297
|> DynObj.withOptionalSingleOrMultiPropertyBy "textposition" (TextPosition, MultiTextPosition) StyleParam.TextPosition.convert
278298
|> DynObj.withOptionalSingleOrMultiProperty "texttemplate" (TextTemplate, MultiTextTemplate)
279299
|> DynObj.withOptionalSingleOrMultiProperty "hovertext" (HoverText, MultiHoverText)
280300
|> DynObj.withOptionalPropertyBy "hoverinfo" HoverInfo StyleParam.HoverInfo.convert
281301
|> DynObj.withOptionalSingleOrMultiProperty "hovertemplate" (HoverTemplate, MultiHoverTemplate)
282302
|> DynObj.withOptionalProperty "meta" Meta
283303
|> DynObj.withOptionalProperty "customdata" CustomData
304+
|> DynObj.withOptionalProperty "customdata" CustomDataEncoded
284305
|> DynObj.withOptionalPropertyBy "geo" Geo StyleParam.SubPlotId.convert
285306
|> DynObj.withOptionalProperty "marker" Marker
286307
|> DynObj.withOptionalProperty "line" Line
287308
|> DynObj.withOptionalProperty "textfont" TextFont
288309
|> DynObj.withOptionalProperty "selectedpoints" SelectedPoints
310+
|> DynObj.withOptionalProperty "selectedpoints" SelectedPointsEncoded
289311
|> DynObj.withOptionalProperty "selected" Selected
290312
|> DynObj.withOptionalProperty "unselected" Unselected
291313
|> DynObj.withOptionalProperty "connectgaps" ConnectGaps

0 commit comments

Comments
 (0)