[bugfix] deck.gl on druid always shows animation (apache#5107)

airbnb · May 31, 2018 · 4ecd95a · 4ecd95a
1 parent f3778c3
commit 4ecd95a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
@@ -1359,7 +1359,9 @@ def query(self, query_obj):
         if df is None or df.size == 0:
             raise Exception(_('No data was returned.'))
         df.columns = [
-            DTTM_ALIAS if c == 'timestamp' else c for c in df.columns]
+            DTTM_ALIAS if c in ('timestamp', '__time') else c
+            for c in df.columns
+        ]
 
         is_timeseries = query_obj['is_timeseries'] \
             if 'is_timeseries' in query_obj else True

diff --git a/superset/viz.py b/superset/viz.py
@@ -2150,7 +2150,8 @@ class DeckScatterViz(BaseDeckGLViz):
 
     def query_obj(self):
         fd = self.form_data
-        self.is_timeseries = fd.get('time_grain_sqla') or fd.get('granularity')
+        self.is_timeseries = bool(
+            fd.get('time_grain_sqla') or fd.get('granularity'))
         self.point_radius_fixed = (
             fd.get('point_radius_fixed') or {'type': 'fix', 'value': 500})
         return super(DeckScatterViz, self).query_obj()
@@ -2168,7 +2169,7 @@ def get_properties(self, d):
             'radius': self.fixed_value if self.fixed_value else d.get(self.metric),
             'cat_color': d.get(self.dim) if self.dim else None,
             'position': d.get('spatial'),
-            '__timestamp': d.get(DTTM_ALIAS) or d.get('__time'),
+            DTTM_ALIAS: d.get(DTTM_ALIAS),
         }
 
     def get_data(self, df):