Merge branch 'master' of github.com:mistercrunch/panoramix

apache · Dec 17, 2015 · 2a30908 · 2a30908
2 parents 4e3d284 + b04c422
commit 2a30908
Show file tree

Hide file tree

Showing 13 changed files with 26,815 additions and 13 deletions.
diff --git a/panoramix/data/countries.json b/panoramix/data/countries.json
diff --git a/panoramix/data/countries.py b/panoramix/data/countries.py
diff --git a/panoramix/forms.py b/panoramix/forms.py
@@ -108,6 +108,18 @@ def __init__(self, viz):
                 'Color Metric', choices=datasource.metrics_combo,
                 default=default_metric,
                 description="A metric to use for color"),
+            'country_fieldtype': SelectField(
+                'Country Field Type',
+                default='cca2',
+                choices=(
+                    ('name', 'Full name'),
+                    ('cioc', 'code International Olympic Committee (cioc)'),
+                    ('cca2', 'code ISO 3166-1 alpha-2 (cca2)'),
+                    ('cca3', 'code ISO 3166-1 alpha-3 (cca3)'),
+                ),
+                description=(
+                    "The country code standard that Panoramix should expect "
+                    "to find in the [country] column")),
             'groupby': SelectMultipleSortableField(
                 'Group by',
                 choices=self.choicify(datasource.groupby_column_names),
@@ -191,6 +203,18 @@ def __init__(self, viz):
                     '90 days ago',
                     '1 year ago'])
                 ),
+            'max_bubble_size': FreeFormSelectField(
+                'Max Bubble Size', default="25",
+                choices=self.choicify([
+                    '5',
+                    '10',
+                    '15',
+                    '25',
+                    '50',
+                    '75',
+                    '100',
+                    ])
+                ),
             'row_limit':
                 FreeFormSelectField(
                     'Row limit',
@@ -298,6 +322,10 @@ def __init__(self, viz):
                 "Range Filter", default=True,
                 description=(
                     "Whether to display the time range interactive selector")),
+            'show_bubbles': BetterBooleanField(
+                "Show Bubbles", default=False,
+                description=(
+                    "Whether to display bubbles on top of countries")),
             'show_legend': BetterBooleanField(
                 "Legend", default=True,
                 description="Whether to display the legend (toggles)"),