diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 5abfea436..559ad1d0e 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -35,9 +35,8 @@ is a great starting point if you are new to version control. - `upstream`, which refers to the `insarlab` repository - `origin`, which refers to your personal fork -+ Setting up `pre-commit` within `MintPy` directory: - - Run `pre-commit install` to set up the git hook scripts, so that `pre-commit` will run automatically on `git commit` ([https://pre-commit.com/](https://pre-commit.com/)). - - If the error of `No .pre-commit-config.yaml file was found` occurrs while doing `git commit`, update MintPy to the latest upstream to have this config file. ++ Setting up [`pre-commit`](https://pre-commit.com/) within `MintPy` directory: + - Run `pre-commit install` to set up the git hook scripts, so that `pre-commit` will run automatically on `git commit`. If the `No .pre-commit-config.yaml file was found` error occurrs, update your local MintPy to the latest upstream version to have this config file. #### 2. Develop your contribution: #### diff --git a/docs/README.md b/docs/README.md index ace87ab78..e0d86b1e3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,10 +1,12 @@ -[![Language](https://img.shields.io/badge/python-3.6%2B-blue.svg)](https://www.python.org/) -[![CircleCI](https://img.shields.io/circleci/build/github/insarlab/MintPy.svg?logo=circleci&label=CI)](https://circleci.com/gh/insarlab/MintPy) -[![Docs Status](https://readthedocs.org/projects/mintpy/badge/?color=green&version=latest)](https://mintpy.readthedocs.io/?badge=latest) -[![Version](https://img.shields.io/github/v/release/insarlab/MintPy?color=green&label=version)](https://github.com/insarlab/MintPy/releases) -[![License](https://img.shields.io/badge/license-GPLv3+-yellow.svg)](https://github.com/insarlab/MintPy/blob/main/LICENSE) -[![Forum](https://img.shields.io/badge/forum-Google%20Groups-orange.svg)](https://groups.google.com/g/mintpy) -[![Citation](https://img.shields.io/badge/doi-10.1016%2Fj.cageo.2019.104331-blue)](https://doi.org/10.1016/j.cageo.2019.104331) +[![Language](https://img.shields.io/badge/python-3.6%2B-blue.svg?style=flat-square)](https://www.python.org/) +[![Docs Status](https://readthedocs.org/projects/mintpy/badge/?color=green&version=latest&style=flat-square)](https://mintpy.readthedocs.io/?badge=latest) +[![CircleCI](https://img.shields.io/circleci/build/github/insarlab/MintPy.svg?logo=circleci&label=test&style=flat-square)](https://circleci.com/gh/insarlab/MintPy) +[![Docker Status](https://img.shields.io/github/actions/workflow/status/insarlab/MintPy/build-docker.yml?label=docker&style=flat-square)](https://github.com/insarlab/MintPy/pkgs/container/mintpy) +[![Version](https://img.shields.io/github/v/release/insarlab/MintPy?color=brightgreen&label=version&style=flat-square)](https://github.com/insarlab/MintPy/releases) +[![Conda Download](https://img.shields.io/conda/dn/conda-forge/mintpy?color=green&style=flat-square)](https://anaconda.org/conda-forge/mintpy) +[![License](https://img.shields.io/badge/license-GPLv3+-yellow.svg?style=flat-square)](https://github.com/insarlab/MintPy/blob/main/LICENSE) +[![Forum](https://img.shields.io/badge/forum-Google%20Groups-orange.svg?style=flat-square)](https://groups.google.com/g/mintpy) +[![Citation](https://img.shields.io/badge/doi-10.1016%2Fj.cageo.2019.104331-blue?style=flat-square)](https://doi.org/10.1016/j.cageo.2019.104331) ## MintPy ## diff --git a/scripts/load_data_aoi.sh b/scripts/load_data_aoi.sh index 7bc110dd7..f694b8a52 100755 --- a/scripts/load_data_aoi.sh +++ b/scripts/load_data_aoi.sh @@ -62,7 +62,7 @@ subset_opt=" --lat $S $N --lon $W $E" echo "subset - DEM" src_file=$inputs_dir_src"/../../../DEM/gsi10m.dem.wgs84" #adjust filename for specific dataset -dst_file=$inputs_dir_dst"/gsi10m.dem.wgs84" #adjust filename for specific dataset +dst_file=$inputs_dir_dst"/gsi10m.h5" #adjust filename for specific dataset echo "subset.py $src_file -o $dst_file $subset_opt" subset.py $src_file -o $dst_file $subset_opt diff --git a/src/mintpy/cli/save_kmz.py b/src/mintpy/cli/save_kmz.py index 3c8e991a9..40f47c38d 100755 --- a/src/mintpy/cli/save_kmz.py +++ b/src/mintpy/cli/save_kmz.py @@ -60,8 +60,9 @@ def create_parser(subparsers=None): # data parser.add_argument('-v','--vlim', dest='vlim', nargs=2, metavar=('MIN', 'MAX'), type=float, - help='Y/value limits for plotting.') - parser.add_argument('-u', dest='disp_unit', metavar='UNIT', help='unit for display.') + help='Y/value limits in the unit of {-u/--unit} for plotting.') + parser.add_argument('-u','--unit', dest='disp_unit', metavar='UNIT', default='cm/year', + help='unit for display (default: %(default)s).') parser.add_argument('-c', '--cm', '--colormap', dest='cmap_name', default='jet', help='Colormap for plotting (default: %(default)s), such as jet, RdBu, etc.\n' 'More details at https://mintpy.readthedocs.io/en/latest/api/colormaps/') diff --git a/src/mintpy/utils/isce_utils.py b/src/mintpy/utils/isce_utils.py index 8c43b3c5d..f1e680d36 100644 --- a/src/mintpy/utils/isce_utils.py +++ b/src/mintpy/utils/isce_utils.py @@ -395,10 +395,11 @@ def alos2_acquisition_modes(): ''' spotlightModes = ['SBS'] + # StripMap: Ultrafine [3 m], High sensitive [6 m], Fine [10 m] stripmapModes = ['UBS', 'UBD', 'HBS', 'HBD', 'HBQ', 'FBS', 'FBD', 'FBQ'] scansarNominalModes = ['WBS', 'WBD', 'WWS', 'WWD'] scansarWideModes = ['VBS', 'VBD'] - scansarModes = ['WBS', 'WBD', 'WWS', 'WWD', 'VBS', 'VBD'] + scansarModes = scansarNominalModes + scansarWideModes return (spotlightModes, stripmapModes, scansarNominalModes, scansarWideModes, scansarModes) diff --git a/src/mintpy/utils/plot.py b/src/mintpy/utils/plot.py index 39876e61e..c1be83fe6 100644 --- a/src/mintpy/utils/plot.py +++ b/src/mintpy/utils/plot.py @@ -1148,6 +1148,7 @@ def plot_gps(ax, SNWE, inps, metadata=dict(), print_msg=True): inps.gps_component = None vprint(f'WARNING: --gps-comp is not implemented for {k} file yet, set --gps-comp = None and continue') + plot_kwargs = dict(s=inps.gps_marker_size**2, edgecolors='k', lw=0.5, zorder=10) if inps.gps_component: # plot GPS velocity/displacement along LOS direction vprint('-'*30) @@ -1209,28 +1210,12 @@ def plot_gps(ax, SNWE, inps, metadata=dict(), print_msg=True): for lat, lon, obs in zip(site_lats, site_lons, site_obs): if not np.isnan(obs): color = cmap( (obs - vmin) / (vmax - vmin) ) - ax.scatter( - lon, - lat, - color=color, - s=inps.gps_marker_size**2, - edgecolors='k', - lw=0.5, - zorder=10, - ) + ax.scatter(lon, lat, color=color, **plot_kwargs) else: # plot GPS locations only vprint('showing GPS locations') - ax.scatter( - site_lons, - site_lats, - s=inps.gps_marker_size**2, - color='w', - edgecolors='k', - lw=0.5, - zorder=10, - ) + ax.scatter(site_lons, site_lats, color='w', **plot_kwargs) # plot GPS label if inps.disp_gps_label: