fix(world-map): remove categorical color option (#19781)

This commit is contained in:
serenajiang 2022-04-20 09:36:28 -07:00 committed by GitHub
parent fcc8080ff3
commit 5e468f7a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 32 deletions

View File

@ -23,7 +23,6 @@ import { extent as d3Extent } from 'd3-array';
import {
getNumberFormatter,
getSequentialSchemeRegistry,
CategoricalColorNamespace,
} from '@superset-ui/core';
import Datamap from 'datamaps/dist/datamaps.world.min';
@ -56,8 +55,6 @@ function WorldMap(element, props) {
showBubbles,
linearColorScheme,
color,
colorScheme,
sliceId,
} = props;
const div = d3.select(element);
div.classed('superset-legacy-chart-world-map', true);
@ -72,24 +69,15 @@ function WorldMap(element, props) {
.domain([extRadius[0], extRadius[1]])
.range([1, maxBubbleSize]);
const linearColorScale = getSequentialSchemeRegistry()
const colorScale = getSequentialSchemeRegistry()
.get(linearColorScheme)
.createLinearScale(d3Extent(filteredData, d => d.m1));
const colorScale = CategoricalColorNamespace.getScale(colorScheme);
const processedData = filteredData.map(d => {
let color = linearColorScale(d.m1);
if (colorScheme) {
// use color scheme instead
color = colorScale(d.name, sliceId);
}
return {
...d,
radius: radiusScale(Math.sqrt(d.m2)),
fillColor: color,
};
});
const processedData = filteredData.map(d => ({
...d,
radius: radiusScale(Math.sqrt(d.m2)),
fillColor: colorScale(d.m1),
}));
const mapData = {};
processedData.forEach(d => {

View File

@ -106,7 +106,6 @@ const config: ControlPanelConfig = {
},
],
['color_picker'],
['color_scheme'],
['linear_color_scheme'],
],
},
@ -127,9 +126,6 @@ const config: ControlPanelConfig = {
color_picker: {
label: t('Bubble Color'),
},
color_scheme: {
label: t('Categorical Color Scheme'),
},
linear_color_scheme: {
label: t('Country Color Scheme'),
},

View File

@ -20,14 +20,8 @@ import { rgb } from 'd3-color';
export default function transformProps(chartProps) {
const { width, height, formData, queriesData } = chartProps;
const {
maxBubbleSize,
showBubbles,
linearColorScheme,
colorPicker,
colorScheme,
sliceId,
} = formData;
const { maxBubbleSize, showBubbles, linearColorScheme, colorPicker } =
formData;
const { r, g, b } = colorPicker;
return {
@ -38,7 +32,5 @@ export default function transformProps(chartProps) {
showBubbles,
linearColorScheme,
color: rgb(r, g, b).hex(),
colorScheme,
sliceId,
};
}