Skip to content

Commit

Permalink
[deck_polygon] implement null locations flag (apache#5948)
Browse files Browse the repository at this point in the history
* [deck_polygon] implement null locations flag

* Fix unrelated JS test issue
  • Loading branch information
mistercrunch authored Sep 21, 2018
1 parent f94bda0 commit a1fa4bc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,5 @@ describe('TableElement', () => {
wrapper.find('.table-remove').simulate('click');
expect(wrapper.state().expanded).to.equal(false);
expect(mockedActions.removeDataPreview.called).to.equal(true);
expect(mockedActions.removeTable.called).to.equal(true);
});
});
10 changes: 0 additions & 10 deletions superset/assets/src/explore/controls.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -712,16 +712,6 @@ export const controls = {
}),
},

polygon: {
type: 'SelectControl',
label: t('Polygon Column'),
validators: [v.nonEmpty],
description: t('Select the polygon column. Each row should contain JSON.array(N) of [longitude, latitude] points'),
mapStateToProps: state => ({
choices: (state.datasource) ? state.datasource.all_cols : [],
}),
},

point_radius_scale: {
type: 'SelectControl',
freeForm: true,
Expand Down
11 changes: 8 additions & 3 deletions superset/viz.py
Original file line number Diff line number Diff line change
Expand Up @@ -2135,21 +2135,26 @@ def process_spatial_data_obj(self, key, df):
return df

def add_null_filters(self):
fd = self.form_data
spatial_columns = set()
for key in self.spatial_control_keys:
for column in self.get_spatial_columns(key):
spatial_columns.add(column)

if self.form_data.get('adhoc_filters') is None:
self.form_data['adhoc_filters'] = []
if fd.get('adhoc_filters') is None:
fd['adhoc_filters'] = []

line_column = fd.get('line_column')
if line_column:
spatial_columns.add(line_column)

for column in sorted(spatial_columns):
filter_ = to_adhoc({
'col': column,
'op': 'IS NOT NULL',
'val': '',
})
self.form_data['adhoc_filters'].append(filter_)
fd['adhoc_filters'].append(filter_)

def query_obj(self):
fd = self.form_data
Expand Down

0 comments on commit a1fa4bc

Please sign in to comment.