Update dependency to pyshp v2.1.1 to correctly display shapefiles wit…

…h multi-polygon holes (#1653)

* Make full use of pyshp's convenience functions

The Shapefile reader code wasn't making use of the full range of pyshp's convenience functions, duplicating some of the things pyshp already does behind the scenes, making it more error prone and potentially less efficient.

* Require pyshp 2, to avoid shapefile multipolygon rendering issue

lib/cartopy/io/shapereader.py

@@ -138,7 +138,7 @@ def close(self):
         return self._reader.close()
 
     def __len__(self):
-        return self._reader.numRecords
+        return len(self._reader)
 
     def geometries(self):
         """
@@ -152,8 +152,7 @@ def geometries(self):
         :meth:`~Record.geometry` method.
 
         """
-        for i in range(self._reader.numRecords):
-            shape = self._reader.shape(i)
+        for shape in self._reader.iterShapes():
             # Skip the shape that can not be represented as geometry.
             if shape.shapeType != shapefile.NULL:
                 yield sgeom.shape(shape)
@@ -166,9 +165,8 @@ def records(self):
         # Ignore the "DeletionFlag" field which always comes first
         fields = self._reader.fields[1:]
         field_names = [field[0] for field in fields]
-        for i in range(self._reader.numRecords):
-            shape_record = self._reader.shapeRecord(i)
-            attributes = dict(zip(field_names, shape_record.record))
+        for shape_record in self._reader.iterShapeRecords():
+            attributes = shape_record.record.as_dict()
             yield Record(shape_record.shape, attributes, fields)
 
 

requirements/default.txt

@@ -1,4 +1,4 @@
 numpy>=1.10
 shapely>=1.5.6
-pyshp>=1.1.4
+pyshp>=2
 setuptools>=0.7.2