merge save-aps into v2beta #75
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tep 4 accordingly.
# Conflicts: # docs/demo/demo_masjed_dam_detailed_guide.rst # docs/processing.rst # sarvey/config.py # sarvey/densification.py # sarvey/processing.py # tests/test_processing.py # tests/testdata/config_test.json
# Conflicts: # docs/processing.rst # sarvey/filtering.py # sarvey/processing.py
Fix bug in computing grid size
This reverts commit 462de88.
merge upstream into main
merge main into update-runner2
- update runner with pip instllation - update docs - move environment.yml to root
Update readme
Main to merge
update dev installation in docs
…tion Update runner and installation
Update runner
merge main
# Conflicts: # HISTORY.rst # sarvey/preparation.py # sarvey/processing.py # sarvey/utils.py
There was a problem hiding this comment.
Pull Request Overview
This PR merges the "save-aps" branch into v2beta and updates the code to use map coordinates instead of UTM coordinates. Key changes include:
- Updating dependency constraints and adding an extra requirement ("gdal") in setup.py.
- Replacing UTM coordinate variables and function parameter names with their map coordinate counterparts across multiple modules.
- Adjustments to APS estimation, densification logic, configuration validations, and CI pipeline modifications.
Reviewed Changes
Copilot reviewed 19 out of 25 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| setup.py | Updated dependency constraints and added an extra dependency. |
| sarvey/utils.py | Switched coordinate calculations from UTM to map coordinates. |
| sarvey/triangulation.py | Updated parameter names from coord_utmxy to coord_map_xy. |
| sarvey/sarvey_plot.py | Updated function calls to use map coordinates. |
| sarvey/processing.py | Replaced UTM references with map coordinates and updated APS handling. |
| sarvey/export.py | Updated coordinate transformations and CRS settings. |
| sarvey/objects.py | Renamed and reworked coordinate class from CoordinatesUTM to CoordinatesMap. |
| sarvey/filtering.py | Modified functions for atmospheric phase screen estimation using map coordinates. |
| sarvey/densification.py | Updated densification logic and second-order points selection based on map coordinates. |
| sarvey/config.py | Adjusted configuration validations and thresholds for densification. |
| .github/workflows/ci.yml | Changed environment variable settings and CI environment activation. |
Files not reviewed (6)
- HISTORY.rst: Language not supported
- README.rst: Language not supported
- docs/demo/demo_masjed_dam_detailed_guide.rst: Language not supported
- docs/demo/demo_masjed_dam_fast_track.rst: Language not supported
- docs/installation.rst: Language not supported
- docs/processing.rst: Language not supported
Comments suppressed due to low confidence (1)
.github/workflows/ci.yml:20
- The environment variable changes for SKIP_DEPLOY and SKIP_INSTALL may affect the CI pipeline behavior. Please verify that these updated values match the intended deployment and installation requirements.
SKIP_DEPLOY: true
SKIP_INSTALL: false
Comment on lines
+502
to
+503
| interp_method=aps_params_obj.params_obj.model_name) | ||
|
|
There was a problem hiding this comment.
The code attempts to reference 'params_obj.model_name' on 'aps_params_obj', but the ApsParameters class defines 'model_name' directly. It likely should be updated to use 'aps_params_obj.model_name' to avoid an AttributeError.
Suggested change
| interp_method=aps_params_obj.params_obj.model_name) | |
| interp_method=aps_params_obj.model_name) |
Copilot uses AI. Check for mistakes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.