Fix constructor logic when geometry and columns both provided

geopandas · Aug 18, 2017 · 7c0e0b3 · 7c0e0b3
1 parent e288068
commit 7c0e0b3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/geopandas/geodataframe.py b/geopandas/geodataframe.py
@@ -83,7 +83,7 @@ def __init__(self, *args, **kwargs):
                 if isinstance(v, GeoSeries):
                     if 'columns' in kwargs:
                         columns = kwargs['columns'].copy()
-                        columns.pop(i)
+                        columns.remove(k)
                         kwargs['columns'] = columns
                     gs[k] = arg.pop(k)
                     kwargs['index'] = v.index  # TODO: assumes consistent index

diff --git a/geopandas/tests/test_geodataframe.py b/geopandas/tests/test_geodataframe.py
@@ -520,3 +520,15 @@ def test_set_geometry_null():
 def test_constructor_without_geometries():
     gdf = GeoDataFrame({'x': [1]})
     assert list(gdf.x) == [1]
+
+
+def test_constructor_column_ordering():
+    geoms = [Point(1, 1), Point(2, 2), Point(3, 3)]
+    gs = GeoSeries(geoms)
+    gdf = GeoDataFrame({'a': [1, 2, 3], 'geometry': gs},
+                       columns=['geometry', 'a'],
+                       index=pd.Index([0, 0, 1]),
+                       geometry='geometry')
+
+    assert gdf.geometry._geometry_array is gs._geometry_array
+    assert gdf.geometry._geometry_array.data.all()