Merge pull request #93 from mggg/2.0.0

Everything updated for version 2.0.0
mggg · Dec 7, 2023 · 0508cc5 · 0508cc5
2 parents c5d8dd0 + 8c64aff
commit 0508cc5
Show file tree

Hide file tree

Showing 66 changed files with 14,431 additions and 481 deletions.
diff --git a/README.md b/README.md
diff --git a/docs/conf.py b/docs/conf.py
@@ -23,7 +23,7 @@
 author = 'Max Hully, Max Fan'
 
 # The full version, including alpha/beta/rc tags
-release = '1.1.0'
+release = '2.0.0'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.cpg b/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.cpg
@@ -0,0 +1 @@
+ISO-8859-1
diff --git a/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.dbf b/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.dbf
diff --git a/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.prj b/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_StatePlane_Colorado_Central_FIPS_0502_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",3000000.0],PARAMETER["False_Northing",1000000.0],PARAMETER["Central_Meridian",-105.5],PARAMETER["Standard_Parallel_1",39.75],PARAMETER["Standard_Parallel_2",38.45],PARAMETER["Latitude_Of_Origin",37.8333333333333],UNIT["US survey foot",0.304800609601219]]
diff --git a/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.shp b/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.shp
diff --git a/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.shx b/examples/Shapefiles/DenverCo_blocks/DenverCo_blocks.shx
diff --git a/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.cpg b/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.cpg
@@ -0,0 +1 @@
+ISO-8859-1
diff --git a/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.dbf b/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.dbf
diff --git a/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.prj b/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_StatePlane_Colorado_Central_FIPS_0502_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",3000000.0],PARAMETER["False_Northing",1000000.0],PARAMETER["Central_Meridian",-105.5],PARAMETER["Standard_Parallel_1",39.75],PARAMETER["Standard_Parallel_2",38.45],PARAMETER["Latitude_Of_Origin",37.8333333333333],UNIT["US survey foot",0.304800609601219]]
diff --git a/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.shp b/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.shp
diff --git a/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.shx b/examples/Shapefiles/DenverCo_precincts2016_orig/DenverCo_precincts2016_orig.shx
diff --git a/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.cpg b/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.cpg
@@ -0,0 +1 @@
+ISO-8859-1
diff --git a/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.dbf b/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.dbf
diff --git a/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.prj b/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_StatePlane_Colorado_Central_FIPS_0502_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",3000000.0],PARAMETER["False_Northing",1000000.0],PARAMETER["Central_Meridian",-105.5],PARAMETER["Standard_Parallel_1",39.75],PARAMETER["Standard_Parallel_2",38.45],PARAMETER["Latitude_Of_Origin",37.8333333333333],UNIT["US survey foot",0.304800609601219]]
diff --git a/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.shp b/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.shp
diff --git a/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.shx b/examples/Shapefiles/DenverCo_precincts2016_repaired/DenverCo_precincts2016_repaired.shx
diff --git a/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.cpg b/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.cpg
@@ -0,0 +1 @@
+ISO-8859-1
diff --git a/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.dbf b/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.dbf
diff --git a/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.prj b/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_StatePlane_Colorado_Central_FIPS_0502_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",3000000.0],PARAMETER["False_Northing",1000000.0],PARAMETER["Central_Meridian",-105.5],PARAMETER["Standard_Parallel_1",39.75],PARAMETER["Standard_Parallel_2",38.45],PARAMETER["Latitude_Of_Origin",37.8333333333333],UNIT["US survey foot",0.304800609601219]]
diff --git a/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.shp b/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.shp
diff --git a/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.shx b/examples/Shapefiles/DenverCo_precincts2018_orig/DenverCo_precincts2018_orig.shx
diff --git a/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.cpg b/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.cpg
@@ -0,0 +1 @@
+ISO-8859-1
diff --git a/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.dbf b/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.dbf
diff --git a/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.prj b/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_StatePlane_Colorado_Central_FIPS_0502_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",3000000.0],PARAMETER["False_Northing",1000000.0],PARAMETER["Central_Meridian",-105.5],PARAMETER["Standard_Parallel_1",39.75],PARAMETER["Standard_Parallel_2",38.45],PARAMETER["Latitude_Of_Origin",37.8333333333333],UNIT["US survey foot",0.304800609601219]]
diff --git a/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.shp b/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.shp
diff --git a/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.shx b/examples/Shapefiles/DenverCo_precincts2018_repaired/DenverCo_precincts2018_repaired.shx
diff --git a/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.cpg b/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.cpg
@@ -0,0 +1 @@
+ISO-8859-1
diff --git a/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.dbf b/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.dbf
diff --git a/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.prj b/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_StatePlane_Colorado_Central_FIPS_0502_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",3000000.0],PARAMETER["False_Northing",1000000.0],PARAMETER["Central_Meridian",-105.5],PARAMETER["Standard_Parallel_1",39.75],PARAMETER["Standard_Parallel_2",38.45],PARAMETER["Latitude_Of_Origin",37.8333333333333],UNIT["US survey foot",0.304800609601219]]
diff --git a/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.shp b/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.shp
diff --git a/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.shx b/examples/Shapefiles/DenverCo_precincts2020_orig/DenverCo_precincts2020_orig.shx
diff --git a/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.cpg b/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.cpg
@@ -0,0 +1 @@
+ISO-8859-1
diff --git a/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.dbf b/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.dbf
diff --git a/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.prj b/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_StatePlane_Colorado_Central_FIPS_0502_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",3000000.0],PARAMETER["False_Northing",1000000.0],PARAMETER["Central_Meridian",-105.5],PARAMETER["Standard_Parallel_1",39.75],PARAMETER["Standard_Parallel_2",38.45],PARAMETER["Latitude_Of_Origin",37.8333333333333],UNIT["US survey foot",0.304800609601219]]
diff --git a/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.shp b/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.shp
diff --git a/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.shx b/examples/Shapefiles/DenverCo_precincts2020_repaired/DenverCo_precincts2020_repaired.shx
diff --git a/examples/Shapefiles/bad_gap_region/bad_gap_region.cpg b/examples/Shapefiles/bad_gap_region/bad_gap_region.cpg
@@ -0,0 +1 @@
+ISO-8859-1
diff --git a/examples/Shapefiles/bad_gap_region/bad_gap_region.dbf b/examples/Shapefiles/bad_gap_region/bad_gap_region.dbf
diff --git a/examples/Shapefiles/bad_gap_region/bad_gap_region.prj b/examples/Shapefiles/bad_gap_region/bad_gap_region.prj
@@ -0,0 +1 @@
+PROJCS["NAD_1983_StatePlane_Colorado_Central_FIPS_0502_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",3000000.0],PARAMETER["False_Northing",1000000.0],PARAMETER["Central_Meridian",-105.5],PARAMETER["Standard_Parallel_1",39.75],PARAMETER["Standard_Parallel_2",38.45],PARAMETER["Latitude_Of_Origin",37.8333333333333],UNIT["US survey foot",0.304800609601219]]
diff --git a/examples/Shapefiles/bad_gap_region/bad_gap_region.shp b/examples/Shapefiles/bad_gap_region/bad_gap_region.shp
diff --git a/examples/Shapefiles/bad_gap_region/bad_gap_region.shx b/examples/Shapefiles/bad_gap_region/bad_gap_region.shx
diff --git a/examples/toy_counties.png b/examples/toy_counties.png
diff --git a/examples/toy_precincts.png b/examples/toy_precincts.png
diff --git a/examples/toy_precincts_corner.png b/examples/toy_precincts_corner.png
diff --git a/examples/toy_precincts_corner_repaired.png b/examples/toy_precincts_corner_repaired.png
diff --git a/examples/toy_precincts_corner_repaired_rook_to_queen.png b/examples/toy_precincts_corner_repaired_rook_to_queen.png
diff --git a/examples/toy_precincts_repaired.png b/examples/toy_precincts_repaired.png
diff --git a/examples/toy_precincts_repaired_county_aware.png b/examples/toy_precincts_repaired_county_aware.png
diff --git a/examples/toy_precincts_repaired_county_aware_rook_to_queen.png b/examples/toy_precincts_repaired_county_aware_rook_to_queen.png
diff --git a/maup/__init__.py b/maup/__init__.py
@@ -3,11 +3,11 @@
 from .assign import assign
 from .indexed_geometries import IndexedGeometries
 from .intersections import intersections, prorate
-from .repair import close_gaps, autorepair, snap_to_grid, crop_to, doctor, resolve_overlaps
+from .repair import close_gaps, resolve_overlaps, quick_repair, snap_to_grid, crop_to, expand_to, doctor
+from .smart_repair import smart_repair
 from .normalize import normalize
 from .progress_bar import progress
 
-
 # warn about https://github.com/geopandas/geopandas/issues/2199
 if geopandas.options.use_pygeos:
     raise ImportError(
@@ -16,19 +16,21 @@
         "`geopandas.options.use_pygeos = False` before importing your shapefile."
     )
 
-__version__ = "1.1.3"
+__version__ = "2.0.0"
 __all__ = [
     "adjacencies",
     "assign",
     "IndexedGeometries",
     "intersections",
     "prorate",
     "close_gaps",
-    "autorepair",
     "resolve_overlaps",
+    "quick_repair",
     "snap_to_grid",
     "crop_to",
+    "expand_to",
     "doctor",
+    "smart_repair",
     "normalize",
     "progress"
-]
+]
diff --git a/maup/adjacencies.py b/maup/adjacencies.py
@@ -1,8 +1,7 @@
 import warnings
 
 from geopandas import GeoSeries, GeoDataFrame
-
-from shapely import make_valid 
+from shapely import make_valid
 
 from .indexed_geometries import IndexedGeometries, get_geometries
 from .progress_bar import progress
@@ -26,12 +25,13 @@ def iter_adjacencies(geometries):
         for j, inter in inters.items():
             yield (i, j), inter
 
+
 def adjacencies(
     geometries,
     adjacency_type="rook",
     output_type="geoseries", *, warn_for_overlaps=True, warn_for_islands=True
 ):
-    """Returns adjacencies between geometries.     
+    """Returns adjacencies between geometries.
     The default return type is a
     `GeoSeries` with a `MultiIndex`, whose (i, j)th entry is the pairwise
     intersection between geometry `i` and geometry `j`. We ensure that
@@ -48,20 +48,20 @@ def adjacencies(
     orig_crs = geometries.crs
     geometries = get_geometries(geometries)
     geometries = make_valid(geometries)
-    
+
     adjs = list(iter_adjacencies(geometries))
     if adjs:
         index, geoms = zip(*adjs)
     else:
-        index, geoms = [[],[]]    
-    
+        index, geoms = [[], []]
+
     if output_type == "geodataframe":
-        inters = GeoDataFrame({"neighbors" : index, "geometry" : geoms})
+        inters = GeoDataFrame({"neighbors" : index, "geometry" : geoms}, crs = geometries.crs)
     else:
-        inters = GeoSeries(geoms, index=index)
+        inters = GeoSeries(geoms, index=index, crs=geometries.crs)
 
     if adjacency_type == "rook":
-        inters = inters[inters.length > 0].copy()
+        inters = inters[inters.length > 0]
 
     if warn_for_overlaps:
         overlaps = inters[inters.area > 0]

diff --git a/maup/assign.py b/maup/assign.py
@@ -24,7 +24,7 @@ def assign(sources, targets):
             dtype="float"
         )
         assignment.update(assignments_by_area)
-        
+
     # TODO: add a warning here if there are still unassigned source geometries.
     return assignment.astype(targets.index.dtype, errors="ignore")
 

diff --git a/maup/indexed_geometries.py b/maup/indexed_geometries.py
@@ -1,8 +1,6 @@
 import pandas
 import geopandas
-# Added numpy import to handle output of STRtree query
 import numpy
-import warnings
 
 from shapely.prepared import prep
 from shapely.strtree import STRtree
@@ -21,8 +19,7 @@ def __init__(self, geometries):
         self.spatial_index = STRtree(self.geometries)
         self.index = self.geometries.index
 
-
-    def query(self, geometry):  
+    def query(self, geometry):
         # IMPORTANT: When "geometry" is multi-part, this query will return a
         # (2 x n) array instead of a (1 x n) array, so it's safest to flatten the query
         # output before proceeding.
@@ -31,12 +28,12 @@ def query(self, geometry):
         relevant_geometries = self.geometries.iloc[relevant_indices]
         return relevant_geometries
 
-    def intersections(self, geometry):  
-        relevant_geometries = self.query(geometry)  
+    def intersections(self, geometry):
+        relevant_geometries = self.query(geometry)
         intersections = relevant_geometries.intersection(geometry)
         return intersections[-(intersections.is_empty | intersections.isna())]
 
-    def covered_by(self, container):   
+    def covered_by(self, container):
         relevant_geometries = self.query(container)
         prepared_container = prep(container)
 
@@ -46,37 +43,33 @@ def covered_by(self, container):
             selected_geometries = relevant_geometries.apply(prepared_container.covers)
             return relevant_geometries[selected_geometries]
 
-    def assign(self, targets):  
+    def assign(self, targets):
         target_geometries = get_geometries(targets)
         groups = [
             self.covered_by(container).apply(lambda x: container_index)
             for container_index, container in progress(
                 target_geometries.items(), len(target_geometries)
             )
         ]
+        # New in pandas 2.1.2: Only concatenate Series of positive length
+        groups = [group for group in groups if len(group) > 0]
         if groups:
-            # New in pandas 2.1.2: Only concatenate Series of positive length
-            groups = [group for group in groups if len(group) > 0]
-            if groups:
-                groups_concat = pandas.concat(groups)
-                # New in pandas 2.1.2: No reindexing allowed with a non-unique Index,
-                # so we need to find and remove repetitions.  (This only happens when the
-                # targets have overlaps and some source is completely covered by more
-                # than one target.)
-                # Any that get removed here will be randomly assigned to one of the 
-                # covering units at the assign_by_area step ub maup.assign.
-                groups_concat_index_list = list(groups_concat.index)
-                seen = set()
-                bad_indices = list(set([x for x in groups_concat_index_list if x in seen or seen.add(x)]))             
-                if len(bad_indices)>0:
-                    groups_concat = groups_concat.drop(bad_indices)
-                return groups_concat.reindex(self.index)
-            else:
-                return geopandas.GeoSeries().reindex(self.index)
+            groups_concat = pandas.concat(groups)
+            # New in pandas 2.1.2: No reindexing allowed with a non-unique Index,
+            # so we need to find and remove repetitions.  (This only happens when the
+            # targets have overlaps and some source is completely covered by more
+            # than one target.)
+            # Any that get removed here will be randomly assigned to one of the
+            # covering units at the assign_by_area step ub maup.assign.
+            groups_concat_index_list = list(groups_concat.index)
+            seen = set()
+            bad_indices = list(set([x for x in groups_concat_index_list if x in seen or seen.add(x)]))
+            if len(bad_indices) > 0:
+                groups_concat = groups_concat.drop(bad_indices)
+            return groups_concat.reindex(self.index)
         else:
             return geopandas.GeoSeries().reindex(self.index)
 
-
     def enumerate_intersections(self, targets):
         target_geometries = get_geometries(targets)
         for i, target in progress(target_geometries.items(), len(target_geometries)):

diff --git a/maup/intersections.py b/maup/intersections.py
@@ -7,35 +7,26 @@
 
 
 @require_same_crs
-
 def intersections(sources, targets, output_type="geoseries", area_cutoff=None):
-    """
-    Computes all of the nonempty intersections between two sets of geometries.
-    
-    By default, the returned `~geopandas.GeoSeries` will have a MultiIndex, where the 
-    geometry at index *(i, j)* is the intersection of ``sources[i]`` and ``targets[j]`` 
-    (if it is not empty).  
-    
+    """Computes all of the nonempty intersections between two sets of geometries.
+    By default, the returned `~geopandas.GeoSeries` will have a MultiIndex, where the
+    geometry at index *(i, j)* is the intersection of ``sources[i]`` and ``targets[j]``
+    (if it is not empty).
     If output_type == "geodataframe", the return type is a range-indexed GeoDataFrame
-    with "source" and "target" columns containing the indices i,j, respectively, for the 
-    intersection of ``sources[i]`` and ``targets[j]``.
-    
+    with "source" and "target" columns containing the indices i,j, respectively, for the
+    intersection of ``sources[i]`` and ``targets[j]``
     :param sources: geometries
     :type sources: :class:`~geopandas.GeoSeries` or :class:`~geopandas.GeoDataFrame`
     :param targets: geometries
     :type targets: :class:`~geopandas.GeoSeries` or :class:`~geopandas.GeoDataFrame`
-    :param output_type: type of output, "geoseries" or "geodataframe"
-    :type output_type: str
+    :rtype: :class:`~geopandas.GeoSeries`
     :param area_cutoff: (optional) if provided, only return intersections with
         area greater than ``area_cutoff``
     :type area_cutoff: Number or None
-    :rtype: :class:`~geopandas.GeoSeries` or :class:`~geopandas.GeoDataFrame`
     """
 
-
     reindexed_sources = get_geometries_with_range_index(sources)
     reindexed_targets = get_geometries_with_range_index(targets)
-
     spatially_indexed_sources = IndexedGeometries(reindexed_sources)
 
     records = [
@@ -45,11 +36,11 @@ def intersections(sources, targets, output_type="geoseries", area_cutoff=None):
             reindexed_targets
         )
     ]
-    
+
     df = GeoDataFrame.from_records(records, columns=["source", "target", "geometry"])
     df = df.sort_values(by=["source", "target"]).reset_index(drop=True)
     df.crs = sources.crs
-    
+
     geometries = df.set_index(["source", "target"]).geometry
     geometries.sort_index(inplace=True)
     geometries.crs = sources.crs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		PROJCS["NAD_1983_StatePlane_Colorado_Central_FIPS_0502_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",3000000.0],PARAMETER["False_Northing",1000000.0],PARAMETER["Central_Meridian",-105.5],PARAMETER["Standard_Parallel_1",39.75],PARAMETER["Standard_Parallel_2",38.45],PARAMETER["Latitude_Of_Origin",37.8333333333333],UNIT["US survey foot",0.304800609601219]]