shapely 2.0 modifications

scripts/addons/cam/curvecamtools.py

@@ -179,7 +179,7 @@ class CamCurveOvercuts(bpy.types.Operator):
         for s in shapes.geoms:
             s = shapely.geometry.polygon.orient(s, 1)
             if s.boundary.geom_type == 'LineString':
-                loops = [s.boundary]
+                loops = [s.boundary.geoms]
             else:
                 loops = s.boundary
 
@@ -342,6 +342,8 @@ class CamCurveOvercutsB(bpy.types.Operator):
         for s in shapes.geoms:
             s = shapely.geometry.polygon.orient(s, 1)  # ensure the shape is counterclockwise
             loops = [s.boundary] if s.boundary.geom_type == 'LineString' else s.boundary
+            print("loops:",loops)
+#            list(loops.geoms)
             outercurve = self.do_outer or len(loops) == 1
             for ci, c in enumerate(loops):
                 if ci > 0 or outercurve:

scripts/addons/cam/polygon_utils_cam.py

@@ -92,7 +92,7 @@ def shapelyToCoords(anydata):
         # print(len(p.interiors))
         for interior in p.interiors:
             seq.append(interior.coords)
-    elif p.type == 'MultiPolygon':
+    elif p.geom_type == 'MultiPolygon':
         clen = 0
         seq = []
         for sp in p.geoms:
@@ -101,23 +101,23 @@ def shapelyToCoords(anydata):
             for interior in sp.interiors:
                 seq.append(interior.coords)
 
-    elif p.type == 'MultiLineString':
+    elif p.geom_type == 'MultiLineString':
         seq = []
         for linestring in p.geoms:
             seq.append(linestring.coords)
-    elif p.type == 'LineString':
+    elif p.geom_type == 'LineString':
         seq = []
         seq.append(p.coords)
 
-    elif p.type == 'MultiPoint':
+    elif p.geom_type == 'MultiPoint':
         return
-    elif p.type == 'GeometryCollection':
+    elif p.geom_type == 'GeometryCollection':
         # print(dir(p))
         # print(p.geometryType, p.geom_type)
         clen = 0
         seq = []
         # print(p.boundary.coordsd)
-        for sp in p:  # TODO
+        for sp in p.geoms:  # TODO
             clen += len(sp.exterior.coords)
             seq.append(sp.exterior.coords)
             for interior in sp.interiors: