betodealmeida closed pull request #5767: Fix multilayer geoviz and color picker
error
URL: https://github.com/apache/incubator-superset/pull/5767
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/superset/assets/src/visualizations/deckgl/CategoricalDeckGLContainer.jsx
b/superset/assets/src/visualizations/deckgl/CategoricalDeckGLContainer.jsx
index 1182312049..4c098ce90d 100644
--- a/superset/assets/src/visualizations/deckgl/CategoricalDeckGLContainer.jsx
+++ b/superset/assets/src/visualizations/deckgl/CategoricalDeckGLContainer.jsx
@@ -30,11 +30,11 @@ function getCategories(fd, data) {
const propTypes = {
slice: PropTypes.object.isRequired,
- data: PropTypes.array.isRequired,
mapboxApiKey: PropTypes.string.isRequired,
setControlValue: PropTypes.func.isRequired,
viewport: PropTypes.object.isRequired,
getLayer: PropTypes.func.isRequired,
+ payload: PropTypes.object.isRequired,
};
export default class CategoricalDeckGLContainer extends React.PureComponent {
@@ -50,9 +50,9 @@ export default class CategoricalDeckGLContainer extends
React.PureComponent {
const fd = nextProps.slice.formData;
const timeGrain = fd.time_grain_sqla || fd.granularity || 'PT1M';
- const timestamps = nextProps.data.map(f => f.__timestamp);
+ const timestamps = nextProps.payload.data.features.map(f => f.__timestamp);
const { start, end, step, values, disabled } =
getPlaySliderParams(timestamps, timeGrain);
- const categories = getCategories(fd, nextProps.data);
+ const categories = getCategories(fd, nextProps.payload.data.features);
return { start, end, step, values, disabled, categories };
}
@@ -79,8 +79,9 @@ export default class CategoricalDeckGLContainer extends
React.PureComponent {
});
}
getLayers(values) {
- const fd = this.props.slice.formData;
- let data = [...this.props.data];
+ const { getLayer, payload, slice } = this.props;
+ const fd = slice.formData;
+ let data = [...payload.data.features];
// Add colors from categories or fixed color
data = this.addColor(data, fd);
@@ -103,7 +104,8 @@ export default class CategoricalDeckGLContainer extends
React.PureComponent {
data = data.filter(d => this.state.categories[d.cat_color].enabled);
}
- return [this.props.getLayer(fd, data, this.props.slice)];
+ payload.data.features = data;
+ return [getLayer(fd, payload, slice)];
}
toggleCategory(category) {
const categoryState = this.state.categories[category];
diff --git a/superset/assets/src/visualizations/deckgl/layers/arc.jsx
b/superset/assets/src/visualizations/deckgl/layers/arc.jsx
index 80b5858aef..883ffbd6c6 100644
--- a/superset/assets/src/visualizations/deckgl/layers/arc.jsx
+++ b/superset/assets/src/visualizations/deckgl/layers/arc.jsx
@@ -18,7 +18,8 @@ function getPoints(data) {
return points;
}
-function getLayer(fd, data, slice) {
+function getLayer(fd, payload, slice) {
+ const data = payload.data.features;
const sc = fd.color_picker;
const tc = fd.target_color_picker;
return new ArcLayer({
@@ -40,17 +41,17 @@ function deckArc(slice, payload, setControlValue) {
};
if (fd.autozoom) {
- viewport = common.fitViewport(viewport, getPoints(payload.data.arcs));
+ viewport = common.fitViewport(viewport, getPoints(payload.data.features));
}
ReactDOM.render(
<CategoricalDeckGLContainer
slice={slice}
- data={payload.data.arcs}
mapboxApiKey={payload.data.mapboxApiKey}
setControlValue={setControlValue}
viewport={viewport}
getLayer={getLayer}
+ payload={payload}
/>,
document.getElementById(slice.containerId),
);
diff --git a/superset/assets/src/visualizations/deckgl/layers/scatter.jsx
b/superset/assets/src/visualizations/deckgl/layers/scatter.jsx
index 07590551ac..d9474a4770 100644
--- a/superset/assets/src/visualizations/deckgl/layers/scatter.jsx
+++ b/superset/assets/src/visualizations/deckgl/layers/scatter.jsx
@@ -14,13 +14,18 @@ function getPoints(data) {
return data.map(d => d.position);
}
-function getLayer(fd, data, slice) {
- const dataWithRadius = data.map((d) => {
+function getLayer(fd, payload, slice) {
+ const dataWithRadius = payload.data.features.map((d) => {
let radius = unitToRadius(fd.point_unit, d.radius) || 10;
if (fd.multiplier) {
radius *= fd.multiplier;
}
- return { ...d, radius };
+ if (d.color) {
+ return { ...d, radius };
+ }
+ const c = fd.color_picker || { r: 0, g: 0, b: 0, a: 1 };
+ const color = [c.r, c.g, c.b, c.a * 255];
+ return { ...d, radius, color };
});
return new ScatterplotLayer({
@@ -49,11 +54,11 @@ function deckScatter(slice, payload, setControlValue) {
ReactDOM.render(
<CategoricalDeckGLContainer
slice={slice}
- data={payload.data.features}
mapboxApiKey={payload.data.mapboxApiKey}
setControlValue={setControlValue}
viewport={viewport}
getLayer={getLayer}
+ payload={payload}
/>,
document.getElementById(slice.containerId),
);
diff --git a/superset/assets/src/visualizations/deckgl/multi.jsx
b/superset/assets/src/visualizations/deckgl/multi.jsx
index 9bd80750a9..8b35c86768 100644
--- a/superset/assets/src/visualizations/deckgl/multi.jsx
+++ b/superset/assets/src/visualizations/deckgl/multi.jsx
@@ -33,10 +33,11 @@ function deckMulti(slice, payload, setControlValue) {
// Filters applied to multi_deck are passed down to underlying charts
// note that dashboard contextual information (filter_immune_slices and
such) aren't
// taken into consideration here
- let filters = subslice.form_data.filters.concat(fd.filters);
- if (fd.extra_filters) {
- filters = filters.concat(fd.extra_filters);
- }
+ const filters = [
+ ...(subslice.form_data.filters || []),
+ ...(fd.filters || []),
+ ...(fd.extra_filters || []),
+ ];
const subsliceCopy = {
...subslice,
form_data: {
diff --git a/superset/viz.py b/superset/viz.py
index 5f4cea8498..70deddde88 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -2161,7 +2161,7 @@ def query_obj(self):
fd = self.form_data
# add NULL filters
- if fd.get('filter_nulls'):
+ if fd.get('filter_nulls', True):
self.add_null_filters()
d = super(BaseDeckGLViz, self).query_obj()
@@ -2409,10 +2409,9 @@ def get_properties(self, d):
def get_data(self, df):
d = super(DeckArc, self).get_data(df)
- arcs = d['features']
return {
- 'arcs': arcs,
+ 'features': d['features'],
'mapboxApiKey': config.get('MAPBOX_API_KEY'),
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
