Merge pull request #91 from MiraGeoscience/GEOPY-2588

GEOPY-2588: Add strike angle to output metrics

Author: benk-mira

curve_apps/edges/driver.py

@@ -30,6 +30,7 @@
 
 from curve_apps.driver import BaseCurveDriver
 from curve_apps.edges.options import EdgeDetectionParameters, EdgeParameters
+from curve_apps.utils import orientation_from_segments
 
 
 logger = logging.getLogger(__name__)
@@ -83,14 +84,7 @@ def make_curve(self):
             )
 
             # Compute positive angle from North
-            # TODO: Move to geoapps-utils
-            delta = np.c_[
-                vertices[cells[:, 1], 0] - vertices[cells[:, 0], 0],
-                vertices[cells[:, 1], 1] - vertices[cells[:, 0], 1],
-            ]
-            delta[delta[:, 0] < 0, :] *= -1
-            amp = np.linalg.norm(delta, axis=1)
-            orientation = np.arccos(delta[:, 1] / amp)
+            length, orientation = orientation_from_segments(vertices, cells)
 
             # TODO: Assign values to vertices until better handling of cell data by GA
             vert_azimuth = np.zeros(curve.n_vertices) * np.nan
@@ -102,7 +96,7 @@ def make_curve(self):
             )
 
             vert_lengths = np.zeros(curve.n_vertices) * np.nan
-            vert_lengths[cells.flatten()] = np.repeat(amp, 2)
+            vert_lengths[cells.flatten()] = np.repeat(length, 2)
             curve.add_data(
                 {
                     "lengths": {"values": vert_lengths},

curve_apps/peak_finder/driver.py

@@ -401,6 +401,7 @@ def run(self):  # pylint: disable=too-many-locals, too-many-branches, too-many-s
                         out_trend = driver.make_curve()
 
                         if out_trend is not None:
+                            out_trend.parent = out_group
                             driver.add_ui_json(out_trend)
 
                     except QhullError as e:

curve_apps/trend_lines/driver.py

@@ -22,7 +22,7 @@
 
 from curve_apps.driver import BaseCurveDriver
 from curve_apps.trend_lines.options import TrendLineParameters
-from curve_apps.utils import find_curves
+from curve_apps.utils import find_curves, orientation_from_segments
 
 
 logger = logging.getLogger(__name__)
@@ -60,6 +60,16 @@ def make_curve(self):
             )
 
             if curve is not None and self.params.source.data is not None:
+                _, orientation = orientation_from_segments(curve.vertices, curve.cells)
+                curve.add_data(
+                    {
+                        "azimuth": {
+                            "values": np.degrees(orientation),
+                            "association": "CELL",
+                        },
+                    }
+                )
+
                 curve.add_data(
                     {
                         self.params.source.data.name: {

curve_apps/utils.py

@@ -302,3 +302,25 @@ def filter_segments_orientation(
         np.abs(angles) < np.deg2rad(azimuth_tol),
         np.abs(angles - np.pi) < np.deg2rad(azimuth_tol),
     )
+
+
+def orientation_from_segments(
+    vertices: np.ndarray, cells: np.ndarray
+) -> tuple[np.ndarray, np.ndarray]:
+    """
+    Compute orientation vectors from segments.
+
+    :param vertices: Segment vertices.
+    :param cells: Segment connectivity.
+
+    :return: Lengths and orientations of segments.
+    """
+    delta = np.c_[
+        vertices[cells[:, 1], 0] - vertices[cells[:, 0], 0],
+        vertices[cells[:, 1], 1] - vertices[cells[:, 0], 1],
+    ]
+    delta[delta[:, 0] < 0, :] *= -1
+    length = np.linalg.norm(delta, axis=1)
+    orientation = np.arccos(delta[:, 1] / length)
+
+    return length, orientation

tests/trend_line_run_test.py

@@ -136,6 +136,11 @@ def test_driver_points(tmp_path: Path):
             4: "D",
         }
 
+        orientations = edges.get_data("azimuth")[0]
+        assert orientations is not None
+        assert len(orientations.values) == 27
+        np.testing.assert_almost_equal(np.median(orientations.values), 35.0, decimal=1)
+
 
 def test_driver_points_no_parts(tmp_path: Path):
     workspace = Workspace.create(tmp_path / "test_trend_lines.geoh5")