Merge pull request #1714 from mattijn/type-geojson

ENH: add datatype geojson
vega · Oct 1, 2019 · a8633e4 · a8633e4
2 parents 2831753 + 22d0d04
commit a8633e4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 2 deletions.
diff --git a/altair/examples/us_incomebrackets_by_state_facet.py b/altair/examples/us_incomebrackets_by_state_facet.py
@@ -0,0 +1,30 @@
+"""
+US Income by State: Wrapped Facet
+---------------------------------
+This example shows how to create a map of income in the US by state,
+faceted over income brackets 
+"""
+# category: maps
+
+import altair as alt
+from vega_datasets import data
+
+states = alt.topo_feature(data.us_10m.url, 'states')
+source = data.income.url
+
+alt.Chart(source).mark_geoshape().encode(
+    shape='geo:G',
+    color='pct:Q',
+    tooltip=['name:N', 'pct:Q'],
+    facet='group:N'
+).transform_lookup(
+    lookup='id',
+    from_=alt.LookupData(data=states, key='id'),
+    as_='geo'
+).properties(
+    width=300,
+    height=175,
+    columns=2
+).project(
+    type='albersUsa'
+)
diff --git a/altair/utils/core.py b/altair/utils/core.py
@@ -47,7 +47,8 @@ def infer_dtype(value):
 TYPECODE_MAP = {'ordinal': 'O',
                 'nominal': 'N',
                 'quantitative': 'Q',
-                'temporal': 'T'}
+                'temporal': 'T',
+                'geojson': 'G'}
 
 INV_TYPECODE_MAP = {v: k for k, v in TYPECODE_MAP.items()}
 

diff --git a/altair/utils/tests/test_core.py b/altair/utils/tests/test_core.py
@@ -82,11 +82,13 @@ def check(s, **kwargs):
     check('foobar:nominal', type='nominal', field='foobar')
     check('foobar:ordinal', type='ordinal', field='foobar')
     check('foobar:temporal', type='temporal', field='foobar')
+    check('foobar:geojson', type='geojson', field='foobar')    
 
     check('foobar:Q', type='quantitative', field='foobar')
     check('foobar:N', type='nominal', field='foobar')
     check('foobar:O', type='ordinal', field='foobar')
     check('foobar:T', type='temporal', field='foobar')
+    check('foobar:G', type='geojson', field='foobar')    
 
     # Fields with aggregate and/or type
     check('average(foobar)', field='foobar', aggregate='average')

diff --git a/altair/vegalite/v3/tests/test_api.py b/altair/vegalite/v3/tests/test_api.py
@@ -476,7 +476,6 @@ def test_filter_transform_selection_predicates():
     assert chart.to_dict()['transform'] == [{'filter': {'selection': {'or': ['s1', 's2']}}}]
 
 
-
 def test_resolve_methods():
     chart = alt.LayerChart().resolve_axis(x='shared', y='independent')
     assert chart.resolve == alt.Resolve(axis=alt.AxisResolveMap(x='shared', y='independent'))

diff --git a/doc/user_guide/encoding.rst b/doc/user_guide/encoding.rst
@@ -132,6 +132,7 @@ quantitative  ``Q``           a continuous real-valued quantity
 ordinal       ``O``           a discrete ordered quantity
 nominal       ``N``           a discrete unordered category
 temporal      ``T``           a time or date value
+geojson       ``G``           a geographic shape
 ============  ==============  ================================================
 
 If types are not specified for data input as a DataFrame, Altair defaults to