Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

World Map viz with bubbles #88

Merged
merged 2 commits into from
Dec 17, 2015
Merged

World Map viz with bubbles #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48c1481
World Map with bubbles
mistercrunch Dec 16, 2015
b3edc07
Touchups
mistercrunch Dec 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11,549 changes: 11,549 additions & 0 deletions panoramix/data/countries.json
View file
Open in desktop

Large diffs are not rendered by default.

2,490 changes: 2,490 additions & 0 deletions panoramix/data/countries.py
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions panoramix/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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)"),
Expand Down
Loading