Merge pull request #20 from MrClock8163/feature/resection

Add station management

Author: MrClock8163

.github/workflows/run-tests.yml

@@ -7,6 +7,30 @@ env:
   MYPY_FORCE_COLOR: 1
 
 jobs:  
+  testing:
+    name: Running tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.11", "3.12", "3.13"]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+        
+      - name: Build and install package
+        run: python -m pip install .
+
+      - name: Test with pytest
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --group testing
+          python -m pytest
+
   linting:
     name: Linting
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -7,6 +7,14 @@ The project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
 
+### Added
+
+- Added resection calculation logic
+- Added station calculation (`calc station`) using resection from set
+  measurements
+- Added station uploading (`upload station`) to set station coordinates and
+  orientation
+
 ### Changed
 
 - Updated file listing to display results in a tree view

docs/commands/station/calc.rst

@@ -0,0 +1,25 @@
+Calculation
+===========
+
+Resection calculation is commonly used when setting up an instrument on an
+unkown point. Alternatively resection can be used in monitoring setups as well,
+to handle the possible movement of the instrument between measurement cycles,
+and to verify the integrity of the control points. The resection
+calculation will always have excess measurements, which means it can be
+adjusted with least squares, that provides standard deviations. If the
+deviations of the resection suddenly increase in one of the cycles, it likely
+indicates, that one of the control points moved.
+
+The resection is done in two steps, separate horizontal and vertical
+calculations.
+
+Requirements
+------------
+
+- Session result file from previous set measurement
+
+Usage
+-----
+
+.. click:: instrumentman.station:cli_calc
+    :prog: iman calc station

docs/commands/station/index.rst

@@ -0,0 +1,13 @@
+:icon: material/map-marker-outline
+
+Station
+=======
+
+Managing the instrument station setup is an important part of measurements.
+The stationing commands can be used to manage various aspects of a setup.
+
+.. toctree::
+    :maxdepth: 1
+
+    calc
+    upload

docs/commands/station/upload.rst

@@ -0,0 +1,22 @@
+Uploading
+=========
+
+If a station setup was calculated separately (not using the on-board software),
+it has to be uploaded to the instrument. This command allows to set the station
+coordinates, instrument height and orientation.
+
+.. note::
+
+    The station name cannot be set. It will remain the last point name set with
+    the on-board software.
+
+Requirements
+------------
+
+- GeoCom capable total station
+
+Usage
+-----
+
+.. click:: instrumentman.station:cli_upload
+    :prog: iman upload station

docs/index.rst

@@ -46,6 +46,7 @@ Content
     commands/data/index
     commands/jobs/index
     commands/settings/index
+    commands/station/index
 
 Indices
 

docs/latexindex.rst

@@ -31,3 +31,4 @@ Applications
     commands/data/index
     commands/jobs/index
     commands/settings/index
+    commands/station/index

pyproject.toml

@@ -13,14 +13,15 @@ readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "pyserial ~= 3.5.0",
-    "geocompy >= 0.8.1",
+    "geocompy >= 0.10.0",
     "rich >= 13.9",
     "textual >= 3.2.0",
     "rapidfuzz ~= 3.13.0",
     "jsonschema ~= 4.21",
     "jmespath ~= 1.0.1",
     "toml ~= 0.10.2",
     "PyYAML ~= 6.0.2",
+    "numpy ~= 2.0",
     "cloup ~= 3.0.7",
     "click-extra ~= 5.0.2"
 ]
@@ -59,7 +60,9 @@ Changelog = "https://instrumentman.readthedocs.io/latest/changelog"
 iman = "instrumentman:cli"
 
 [dependency-groups]
-testing = []
+testing = [
+    "pytest ~= 8.4.1"
+]
 linting = [
     {include-group = "testing"},
     "types-pyserial ~= 3.5.0.20250326",
@@ -94,7 +97,6 @@ version-file = "src/instrumentman/_version.py"
 [tool.pytest.ini_options]
 addopts = ["-ra", "-v", "--color=yes"]
 testpaths = ["tests"]
-required_plugins = "pytest-mock"
 
 [tool.mypy]
 strict = true

src/instrumentman/__init__.py

@@ -9,6 +9,7 @@
 from . import terminal
 from . import setup
 from . import setmeasurement
+from . import station
 from . import protocoltest
 from . import inclination
 from . import filetransfer
@@ -77,6 +78,7 @@ def cli_upload() -> None:
 cli_measure.add_command(inclination.cli_measure)
 cli_calc.add_command(setmeasurement.cli_calc)
 cli_calc.add_command(inclination.cli_calc)
+cli_calc.add_command(station.cli_calc)
 cli_test.add_command(protocoltest.cli_geocom)
 cli_test.add_command(protocoltest.cli_gsidna)
 cli_merge.add_command(setmeasurement.cli_merge)
@@ -91,3 +93,4 @@ def cli_upload() -> None:
 cli_download.add_command(settings.cli_download)
 cli_upload.add_command(datatransfer.cli_upload)
 cli_upload.add_command(settings.cli_upload)
+cli_upload.add_command(station.cli_upload)