From 8d01b2a22ed0cc7bff3b3e880cca54031b6ebe4d Mon Sep 17 00:00:00 2001 From: Hugh Miles Date: Wed, 3 Jan 2018 20:48:50 -0800 Subject: [PATCH] refactor arc.get_data --- superset/viz.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/superset/viz.py b/superset/viz.py index d1a41b39a1b03..403ff59b39221 100644 --- a/superset/viz.py +++ b/superset/viz.py @@ -2075,20 +2075,13 @@ def query_obj(self): return d def get_data(self, df): - fd = self.form_data - start_lat = df[fd.get('start_spatial').get('latCol')] - start_lon = df[fd.get('start_spatial').get('lonCol')] - end_lat = df[fd.get('end_spatial').get('latCol')] - end_lon = df[fd.get('end_spatial').get('lonCol')] - source_pos = list(zip(start_lon, start_lat)) - target_pos = list(zip(end_lon, end_lat)) - data = [] - for pos in list(zip(source_pos, target_pos)): + for item in self.process_spatial_data_obj(df): + pos = item.get('position') data.append({ - 'sourcePosition': pos[0], - 'targetPosition': pos[1], - }) + 'sourcePosition': pos[0], + 'targetPosition': pos[1], + }) return { 'arcs': data,