This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch geojson-controls
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/geojson-controls by this push:
new d901c5a7af feat(deckgl): additional geojson point controls
d901c5a7af is described below
commit d901c5a7af4d397409826cd5a725102993344e9d
Author: Evan Rusackas <[email protected]>
AuthorDate: Fri Apr 25 10:46:10 2025 -0600
feat(deckgl): additional geojson point controls
---
.../src/layers/Geojson/Geojson.tsx | 2 ++
.../src/layers/Geojson/controlPanel.ts | 30 +++++++++++++++++++---
.../src/Histogram/transformProps.ts | 2 +-
3 files changed, 30 insertions(+), 4 deletions(-)
diff --git
a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
index 6960fed801..9e995265a6 100644
---
a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
+++
b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.tsx
@@ -156,6 +156,8 @@ export function getLayer(
getFillColor,
getLineColor,
getLineWidth: fd.line_width || 1,
+ getPointRadius: fd.get_point_radius,
+ pointRadiusUnits: fd.point_radius_units,
pointRadiusScale: fd.point_radius_scale,
lineWidthUnits: fd.line_width_unit,
...commonLayerProps(fd, setTooltip, setTooltipContent),
diff --git
a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.ts
b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.ts
index 079c352480..e08e36545d 100644
---
a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.ts
+++
b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/controlPanel.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import { ControlPanelConfig } from '@superset-ui/chart-controls';
-import { t, legacyValidateInteger } from '@superset-ui/core';
+import { t, validateNumber, validateInteger } from '@superset-ui/core';
import { formatSelectOptions } from '../../utilities/utils';
import {
filterNulls,
@@ -76,15 +76,39 @@ const config: ControlPanelConfig = {
},
],
[
+ {
+ name: 'get_point_radius',
+ config: {
+ type: 'SelectControl',
+ freeForm: true,
+ label: t('Point Radius'),
+ validators: [validateInteger],
+ default: 1,
+ choices: formatSelectOptions([1, 5, 10, 20, 50, 100]),
+ renderTrigger: true,
+ },
+ },
{
name: 'point_radius_scale',
config: {
type: 'SelectControl',
freeForm: true,
label: t('Point Radius Scale'),
- validators: [legacyValidateInteger],
- default: null,
+ validators: [validateNumber],
+ default: 100,
choices: formatSelectOptions([0, 100, 200, 300, 500]),
+ renderTrigger: true,
+ },
+ },
+ ],
+ [
+ {
+ name: 'point_radius_units',
+ config: {
+ type: 'SelectControl',
+ label: t('Point Radius Units'),
+ default: 'meters',
+ choices: formatSelectOptions(['meters', 'common', 'pixels']),
},
},
],
diff --git
a/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/transformProps.ts
b/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/transformProps.ts
index 388e79ae94..28d2a93e6d 100644
---
a/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/transformProps.ts
+++
b/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/transformProps.ts
@@ -84,7 +84,7 @@ export default function transformProps(
.filter(key => !groupbySet.has(key))
.map(key => {
const array = key.split(' - ').map(value => parseFloat(value));
- return `${xAxisFormatter(array[0])} '-' ${xAxisFormatter(array[1])}`;
+ return `${xAxisFormatter(array[0])} - ${xAxisFormatter(array[1])}`;
});
const barSeries: BarSeriesOption[] = data.map(datum => {
const seriesName =
