Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

multiple GNSS/GPS sources support #1173

Merged
merged 45 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
268e084
Start of GPS overhaul. Use only default UNR option.
Mar 29, 2024
29f5370
Created objects enabling ingest of different GPS processing sources.
Apr 1, 2024
3da2035
Changes to GPS for codacy and pre-commit compliance.
Apr 1, 2024
7e59002
More changes to GPS for codacy and pre-commit compliance.
Apr 1, 2024
ef11a9a
More changes to GPS for codacy and pre-commit compliance again.
Apr 1, 2024
f978a74
More changes to GPS for codacy and pre-commit compliance again.
Apr 1, 2024
528f5b8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 1, 2024
7182d1a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 1, 2024
f918085
Made print statement optional
Apr 1, 2024
52dbebb
Updated source specification for search_gps
Apr 3, 2024
e383238
Changed GPS to GNSS for generalization
Apr 3, 2024
dd8542f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 3, 2024
96c7213
attempt fix circle_ci error in plot_insar_vs_gnss_scatter
Apr 3, 2024
34c5107
fix dangerous default value in plot_insar_vs_gnss_scatter
Apr 3, 2024
b3ddcc6
no mutable values as inputs in plot_insar_vs_gnss_scatter
Apr 3, 2024
6afac2e
gps to gnss args in cli calls
Apr 3, 2024
c74c26a
Added JPL-SIDESHOW and Generic source capabilities
Apr 3, 2024
0cb2d68
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 3, 2024
29d58e7
codacy
Apr 3, 2024
a52d22b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 3, 2024
9c04a5d
arg_utils: re-organize GNSS options into smaller groups
yunjunz Apr 15, 2024
e5ba8e3
arg_utils: add *gps* option names for backward compatibility
yunjunz Apr 15, 2024
b038b00
fix bug introduced in the previous 2 commits
yunjunz Apr 15, 2024
b7a7e05
Changed pandas functions to numpy. Set source-based folder names to d…
Apr 15, 2024
50d4892
Removed unnecessary Geod module import from gnss.py
Apr 15, 2024
0681888
refactor `search_gnss()`
yunjunz Apr 18, 2024
a9683b7
codacy fix
yunjunz Apr 18, 2024
d9d4294
Merge branch 'main' into gps_object_split
rzinke Apr 18, 2024
bc6567c
refactor GNSS_UNR
yunjunz Apr 21, 2024
de77ca6
use site instead of site and stat(ion)
yunjunz Apr 21, 2024
9bd488b
refactor GNSS_ESESES/JPL-SIDESHOW/GENERIC [WIP]
yunjunz Apr 21, 2024
f3d4922
bugfix for GNSS_ESESES.read_displacement()
yunjunz Apr 21, 2024
9a7ed8b
GNSS_ESESES: add dload_site() and move the url_prefix searching into it
yunjunz Apr 22, 2024
c444952
pass testing of all sources except for generic
yunjunz Apr 22, 2024
a1a7fa5
cli/view: add example usage
yunjunz Apr 22, 2024
f5b76df
docs: update names in module_hierarchy
yunjunz Apr 22, 2024
829408e
rename insar_vs_gps to insar_vs_gnss
yunjunz Apr 22, 2024
320265b
utils.plot.plot_insar_vs_gnss_scatter(): update default csv_file name
yunjunz Apr 22, 2024
b7be5cb
move the rarely used zipfile import to the inside of the func
yunjunz Apr 22, 2024
51f86f0
simplify and rm _format_data_dir_()
yunjunz Apr 22, 2024
9ed3d16
gnss: add one line description
yunjunz Apr 22, 2024
ac7242c
Update gnss.py
yunjunz Apr 22, 2024
cb3b326
GNSS_UNR: add dload_site() to download the plot png file
yunjunz Apr 22, 2024
26dd11a
Update gnss.py
yunjunz Apr 22, 2024
63df144
displacement_enu2los(): rm plotting code
yunjunz Apr 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/api/module_hierarchy.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Hierarchy of sub-modules within MintPy. Level _N_ modules depends on level _N-1_
network (objects/{stack, sensor}, utils/{readfile})
------------------ level 4 --------------------
/objects
gps (objects/{stack, coord}, utils/{ptime, utils1, readfile})
gnss (objects/{stack, coord}, utils/{ptime, utils1, readfile})
stackDict (objects/{stack}, utils/{ptime, utils0, readfile})
/simulation
simulation (objects/{stack}, utils/{ptime, network}, simulation/{fractal, decorrelation, defo_model})
Expand All @@ -65,5 +65,5 @@ Hierarchy of sub-modules within MintPy. Level _N_ modules depends on level _N-1_
isce_utils (constants, utils/{ptime, readfile, writefile, attribute, utils1})
------------------ level 6 --------------------
/objects
insar_vs_gps (objects/{stack, giant}, utils/{readfile, gps, plot, utils})
insar_vs_gnss (objects/{stack, giant}, utils/{readfile, gnss, plot, utils})
```
8 changes: 4 additions & 4 deletions src/mintpy/cli/tsview.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def create_parser(subparsers=None):
parser = arg_utils.add_data_disp_argument(parser)
parser = arg_utils.add_dem_argument(parser)
parser = arg_utils.add_figure_argument(parser, figsize_img=True)
parser = arg_utils.add_gps_argument(parser)
parser = arg_utils.add_gnss_argument(parser)
parser = arg_utils.add_mask_argument(parser)
parser = arg_utils.add_map_argument(parser)
parser = arg_utils.add_memory_argument(parser)
Expand All @@ -124,9 +124,9 @@ def cmd_line_parse(iargs=None):
# use sys.argv[1:] for command line call
inps.argv = iargs if iargs else sys.argv[1:]

# check: --gps-comp option (not implemented for tsview yet)
if inps.gps_component:
msg = f'--gps-comp is not supported for {os.path.basename(__file__)}'
# check: --gnss-comp option (not implemented for tsview yet)
if inps.gnss_component:
msg = f'--gnss-comp is not supported for {os.path.basename(__file__)}'
raise NotImplementedError(msg)

# check: --label option (same number as input files)
Expand Down
13 changes: 7 additions & 6 deletions src/mintpy/cli/view.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@
view.py ifgramStack.h5 20171010_20171115 #all data related with 20171010_20171115
view.py ifgramStack.h5 'coherence*20171010*' #all coherence related with 20171010

# GPS (for one subplot in geo-coordinates only)
view.py geo_velocity_msk.h5 velocity --show-gps --gps-label #show locations of available GPS
view.py geo_velocity_msk.h5 velocity --show-gps --gps-comp enu2los --ref-gps GV01
view.py geo_timeseries_ERA5_ramp_demErr.h5 20180619 --ref-date 20141213 --show-gps --gps-comp enu2los --ref-gps GV01
# GNSS (for one subplot in geo-coordinates only)
view.py geo_velocity_msk.h5 velocity --show-gnss --gnss-label #show locations of available GPS
view.py geo_velocity_msk.h5 velocity --show-gnss --gnss-comp enu2los --ref-gnss GV01
view.py geo_velocity_msk.h5 velocity --show-gnss --gnss-comp enu2los --ref-gnss GV01 --gnss-source ESESES
view.py geo_timeseries_ERA5_ramp_demErr.h5 20180619 --ref-date 20141213 --show-gnss --gnss-comp enu2los --ref-gnss GV01

# Faults
view.py filt_dense_offsets.bil range --faultline simple_fault_confident.lonlat
Expand Down Expand Up @@ -83,7 +84,7 @@ def create_parser(subparsers=None):
parser = arg_utils.add_data_disp_argument(parser)
parser = arg_utils.add_dem_argument(parser)
parser = arg_utils.add_figure_argument(parser)
parser = arg_utils.add_gps_argument(parser)
parser = arg_utils.add_gnss_argument(parser)
parser = arg_utils.add_mask_argument(parser)
parser = arg_utils.add_map_argument(parser)
parser = arg_utils.add_memory_argument(parser)
Expand Down Expand Up @@ -154,7 +155,7 @@ def cmd_line_parse(iargs=None):
print('WARNING: --cbar-ext is NOT compatible with --dem-blend, ignore --cbar-ext and continue.')

# check: conflicted options (geo-only options if inpput file is in radar-coordinates)
geo_opt_names = ['--coord', '--show-gps', '--coastline', '--lalo-label', '--lalo-step', '--scalebar', '--faultline']
geo_opt_names = ['--coord', '--show-gnss', '--coastline', '--lalo-label', '--lalo-step', '--scalebar', '--faultline']
geo_opt_names = list(set(geo_opt_names) & set(inps.argv))
if geo_opt_names and 'Y_FIRST' not in readfile.read_attribute(inps.file).keys():
for opt_name in geo_opt_names:
Expand Down
Loading