diff -Naur Shapely-1.7.1-original/shapely/geos.py Shapely-1.7.1/shapely/geos.py
--- Shapely-1.7.1-original/shapely/geos.py 2020-08-20 16:02:11.000000000 -0400
+++ Shapely-1.7.1/shapely/geos.py 2021-03-10 12:54:49.075728259 -0500
@@ -84,7 +84,7 @@
'libgeos_c.so.1',
'libgeos_c.so',
]
- _lgeos = load_dll('geos_c', fallbacks=alt_paths)
+ _lgeos = load_dll('libgeos_c', fallbacks=alt_paths)
# Necessary for environments with only libc.musl
c_alt_paths = [
'libc.musl-x86_64.so.1'
diff -Naur Shapely-1.7.1-original/tests/test_create_inconsistent_dimensionality.py Shapely-1.7.1/tests/test_create_inconsistent_dimensionality.py
--- Shapely-1.7.1-original/tests/test_create_inconsistent_dimensionality.py 2020-08-20 16:02:11.000000000 -0400
+++ Shapely-1.7.1/tests/test_create_inconsistent_dimensionality.py 2021-03-10 14:35:22.383306748 -0500
@@ -29,8 +29,15 @@
wkt_cases = [
+ # for Shapely 1.7.1, does not preserve 3rd dimension by default:
+ ('MULTIPOINT (1 1 1, 2 2)', 'MULTIPOINT (1.0000000000000000 1.0000000000000000, 2.0000000000000000 2.0000000000000000)'),
+ ('MULTIPOINT (1 1, 2 2 2)', 'MULTIPOINT (1.0000000000000000 1.0000000000000000, 2.0000000000000000 2.0000000000000000)'),
('LINESTRING (1 1 1, 2 2)', 'LINESTRING (1.0000000000000000 1.0000000000000000, 2.0000000000000000 2.0000000000000000)'),
- ('POLYGON ((0 0 0, 1 0 0, 1 1, 0 1 0, 0 0 0))', 'POLYGON ((0.0000000000000000 0.0000000000000000, 1.0000000000000000 0.0000000000000000, 1.0000000000000000 1.0000000000000000, 0.0000000000000000 1.0000000000000000, 0.0000000000000000 0.0000000000000000))')
+ ('POLYGON ((0 0 0, 1 0 0, 1 1, 0 1 0, 0 0 0))', 'POLYGON ((0.0000000000000000 0.0000000000000000, 1.0000000000000000 0.0000000000000000, 1.0000000000000000 1.0000000000000000, 0.0000000000000000 1.0000000000000000, 0.0000000000000000 0.0000000000000000))'),
+ # drop 3rd dimension
+ ('LINESTRING (1 1, 2 2 2)', 'LINESTRING (1.0000000000000000 1.0000000000000000, 2.0000000000000000 2.0000000000000000)'),
+ ('POLYGON ((0 0, 1 0 1, 1 1, 0 1, 0 0))',
+ 'POLYGON ((0.0000000000000000 0.0000000000000000, 1.0000000000000000 0.0000000000000000, 1.0000000000000000 1.0000000000000000, 0.0000000000000000 1.0000000000000000, 0.0000000000000000 0.0000000000000000))'),
]
diff -Naur Shapely-1.7.1-original/tests/test_svg.py Shapely-1.7.1/tests/test_svg.py
--- Shapely-1.7.1-original/tests/test_svg.py 2020-08-20 16:02:11.000000000 -0400
+++ Shapely-1.7.1/tests/test_svg.py 2021-03-10 12:54:49.076728265 -0500
@@ -174,7 +174,8 @@
self.assertSVG(GeometryCollection(), '')
# Valid
self.assertSVG(
- Point(7, 3).union(LineString([(4, 2), (8, 4)])),
+ GeometryCollection(
+ [Point(7, 3), LineString([(4, 2), (8, 4)])]),
''
'