this removes the monkey patching for geocanvas and moves it to dframe…

…_explorer

still needs a test for this new function

.travis.yml

@@ -6,7 +6,7 @@ install:
 - sudo conda init
 - sudo conda update --yes conda
 - |
-  conda create -p $HOME/py --yes ipython-notebook jinja2 matplotlib numpy pandas patsy pip scipy statsmodels pandana pytables pytest pyyaml toolz "python=$TRAVIS_PYTHON_VERSION" -c "synthicity"
+  conda create -p $HOME/py --yes fiona ipython-notebook jinja2 matplotlib numpy pandas patsy pip scipy statsmodels pandana pytables pytest pyyaml shapely toolz "python=$TRAVIS_PYTHON_VERSION" -c "synthicity"
 - export PATH=$HOME/py/bin:$PATH
 - pip install simplejson bottle
 - pip install pytest-cov coveralls pep8

setup.py

@@ -32,7 +32,6 @@
     packages=find_packages(exclude=['*.tests']),
     install_requires=[
         'bottle>=0.12.5',
-        'geopandas>=0.1.0',
         'matplotlib>=1.3.1',
         'numpy>=1.8.0',
         'pandas>=0.13.1',
@@ -46,6 +45,7 @@
         'toolz>=0.7.0'
     ],
     extras_require = {
-        'pandana': ['pandana>=0.1']
+        'pandana': ['pandana>=0.1'],
+        'geopandas': ['geopandas>=0.1.0']
     }
 )

urbansim/__init__.py

@@ -2,6 +2,3 @@
 
 from .patsypatch import patch_patsy
 patch_patsy()
-
-from .geopandaspatch import patch_geopandas
-patch_geopandas()

urbansim/maps/dframe_explorer.py

@@ -156,3 +156,55 @@ def start(views,
     webbrowser.open("http://%s:%s" % (host, port), new=2)
 
     run(host=host, port=port, debug=True)
+
+
+def geodataframe_explore(gdf,
+                         dataframe_d=None,
+                         center=None,
+                         zoom=11,
+                         geom_name=None,  # from JSON file, use index if None
+                         join_name='zone_id',  # from data frames
+                         precision=2,
+                         port=8765,
+                         host='localhost',
+                         testing=False):
+    """
+    This method
+    """
+    try:
+        import geopandas
+    except:
+        raise ImportError("This method requires that geopandas be installed "
+                          "in order to work correctly")
+
+    if dataframe_d is None:
+        dataframe_d = {}
+
+    # add the geodataframe
+    df = pd.DataFrame(gdf)
+    if geom_name is None:
+        df[join_name] = df.index
+    dataframe_d["local"] = df
+
+    # need to check if it's already 4326
+    if gdf.crs != 4326:
+        self = gdf.to_crs(epsg=4326)
+
+    bbox = self.total_bounds
+    if center is None:
+        center = [(bbox[1]+bbox[3])/2, (bbox[0]+bbox[2])/2]
+
+    self.to_json()
+
+    start(
+        dataframe_d,
+        center=center,
+        zoom=zoom,
+        shape_json=self.to_json(),
+        geom_name=geom_name,  # from JSON file
+        join_name=join_name,  # from data frames
+        precision=precision,
+        port=port,
+        host=host,
+        testing=testing
+    )