ingest any from __geo_interface__

Author: ocefpaf

CHANGES.txt

@@ -15,6 +15,7 @@
 - Added BeautifyIcon Plugin (arthuralvim and jeremybyu #819)
 - Explicit WMSTileLayer options, accept all **kwargs (conengmo #838)
 - Updated links to Draw plugin (conengmo #868)
+- Ingest any object that __geo_interface__ (ocefpaf #880)
 
 API changes
 

examples/Geopandas and geo_interface.ipynb

@@ -403,17 +403,11 @@ def __init__(self, data, style_function=None, name=None,
             else:  # This is a filename
                 with open(data) as f:
                     self.data = json.loads(f.read())
-        elif data.__class__.__name__ in ['GeoDataFrame', 'GeoSeries']:
+        elif hasattr(data, '__geo_interface__'):
             self.embed = True
-            if hasattr(data, '__geo_interface__'):
-                # We have a GeoPandas 0.2 object.
-                self.data = json.loads(json.dumps(data.to_crs(epsg='4326').__geo_interface__))  # noqa
-            elif hasattr(data, 'columns'):
-                # We have a GeoDataFrame 0.1
-                self.data = json.loads(data.to_crs(epsg='4326').to_json())
-            else:
-                msg = 'Unable to transform this object to a GeoJSON.'
-                raise ValueError(msg)
+            if hasattr(data, 'to_crs'):
+                data = data.to_crs(epsg='4326')
+            self.data = json.loads(json.dumps(data.__geo_interface__))  # noqa
         else:
             raise ValueError('Unhandled object {!r}.'.format(data))