Rename package to mogeo 🌎 (#12)

guidorice · Dec 17, 2023 · b302043 · b302043
1 parent 4a5c71f
commit b302043
Show file tree

Hide file tree

Showing 63 changed files with 104 additions and 111 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -37,11 +37,11 @@ jobs:
           modular auth ${{secrets.MODULAR_AUTH}} && \
           modular install mojo
 
-      - name: "Setup conda env (geo-features)"
+      - name: "Setup conda env (mogeo)"
         uses: conda-incubator/setup-miniconda@v2
         with:
           python-version: 3.11
-          activate-environment: geo-features
+          activate-environment: mogeo
           environment-file: environment.yml
 
       - name: "Run mojo-pytest"

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "geo_features/test/fixtures/geoarrow/geoarrow-data"]
-	path = geo_features/test/fixtures/geoarrow/geoarrow-data
-	url = https://github.com/geoarrow/geoarrow-data
+[submodule "mogeo/test/fixtures/geoarrow/geoarrow-data"]
+	path = mogeo/test/fixtures/geoarrow/geoarrow-data
+	url = https://github.com/geoarrow/geoarrow-data.git
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ install-py-packages:
 	conda env create -p venv --file environment.yml
 
 clean:
-	rm -rf ~/.modular/.mojo_cache build/geo_features.mojopkg
+	rm -rf ~/.modular/.mojo_cache build/mogeo.mojopkg
 
 test:
 	pytest -W error
@@ -14,4 +14,4 @@ format:
 
 package:
 	mkdir -p build/
-	mojo package geo_features/ -o build/geo_features.mojopkg
+	mojo package mogeo/ -o build/mogeo.mojopkg
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# geo-features
+# MoGeo: Mojo Geospatial/Geometric Package
 
-[![Run Tests](https://github.com/guidorice/geo-features/actions/workflows/tests.yaml/badge.svg)](https://github.com/guidorice/geo-features/actions/workflows/tests.yaml)
+[![Run Tests](https://github.com/guidorice/mogeo/actions/workflows/tests.yaml/badge.svg)](https://github.com/guidorice/mogeo/actions/workflows/tests.yaml)
 
 [Mojo🔥](https://github.com/modularml/mojo) package for geographic or geometric
 vector features, for example: location data or earth observation data. It is
@@ -90,16 +90,16 @@ efficient representation of coordinates, features and attributes.
 1. Clone this repo, including submodules:
 
     ```shell
-    git clone --recurse-submodules https://github.com/guidorice/geo-features
+    git clone --recurse-submodules https://github.com/guidorice/mogeo
     ```
 
 2. Create a Python environment using [environment.yml](./environment.yml). This is required for supporting packages used
-by `geo-features`, for example for interchange, serialization, and unit testing.
+by `mogeo`, for example for interchange, serialization, and unit testing.
 [Conda](https://docs.conda.io/projects/miniconda/en/latest/) is recommended because it puts a copy of libpython into
 each conda env.
 
     ```text
-    conda env create -n geo-features --file environment.yml
+    conda env create -n mogeo --file environment.yml
     ```
 
 3. Set `MOJO_PYTHON_LIBRARY` environment variable to your libpython. An example of doing

diff --git a/environment.yml b/environment.yml
@@ -1,4 +1,4 @@
-name: geo-features
+name: mogeo
 channels:
   - defaults
 dependencies:

diff --git a/geo_features/__init__.mojo b/geo_features/__init__.mojo
diff --git a/geo_features/bench/__init__.mojo b/geo_features/bench/__init__.mojo
diff --git a/geo_features/geog/__init__.mojo b/geo_features/geog/__init__.mojo
diff --git a/geo_features/geom/__init__.mojo b/geo_features/geom/__init__.mojo
diff --git a/geo_features/test/__init__.mojo b/geo_features/test/__init__.mojo
diff --git a/geo_features/test/algo/__init__.mojo b/geo_features/test/algo/__init__.mojo
diff --git a/geo_features/test/geog/__init__.mojo b/geo_features/test/geog/__init__.mojo
diff --git a/geo_features/test/geom/__init__.mojo b/geo_features/test/geom/__init__.mojo
diff --git a/geo_features/util/__init__.mojo b/geo_features/util/__init__.mojo
diff --git a/mogeo/__init__.mojo b/mogeo/__init__.mojo
@@ -0,0 +1,3 @@
+"""
+MoGeo: Mojo Geospatial/Geometric Package
+"""
diff --git a/mogeo/algo/__init__.mojo b/mogeo/algo/__init__.mojo
@@ -0,0 +1,3 @@
+"""
+Algorithms module.
+"""
diff --git a/mogeo/bench/__init__.mojo b/mogeo/bench/__init__.mojo
@@ -0,0 +1,3 @@
+"""
+Benchmarks module.
+"""
diff --git a/mogeo/geog/__init__.mojo b/mogeo/geog/__init__.mojo
@@ -0,0 +1,3 @@
+"""
+Geographic module.
+"""
diff --git a/geo_features/geog/crs.mojo → mogeo/geog/crs.mojo b/geo_features/geog/crs.mojo → mogeo/geog/crs.mojo
diff --git a/geo_features/geog/feature.mojo → mogeo/geog/feature.mojo b/geo_features/geog/feature.mojo → mogeo/geog/feature.mojo
diff --git a/geo_features/geog/feature_collection.mojo → mogeo/geog/feature_collection.mojo b/geo_features/geog/feature_collection.mojo → mogeo/geog/feature_collection.mojo
diff --git a/mogeo/geom/__init__.mojo b/mogeo/geom/__init__.mojo
@@ -0,0 +1,3 @@
+"""
+Geometric module.
+"""
diff --git a/geo_features/geom/empty.mojo → mogeo/geom/empty.mojo b/geo_features/geom/empty.mojo → mogeo/geom/empty.mojo
diff --git a/geo_features/geom/enums.mojo → mogeo/geom/enums.mojo b/geo_features/geom/enums.mojo → mogeo/geom/enums.mojo
diff --git a/geo_features/geom/envelope.mojo → mogeo/geom/envelope.mojo b/geo_features/geom/envelope.mojo → mogeo/geom/envelope.mojo
@@ -7,13 +7,13 @@ from algorithm.functional import parallelize
 import math
 from tensor import Tensor
 
-from geo_features.geom.empty import empty_value, is_empty
-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 (
+from mogeo.geom.empty import empty_value, is_empty
+from mogeo.geom.point import Point
+from mogeo.geom.enums import CoordDims
+from mogeo.geom.layout import Layout
+from mogeo.geom.traits import Geometric, Emptyable
+from mogeo.serialization.traits import JSONable, WKTable, Geoarrowable
+from mogeo.serialization import (
     WKTParser,
     JSONParser,
 )

diff --git a/geo_features/geom/geometry_collection.mojo → mogeo/geom/geometry_collection.mojo b/geo_features/geom/geometry_collection.mojo → mogeo/geom/geometry_collection.mojo
diff --git a/geo_features/geom/layout.mojo → mogeo/geom/layout.mojo b/geo_features/geom/layout.mojo → mogeo/geom/layout.mojo
diff --git a/geo_features/geom/line_string.mojo → mogeo/geom/line_string.mojo b/geo_features/geom/line_string.mojo → mogeo/geom/line_string.mojo
@@ -4,14 +4,14 @@ from utils.vector import DynamicVector
 from memory import memcmp
 from python import Python
 
-from geo_features.serialization import WKTParser, JSONParser
-from geo_features.geom.point import Point
-from geo_features.geom.layout import Layout
-from geo_features.geom.enums import CoordDims
-from geo_features.geom.empty import is_empty, empty_value
-from geo_features.geom.traits import Geometric, Emptyable
-from geo_features.serialization.traits import WKTable, JSONable, Geoarrowable
-from geo_features.serialization import (
+from mogeo.serialization import WKTParser, JSONParser
+from mogeo.geom.point import Point
+from mogeo.geom.layout import Layout
+from mogeo.geom.enums import CoordDims
+from mogeo.geom.empty import is_empty, empty_value
+from mogeo.geom.traits import Geometric, Emptyable
+from mogeo.serialization.traits import WKTable, JSONable, Geoarrowable
+from mogeo.serialization import (
     WKTParser,
     JSONParser,
 )

diff --git a/geo_features/geom/multi_line_string.mojo → mogeo/geom/multi_line_string.mojo b/geo_features/geom/multi_line_string.mojo → mogeo/geom/multi_line_string.mojo
diff --git a/geo_features/geom/multi_point.mojo → mogeo/geom/multi_point.mojo b/geo_features/geom/multi_point.mojo → mogeo/geom/multi_point.mojo
@@ -4,14 +4,14 @@ from utils.vector import DynamicVector
 from memory import memcmp
 from python import Python
 
-from geo_features.serialization import WKTParser, JSONParser
-from geo_features.geom.layout import Layout
-from geo_features.geom.empty import is_empty, empty_value
-from geo_features.geom.traits import Geometric, Emptyable
-from geo_features.geom.point import Point
-from geo_features.geom.enums import CoordDims
-from geo_features.serialization.traits import WKTable, JSONable, Geoarrowable
-from geo_features.serialization import (
+from mogeo.serialization import WKTParser, JSONParser
+from mogeo.geom.layout import Layout
+from mogeo.geom.empty import is_empty, empty_value
+from mogeo.geom.traits import Geometric, Emptyable
+from mogeo.geom.point import Point
+from mogeo.geom.enums import CoordDims
+from mogeo.serialization.traits import WKTable, JSONable, Geoarrowable
+from mogeo.serialization import (
     WKTParser,
     JSONParser,
 )

diff --git a/geo_features/geom/multi_polygon.mojo → mogeo/geom/multi_polygon.mojo b/geo_features/geom/multi_polygon.mojo → mogeo/geom/multi_polygon.mojo
diff --git a/geo_features/geom/point.mojo → mogeo/geom/point.mojo b/geo_features/geom/point.mojo → mogeo/geom/point.mojo
@@ -2,10 +2,10 @@ from python import Python
 from math import nan, isnan
 from math.limit import max_finite
 
-from geo_features.geom.empty import empty_value, is_empty
-from geo_features.geom.envelope import Envelope
-from geo_features.serialization.traits import WKTable, JSONable, Geoarrowable
-from geo_features.serialization import (
+from mogeo.geom.empty import empty_value, is_empty
+from mogeo.geom.envelope import Envelope
+from mogeo.serialization.traits import WKTable, JSONable, Geoarrowable
+from mogeo.serialization import (
     WKTParser,
     JSONParser,
 )

diff --git a/geo_features/geom/polygon.mojo → mogeo/geom/polygon.mojo b/geo_features/geom/polygon.mojo → mogeo/geom/polygon.mojo
diff --git a/geo_features/geom/traits.mojo → mogeo/geom/traits.mojo b/geo_features/geom/traits.mojo → mogeo/geom/traits.mojo
diff --git a/geo_features/serialization/__init__.mojo → mogeo/serialization/__init__.mojo b/geo_features/serialization/__init__.mojo → mogeo/serialization/__init__.mojo
@@ -1,6 +1,7 @@
 """
-Interchange, parsers, and serialization formats.
+Serialization module.
 """
+
 from .json import *
 from .wkt import *
 from .geoarrow import *
diff --git a/geo_features/serialization/geoarrow.mojo → mogeo/serialization/geoarrow.mojo b/geo_features/serialization/geoarrow.mojo → mogeo/serialization/geoarrow.mojo
diff --git a/geo_features/serialization/json.mojo → mogeo/serialization/json.mojo b/geo_features/serialization/json.mojo → mogeo/serialization/json.mojo
diff --git a/geo_features/serialization/traits.mojo → mogeo/serialization/traits.mojo b/geo_features/serialization/traits.mojo → mogeo/serialization/traits.mojo
diff --git a/geo_features/serialization/wkt.mojo → mogeo/serialization/wkt.mojo b/geo_features/serialization/wkt.mojo → mogeo/serialization/wkt.mojo
diff --git a/mogeo/test/__init__.mojo b/mogeo/test/__init__.mojo
@@ -0,0 +1,3 @@
+"""
+Test module.
+"""
diff --git a/geo_features/algo/__init__.mojo → mogeo/test/algo/__init__.mojo b/geo_features/algo/__init__.mojo → mogeo/test/algo/__init__.mojo
diff --git a/geo_features/test/constants.mojo → mogeo/test/constants.mojo b/geo_features/test/constants.mojo → mogeo/test/constants.mojo
diff --git a/...ures/test/fixtures/geoarrow/geoarrow-data → mogeo/test/fixtures/geoarrow/geoarrow-data b/...ures/test/fixtures/geoarrow/geoarrow-data → mogeo/test/fixtures/geoarrow/geoarrow-data
diff --git a/...xtures/geojson/line_string/curved.geojson → ...xtures/geojson/line_string/curved.geojson b/...xtures/geojson/line_string/curved.geojson → ...xtures/geojson/line_string/curved.geojson
diff --git a/...ures/geojson/line_string/straight.geojson → ...ures/geojson/line_string/straight.geojson b/...ures/geojson/line_string/straight.geojson → ...ures/geojson/line_string/straight.geojson
diff --git a/...xtures/geojson/line_string/zigzag.geojson → ...xtures/geojson/line_string/zigzag.geojson b/...xtures/geojson/line_string/zigzag.geojson → ...xtures/geojson/line_string/zigzag.geojson
diff --git a/...s/geojson/multi_point/multi_point.geojson → ...s/geojson/multi_point/multi_point.geojson b/...s/geojson/multi_point/multi_point.geojson → ...s/geojson/multi_point/multi_point.geojson
diff --git a/...geojson/multi_point/multi_point_z.geojson → ...geojson/multi_point/multi_point_z.geojson b/...geojson/multi_point/multi_point_z.geojson → ...geojson/multi_point/multi_point_z.geojson
diff --git a/.../test/fixtures/wkt/line_string/curved.wkt → .../test/fixtures/wkt/line_string/curved.wkt b/.../test/fixtures/wkt/line_string/curved.wkt → .../test/fixtures/wkt/line_string/curved.wkt
diff --git a/...s/test/fixtures/wkt/multi_point/point.wkt → ...o/test/fixtures/wkt/multi_point/point.wkt b/...s/test/fixtures/wkt/multi_point/point.wkt → ...o/test/fixtures/wkt/multi_point/point.wkt
diff --git a/...test/fixtures/wkt/multi_point/point_z.wkt → ...test/fixtures/wkt/multi_point/point_z.wkt b/...test/fixtures/wkt/multi_point/point_z.wkt → ...test/fixtures/wkt/multi_point/point_z.wkt
diff --git a/...eatures/test/fixtures/wkt/point/point.wkt → mogeo/test/fixtures/wkt/point/point.wkt b/...eatures/test/fixtures/wkt/point/point.wkt → mogeo/test/fixtures/wkt/point/point.wkt
diff --git a/mogeo/test/geog/__init__.mojo b/mogeo/test/geog/__init__.mojo
@@ -0,0 +1,3 @@
+"""
+Tests for mogeo/geog module.
+"""
diff --git a/mogeo/test/geom/__init__.mojo b/mogeo/test/geom/__init__.mojo
@@ -0,0 +1,3 @@
+"""
+Tests for mogeo/geom module.
+"""
diff --git a/geo_features/test/geom/test_empty.mojo → mogeo/test/geom/test_empty.mojo b/geo_features/test/geom/test_empty.mojo → mogeo/test/geom/test_empty.mojo
@@ -1,5 +1,5 @@
-from geo_features.geom.empty import empty_value, is_empty
-from geo_features.test.pytest import MojoTest
+from mogeo.geom.empty import empty_value, is_empty
+from mogeo.test.pytest import MojoTest
 
 
 fn main() raises:

diff --git a/...tures/test/geom/test_enums_coorddims.mojo → mogeo/test/geom/test_enums_coorddims.mojo b/...tures/test/geom/test_enums_coorddims.mojo → mogeo/test/geom/test_enums_coorddims.mojo
@@ -2,9 +2,9 @@ from python import Python
 from python.object import PythonObject
 from pathlib import Path
 
-from geo_features.geom.empty import empty_value, is_empty
-from geo_features.test.pytest import MojoTest
-from geo_features.geom.enums import CoordDims
+from mogeo.geom.empty import empty_value, is_empty
+from mogeo.test.pytest import MojoTest
+from mogeo.geom.enums import CoordDims
 
 
 fn main() raises:

diff --git a/geo_features/test/geom/test_envelope.mojo → mogeo/test/geom/test_envelope.mojo b/geo_features/test/geom/test_envelope.mojo → mogeo/test/geom/test_envelope.mojo
@@ -4,14 +4,14 @@ from utils.vector import DynamicVector
 from pathlib import Path
 from random import rand
 
-from geo_features.test.pytest import MojoTest
-from geo_features.test.constants import lon, lat, height, measure
+from mogeo.test.pytest import MojoTest
+from mogeo.test.constants import lon, lat, height, measure
 
-from geo_features.geom.envelope import Envelope
-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 mogeo.geom.envelope import Envelope
+from mogeo.geom.point import Point
+from mogeo.geom.enums import CoordDims
+from mogeo.geom.layout import Layout
+from mogeo.geom.traits import Geometric, Emptyable
 
 
 fn main() raises:
@@ -181,7 +181,7 @@ fn test_with_geos() raises:
 
     # LineString
 
-    # let path = Path("geo_features/test/fixtures/geojson/line_string")
+    # let path = Path("mogeo/test/fixtures/geojson/line_string")
     # let fixtures = VariadicList("curved.geojson", "straight.geojson", "zigzag.geojson")
     # for i in range(len(fixtures)):
     #     let file = path / fixtures[i]

diff --git a/geo_features/test/geom/test_layout.mojo → mogeo/test/geom/test_layout.mojo b/geo_features/test/geom/test_layout.mojo → mogeo/test/geom/test_layout.mojo
@@ -1,10 +1,10 @@
 from tensor import Tensor, TensorSpec, TensorShape
 from utils.index import Index
 
-from geo_features.test.pytest import MojoTest
-from geo_features.geom.layout import Layout
-from geo_features.test.constants import lat, lon, height, measure
-from geo_features.geom.enums import CoordDims
+from mogeo.test.pytest import MojoTest
+from mogeo.geom.layout import Layout
+from mogeo.test.constants import lat, lon, height, measure
+from mogeo.geom.enums import CoordDims
 
 
 fn main() raises:

diff --git a/geo_features/test/geom/test_line_string.mojo → mogeo/test/geom/test_line_string.mojo b/geo_features/test/geom/test_line_string.mojo → mogeo/test/geom/test_line_string.mojo
@@ -4,10 +4,10 @@ from utils.vector import DynamicVector
 from utils.index import Index
 from pathlib import Path
 
-from geo_features.test.pytest import MojoTest
-from geo_features.test.constants import lon, lat, height, measure
-from geo_features.geom.point import Point, Point64
-from geo_features.geom.line_string import LineString
+from mogeo.test.pytest import MojoTest
+from mogeo.test.constants import lon, lat, height, measure
+from mogeo.geom.point import Point, Point64
+from mogeo.geom.line_string import LineString
 
 
 fn main() raises:
@@ -233,7 +233,7 @@ fn test_from_json() raises:
 
     let json = Python.import_module("orjson")
     let builtins = Python.import_module("builtins")
-    let path = Path("geo_features/test/fixtures/geojson/line_string")
+    let path = Path("mogeo/test/fixtures/geojson/line_string")
     let fixtures = VariadicList("curved.geojson", "straight.geojson", "zigzag.geojson")
 
     for i in range(len(fixtures)):

diff --git a/geo_features/test/geom/test_multi_point.mojo → mogeo/test/geom/test_multi_point.mojo b/geo_features/test/geom/test_multi_point.mojo → mogeo/test/geom/test_multi_point.mojo
@@ -4,12 +4,12 @@ from utils.vector import DynamicVector
 from utils.index import Index
 from pathlib import Path
 
-from geo_features.test.constants import lat, lon, height, measure
-from geo_features.test.pytest import MojoTest
-from geo_features.geom.point import Point, Point64
-from geo_features.geom.multi_point import MultiPoint
-from geo_features.serialization.json import JSONParser
-from geo_features.geom.enums import CoordDims
+from mogeo.test.constants import lat, lon, height, measure
+from mogeo.test.pytest import MojoTest
+from mogeo.geom.point import Point, Point64
+from mogeo.geom.multi_point import MultiPoint
+from mogeo.serialization.json import JSONParser
+from mogeo.geom.enums import CoordDims
 
 
 fn main() raises:
@@ -160,7 +160,7 @@ fn test_stringable() raises:
 
 fn test_wktable() raises:
     let test = MojoTest("wktable")
-    let path = Path("geo_features/test/fixtures/wkt/multi_point")
+    let path = Path("mogeo/test/fixtures/wkt/multi_point")
     let fixtures = VariadicList("point.wkt", "point_z.wkt")
     for i in range(len(fixtures)):
         let file = path / fixtures[i]
@@ -218,7 +218,7 @@ fn test_from_json() raises:
     pass
     # let test = MojoTest("from_json")
 
-    # let path = Path("geo_features/test/fixtures/geojson/multi_point")
+    # let path = Path("mogeo/test/fixtures/geojson/multi_point")
     # let fixtures = VariadicList("multi_point.geojson")  # , "multi_point_z.geojson"
     # for i in range(len(fixtures)):
     #     let file = path / fixtures[i]

diff --git a/geo_features/test/geom/test_point.mojo → mogeo/test/geom/test_point.mojo b/geo_features/test/geom/test_point.mojo → mogeo/test/geom/test_point.mojo
@@ -2,12 +2,12 @@ from python import Python
 from python.object import PythonObject
 from pathlib import Path
 
-from geo_features.geom.empty import empty_value, is_empty
-from geo_features.geom.point import Point, CoordDims
-from geo_features.geom.traits import Dimensionable, Geometric, Emptyable
-from geo_features.test.helpers import load_geoarrow_test_fixture
-from geo_features.test.pytest import MojoTest
-from geo_features.test.constants import lon, lat, height, measure
+from mogeo.geom.empty import empty_value, is_empty
+from mogeo.geom.point import Point, CoordDims
+from mogeo.geom.traits import Dimensionable, Geometric, Emptyable
+from mogeo.test.helpers import load_geoarrow_test_fixture
+from mogeo.test.pytest import MojoTest
+from mogeo.test.constants import lon, lat, height, measure
 
 
 fn main() raises:
@@ -307,7 +307,7 @@ fn test_wkt() raises:
 fn test_from_wkt() raises:
     let test = MojoTest("from_wkt")
 
-    let path = Path("geo_features/test/fixtures/wkt/point/point.wkt")
+    let path = Path("mogeo/test/fixtures/wkt/point/point.wkt")
     let wkt: String
     with open(path, "rb") as f:
         wkt = f.read()
@@ -357,7 +357,7 @@ fn test_from_geoarrow() raises:
     let test = MojoTest("from_geoarrow")
 
     let ga = Python.import_module("geoarrow.pyarrow")
-    let path = Path("geo_features/test/fixtures/geoarrow/geoarrow-data/example")
+    let path = Path("mogeo/test/fixtures/geoarrow/geoarrow-data/example")
     let empty = empty_value[DType.float64]()
     var file = path / "example-point.arrow"
     var table = load_geoarrow_test_fixture(file)

diff --git a/geo_features/test/helpers.mojo → mogeo/test/helpers.mojo b/geo_features/test/helpers.mojo → mogeo/test/helpers.mojo
diff --git a/geo_features/test/pytest.mojo → mogeo/test/pytest.mojo b/geo_features/test/pytest.mojo → mogeo/test/pytest.mojo