From 09c95fb28a4497a90f529f1f6adc3b2df1d8a3c7 Mon Sep 17 00:00:00 2001
From: x4base <x4base@gmail.com>
Date: Wed, 13 Jul 2016 09:58:59 -0500
Subject: [PATCH] Fix the mapbox for Druid (#725)

---
 caravel/forms.py  | 3 +++
 caravel/models.py | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/caravel/forms.py b/caravel/forms.py
index 230ba3cea6..998ed88eb7 100755
--- a/caravel/forms.py
+++ b/caravel/forms.py
@@ -295,11 +295,13 @@ class FormFactory(object):
             'all_columns_x': (SelectField, {
                 "label": _("X"),
                 "choices": self.choicify(datasource.column_names),
+                "default": datasource.column_names[0],
                 "description": _("Columns to display")
             }),
             'all_columns_y': (SelectField, {
                 "label": _("Y"),
                 "choices": self.choicify(datasource.column_names),
+                "default": datasource.column_names[0],
                 "description": _("Columns to display")
             }),
             'druid_time_origin': (FreeFormSelectField, {
@@ -829,6 +831,7 @@ class FormFactory(object):
                     ("mapbox://styles/mapbox/satellite-v9", "Satellite"),
                     ("mapbox://styles/mapbox/outdoors-v9", "Outdoors"),
                 ],
+                "default": "mapbox://styles/mapbox/streets-v9",
                 "description": _("Base layer map style")
             }),
             'clustering_radius': (FreeFormSelectField, {
diff --git a/caravel/models.py b/caravel/models.py
index ce568e7099..31f6f1bbe9 100644
--- a/caravel/models.py
+++ b/caravel/models.py
@@ -1190,7 +1190,8 @@ class DruidDatasource(Model, AuditMixinNullable, Queryable):
             inner_from_dttm=None, inner_to_dttm=None,
             orderby=None,
             extras=None,  # noqa
-            select=None,):  # noqa
+            select=None,  # noqa
+            columns=None, ):
         """Runs a query against Druid and returns a dataframe.
 
         This query interface is common to SqlAlchemy and Druid