diff --git a/src/specklepy/objects/GIS/__init__.py b/src/specklepy/objects/GIS/__init__.py index 58d7b337..5ac3dff8 100644 --- a/src/specklepy/objects/GIS/__init__.py +++ b/src/specklepy/objects/GIS/__init__.py @@ -7,6 +7,7 @@ GisPolygonElement, GisPolygonGeometry, GisRasterElement, + PolygonGeometry, ) from specklepy.objects.GIS.layers import RasterLayer, VectorLayer @@ -14,6 +15,7 @@ "VectorLayer", "RasterLayer", "GisPolygonGeometry", + "PolygonGeometry", "GisPolygonElement", "GisLineElement", "GisPointElement", diff --git a/src/specklepy/objects/GIS/geometry.py b/src/specklepy/objects/GIS/geometry.py index 5cb78e11..68df54cf 100644 --- a/src/specklepy/objects/GIS/geometry.py +++ b/src/specklepy/objects/GIS/geometry.py @@ -12,14 +12,14 @@ ) -class GisPolygonGeometry( - Base, speckle_type="Objects.GIS.PolygonGeometry", detachable={"displayValue"} -): +class PolygonGeometry(Base, speckle_type="Objects.GIS.PolygonGeometry"): """GIS Polygon Geometry""" - boundary: Optional[Union[Polyline, Arc, Line, Circle, Polycurve]] = None - voids: Optional[List[Union[Polyline, Arc, Line, Circle, Polycurve]]] = None - displayValue: Optional[List[Mesh]] = None + boundary: Optional[Polyline] + voids: Optional[List[Polyline]] + + +GisPolygonGeometry = PolygonGeometry class GisPolygonElement(Base, speckle_type="Objects.GIS.PolygonElement"): diff --git a/src/specklepy/objects/other.py b/src/specklepy/objects/other.py index 5a2576e4..76a01e46 100644 --- a/src/specklepy/objects/other.py +++ b/src/specklepy/objects/other.py @@ -303,9 +303,19 @@ class RevitParameter(Base, speckle_type="Objects.BuiltElements.Revit.Parameter") isTypeParameter: bool = False +@deprecated(version="2.20", reason="Namespace changed, collectionType deprecated") class Collection( Base, speckle_type="Speckle.Core.Models.Collection", detachable={"elements"} ): name: Optional[str] = None collectionType: Optional[str] = None elements: Optional[List[Base]] = None + + +class Collection( # noqa: F811 + Base, + speckle_type="Speckle.Core.Models.Collections.Collection", + detachable={"elements"}, +): + name: Optional[str] = None + elements: Optional[List[Base]]