diff --git a/superset/assets/src/explore/components/controls/SpatialControl.jsx b/superset/assets/src/explore/components/controls/SpatialControl.jsx
index 9d38fca36a151..16d21a0d1b63f 100644
--- a/superset/assets/src/explore/components/controls/SpatialControl.jsx
+++ b/superset/assets/src/explore/components/controls/SpatialControl.jsx
@@ -33,6 +33,7 @@ const spatialTypes = {
   delimited: 'delimited',
   geohash: 'geohash',
   zipcode: 'zipcode',
+  fsa: 'fsa',
 };
 
 const propTypes = {
@@ -65,6 +66,7 @@ export default class SpatialControl extends React.Component {
       reverseCheckbox: v.reverseCheckbox || false,
       geohashCol: v.geohashCol || defaultCol,
       zipcodeCol: v.zipcodeCol || defaultCol,
+      fsaCol: v.fsaCol || defaultCol,
       value: null,
       errors: [],
     };
@@ -105,6 +107,12 @@ export default class SpatialControl extends React.Component {
       if (!value.zipcodeCol) {
         errors.push(errMsg);
       }
+    } else if (type === spatialTypes.fsa) {
+      value.fsaCol = this.state.fsaCol;
+      value.reverseCheckbox = this.state.reverseCheckbox;
+      if (!value.fsaCol) {
+        errors.push(errMsg);
+      }
     }
     this.setState({ value, errors });
     this.props.onChange(value, errors);
@@ -130,6 +138,8 @@ export default class SpatialControl extends React.Component {
       return `${this.state.geohashCol}`;
     } else if (this.state.type === spatialTypes.zipcode) {
       return `${this.state.zipcodeCol}`;
+    } else if (this.state.type === spatialTypes.fsa) {
+      return `${this.state.fsaCol}`;
     }
     return null;
   }
@@ -224,6 +234,21 @@ export default class SpatialControl extends React.Component {
               </Col>
             </Row>
           </PopoverSection>
+          <PopoverSection
+            title={t('FSA')}
+            isSelected={this.state.type === spatialTypes.fsa}
+            onSelect={this.setType.bind(this, spatialTypes.fsa)}
+          >
+            <Row>
+              <Col md={6}>
+                Column
+                {this.renderSelect('fsaCol', spatialTypes.fsa)}
+              </Col>
+              <Col md={6}>
+                {this.renderReverseCheckbox()}
+              </Col>
+            </Row>
+          </PopoverSection>
           <div className="clearfix">
             <Button
               bsSize="small"
diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index de493341cea41..04148612f5fe4 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -2184,6 +2184,7 @@ export const controls = {
       ['json', 'JSON'],
       ['geohash', 'geohash (square)'],
       ['zipcode', 'ZIP code'],
+      ['fsa', 'FSA'],
     ],
   },
 
diff --git a/superset/assets/src/visualizations/deckgl/layers/common.jsx b/superset/assets/src/visualizations/deckgl/layers/common.jsx
index b948bb82dfe42..3b98db4cd096e 100644
--- a/superset/assets/src/visualizations/deckgl/layers/common.jsx
+++ b/superset/assets/src/visualizations/deckgl/layers/common.jsx
@@ -56,7 +56,7 @@ export function commonLayerProps(formData, setTooltip, onSelect) {
   let tooltipContentGenerator;
   if (fd.js_tooltip) {
     tooltipContentGenerator = sandboxedEval(fd.js_tooltip);
-  } else if (fd.line_column && fd.metric && ['geohash', 'zipcode'].indexOf(fd.line_type) >= 0) {
+  } else if (fd.line_column && fd.metric && ['geohash', 'zipcode', 'fsa'].indexOf(fd.line_type) >= 0) {
     const metricLabel = fd.metric.label || fd.metric;
     tooltipContentGenerator = o => (
       <div>
diff --git a/superset/viz.py b/superset/viz.py
index 5678b9b57c9d5..8f19988b74251 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -2114,6 +2114,8 @@ def get_spatial_columns(self, key):
             return [spatial.get('geohashCol')]
         elif spatial.get('type') == 'zipcode':
             return [spatial.get('zipcodeCol')]
+        elif spatial.get('type') == 'fsa':
+            return [spatial.get('fsaCol')]
 
     @staticmethod
     def parse_coordinates(s):
@@ -2136,6 +2138,11 @@ def reverse_zipcode_decode(zipcode):
         raise NotImplementedError(
             'No mapping from ZIP code to single latitude/longitude')
 
+    @staticmethod
+    def reverse_fsa_decode(fsa):
+        raise NotImplementedError(
+            'No mapping from FSA code to single latitude/longitude')
+
     @staticmethod
     def reverse_latlong(df, key):
         df[key] = [
@@ -2164,6 +2171,9 @@ def process_spatial_data_obj(self, key, df):
         elif spatial.get('type') == 'zipcode':
             df[key] = df[spatial.get('zipcodeCol')].map(self.reverse_zipcode_decode)
             del df[spatial.get('zipcodeCol')]
+        elif spatial.get('type') == 'fsa':
+            df[key] = df[spatial.get('fsaCol')].map(self.reverse_fsa_decode)
+            del df[spatial.get('fsaCol')]
 
         if spatial.get('reverseCheckbox'):
             self.reverse_latlong(df, key)
@@ -2362,6 +2372,15 @@ def deser(zipcode):
     return deser
 
 
+def fsa_deser(fsas):
+    geojson = fsas_to_json(fsas)
+
+    def deser(fsa):
+        if fsa in geojson:
+            return geojson[fsa][0][0]
+    return deser
+
+
 def zipcodes_to_json(zipcodes):
     user = os.environ.get('CREDENTIALS_LYFTPG_USER', '')
     password = os.environ.get('CREDENTIALS_LYFTPG_PASSWORD', '')
@@ -2385,7 +2404,7 @@ def zipcodes_to_json(zipcodes):
     if not missing:
         return out
 
-    # fetch missing geojson from lyftpg
+    # fetch missing geojson from
     in_clause = ', '.join(['%s'] * len(missing))
     query = (
         'SELECT zipcode, geojson FROM zip_codes WHERE zipcode IN ({0})'
@@ -2405,6 +2424,43 @@ def zipcodes_to_json(zipcodes):
     return out
 
 
+def fsas_to_json(fsas):
+    url = 'presto://prestoproxy.lyft.net:8443/hive'
+
+    out = {}
+    missing = set()
+    for fsa in fsas:
+        cache_key = 'fsa_geojson_{}'.format(fsa)
+        geojson = cache and cache.get(cache_key)
+        if geojson:
+            out[fsa] = geojson
+        else:
+            missing.add(fsa)
+
+    if not missing:
+        return out
+
+    # fetch missing geojson from lyftpg
+    in_clause = ', '.join(['%s'] * len(missing))
+    query = (
+        'SELECT fsa, geo_json FROM jbridgem.test_geo_json_fsa WHERE fsa IN ({0})'
+        .format(in_clause))
+    conn = sqlalchemy.create_engine(url, connect_args={'protocol': 'https'})
+    results = conn.execute(query, tuple(missing)).fetchall()
+
+    for fsa, geojson in results:
+        geojson = json.loads(geojson)
+        out[fsa] = geojson
+        if cache and len(results) < 10000:  # avoid storing too much
+            cache_key = 'fsa_geojson_{}'.format(fsa)
+            try:
+                cache.set(cache_key, geojson, timeout=86400)
+            except Exception:
+                pass
+
+    return out
+
+
 class DeckPathViz(BaseDeckGLViz):
 
     """deck.gl's PathLayer"""
@@ -2418,6 +2474,7 @@ class DeckPathViz(BaseDeckGLViz):
         'polyline': polyline.decode,
         'geohash': geohash_to_json,
         'zipcode': None,  # per request
+        'fsa': None,  # per request
     }
 
     def query_obj(self):
@@ -2443,7 +2500,7 @@ def get_properties(self, d):
         if fd.get('reverse_long_lat'):
             path = [(o[1], o[0]) for o in path]
         d[self.deck_viz_key] = path
-        if line_type not in ['geohash', 'zipcode']:
+        if line_type not in ['geohash', 'zipcode', 'fsa']:
             del d[line_column]
         d['__timestamp'] = d.get(DTTM_ALIAS) or d.get('__time')
         return d
@@ -2455,6 +2512,9 @@ def get_data(self, df):
         if line_type == 'zipcode':
             zipcodes = df[fd['line_column']].unique()
             self.deser_map['zipcode'] = zipcode_deser(zipcodes)
+        elif line_type == 'fsa':
+            fsas = df[fd['line_column']].unique()
+            self.deser_map['fsa'] = fsa_deser(fsas)
 
         return super(DeckPathViz, self).get_data(df)