[Geo] Added DeckGL Arc Layer and Refactor on BaseDeckGL class

superset/assets/javascripts/explore/stores/controls.jsx

@@ -499,6 +499,26 @@ export const controls = {
     }),
   },
 
+  start_spatial: {
+    type: 'SpatialControl',
+    label: t('Start Longitude & Latitude'),
+    validators: [v.nonEmpty],
+    description: t('Point to your spatial columns'),
+    mapStateToProps: state => ({
+      choices: (state.datasource) ? state.datasource.all_cols : [],
+    }),
+  },
+
+  end_spatial: {
+    type: 'SpatialControl',
+    label: t('End Longitude & Latitude'),
+    validators: [v.nonEmpty],
+    description: t('Point to your spatial columns'),
+    mapStateToProps: state => ({
+      choices: (state.datasource) ? state.datasource.all_cols : [],
+    }),
+  },
+
   longitude: {
     type: 'SelectControl',
     label: t('Longitude'),
@@ -540,6 +560,15 @@ export const controls = {
     choices: formatSelectOptions([0, 100, 200, 300, 500]),
   },
 
+  stroke_width: {
+    type: 'SelectControl',
+    freeForm: true,
+    label: t('Stroke Width'),
+    validators: [v.integer],
+    default: null,
+    choices: formatSelectOptions([1, 2, 3, 4, 5]),
+  },
+
   all_columns_x: {
     type: 'SelectControl',
     label: 'X',

superset/assets/javascripts/explore/stores/visTypes.js

@@ -497,6 +497,34 @@ export const visTypes = {
     ],
   },
 
+  deck_arc: {
+    label: t('Deck.gl - Arc'),
+    requiresTime: true,
+    controlPanelSections: [
+      {
+        label: t('Query'),
+        expanded: true,
+        controlSetRows: [
+          ['start_spatial', 'end_spatial'],
+          ['row_limit', null],
+        ],
+      },
+      {
+        label: t('Map'),
+        controlSetRows: [
+          ['mapbox_style', 'viewport'],
+        ],
+      },
+      {
+        label: t('Arc'),
+        controlSetRows: [
+          ['color_picker', null],
+          ['stroke_width', null],
+        ],
+      },
+    ],
+  },
+
   deck_scatter: {
     label: t('Deck.gl - Scatter plot'),
     requiresTime: true,

superset/assets/visualizations/deckgl/layers/arc.jsx

@@ -0,0 +1,16 @@
+import { ArcLayer } from 'deck.gl';
+
+export default function arcLayer(formData, payload) {
+  const fd = formData;
+  const fc = fd.color_picker;
+  const data = payload.data.arcs.map(d => ({
+    ...d,
+    color: [fc.r, fc.g, fc.b, 255 * fc.a],
+  }));
+
+  return new ArcLayer({
+    id: `path-layer-${fd.slice_id}`,
+    data,
+    strokeWidth: (fd.stroke_width) ? fd.stroke_width : 3,
+  });
+}

superset/assets/visualizations/deckgl/layers/index.js

@@ -5,6 +5,7 @@ import deck_path from './path';
 import deck_hex from './hex';
 import deck_scatter from './scatter';
 import deck_geojson from './geojson';
+import deck_arc from './arc';
 
 const layerGenerators = {
   deck_grid,
@@ -13,5 +14,6 @@ const layerGenerators = {
   deck_hex,
   deck_scatter,
   deck_geojson,
+  deck_arc,
 };
 export default layerGenerators;

superset/assets/visualizations/main.js

@@ -46,6 +46,7 @@ export const VIZ_TYPES = {
   deck_path: 'deck_path',
   deck_geojson: 'deck_geojson',
   deck_multi: 'deck_multi',
+  deck_arc: 'deck_arc',
 };
 
 const vizMap = {
@@ -92,6 +93,7 @@ const vizMap = {
   [VIZ_TYPES.deck_hex]: deckglFactory,
   [VIZ_TYPES.deck_path]: deckglFactory,
   [VIZ_TYPES.deck_geojson]: deckglFactory,
+  [VIZ_TYPES.deck_arc]: deckglFactory,
   [VIZ_TYPES.deck_multi]: require('./deckgl/multi.jsx'),
 };
 export default vizMap;

superset/viz.py

@@ -1818,6 +1818,58 @@ def get_position(self, d):
             d.get('lat'),
         ]
 
+    def process_spatial_query_obj(self, spatial_key):
+        fd = self.form_data
+        gb = []
+        spatial = fd.get(spatial_key)
+
+        if spatial is None:
+            raise Exception(_('Bad spatial key'))
+
+        if spatial.get('type') == 'latlong':
+            gb += [spatial.get('lonCol')]
+            gb += [spatial.get('latCol')]
+        elif spatial.get('type') == 'delimited':
+            gb += [spatial.get('lonlatCol')]
+        elif spatial.get('type') == 'geohash':
+            gb += [spatial.get('geohashCol')]
+
+        return gb
+
+    def process_spatial_data_obj(self, df, spatial_key):
+        fd = self.form_data
+        spatial = fd.get(spatial_key)
+        if spatial is None:
+            raise Exception(_('Bad spatial key'))
+
+        if spatial.get('type') == 'latlong':
+            df = df.rename(columns={
+                spatial.get('lonCol'): 'lon',
+                spatial.get('latCol'): 'lat'})
+        elif spatial.get('type') == 'delimited':
+            cols = ['lon', 'lat']
+            if spatial.get('reverseCheckbox'):
+                cols.reverse()
+            df[cols] = (
+                df[spatial.get('lonlatCol')]
+                .str
+                .split(spatial.get('delimiter'), expand=True)
+                .astype(np.float64)
+            )
+            del df[spatial.get('lonlatCol')]
+        elif spatial.get('type') == 'geohash':
+            latlong = df[spatial.get('geohashCol')].map(geohash.decode)
+            df['lat'] = latlong.apply(lambda x: x[0])
+            df['lon'] = latlong.apply(lambda x: x[1])
+            del df['geohash']
+
+        features = []
+        for d in df.to_dict(orient='records'):
+            d = dict(position=self.get_position(d), **self.get_properties(d))
+            features.append(d)
+
+        return features
+
     def query_obj(self):
         d = super(BaseDeckGLViz, self).query_obj()
         fd = self.form_data
@@ -1847,6 +1899,7 @@ def query_obj(self):
 
     def get_data(self, df):
         fd = self.form_data
+
         spatial = fd.get('spatial')
         if spatial:
             if spatial.get('type') == 'latlong':
@@ -1998,6 +2051,51 @@ def get_data(self, df):
         }
 
 
+class DeckArc(BaseDeckGLViz):
+
+    """deck.gl's Arc Layer"""
+
+    viz_type = 'deck_arc'
+    verbose_name = _('Deck.gl - Arc')
+
+    def query_obj(self):
+        d = super(DeckArc, self).query_obj()
+
+        gb = []
+        for spatial_key in ['start_spatial', 'end_spatial']:
+            gb += self.process_spatial_query_obj(spatial_key)
+
+        metrics = self.get_metrics()
+        if metrics:
+            d['groupby'] = gb
+            d['metrics'] = self.get_metrics()
+        else:
+            d['columns'] = gb
+
+        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)):
+            data.append({
+                         'sourcePosition': pos[0],
+                         'targetPosition': pos[1],
+                         })
+
+        return {
+            'arcs': data,
+            'mapboxApiKey': config.get('MAPBOX_API_KEY'),
+        }
+
+
 class EventFlowViz(BaseViz):
 
     """A visualization to explore patterns in event sequences"""