Port to mojo v0.6, begin implementing traits.

guidorice · Dec 16, 2023 · 02651ba · 02651ba
1 parent 1d83dea
commit 02651ba
Show file tree

Hide file tree

Showing 24 changed files with 657 additions and 652 deletions.
diff --git a/geo_features/geom/envelope.mojo b/geo_features/geom/envelope.mojo
@@ -12,14 +12,13 @@ from geo_features.geom.point import Point
 from geo_features.geom.enums import CoordDims
 from geo_features.geom.layout import Layout
 from geo_features.geom.traits import Geometric, Emptyable
+from geo_features.serialization.traits import JSONable, WKTable, Geoarrowable
 from geo_features.serialization import (
     WKTParser,
-    WKTable,
     JSONParser,
-    JSONable,
-    Geoarrowable,
 )
 
+
 @value
 @register_passable("trivial")
 struct Envelope[dtype: DType](
@@ -146,6 +145,7 @@ struct Envelope[dtype: DType](
 
     fn __str__(self) -> String:
         return self.__repr__()
+
     #
     # Getters
     #
@@ -200,6 +200,17 @@ struct Envelope[dtype: DType](
     fn dims(self) -> Int:
         return len(self.ogc_dims)
 
+    fn set_ogc_dims(inout self, ogc_dims: CoordDims):
+        """
+        Setter for ogc_dims enum. May be only be useful if the Point constructor with variadic list of coordinate values.
+        (ex: when Point Z vs Point M is ambiguous.
+        """
+        debug_assert(
+            len(self.ogc_dims) == 3 and len(ogc_dims) == 3,
+            "Unsafe change of dimension number",
+        )
+        self.ogc_dims = ogc_dims
+
     fn has_height(self) -> Bool:
         return (self.ogc_dims == CoordDims.PointZ) or (
             self.ogc_dims == CoordDims.PointZM

diff --git a/geo_features/geom/geometry_collection.nojo → geo_features/geom/geometry_collection.mojo b/geo_features/geom/geometry_collection.nojo → geo_features/geom/geometry_collection.mojo
diff --git a/geo_features/geom/layout.mojo b/geo_features/geom/layout.mojo
@@ -85,3 +85,13 @@ struct Layout[dtype: DType = DType.float64, offset_dtype: DType = DType.uint32](
 
     fn has_measure(self) -> Bool:
         return self.ogc_dims == CoordDims.PointM or self.ogc_dims == CoordDims.PointZM
+
+    fn set_ogc_dims(inout self, ogc_dims: CoordDims):
+        """
+        Setter for ogc_dims enum. May be only be useful if the Point constructor with variadic list of coordinate values.
+        (ex: when Point Z vs Point M is ambiguous.
+        """
+        debug_assert(
+            len(self.ogc_dims) == len(ogc_dims), "Unsafe change of dimension number"
+        )
+        self.ogc_dims = ogc_dims