@d3plus/core 4.10.0 → 4.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/index.js +1 -1
- package/es/internal.js +167 -8
- package/es/src/charts/Alluvial/aggregate.js +145 -0
- package/es/src/charts/Alluvial/applyLayout.js +125 -0
- package/es/src/charts/Alluvial/dimensions.js +56 -0
- package/es/src/charts/Alluvial/emit.js +73 -0
- package/es/src/charts/Alluvial/hover.js +101 -0
- package/es/src/charts/Alluvial/index.js +170 -0
- package/es/src/charts/Alluvial/layout.js +137 -0
- package/es/src/charts/Alluvial/meta.js +57 -0
- package/es/src/charts/Alluvial/titles.js +81 -0
- package/es/src/charts/ArcDiagram/applyLayout.js +386 -0
- package/es/src/charts/ArcDiagram/arcGeometry.js +275 -0
- package/es/src/charts/ArcDiagram/arcLabels.js +171 -0
- package/es/src/charts/ArcDiagram/arcLoops.js +78 -0
- package/es/src/charts/ArcDiagram/emit.js +178 -0
- package/es/src/charts/ArcDiagram/events.js +144 -0
- package/es/src/charts/ArcDiagram/index.js +215 -0
- package/es/src/charts/BarChart/index.js +14 -2
- package/es/src/charts/BoxWhisker/index.js +22 -0
- package/es/src/charts/BubbleChart/emit.js +31 -0
- package/es/src/charts/BubbleChart/index.js +54 -0
- package/es/src/charts/Calendar/emit.js +1 -1
- package/es/src/charts/Calendar/index.js +3 -2
- package/es/src/charts/Candlestick/buffer.js +6 -4
- package/es/src/charts/Candlestick/index.js +2 -1
- package/es/src/charts/Chord/applyLayout.js +56 -69
- package/es/src/charts/Chord/emit.js +55 -24
- package/es/src/charts/Chord/index.js +14 -10
- package/es/src/charts/Chord/labels.js +105 -0
- package/es/src/charts/Donut/index.js +5 -11
- package/es/src/charts/Dumbbell/index.js +2 -4
- package/es/src/charts/Gantt/applyLayout.js +162 -0
- package/es/src/charts/Gantt/emit.js +142 -0
- package/es/src/charts/Gantt/ganttDecor.js +207 -0
- package/es/src/charts/Gantt/ganttGeometry.js +107 -0
- package/es/src/charts/Gantt/ganttLabels.js +85 -0
- package/es/src/charts/Gantt/ganttRows.js +111 -0
- package/es/src/charts/Gantt/ganttTooltip.js +136 -0
- package/es/src/charts/Gantt/index.js +219 -0
- package/es/src/charts/Geomap/applyLayout.js +90 -49
- package/es/src/charts/Geomap/basemapTheme.js +3 -48
- package/es/src/charts/Geomap/emit.js +19 -2
- package/es/src/charts/Geomap/flowEmit.js +132 -0
- package/es/src/charts/Geomap/flowEvents.js +86 -0
- package/es/src/charts/Geomap/flowFields.js +91 -0
- package/es/src/charts/Geomap/flowGeometry.js +225 -0
- package/es/src/charts/Geomap/flowLinks.js +239 -0
- package/es/src/charts/Geomap/geoCache.js +180 -0
- package/es/src/charts/Geomap/globeKeys.js +131 -0
- package/es/src/charts/Geomap/globeRotate.js +208 -0
- package/es/src/charts/Geomap/index.js +51 -16
- package/es/src/charts/Geomap/pointLabels.js +107 -0
- package/es/src/charts/Hexbin/binning.js +103 -0
- package/es/src/charts/Hexbin/buffer.js +33 -0
- package/es/src/charts/Hexbin/contourLabels.js +234 -0
- package/es/src/charts/Hexbin/contours.js +48 -0
- package/es/src/charts/Hexbin/emit.js +142 -0
- package/es/src/charts/Hexbin/index.js +204 -0
- package/es/src/charts/Hexbin/layers.js +212 -0
- package/es/src/charts/Hexbin/settings.js +86 -0
- package/es/src/charts/Hexbin/tooltip.js +77 -0
- package/es/src/charts/Histogram/binData.js +31 -4
- package/es/src/charts/Histogram/index.js +32 -15
- package/es/src/charts/Histogram/labels.js +18 -0
- package/es/src/charts/Icicle/index.js +3 -3
- package/es/src/charts/LinePlot/index.js +7 -0
- package/es/src/charts/Marimekko/index.js +7 -4
- package/es/src/charts/Network/applyLayout.js +138 -94
- package/es/src/charts/Network/bundle.js +81 -0
- package/es/src/charts/Network/clusterLabels.js +423 -0
- package/es/src/charts/Network/clusters.js +290 -0
- package/es/src/charts/Network/emit.js +253 -70
- package/es/src/charts/Network/graph.js +117 -0
- package/es/src/charts/Network/graphFluent.js +79 -0
- package/es/src/charts/Network/index.js +86 -106
- package/es/src/charts/Network/minNodeDistance.js +64 -0
- package/es/src/charts/Network/polygonRows.js +44 -0
- package/es/src/charts/Pack/index.js +5 -1
- package/es/src/charts/Pie/applyLayout.js +86 -27
- package/es/src/charts/Pie/arcFit.js +152 -0
- package/es/src/charts/Pie/curvedLabels.js +134 -0
- package/es/src/charts/Pie/emit.js +43 -96
- package/es/src/charts/Pie/index.js +64 -31
- package/es/src/charts/Pie/labelRoom.js +154 -0
- package/es/src/charts/Pie/outsideLabels.js +224 -0
- package/es/src/charts/Pie/outsideNodes.js +267 -0
- package/es/src/charts/Pie/pieLabels.js +137 -0
- package/es/src/charts/Pie/sectorBox.js +223 -0
- package/es/src/charts/Pie/straightLabels.js +96 -0
- package/es/src/charts/Pie/straightLayout.js +215 -0
- package/es/src/charts/Plot/alongLegend.js +76 -0
- package/es/src/charts/Plot/areaLabelsAlong.js +333 -0
- package/es/src/charts/Plot/axisHoverScene.js +2 -1
- package/es/src/charts/Plot/axisValues.js +43 -0
- package/es/src/charts/Plot/barWidth.js +59 -11
- package/es/src/charts/Plot/circleLabels.js +98 -0
- package/es/src/charts/Plot/connectGaps.js +237 -0
- package/es/src/charts/Plot/connectGapsScene.js +188 -0
- package/es/src/charts/Plot/draw.js +8 -2
- package/es/src/charts/Plot/fillBetween.js +2 -1
- package/es/src/charts/Plot/forecastScene.js +3 -4
- package/es/src/charts/Plot/index.js +18 -10
- package/es/src/charts/Plot/labelPlacement.js +1 -1
- package/es/src/charts/Plot/lineLabelEmit.js +82 -0
- package/es/src/charts/Plot/lineLabelSides.js +51 -0
- package/es/src/charts/Plot/lineLabelSpread.js +65 -0
- package/es/src/charts/Plot/lineLabelsAlong.js +282 -0
- package/es/src/charts/Plot/pipeline.js +66 -19
- package/es/src/charts/Plot/pipelineAxisLayout.js +5 -1
- package/es/src/charts/Plot/pipelineDomains.js +16 -3
- package/es/src/charts/Plot/pipelineLineLabels.js +144 -52
- package/es/src/charts/Plot/pipelineScales.js +40 -8
- package/es/src/charts/Plot/plotFacet.js +12 -1
- package/es/src/charts/Plot/plotInit.js +34 -5
- package/es/src/charts/Plot/plotRangeBreaks.js +85 -0
- package/es/src/charts/Plot/referenceDomains.js +133 -0
- package/es/src/charts/Plot/shapeDefaults.js +10 -5
- package/es/src/charts/Plot/stackLegendOrder.js +176 -0
- package/es/src/charts/Plot/trendLabels.js +183 -0
- package/es/src/charts/Plot/trendLines.js +1 -0
- package/es/src/charts/Plot/trendScene.js +6 -3
- package/es/src/charts/Plot/trendTooltip.js +5 -1
- package/es/src/charts/PolarArea/index.js +2 -2
- package/es/src/charts/Priestley/applyLayout.js +14 -20
- package/es/src/charts/Priestley/index.js +4 -35
- package/es/src/charts/Priestley/timeAxis.js +100 -0
- package/es/src/charts/Radar/axisDecorations.js +49 -12
- package/es/src/charts/Radar/curvedLabels.js +187 -0
- package/es/src/charts/Radar/index.js +2 -3
- package/es/src/charts/RadialBar/curvedLabels.js +111 -0
- package/es/src/charts/RadialBar/emit.js +4 -1
- package/es/src/charts/RadialBar/index.js +16 -9
- package/es/src/charts/RadialBar/trackLayout.js +43 -13
- package/es/src/charts/RadialMatrix/index.js +3 -7
- package/es/src/charts/Rings/applyLayout.js +41 -24
- package/es/src/charts/Rings/emit.js +174 -58
- package/es/src/charts/Rings/index.js +61 -28
- package/es/src/charts/Rings/ringsGraph.js +28 -9
- package/es/src/charts/Rings/ringsLoops.js +73 -0
- package/es/src/charts/Rings/ringsParallel.js +166 -0
- package/es/src/charts/Sankey/applyLayout.js +116 -39
- package/es/src/charts/Sankey/circularLayout.js +208 -0
- package/es/src/charts/Sankey/circularLinks.js +301 -0
- package/es/src/charts/Sankey/emit.js +164 -94
- package/es/src/charts/Sankey/index.js +72 -75
- package/es/src/charts/Sankey/labels.js +80 -0
- package/es/src/charts/Sankey/ribbons.js +88 -0
- package/es/src/charts/Sankey/sankeyCycles.js +117 -0
- package/es/src/charts/Sankey/sankeyLayout.js +8 -3
- package/es/src/charts/Sankey/sankeyLinks.js +47 -0
- package/es/src/charts/Scatter/index.js +25 -0
- package/es/src/charts/SlopeChart/index.js +116 -0
- package/es/src/charts/SlopeChart/slope.js +95 -0
- package/es/src/charts/Streamgraph/index.js +51 -0
- package/es/src/charts/Sunburst/curvedLabels.js +74 -0
- package/es/src/charts/Sunburst/emit.js +74 -63
- package/es/src/charts/Sunburst/index.js +3 -3
- package/es/src/charts/Tree/index.js +2 -6
- package/es/src/charts/Treemap/index.js +2 -5
- package/es/src/charts/Violin/inner.js +3 -5
- package/es/src/charts/definition/makeChart.js +10 -2
- package/es/src/charts/drawSteps/backControl.js +17 -5
- package/es/src/charts/drawSteps/gestureHover.js +79 -0
- package/es/src/charts/drawSteps/minimap.js +6 -5
- package/es/src/charts/drawSteps/minimapMarkup.js +25 -9
- package/es/src/charts/drawSteps/searchControls.js +2 -1
- package/es/src/charts/drawSteps/searchControlsMarkup.js +11 -2
- package/es/src/charts/drawSteps/tableViewMarkup.js +17 -10
- package/es/src/charts/drawSteps/zoomControls.js +21 -5
- package/es/src/charts/events/click.legend.js +7 -2
- package/es/src/charts/events/click.shape.js +8 -1
- package/es/src/charts/events/mousemove.shape.js +5 -2
- package/es/src/charts/facet/drawFacets.js +14 -5
- package/es/src/charts/features/annotationFrame.js +179 -0
- package/es/src/charts/features/annotationText.js +83 -0
- package/es/src/charts/features/annotationTypes.js +10 -0
- package/es/src/charts/features/attributionFeature.js +6 -11
- package/es/src/charts/features/axes.js +2 -1
- package/es/src/charts/features/axesFinal.js +3 -1
- package/es/src/charts/features/axesMeasure.js +7 -4
- package/es/src/charts/features/calloutLayout.js +121 -0
- package/es/src/charts/features/calloutScene.js +155 -0
- package/es/src/charts/features/chartGeometry.js +1 -1
- package/es/src/charts/features/circleLabelPlacement.js +297 -0
- package/es/src/charts/features/circleLabels.js +207 -0
- package/es/src/charts/features/colorScaleBucket.js +2 -1
- package/es/src/charts/features/colorScaleHover.js +3 -2
- package/es/src/charts/features/colorScaleValue.js +97 -0
- package/es/src/charts/features/curvedArrows.js +158 -0
- package/es/src/charts/features/edgeArrows.js +160 -4
- package/es/src/charts/features/edgeBundling.js +442 -0
- package/es/src/charts/features/edgeBundlingSmooth.js +117 -0
- package/es/src/charts/features/ensureZoomDom.js +32 -8
- package/es/src/charts/features/features.js +32 -14
- package/es/src/charts/features/featuresColorScale.js +20 -6
- package/es/src/charts/features/featuresLegend.js +15 -24
- package/es/src/charts/features/legendKeys.js +64 -0
- package/es/src/charts/features/lineLabels.js +55 -46
- package/es/src/charts/features/linkBundle.js +19 -0
- package/es/src/charts/features/linkColor.js +72 -0
- package/es/src/charts/features/linkFields.js +86 -0
- package/es/src/charts/features/linkFocus.js +118 -0
- package/es/src/charts/features/linkInteraction.js +312 -0
- package/es/src/charts/features/linkKeys.js +20 -0
- package/es/src/charts/features/linkLabelGeometry.js +209 -0
- package/es/src/charts/features/linkLabelPath.js +162 -0
- package/es/src/charts/features/linkLabels.js +340 -0
- package/es/src/charts/features/linkWidths.js +32 -0
- package/es/src/charts/features/pathLabelGeometry.js +232 -0
- package/es/src/charts/features/pathLabels.js +50 -0
- package/es/src/charts/features/plotAnnotations.js +68 -17
- package/es/src/charts/features/plotPaint.js +38 -11
- package/es/src/charts/features/polyline.js +129 -0
- package/es/src/charts/features/referenceAnnotations.js +403 -0
- package/es/src/charts/features/referenceLabelPlacement.js +106 -0
- package/es/src/charts/features/ringLabelNodes.js +93 -0
- package/es/src/charts/features/ringLabels.js +222 -0
- package/es/src/charts/features/sceneBounds.js +26 -6
- package/es/src/charts/features/selfLoops.js +306 -0
- package/es/src/charts/features/shapeEmit.js +47 -31
- package/es/src/charts/features/sharedFields.js +15 -2
- package/es/src/charts/features/textHalo.js +29 -0
- package/es/src/charts/index.js +8 -0
- package/es/src/charts/partition/chartFields.js +2 -2
- package/es/src/charts/partition/interaction.js +9 -5
- package/es/src/charts/partition/zoom.js +7 -6
- package/es/src/charts/pipeline/insetPlacement.js +14 -6
- package/es/src/charts/pipeline/preDrawData.js +46 -3
- package/es/src/charts/pipeline/runVizPipeline.js +5 -0
- package/es/src/charts/pipeline/vizPreDraw.js +5 -3
- package/es/src/charts/plotBuffers/discreteBuffer.js +7 -4
- package/es/src/charts/polar/config.js +2 -3
- package/es/src/charts/viz/Viz.js +39 -36
- package/es/src/charts/viz/VizBase.js +18 -10
- package/es/src/charts/viz/backgroundInk.js +13 -7
- package/es/src/charts/viz/focusRing.js +104 -0
- package/es/src/charts/viz/focusTargets.js +208 -0
- package/es/src/charts/viz/history.js +74 -0
- package/es/src/charts/viz/keyboardNav.js +297 -0
- package/es/src/charts/viz/keyboardNavHost.js +95 -0
- package/es/src/charts/viz/loaderFormat.js +114 -0
- package/es/src/charts/viz/missingFields.js +2 -1
- package/es/src/charts/viz/mountTarget.js +9 -0
- package/es/src/charts/viz/nearestHover.js +183 -0
- package/es/src/charts/viz/nearestHoverSurface.js +92 -0
- package/es/src/charts/viz/ordinalColor.js +14 -12
- package/es/src/charts/viz/pageTheme.js +83 -0
- package/es/src/charts/viz/pointTooltipAnchor.js +59 -0
- package/es/src/charts/viz/pointVoronoi.js +124 -0
- package/es/src/charts/viz/reducedMotion.js +27 -0
- package/es/src/charts/viz/vizDataPolling.js +8 -3
- package/es/src/charts/viz/vizDefaults.js +15 -23
- package/es/src/charts/viz/vizFields.js +35 -0
- package/es/src/charts/viz/vizRender.js +43 -28
- package/es/src/charts/viz/vizTheme.js +96 -0
- package/es/src/charts/viz/vizVisibility.js +14 -0
- package/es/src/components/Axis/Axis.js +6 -0
- package/es/src/components/Axis/AxisBottom.js +1 -0
- package/es/src/components/Axis/AxisLeft.js +1 -0
- package/es/src/components/Axis/AxisRight.js +1 -0
- package/es/src/components/Axis/AxisTop.js +1 -0
- package/es/src/components/Axis/axisBreak.js +4 -1
- package/es/src/components/Axis/axisDefaults.js +5 -9
- package/es/src/components/Axis/axisLayoutScale.js +7 -1
- package/es/src/components/Axis/axisRangeBreaks.js +77 -0
- package/es/src/components/Axis/brokenTimeScale.js +196 -0
- package/es/src/components/Axis/rangeBreaks.js +201 -0
- package/es/src/components/Axis/timeValues.js +19 -4
- package/es/src/components/ColorScale/ColorScale.js +15 -9
- package/es/src/components/ColorScale/bucketBounds.js +32 -3
- package/es/src/components/ColorScale/colorScaleHoverMark.js +3 -3
- package/es/src/components/ColorScale/colorScaleScale.js +28 -15
- package/es/src/components/Legend/Legend.js +3 -0
- package/es/src/components/Legend/legendConfig.js +2 -6
- package/es/src/components/SizeLegend/SizeLegend.js +1 -0
- package/es/src/components/TextBox.js +29 -65
- package/es/src/components/Timeline/Timeline.js +12 -3
- package/es/src/components/Timeline/timelineConfig.js +20 -10
- package/es/src/components/Timeline/timelineMode.js +26 -0
- package/es/src/components/Timeline/timelineRender.js +7 -3
- package/es/src/components/Tooltip.js +15 -5
- package/es/src/components/fontStack.js +20 -0
- package/es/src/components/textBoxLayout.js +58 -21
- package/es/src/components/textBoxPath.js +73 -0
- package/es/src/components/textBoxScene.js +223 -0
- package/es/src/components/textBoxWords.js +70 -0
- package/es/src/shapes/Area.js +1 -0
- package/es/src/shapes/Bar.js +1 -0
- package/es/src/shapes/Box.js +1 -0
- package/es/src/shapes/Circle.js +1 -0
- package/es/src/shapes/Line.js +1 -0
- package/es/src/shapes/Path.js +1 -0
- package/es/src/shapes/Rect.js +1 -0
- package/es/src/shapes/Shape.js +1 -0
- package/es/src/shapes/Whisker.js +1 -0
- package/es/src/utils/BaseClass.js +25 -12
- package/es/src/utils/configPrep.js +2 -1
- package/es/src/utils/constant.js +13 -1
- package/es/src/utils/displayName.js +12 -0
- package/es/src/utils/theme.js +190 -0
- package/es/src/utils/themeInk.js +68 -0
- package/package.json +14 -11
- package/types/index.d.ts +6 -2
- package/types/internal.d.ts +250 -8
- package/types/src/charts/Alluvial/aggregate.d.ts +98 -0
- package/types/src/charts/Alluvial/applyLayout.d.ts +67 -0
- package/types/src/charts/Alluvial/dimensions.d.ts +40 -0
- package/types/src/charts/Alluvial/emit.d.ts +9 -0
- package/types/src/charts/Alluvial/hover.d.ts +31 -0
- package/types/src/charts/Alluvial/index.d.ts +27 -0
- package/types/src/charts/Alluvial/layout.d.ts +70 -0
- package/types/src/charts/Alluvial/meta.d.ts +54 -0
- package/types/src/charts/Alluvial/titles.d.ts +33 -0
- package/types/src/charts/ArcDiagram/applyLayout.d.ts +70 -0
- package/types/src/charts/ArcDiagram/arcGeometry.d.ts +150 -0
- package/types/src/charts/ArcDiagram/arcLabels.d.ts +89 -0
- package/types/src/charts/ArcDiagram/arcLoops.d.ts +48 -0
- package/types/src/charts/ArcDiagram/emit.d.ts +23 -0
- package/types/src/charts/ArcDiagram/events.d.ts +28 -0
- package/types/src/charts/ArcDiagram/index.d.ts +28 -0
- package/types/src/charts/BubbleChart/emit.d.ts +20 -0
- package/types/src/charts/BubbleChart/index.d.ts +16 -0
- package/types/src/charts/Chord/applyLayout.d.ts +3 -0
- package/types/src/charts/Chord/labels.d.ts +66 -0
- package/types/src/charts/Donut/index.d.ts +2 -1
- package/types/src/charts/Gantt/applyLayout.d.ts +64 -0
- package/types/src/charts/Gantt/emit.d.ts +17 -0
- package/types/src/charts/Gantt/ganttDecor.d.ts +41 -0
- package/types/src/charts/Gantt/ganttGeometry.d.ts +57 -0
- package/types/src/charts/Gantt/ganttLabels.d.ts +41 -0
- package/types/src/charts/Gantt/ganttRows.d.ts +84 -0
- package/types/src/charts/Gantt/ganttTooltip.d.ts +57 -0
- package/types/src/charts/Gantt/index.d.ts +36 -0
- package/types/src/charts/Geomap/applyLayout.d.ts +8 -0
- package/types/src/charts/Geomap/basemapTheme.d.ts +2 -19
- package/types/src/charts/Geomap/emit.d.ts +2 -2
- package/types/src/charts/Geomap/flowEmit.d.ts +35 -0
- package/types/src/charts/Geomap/flowEvents.d.ts +20 -0
- package/types/src/charts/Geomap/flowFields.d.ts +7 -0
- package/types/src/charts/Geomap/flowGeometry.d.ts +91 -0
- package/types/src/charts/Geomap/flowLinks.d.ts +97 -0
- package/types/src/charts/Geomap/geoCache.d.ts +47 -0
- package/types/src/charts/Geomap/globeKeys.d.ts +41 -0
- package/types/src/charts/Geomap/globeRotate.d.ts +70 -0
- package/types/src/charts/Geomap/index.d.ts +3 -0
- package/types/src/charts/Geomap/pointLabels.d.ts +24 -0
- package/types/src/charts/Hexbin/binning.d.ts +64 -0
- package/types/src/charts/Hexbin/buffer.d.ts +18 -0
- package/types/src/charts/Hexbin/contourLabels.d.ts +95 -0
- package/types/src/charts/Hexbin/contours.d.ts +48 -0
- package/types/src/charts/Hexbin/emit.d.ts +23 -0
- package/types/src/charts/Hexbin/index.d.ts +25 -0
- package/types/src/charts/Hexbin/layers.d.ts +94 -0
- package/types/src/charts/Hexbin/settings.d.ts +122 -0
- package/types/src/charts/Hexbin/tooltip.d.ts +26 -0
- package/types/src/charts/Histogram/binData.d.ts +20 -1
- package/types/src/charts/Histogram/index.d.ts +3 -2
- package/types/src/charts/Histogram/labels.d.ts +7 -0
- package/types/src/charts/Marimekko/index.d.ts +2 -1
- package/types/src/charts/Network/bundle.d.ts +67 -0
- package/types/src/charts/Network/clusterLabels.d.ts +112 -0
- package/types/src/charts/Network/clusters.d.ts +115 -0
- package/types/src/charts/Network/graph.d.ts +65 -0
- package/types/src/charts/Network/graphFluent.d.ts +20 -0
- package/types/src/charts/Network/minNodeDistance.d.ts +18 -0
- package/types/src/charts/Network/polygonRows.d.ts +29 -0
- package/types/src/charts/Pie/applyLayout.d.ts +31 -3
- package/types/src/charts/Pie/arcFit.d.ts +63 -0
- package/types/src/charts/Pie/curvedLabels.d.ts +57 -0
- package/types/src/charts/Pie/labelRoom.d.ts +83 -0
- package/types/src/charts/Pie/outsideLabels.d.ts +119 -0
- package/types/src/charts/Pie/outsideNodes.d.ts +93 -0
- package/types/src/charts/Pie/pieLabels.d.ts +85 -0
- package/types/src/charts/Pie/sectorBox.d.ts +95 -0
- package/types/src/charts/Pie/straightLabels.d.ts +24 -0
- package/types/src/charts/Pie/straightLayout.d.ts +88 -0
- package/types/src/charts/Plot/alongLegend.d.ts +42 -0
- package/types/src/charts/Plot/areaLabelsAlong.d.ts +119 -0
- package/types/src/charts/Plot/axisValues.d.ts +24 -0
- package/types/src/charts/Plot/barWidth.d.ts +38 -4
- package/types/src/charts/Plot/circleLabels.d.ts +29 -0
- package/types/src/charts/Plot/connectGaps.d.ts +99 -0
- package/types/src/charts/Plot/connectGapsScene.d.ts +55 -0
- package/types/src/charts/Plot/forecastScene.d.ts +5 -0
- package/types/src/charts/Plot/index.d.ts +15 -8
- package/types/src/charts/Plot/lineLabelEmit.d.ts +48 -0
- package/types/src/charts/Plot/lineLabelSides.d.ts +50 -0
- package/types/src/charts/Plot/lineLabelSpread.d.ts +15 -0
- package/types/src/charts/Plot/lineLabelsAlong.d.ts +116 -0
- package/types/src/charts/Plot/pipeline.d.ts +15 -1
- package/types/src/charts/Plot/pipelineLineLabels.d.ts +68 -0
- package/types/src/charts/Plot/plotFacet.d.ts +5 -0
- package/types/src/charts/Plot/plotInit.d.ts +14 -0
- package/types/src/charts/Plot/plotRangeBreaks.d.ts +35 -0
- package/types/src/charts/Plot/referenceDomains.d.ts +49 -0
- package/types/src/charts/Plot/stackLegendOrder.d.ts +83 -0
- package/types/src/charts/Plot/trendLabels.d.ts +73 -0
- package/types/src/charts/Plot/trendTooltip.d.ts +6 -0
- package/types/src/charts/Priestley/timeAxis.d.ts +76 -0
- package/types/src/charts/Radar/axisDecorations.d.ts +7 -2
- package/types/src/charts/Radar/curvedLabels.d.ts +94 -0
- package/types/src/charts/RadialBar/curvedLabels.d.ts +31 -0
- package/types/src/charts/RadialBar/trackLayout.d.ts +34 -3
- package/types/src/charts/Rings/emit.d.ts +50 -0
- package/types/src/charts/Rings/ringsGraph.d.ts +10 -2
- package/types/src/charts/Rings/ringsLoops.d.ts +13 -0
- package/types/src/charts/Rings/ringsParallel.d.ts +43 -0
- package/types/src/charts/Sankey/circularLayout.d.ts +103 -0
- package/types/src/charts/Sankey/circularLinks.d.ts +178 -0
- package/types/src/charts/Sankey/emit.d.ts +58 -0
- package/types/src/charts/Sankey/labels.d.ts +19 -0
- package/types/src/charts/Sankey/ribbons.d.ts +36 -0
- package/types/src/charts/Sankey/sankeyCycles.d.ts +24 -0
- package/types/src/charts/Sankey/sankeyLayout.d.ts +6 -0
- package/types/src/charts/Sankey/sankeyLinks.d.ts +36 -0
- package/types/src/charts/Scatter/index.d.ts +15 -0
- package/types/src/charts/SlopeChart/index.d.ts +43 -0
- package/types/src/charts/SlopeChart/slope.d.ts +43 -0
- package/types/src/charts/Streamgraph/index.d.ts +28 -0
- package/types/src/charts/Sunburst/curvedLabels.d.ts +56 -0
- package/types/src/charts/definition/ChartDefinition.d.ts +13 -0
- package/types/src/charts/definition/makeChart.d.ts +3 -2
- package/types/src/charts/drawSteps/backControl.d.ts +7 -22
- package/types/src/charts/drawSteps/gestureHover.d.ts +33 -0
- package/types/src/charts/drawSteps/minimapMarkup.d.ts +5 -4
- package/types/src/charts/drawSteps/tableViewMarkup.d.ts +3 -1
- package/types/src/charts/drawSteps/zoomGesture.d.ts +32 -0
- package/types/src/charts/events/click.legend.d.ts +2 -1
- package/types/src/charts/facet/facetConfig.d.ts +4 -2
- package/types/src/charts/features/annotationFrame.d.ts +108 -0
- package/types/src/charts/features/annotationText.d.ts +57 -0
- package/types/src/charts/features/annotationTypes.d.ts +161 -0
- package/types/src/charts/features/axesMeasure.d.ts +4 -0
- package/types/src/charts/features/calloutLayout.d.ts +78 -0
- package/types/src/charts/features/calloutScene.d.ts +40 -0
- package/types/src/charts/features/chartGeometry.d.ts +1 -1
- package/types/src/charts/features/circleLabelPlacement.d.ts +97 -0
- package/types/src/charts/features/circleLabels.d.ts +130 -0
- package/types/src/charts/features/colorScaleValue.d.ts +35 -0
- package/types/src/charts/features/curvedArrows.d.ts +105 -0
- package/types/src/charts/features/edgeArrows.d.ts +74 -2
- package/types/src/charts/features/edgeBundling.d.ts +86 -0
- package/types/src/charts/features/edgeBundlingSmooth.d.ts +29 -0
- package/types/src/charts/features/ensureZoomDom.d.ts +19 -1
- package/types/src/charts/features/featuresLegend.d.ts +4 -3
- package/types/src/charts/features/legendKeys.d.ts +34 -0
- package/types/src/charts/features/lineLabels.d.ts +15 -12
- package/types/src/charts/features/linkBundle.d.ts +16 -0
- package/types/src/charts/features/linkColor.d.ts +48 -0
- package/types/src/charts/features/linkFields.d.ts +16 -0
- package/types/src/charts/features/linkFocus.d.ts +51 -0
- package/types/src/charts/features/linkInteraction.d.ts +183 -0
- package/types/src/charts/features/linkKeys.d.ts +11 -0
- package/types/src/charts/features/linkLabelGeometry.d.ts +67 -0
- package/types/src/charts/features/linkLabelPath.d.ts +85 -0
- package/types/src/charts/features/linkLabels.d.ts +77 -0
- package/types/src/charts/features/linkWidths.d.ts +19 -0
- package/types/src/charts/features/pathLabelGeometry.d.ts +99 -0
- package/types/src/charts/features/pathLabels.d.ts +41 -0
- package/types/src/charts/features/plotAnnotations.d.ts +23 -8
- package/types/src/charts/features/plotPaint.d.ts +17 -0
- package/types/src/charts/features/polyline.d.ts +32 -0
- package/types/src/charts/features/referenceAnnotations.d.ts +130 -0
- package/types/src/charts/features/referenceLabelPlacement.d.ts +58 -0
- package/types/src/charts/features/ringLabelNodes.d.ts +63 -0
- package/types/src/charts/features/ringLabels.d.ts +164 -0
- package/types/src/charts/features/sceneBounds.d.ts +6 -0
- package/types/src/charts/features/selfLoops.d.ts +165 -0
- package/types/src/charts/features/shapeEmit.d.ts +3 -1
- package/types/src/charts/features/sharedFields.d.ts +11 -2
- package/types/src/charts/features/textHalo.d.ts +14 -0
- package/types/src/charts/index.d.ts +8 -0
- package/types/src/charts/partition/interaction.d.ts +6 -3
- package/types/src/charts/partition/zoom.d.ts +4 -4
- package/types/src/charts/pipeline/preDrawData.d.ts +14 -1
- package/types/src/charts/pipeline/stages.d.ts +7 -0
- package/types/src/charts/plotBuffers/discreteBuffer.d.ts +0 -5
- package/types/src/charts/viz/Viz.d.ts +16 -2
- package/types/src/charts/viz/VizBase.d.ts +6 -6
- package/types/src/charts/viz/backgroundInk.d.ts +11 -4
- package/types/src/charts/viz/focusRing.d.ts +25 -0
- package/types/src/charts/viz/focusTargets.d.ts +56 -0
- package/types/src/charts/viz/history.d.ts +35 -0
- package/types/src/charts/viz/keyboardNav.d.ts +55 -0
- package/types/src/charts/viz/keyboardNavHost.d.ts +53 -0
- package/types/src/charts/viz/loaderFormat.d.ts +78 -0
- package/types/src/charts/viz/mountTarget.d.ts +7 -0
- package/types/src/charts/viz/nearestHover.d.ts +75 -0
- package/types/src/charts/viz/nearestHoverSurface.d.ts +21 -0
- package/types/src/charts/viz/ordinalColor.d.ts +10 -8
- package/types/src/charts/viz/pageTheme.d.ts +34 -0
- package/types/src/charts/viz/pointTooltipAnchor.d.ts +36 -0
- package/types/src/charts/viz/pointVoronoi.d.ts +65 -0
- package/types/src/charts/viz/reducedMotion.d.ts +25 -0
- package/types/src/charts/viz/vizDefaults.d.ts +0 -9
- package/types/src/charts/viz/vizFields.d.ts +32 -0
- package/types/src/charts/viz/vizRender.d.ts +2 -1
- package/types/src/charts/viz/vizTheme.d.ts +40 -0
- package/types/src/charts/viz/vizTypes.d.ts +84 -7
- package/types/src/charts/viz/vizVisibility.d.ts +6 -0
- package/types/src/components/Axis/Axis.d.ts +1 -0
- package/types/src/components/Axis/AxisBottom.d.ts +1 -0
- package/types/src/components/Axis/AxisLeft.d.ts +1 -0
- package/types/src/components/Axis/AxisRight.d.ts +1 -0
- package/types/src/components/Axis/AxisTop.d.ts +1 -0
- package/types/src/components/Axis/axisBreak.d.ts +2 -0
- package/types/src/components/Axis/axisRangeBreaks.d.ts +25 -0
- package/types/src/components/Axis/brokenTimeScale.d.ts +51 -0
- package/types/src/components/Axis/rangeBreaks.d.ts +82 -0
- package/types/src/components/Axis/timeValues.d.ts +1 -1
- package/types/src/components/ColorScale/ColorScale.d.ts +1 -0
- package/types/src/components/ColorScale/bucketBounds.d.ts +15 -1
- package/types/src/components/Legend/Legend.d.ts +1 -0
- package/types/src/components/SizeLegend/SizeLegend.d.ts +1 -0
- package/types/src/components/TextBox.d.ts +1 -0
- package/types/src/components/Timeline/Timeline.d.ts +1 -0
- package/types/src/components/Timeline/timelineConfig.d.ts +5 -0
- package/types/src/components/Timeline/timelineMode.d.ts +17 -0
- package/types/src/components/Tooltip.d.ts +4 -3
- package/types/src/components/fontStack.d.ts +10 -0
- package/types/src/components/textBoxLayout.d.ts +18 -9
- package/types/src/components/textBoxPath.d.ts +59 -0
- package/types/src/components/textBoxScene.d.ts +51 -0
- package/types/src/components/textBoxWords.d.ts +33 -0
- package/types/src/shapes/Area.d.ts +1 -0
- package/types/src/shapes/Bar.d.ts +1 -0
- package/types/src/shapes/Box.d.ts +1 -0
- package/types/src/shapes/Circle.d.ts +1 -0
- package/types/src/shapes/Line.d.ts +1 -0
- package/types/src/shapes/Path.d.ts +1 -0
- package/types/src/shapes/Rect.d.ts +1 -0
- package/types/src/shapes/Shape.d.ts +1 -0
- package/types/src/shapes/Whisker.d.ts +1 -0
- package/types/src/utils/BaseClass.d.ts +9 -0
- package/types/src/utils/D3plusConfig.d.ts +981 -30
- package/types/src/utils/configPrep.d.ts +2 -0
- package/types/src/utils/constant.d.ts +8 -0
- package/types/src/utils/displayName.d.ts +10 -0
- package/types/src/utils/index.d.ts +1 -1
- package/types/src/utils/theme.d.ts +170 -0
- package/types/src/utils/themeInk.d.ts +56 -0
- package/umd/d3plus-core.full.js +86811 -61031
- package/umd/d3plus-core.full.min.js +2 -2
- package/umd/d3plus-core.js +28392 -6498
- package/umd/d3plus-core.min.js +2 -2
- package/es/src/components/Axis/gridStroke.js +0 -10
- package/types/src/components/Axis/gridStroke.d.ts +0 -8
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Geomap's caches across draws: the features of each topojson, the
|
|
3
|
+
projection fit, and each feature's projected path. A redraw with the same
|
|
4
|
+
topojson, chart size, and projection reuses them instead of streaming
|
|
5
|
+
every shape through the projection again.
|
|
6
|
+
|
|
7
|
+
@module
|
|
8
|
+
*/ import { feature as topojsonFeature } from "topojson-client";
|
|
9
|
+
/** The features converted from each topojson object, by its key. */ const topoCache = new WeakMap();
|
|
10
|
+
/**
|
|
11
|
+
The features of the object `key` names in `topo` (or its first object),
|
|
12
|
+
as `topojson-client`'s `feature`. The conversion is kept per topojson, so
|
|
13
|
+
each draw gets new feature objects around the same geometries.
|
|
14
|
+
*/ export function topoFeatures(topo, key) {
|
|
15
|
+
const objects = topo.objects;
|
|
16
|
+
const k = key && objects[key] ? key : Object.keys(objects)[0];
|
|
17
|
+
let byKey = topoCache.get(topo);
|
|
18
|
+
if (!byKey) topoCache.set(topo, byKey = new Map());
|
|
19
|
+
let collection = byKey.get(k);
|
|
20
|
+
if (!collection) {
|
|
21
|
+
collection = topojsonFeature(topo, k);
|
|
22
|
+
byKey.set(k, collection);
|
|
23
|
+
}
|
|
24
|
+
return Array.isArray(collection.features) ? {
|
|
25
|
+
...collection,
|
|
26
|
+
features: collection.features.map((f)=>({
|
|
27
|
+
...f
|
|
28
|
+
}))
|
|
29
|
+
} : {
|
|
30
|
+
...collection
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
/** The projection settings that place points, besides a custom projection's own. */ const SETTINGS = [
|
|
34
|
+
"scale",
|
|
35
|
+
"translate",
|
|
36
|
+
"rotate",
|
|
37
|
+
"center",
|
|
38
|
+
"angle",
|
|
39
|
+
"reflectX",
|
|
40
|
+
"reflectY",
|
|
41
|
+
"parallels",
|
|
42
|
+
"clipAngle",
|
|
43
|
+
"clipExtent",
|
|
44
|
+
"precision",
|
|
45
|
+
"preclip",
|
|
46
|
+
"postclip"
|
|
47
|
+
];
|
|
48
|
+
/** Points spread over the globe, projected to tell projections apart. */ const PROBES = [
|
|
49
|
+
[
|
|
50
|
+
0,
|
|
51
|
+
0
|
|
52
|
+
],
|
|
53
|
+
[
|
|
54
|
+
-98,
|
|
55
|
+
39
|
|
56
|
+
],
|
|
57
|
+
[
|
|
58
|
+
-150,
|
|
59
|
+
61
|
|
60
|
+
],
|
|
61
|
+
[
|
|
62
|
+
-157,
|
|
63
|
+
21
|
|
64
|
+
],
|
|
65
|
+
[
|
|
66
|
+
-66,
|
|
67
|
+
18
|
|
68
|
+
],
|
|
69
|
+
[
|
|
70
|
+
12,
|
|
71
|
+
50
|
|
72
|
+
],
|
|
73
|
+
[
|
|
74
|
+
116,
|
|
75
|
+
40
|
|
76
|
+
],
|
|
77
|
+
[
|
|
78
|
+
151,
|
|
79
|
+
-34
|
|
80
|
+
],
|
|
81
|
+
[
|
|
82
|
+
-58,
|
|
83
|
+
-34
|
|
84
|
+
],
|
|
85
|
+
[
|
|
86
|
+
28,
|
|
87
|
+
-26
|
|
88
|
+
]
|
|
89
|
+
];
|
|
90
|
+
/** An id for each function a setting holds, so a new one changes the state. */ const functionIds = new WeakMap();
|
|
91
|
+
let nextFunctionId = 0;
|
|
92
|
+
/** A string that tells values apart: numbers exactly (-0 and NaN included), functions by identity. */ function serialize(value) {
|
|
93
|
+
if (typeof value === "function") {
|
|
94
|
+
let id = functionIds.get(value);
|
|
95
|
+
if (id === undefined) functionIds.set(value, id = nextFunctionId++);
|
|
96
|
+
return `f${id}`;
|
|
97
|
+
}
|
|
98
|
+
if (typeof value === "number") return Object.is(value, -0) ? "-0" : String(value);
|
|
99
|
+
if (Array.isArray(value)) return `[${value.map(serialize).join(",")}]`;
|
|
100
|
+
if (value === null || value === undefined) return String(value);
|
|
101
|
+
if (typeof value === "boolean" || typeof value === "string") return JSON.stringify(value);
|
|
102
|
+
return "?";
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
The state of `projection`: its settings and where it places a spread of
|
|
106
|
+
points. Two equal states draw the same paths (a projection with a setting
|
|
107
|
+
outside the list shows it in the points). Null when a setting can't be
|
|
108
|
+
read, which matches nothing.
|
|
109
|
+
*/ export function projectionState(projection) {
|
|
110
|
+
try {
|
|
111
|
+
const parts = [];
|
|
112
|
+
for (const name of SETTINGS){
|
|
113
|
+
const get = projection[name];
|
|
114
|
+
if (typeof get === "function") parts.push(`${name}=${serialize(get.call(projection))}`);
|
|
115
|
+
}
|
|
116
|
+
for (const p of PROBES)parts.push(serialize(projection(p)));
|
|
117
|
+
return parts.join(";");
|
|
118
|
+
} catch {
|
|
119
|
+
return null;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
Whether two GeoJSON values are the same: the same object, or arrays and
|
|
124
|
+
plain objects whose entries are the same, numbers compared exactly.
|
|
125
|
+
*/ export function sameGeo(a, b) {
|
|
126
|
+
if (Object.is(a, b)) return true;
|
|
127
|
+
if (Array.isArray(a)) {
|
|
128
|
+
if (!Array.isArray(b) || a.length !== b.length) return false;
|
|
129
|
+
for(let i = 0; i < a.length; i++)if (!sameGeo(a[i], b[i])) return false;
|
|
130
|
+
return true;
|
|
131
|
+
}
|
|
132
|
+
if (!a || !b || typeof a !== "object" || typeof b !== "object" || Array.isArray(b) || Object.getPrototypeOf(a) !== Object.prototype || Object.getPrototypeOf(b) !== Object.prototype) return false;
|
|
133
|
+
const keys = Object.keys(a);
|
|
134
|
+
if (keys.length !== Object.keys(b).length) return false;
|
|
135
|
+
return keys.every((k)=>Object.prototype.hasOwnProperty.call(b, k) && sameGeo(a[k], b[k]));
|
|
136
|
+
}
|
|
137
|
+
const fits = new WeakMap();
|
|
138
|
+
/**
|
|
139
|
+
`projection.fitExtent(extent, object)`, skipped when the projection's
|
|
140
|
+
last fit was to the same extent and object and nothing about it has
|
|
141
|
+
changed since: fitting again would give the same scale and translate.
|
|
142
|
+
*/ export function fitExtentOnce(projection, extent, object) {
|
|
143
|
+
const last = fits.get(projection);
|
|
144
|
+
if (last && last.state !== null && sameGeo(last.extent, extent) && last.state === projectionState(projection) && sameGeo(last.object, object)) return;
|
|
145
|
+
projection.fitExtent(extent, object);
|
|
146
|
+
fits.set(projection, {
|
|
147
|
+
extent: [
|
|
148
|
+
[
|
|
149
|
+
...extent[0]
|
|
150
|
+
],
|
|
151
|
+
[
|
|
152
|
+
...extent[1]
|
|
153
|
+
]
|
|
154
|
+
],
|
|
155
|
+
object,
|
|
156
|
+
state: projectionState(projection)
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
/** Each projection's paths, by geometry, for the state they were drawn in. */ const paths = new WeakMap();
|
|
160
|
+
/**
|
|
161
|
+
`path(feature)` for each feature, kept by the feature's geometry while
|
|
162
|
+
`projection` stays in the same state (see `projectionState`).
|
|
163
|
+
*/ export function cachedPaths(projection, path) {
|
|
164
|
+
const state = projectionState(projection);
|
|
165
|
+
if (state === null) return path;
|
|
166
|
+
let cache = paths.get(projection);
|
|
167
|
+
if (cache?.state !== state) paths.set(projection, cache = {
|
|
168
|
+
state,
|
|
169
|
+
byGeometry: new WeakMap()
|
|
170
|
+
});
|
|
171
|
+
const { byGeometry } = cache;
|
|
172
|
+
return (feature)=>{
|
|
173
|
+
const geometry = feature?.geometry;
|
|
174
|
+
if (!geometry || typeof geometry !== "object") return path(feature);
|
|
175
|
+
if (byGeometry.has(geometry)) return byGeometry.get(geometry);
|
|
176
|
+
const d = path(feature);
|
|
177
|
+
byGeometry.set(geometry, d);
|
|
178
|
+
return d;
|
|
179
|
+
};
|
|
180
|
+
}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Keyboard rotation for Geomap globes (projections that clip to a circle):
|
|
3
|
+
while the chart has keyboard focus, Shift and an arrow key turns the
|
|
4
|
+
globe a step of longitude (left and right) or latitude (up and down),
|
|
5
|
+
easing there unless motion is reduced. Holding the keys repeats the
|
|
6
|
+
step. Plain arrow keys still move between marks (`keyboardNav`).
|
|
7
|
+
|
|
8
|
+
@module
|
|
9
|
+
*/ import { effectiveDuration } from "../viz/reducedMotion.js";
|
|
10
|
+
import { globeHome, globeRotates } from "./globeRotate.js";
|
|
11
|
+
/** The degrees one key press turns a globe. */ export const GLOBE_KEY_STEP = 10;
|
|
12
|
+
/** The longest a key press eases for, in milliseconds. */ export const GLOBE_KEY_DURATION = 200;
|
|
13
|
+
/** The keys that turn a globe, as `aria-keyshortcuts` lists them. */ export const GLOBE_KEY_SHORTCUTS = "Shift+ArrowLeft Shift+ArrowRight Shift+ArrowUp Shift+ArrowDown";
|
|
14
|
+
/** The instructions read for a globe, after the mark-navigation ones. */ export const GLOBE_KEY_INSTRUCTIONS = "Hold Shift and use the arrow keys to rotate the globe.";
|
|
15
|
+
/** Arrow keys and the way each moves the view: `[east, north]`. */ const GLOBE_KEYS = {
|
|
16
|
+
ArrowLeft: [
|
|
17
|
+
-1,
|
|
18
|
+
0
|
|
19
|
+
],
|
|
20
|
+
ArrowRight: [
|
|
21
|
+
1,
|
|
22
|
+
0
|
|
23
|
+
],
|
|
24
|
+
ArrowUp: [
|
|
25
|
+
0,
|
|
26
|
+
1
|
|
27
|
+
],
|
|
28
|
+
ArrowDown: [
|
|
29
|
+
0,
|
|
30
|
+
-1
|
|
31
|
+
]
|
|
32
|
+
};
|
|
33
|
+
/** A longitude in [-180, 180). */ const wrap = (l)=>((l + 180) % 360 + 360) % 360 - 180;
|
|
34
|
+
/**
|
|
35
|
+
The rotation that moves a globe's view `east` degrees of longitude and
|
|
36
|
+
`north` degrees of latitude. The view centers on `[-lambda, -phi]`, and
|
|
37
|
+
phi is clamped to ±90 so the view stops at a pole rather than flipping
|
|
38
|
+
over it.
|
|
39
|
+
*/ export function rotateByStep(rotation, east, north) {
|
|
40
|
+
const [l = 0, p = 0, g = 0] = rotation;
|
|
41
|
+
return [
|
|
42
|
+
wrap(l - east),
|
|
43
|
+
Math.max(-90, Math.min(90, p - north)),
|
|
44
|
+
g
|
|
45
|
+
];
|
|
46
|
+
}
|
|
47
|
+
/** The rotation a fraction `t` of the way from `a` to `b`, the short way round. */ export function rotationBetween(a, b, t) {
|
|
48
|
+
const [al = 0, ap = 0, ag = 0] = a;
|
|
49
|
+
const [bl = 0, bp = 0, bg = 0] = b;
|
|
50
|
+
return [
|
|
51
|
+
wrap(al + wrap(bl - al) * t),
|
|
52
|
+
ap + (bp - ap) * t,
|
|
53
|
+
ag + (bg - ag) * t
|
|
54
|
+
];
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
How far a key moves a globe's view, `[east, north]` in degrees: Shift
|
|
58
|
+
and an arrow key, with no other modifier. Null for any other key.
|
|
59
|
+
*/ export function globeKeyStep(event) {
|
|
60
|
+
if (!event.shiftKey || event.altKey || event.ctrlKey || event.metaKey) return null;
|
|
61
|
+
const way = GLOBE_KEYS[event.key];
|
|
62
|
+
return way ? [
|
|
63
|
+
way[0] * GLOBE_KEY_STEP,
|
|
64
|
+
way[1] * GLOBE_KEY_STEP
|
|
65
|
+
] : null;
|
|
66
|
+
}
|
|
67
|
+
const ease = (t)=>1 - (1 - t) ** 3;
|
|
68
|
+
const sameRotation = (a, b)=>a.every((v, i)=>Math.abs(v - (b[i] ?? 0)) < 1e-6);
|
|
69
|
+
/**
|
|
70
|
+
Installs the globe's keys on a Geomap as `viz._keyboardGesture`, which
|
|
71
|
+
keyboard navigation consults before moving between marks. A press
|
|
72
|
+
during an eased step adds to where that step is headed; a drag or the
|
|
73
|
+
zoom controls' reset turning the globe meanwhile ends it.
|
|
74
|
+
@param relayout Re-runs the map's layout and emit for the current projection.
|
|
75
|
+
*/ export function installGlobeKeys(viz, relayout) {
|
|
76
|
+
let turn = null;
|
|
77
|
+
const projection = ()=>viz.schema.projection;
|
|
78
|
+
const show = (r)=>{
|
|
79
|
+
projection().rotate(r);
|
|
80
|
+
relayout();
|
|
81
|
+
viz._drawSceneToTarget?.(0);
|
|
82
|
+
return projection().rotate();
|
|
83
|
+
};
|
|
84
|
+
const stop = ()=>{
|
|
85
|
+
if (turn?.frame !== undefined) cancelAnimationFrame(turn.frame);
|
|
86
|
+
turn = null;
|
|
87
|
+
};
|
|
88
|
+
const frame = (now)=>{
|
|
89
|
+
if (!turn) return;
|
|
90
|
+
turn.frame = undefined;
|
|
91
|
+
if (!sameRotation(projection().rotate(), turn.last)) return stop();
|
|
92
|
+
const t = Math.max(0, Math.min(1, (now - turn.start) / turn.duration));
|
|
93
|
+
turn.last = show(t < 1 ? rotationBetween(turn.from, turn.to, ease(t)) : turn.to);
|
|
94
|
+
if (t < 1) turn.frame = requestAnimationFrame(frame);
|
|
95
|
+
else turn = null;
|
|
96
|
+
};
|
|
97
|
+
const gesture = {
|
|
98
|
+
keydown (event) {
|
|
99
|
+
const by = globeKeyStep(event);
|
|
100
|
+
if (!by || !globeRotates(viz)) return false;
|
|
101
|
+
const p = projection();
|
|
102
|
+
if (!globeHome(viz)) viz._globeHome = {
|
|
103
|
+
projection: p,
|
|
104
|
+
rotate: p.rotate()
|
|
105
|
+
};
|
|
106
|
+
const current = p.rotate();
|
|
107
|
+
const base = turn && sameRotation(current, turn.last) ? turn.to : current;
|
|
108
|
+
const to = rotateByStep(base, ...by);
|
|
109
|
+
const duration = Math.min(GLOBE_KEY_DURATION, effectiveDuration(viz));
|
|
110
|
+
stop();
|
|
111
|
+
if (!duration || typeof requestAnimationFrame !== "function") {
|
|
112
|
+
show(to);
|
|
113
|
+
return true;
|
|
114
|
+
}
|
|
115
|
+
turn = {
|
|
116
|
+
from: current,
|
|
117
|
+
to,
|
|
118
|
+
start: performance.now(),
|
|
119
|
+
duration,
|
|
120
|
+
last: current
|
|
121
|
+
};
|
|
122
|
+
turn.frame = requestAnimationFrame(frame);
|
|
123
|
+
return true;
|
|
124
|
+
},
|
|
125
|
+
keys: ()=>globeRotates(viz) ? {
|
|
126
|
+
shortcuts: GLOBE_KEY_SHORTCUTS,
|
|
127
|
+
instructions: viz.schema.translate(GLOBE_KEY_INSTRUCTIONS)
|
|
128
|
+
} : null
|
|
129
|
+
};
|
|
130
|
+
viz._keyboardGesture = gesture;
|
|
131
|
+
}
|
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
/**
|
|
2
|
+
Drag-to-rotate for Geomap globes (projections that clip to a circle,
|
|
3
|
+
such as `"geoOrthographic"`): a drag turns the globe under the pointer
|
|
4
|
+
rather than panning the zoom transform, while the wheel, pinch, and zoom
|
|
5
|
+
buttons still zoom. The rotation follows the pointer with versors
|
|
6
|
+
(quaternions), so the place grabbed stays under the pointer however the
|
|
7
|
+
globe is turned, without the gimbal flips of mapping the drag onto
|
|
8
|
+
longitude and latitude. A drag that starts off the globe turns it by
|
|
9
|
+
longitude and latitude instead; one dragged past the globe's edge keeps
|
|
10
|
+
the grabbed place on the horizon.
|
|
11
|
+
*/ import { clipsToCircle } from "./flowGeometry.js";
|
|
12
|
+
const radians = Math.PI / 180;
|
|
13
|
+
const degrees = 180 / Math.PI;
|
|
14
|
+
const clamp = (n)=>Math.max(-1, Math.min(1, n));
|
|
15
|
+
/** The unit quaternion for a rotation. */ export function versor([l, p, g]) {
|
|
16
|
+
const hl = l * radians / 2, hp = p * radians / 2, hg = (g ?? 0) * radians / 2;
|
|
17
|
+
const sl = Math.sin(hl), cl = Math.cos(hl), sp = Math.sin(hp), cp = Math.cos(hp), sg = Math.sin(hg), cg = Math.cos(hg);
|
|
18
|
+
return [
|
|
19
|
+
cl * cp * cg + sl * sp * sg,
|
|
20
|
+
sl * cp * cg - cl * sp * sg,
|
|
21
|
+
cl * sp * cg + sl * cp * sg,
|
|
22
|
+
cl * cp * sg - sl * sp * cg
|
|
23
|
+
];
|
|
24
|
+
}
|
|
25
|
+
/** The rotation a unit quaternion stands for. */ export function versorRotation(q) {
|
|
26
|
+
return [
|
|
27
|
+
Math.atan2(2 * (q[0] * q[1] + q[2] * q[3]), 1 - 2 * (q[1] ** 2 + q[2] ** 2)) * degrees,
|
|
28
|
+
Math.asin(clamp(2 * (q[0] * q[2] - q[3] * q[1]))) * degrees,
|
|
29
|
+
Math.atan2(2 * (q[0] * q[3] + q[1] * q[2]), 1 - 2 * (q[2] ** 2 + q[3] ** 2)) * degrees
|
|
30
|
+
];
|
|
31
|
+
}
|
|
32
|
+
/** A coordinate as a point on the unit sphere. */ export function cartesian([lon, lat]) {
|
|
33
|
+
const l = lon * radians, p = lat * radians, cp = Math.cos(p);
|
|
34
|
+
return [
|
|
35
|
+
cp * Math.cos(l),
|
|
36
|
+
cp * Math.sin(l),
|
|
37
|
+
Math.sin(p)
|
|
38
|
+
];
|
|
39
|
+
}
|
|
40
|
+
/** The quaternion turning the unit vector `a` onto `b`. */ export function versorDelta(a, b) {
|
|
41
|
+
const w = [
|
|
42
|
+
a[1] * b[2] - a[2] * b[1],
|
|
43
|
+
a[2] * b[0] - a[0] * b[2],
|
|
44
|
+
a[0] * b[1] - a[1] * b[0]
|
|
45
|
+
];
|
|
46
|
+
const l = Math.hypot(...w);
|
|
47
|
+
if (!l) return [
|
|
48
|
+
1,
|
|
49
|
+
0,
|
|
50
|
+
0,
|
|
51
|
+
0
|
|
52
|
+
];
|
|
53
|
+
const t = Math.acos(clamp(a[0] * b[0] + a[1] * b[1] + a[2] * b[2])) / 2, s = Math.sin(t);
|
|
54
|
+
return [
|
|
55
|
+
Math.cos(t),
|
|
56
|
+
w[2] / l * s,
|
|
57
|
+
-w[1] / l * s,
|
|
58
|
+
w[0] / l * s
|
|
59
|
+
];
|
|
60
|
+
}
|
|
61
|
+
/** The product `a * b` of two quaternions. */ export function versorMultiply(a, b) {
|
|
62
|
+
return [
|
|
63
|
+
a[0] * b[0] - a[1] * b[1] - a[2] * b[2] - a[3] * b[3],
|
|
64
|
+
a[1] * b[0] + a[0] * b[1] + a[2] * b[3] - a[3] * b[2],
|
|
65
|
+
a[0] * b[2] - a[1] * b[3] + a[2] * b[0] + a[3] * b[1],
|
|
66
|
+
a[0] * b[3] + a[1] * b[2] - a[2] * b[1] + a[3] * b[0]
|
|
67
|
+
];
|
|
68
|
+
}
|
|
69
|
+
const finite = (p)=>p && Number.isFinite(p[0]) && Number.isFinite(p[1]) ? p : null;
|
|
70
|
+
/**
|
|
71
|
+
The place under a pixel, or null off the globe: d3-geo inverts a pixel
|
|
72
|
+
past a globe's edge to the horizon, so the place must project back onto
|
|
73
|
+
the pixel.
|
|
74
|
+
*/ function placeAt(projection, at) {
|
|
75
|
+
const place = finite(projection.invert?.(at));
|
|
76
|
+
if (!place) return null;
|
|
77
|
+
const back = projection(place);
|
|
78
|
+
return back && Math.hypot(back[0] - at[0], back[1] - at[1]) < 0.5 ? place : null;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
The rotation that carries the place under `from` (with the globe turned
|
|
82
|
+
to `start`) to the pixel `to`. Off the globe, where a pixel names no
|
|
83
|
+
place, it turns the globe by longitude and latitude instead, a degree
|
|
84
|
+
per the pixels a degree spans at the globe's center. Leaves the
|
|
85
|
+
projection's rotation as it found it.
|
|
86
|
+
*/ export function dragRotation(projection, start, from, to) {
|
|
87
|
+
const current = projection.rotate();
|
|
88
|
+
projection.rotate(start);
|
|
89
|
+
const a = placeAt(projection, from);
|
|
90
|
+
// Dragged past the edge, the grabbed place follows to the horizon.
|
|
91
|
+
const b = a ? placeAt(projection, to) ?? finite(projection.invert?.(to)) : null;
|
|
92
|
+
projection.rotate(current);
|
|
93
|
+
const [l, p, g = 0] = start;
|
|
94
|
+
if (a && b) return versorRotation(versorMultiply(versor(start), versorDelta(cartesian(a), cartesian(b))));
|
|
95
|
+
const k = degrees / (projection.scale() || 1);
|
|
96
|
+
return [
|
|
97
|
+
l + (to[0] - from[0]) * k,
|
|
98
|
+
Math.max(-90, Math.min(90, p - (to[1] - from[1]) * k)),
|
|
99
|
+
g
|
|
100
|
+
];
|
|
101
|
+
}
|
|
102
|
+
/** Where a pointer event is on `node`, for a mouse or a single touch. */ function pointerOn(event, node) {
|
|
103
|
+
const touches = event.touches;
|
|
104
|
+
const at = touches && touches.length ? touches[0] : event.clientX !== undefined ? event : null;
|
|
105
|
+
if (!at) return null;
|
|
106
|
+
const rect = node.getBoundingClientRect();
|
|
107
|
+
return [
|
|
108
|
+
at.clientX - rect.left - (node.clientLeft || 0),
|
|
109
|
+
at.clientY - rect.top - (node.clientTop || 0)
|
|
110
|
+
];
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
A point on the zoom surface in the map's projected pixels: the zoom
|
|
114
|
+
`transform` undone, then the chart's own offset.
|
|
115
|
+
*/ export function surfaceToMap(point, transform, offset = {}) {
|
|
116
|
+
return [
|
|
117
|
+
(point[0] - transform.x) / transform.k - (offset.x ?? 0),
|
|
118
|
+
(point[1] - transform.y) / transform.k - (offset.y ?? 0)
|
|
119
|
+
];
|
|
120
|
+
}
|
|
121
|
+
/** Whether `viz` is a globe drag can turn now. */ export function globeRotates(viz) {
|
|
122
|
+
return clipsToCircle(viz.schema.projection) && !!viz.schema.zoom && !viz._ssr && !viz._facetPanels && !viz._facetStep;
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
The rotation a globe returns to, and fits its scale at: the configured
|
|
126
|
+
`projectionRotate`, else the one the projection had before it was first
|
|
127
|
+
dragged. Undefined for a globe that hasn't been turned.
|
|
128
|
+
*/ export function globeHome(viz) {
|
|
129
|
+
const configured = viz.schema.projectionRotate;
|
|
130
|
+
if (Array.isArray(configured)) return configured;
|
|
131
|
+
const home = viz._globeHome;
|
|
132
|
+
return home && home.projection === viz.schema.projection ? home.rotate : undefined;
|
|
133
|
+
}
|
|
134
|
+
/** Whether a gesture event comes from a press that can drag. */ const isPress = (event)=>!!event && (event.type === "mousedown" || event.type === "pointerdown" || event.type === "touchstart" && (event.touches?.length ?? 0) === 1);
|
|
135
|
+
/**
|
|
136
|
+
Installs the globe drag on a Geomap: `viz._zoomGesture`, which the zoom
|
|
137
|
+
behavior consults on each gesture, rotating the projection on a drag
|
|
138
|
+
and re-laying the map out (with `relayout`) once per animation frame.
|
|
139
|
+
The zoom controls' reset turns the globe back to `globeHome`.
|
|
140
|
+
@param relayout Re-runs the map's layout and emit for the current projection.
|
|
141
|
+
*/ export function installGlobeRotation(viz, relayout) {
|
|
142
|
+
let drag = null;
|
|
143
|
+
const surface = ()=>(viz._zoomEventTarget || viz._container)?.node() ?? null;
|
|
144
|
+
const paint = ()=>{
|
|
145
|
+
if (!drag || !drag.to) return;
|
|
146
|
+
drag.frame = undefined;
|
|
147
|
+
const projection = viz.schema.projection;
|
|
148
|
+
projection.rotate(dragRotation(projection, drag.r0, drag.p0, drag.to));
|
|
149
|
+
relayout();
|
|
150
|
+
viz._drawSceneToTarget?.(0);
|
|
151
|
+
};
|
|
152
|
+
const finish = ()=>{
|
|
153
|
+
if (!drag) return;
|
|
154
|
+
if (drag.frame !== undefined) cancelAnimationFrame(drag.frame);
|
|
155
|
+
paint();
|
|
156
|
+
drag = null;
|
|
157
|
+
viz._globeDragging = false;
|
|
158
|
+
};
|
|
159
|
+
const gesture = {
|
|
160
|
+
start (event) {
|
|
161
|
+
drag = null;
|
|
162
|
+
const node = surface();
|
|
163
|
+
if (!node || !globeRotates(viz) || !isPress(event.sourceEvent)) return;
|
|
164
|
+
const at = pointerOn(event.sourceEvent, node);
|
|
165
|
+
if (!at) return;
|
|
166
|
+
const projection = viz.schema.projection;
|
|
167
|
+
if (!globeHome(viz)) viz._globeHome = {
|
|
168
|
+
projection,
|
|
169
|
+
rotate: projection.rotate()
|
|
170
|
+
};
|
|
171
|
+
drag = {
|
|
172
|
+
t0: event.transform,
|
|
173
|
+
r0: projection.rotate(),
|
|
174
|
+
p0: surfaceToMap(at, event.transform, viz._chartTransform)
|
|
175
|
+
};
|
|
176
|
+
},
|
|
177
|
+
zoom (event) {
|
|
178
|
+
if (!drag) return false;
|
|
179
|
+
const source = event.sourceEvent;
|
|
180
|
+
const node = surface();
|
|
181
|
+
// A second finger makes it a pinch, which zooms.
|
|
182
|
+
if (!source || !node || source.type === "wheel" || (source.touches?.length ?? 0) > 1) {
|
|
183
|
+
finish();
|
|
184
|
+
return false;
|
|
185
|
+
}
|
|
186
|
+
// Hold the zoom transform where the drag found it.
|
|
187
|
+
(viz._zoomEventTarget || viz._container).property("__zoom", drag.t0);
|
|
188
|
+
const at = pointerOn(source, node);
|
|
189
|
+
if (!at) return true;
|
|
190
|
+
viz._globeDragging = true;
|
|
191
|
+
drag.to = surfaceToMap(at, drag.t0, viz._chartTransform);
|
|
192
|
+
if (typeof requestAnimationFrame !== "function") paint();
|
|
193
|
+
else if (drag.frame === undefined) drag.frame = requestAnimationFrame(paint);
|
|
194
|
+
return true;
|
|
195
|
+
},
|
|
196
|
+
end () {
|
|
197
|
+
finish();
|
|
198
|
+
},
|
|
199
|
+
reset () {
|
|
200
|
+
if (!globeRotates(viz)) return;
|
|
201
|
+
const home = globeHome(viz);
|
|
202
|
+
if (!home) return;
|
|
203
|
+
viz.schema.projection.rotate(home);
|
|
204
|
+
relayout();
|
|
205
|
+
}
|
|
206
|
+
};
|
|
207
|
+
viz._zoomGesture = gesture;
|
|
208
|
+
}
|
|
@@ -4,6 +4,9 @@
|
|
|
4
4
|
Implementation files in this folder:
|
|
5
5
|
- `applyLayout.ts` — topojson + projection + path/point compute.
|
|
6
6
|
- `emit.ts` — country Paths + point Circles.
|
|
7
|
+
- `flowLinks.ts` / `flowGeometry.ts` — `links`: their ends, widths,
|
|
8
|
+
and great-circle paths; `flowEmit.ts` draws them, `flowEvents.ts`
|
|
9
|
+
wires their hover and click, and `flowFields.ts` declares their config.
|
|
7
10
|
*/ import { color } from "d3-color";
|
|
8
11
|
import { tile } from "d3-tile";
|
|
9
12
|
import { geoMercator } from "d3-geo";
|
|
@@ -15,12 +18,21 @@ import constant from "../../utils/constant.js";
|
|
|
15
18
|
import { chartAreaRect, chartBounds } from "../features/chartGeometry.js";
|
|
16
19
|
import { ensureZoomDom } from "../features/ensureZoomDom.js";
|
|
17
20
|
import { tileZoomTransform } from "../drawSteps/zoomControls.js";
|
|
18
|
-
import { DEFAULT_OCEAN, DEFAULT_TILE_URL,
|
|
21
|
+
import { DEFAULT_OCEAN, DEFAULT_TILE_URL, resolveThemed } from "./basemapTheme.js";
|
|
22
|
+
import { pageIsDark } from "../viz/pageTheme.js";
|
|
19
23
|
import { makeChart } from "../definition/makeChart.js";
|
|
24
|
+
import { isPointShape } from "../viz/nearestHover.js";
|
|
25
|
+
import { loaderFormatFields, setLoaderValue } from "../viz/loaderFormat.js";
|
|
20
26
|
import { applyGeomapLayout, geomapPointData, geomapPointSizeScale } from "./applyLayout.js";
|
|
21
27
|
import { projectionByName } from "./projections.js";
|
|
22
28
|
import { geomapEmit } from "./emit.js";
|
|
29
|
+
import { setupGeomapLinks } from "./flowEvents.js";
|
|
30
|
+
import { installGlobeKeys } from "./globeKeys.js";
|
|
31
|
+
import { installGlobeRotation } from "./globeRotate.js";
|
|
32
|
+
import { runChartDraw } from "../pipeline/runChartDraw.js";
|
|
33
|
+
import { geomapLinkFields } from "./flowFields.js";
|
|
23
34
|
import { sceneInsetRegion } from "../pipeline/insetPlacement.js";
|
|
35
|
+
import { effectiveDuration } from "../viz/reducedMotion.js";
|
|
24
36
|
function findAttribution(url) {
|
|
25
37
|
const a = attributions.find((d)=>d.matches.some((m)=>url.includes(m)));
|
|
26
38
|
return a ? a.text : false;
|
|
@@ -117,9 +129,8 @@ function findAttribution(url) {
|
|
|
117
129
|
// Wrap _draw to ensure DOM zoom group + zoom wiring.
|
|
118
130
|
const supDraw = viz._draw.bind(viz);
|
|
119
131
|
viz._draw = function(callback) {
|
|
120
|
-
// Resolve `{light, dark}` basemaps against the chart's
|
|
121
|
-
viz._basemapDark = pageIsDark(viz);
|
|
122
|
-
if (isThemed(viz)) watchPageTheme(viz);
|
|
132
|
+
// Resolve `{light, dark}` basemaps against the chart's theme.
|
|
133
|
+
viz._basemapDark = viz._theme ? viz._theme.dark : pageIsDark(viz);
|
|
123
134
|
syncTileAttribution(viz);
|
|
124
135
|
const result = supDraw(callback);
|
|
125
136
|
const { width, height } = chartBounds(viz);
|
|
@@ -127,7 +138,7 @@ function findAttribution(url) {
|
|
|
127
138
|
kind: "geomap",
|
|
128
139
|
width,
|
|
129
140
|
height,
|
|
130
|
-
duration: viz
|
|
141
|
+
duration: effectiveDuration(viz),
|
|
131
142
|
// On the canvas backend the ocean + tiles mount in an underlay beneath
|
|
132
143
|
// the <canvas> (see `ensureZoomDom`), so they show through around the
|
|
133
144
|
// geography on either backend. Small multiples paint each panel's
|
|
@@ -201,7 +212,9 @@ function findAttribution(url) {
|
|
|
201
212
|
Accessor function for each data point's coordinates, as
|
|
202
213
|
`[longitude, latitude]` (d3's coordinate order), or one coordinate for
|
|
203
214
|
every point. Defaults to each row's `point` key. Rows with a coordinate are
|
|
204
|
-
drawn as points; the rest are matched to `topojson` shapes.
|
|
215
|
+
drawn as points; the rest are matched to `topojson` shapes. A point the
|
|
216
|
+
projection clips (on the far side of a globe, or outside
|
|
217
|
+
`"geoAlbersUsa"`'s insets) is not drawn.
|
|
205
218
|
@type {number[] | function}
|
|
206
219
|
*/ v.point = function(_) {
|
|
207
220
|
return arguments.length ? (this.schema.point = typeof _ === "function" ? _ : constant(_), this) : this.schema.point;
|
|
@@ -240,10 +253,19 @@ function findAttribution(url) {
|
|
|
240
253
|
Rotates the projection, as d3-geo's
|
|
241
254
|
[`projection.rotate`](https://github.com/d3/d3-geo#projection_rotate) angles
|
|
242
255
|
`[lambda, phi, gamma]` in degrees. Turns `tiles` off, since rotated tiles
|
|
243
|
-
no longer line up.
|
|
256
|
+
no longer line up. On a projection that clips to a circle (a globe,
|
|
257
|
+
such as `"geoOrthographic"`), dragging the map turns the globe under the
|
|
258
|
+
pointer instead of panning it (the wheel, a pinch, and the zoom buttons
|
|
259
|
+
still zoom), Shift and the arrow keys turn it 10° of longitude or
|
|
260
|
+
latitude a press while the chart has keyboard focus (stopping at the
|
|
261
|
+
poles, and easing unless `reducedMotion` is on), and the zoom controls'
|
|
262
|
+
reset turns it back to this rotation. Reads back the rotation set
|
|
263
|
+
here, as the zoom transform isn't read back either;
|
|
264
|
+
`projection().rotate()` reads the globe's current one.
|
|
244
265
|
@type {[number, number] | [number, number, number]}
|
|
245
266
|
*/ v.projectionRotate = function(_) {
|
|
246
267
|
if (arguments.length) {
|
|
268
|
+
this.schema.projectionRotate = _;
|
|
247
269
|
this.schema.projection.rotate(_);
|
|
248
270
|
v.tiles(false);
|
|
249
271
|
this._zoomSet = false;
|
|
@@ -286,12 +308,13 @@ function findAttribution(url) {
|
|
|
286
308
|
const v = viz;
|
|
287
309
|
/**
|
|
288
310
|
The topojson to draw as geographic paths: a topojson object, or a filepath
|
|
289
|
-
or URL to load.
|
|
290
|
-
argument
|
|
311
|
+
or URL to load. `topojsonFormat` transforms it; a function passed as a
|
|
312
|
+
second argument sets it.
|
|
291
313
|
@type {string | object | false}
|
|
292
|
-
*/ v.topojson = function(
|
|
314
|
+
*/ v.topojson = function() {
|
|
293
315
|
if (arguments.length) {
|
|
294
|
-
|
|
316
|
+
// eslint-disable-next-line prefer-rest-params
|
|
317
|
+
setLoaderValue(this, "topojson", arguments);
|
|
295
318
|
this._zoomSet = false;
|
|
296
319
|
return this;
|
|
297
320
|
}
|
|
@@ -299,8 +322,9 @@ function findAttribution(url) {
|
|
|
299
322
|
};
|
|
300
323
|
/**
|
|
301
324
|
The fill for topojson shapes that have no data (or no `colorScale` value):
|
|
302
|
-
a CSS color or a function of the feature. Defaults to
|
|
303
|
-
|
|
325
|
+
a CSS color or a function of the feature. Defaults to the theme's
|
|
326
|
+
`colorScale.missing` when it sets one, else a quiet light gray, or its
|
|
327
|
+
dark counterpart over a dark basemap.
|
|
304
328
|
@type {CssColor | function}
|
|
305
329
|
*/ v.topojsonFill = function(_) {
|
|
306
330
|
return arguments.length ? (this.schema.topojsonFill = typeof _ === "function" ? _ : constant(_), this) : this.schema.topojsonFill;
|
|
@@ -361,6 +385,8 @@ export const geomapDef = {
|
|
|
361
385
|
insetRegion: sceneInsetRegion,
|
|
362
386
|
// A row without a coordinate point draws as its topojson Path.
|
|
363
387
|
colorScaleShape: (viz, d, i)=>viz.schema.point(d, i) instanceof Array ? viz.schema.shape(d, i) : "Path",
|
|
388
|
+
// Coordinate points are points for `hoverDistance`; regions keep exact hit-testing.
|
|
389
|
+
pointMark: (_viz, node)=>isPointShape(node),
|
|
364
390
|
// Clip the geography to the map rectangle — the same box as the ocean rect and
|
|
365
391
|
// the imperative inner <svg> viewport — so projected paths and points can't
|
|
366
392
|
// spill past it (e.g. under the legend/timeline) when a `fitObject`/zoom pushes
|
|
@@ -375,18 +401,27 @@ export const geomapDef = {
|
|
|
375
401
|
setupGeomapRenderTiles(viz);
|
|
376
402
|
setupGeomapDraw(viz);
|
|
377
403
|
setupGeomapFluent(viz);
|
|
404
|
+
setupGeomapLinks(viz);
|
|
405
|
+
// Dragging a globe, or Shift and the arrow keys, re-lays the map out for
|
|
406
|
+
// each new rotation.
|
|
407
|
+
const relayout = ()=>runChartDraw(viz, geomapDef, applyGeomapLayout);
|
|
408
|
+
installGlobeRotation(viz, relayout);
|
|
409
|
+
installGlobeKeys(viz, relayout);
|
|
378
410
|
// Seed the default tile URL through the wrapped accessor so attribution is set.
|
|
379
411
|
v.tileUrl(DEFAULT_TILE_URL);
|
|
380
|
-
// Regions with no data:
|
|
381
|
-
// dark basemap (`topojsonFill`
|
|
382
|
-
|
|
412
|
+
// Regions with no data: the theme's `colorScale.missing`, else a quiet
|
|
413
|
+
// light fill or its dark counterpart over a dark basemap (`topojsonFill`
|
|
414
|
+
// replaces all three).
|
|
415
|
+
viz.schema.topojsonFill = ()=>viz._theme?.colorScale.missing ?? (viz._basemapDark ? "#3d3e44" : "#f5f5f3");
|
|
383
416
|
},
|
|
384
417
|
ctx: {},
|
|
385
418
|
fields: [
|
|
419
|
+
...loaderFormatFields("topojson", "links"),
|
|
386
420
|
{
|
|
387
421
|
key: "fitObject",
|
|
388
422
|
default: false
|
|
389
423
|
},
|
|
424
|
+
...geomapLinkFields(),
|
|
390
425
|
{
|
|
391
426
|
key: "noDataMessage",
|
|
392
427
|
default: false
|