Skip to content

Add -Wo to mapproject for oblique domain in degrees #6474

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.

Sign up for GitHub

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

Merged
PaulWessel merged 3 commits into from
Mar 23, 2022
Merged

Add -Wo to mapproject for oblique domain in degrees #6474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b142cd6
Add -Wo to mapproject for oblique domain in degrees
PaulWessel Mar 23, 2022
a6a6108
add example
PaulWessel Mar 23, 2022
04541d2
Split into -Wo and -WO like for r|R
PaulWessel Mar 23, 2022
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
18 changes: 14 additions & 4 deletions doc/rst/source/mapproject.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Synopsis
[ |-S| ]
[ |-T|\ [**h**]\ *from*\ [/*to*] ]
[ |SYN_OPT-V| ]
[ |-W|\ [**g**\|\ **h**\|\ **j**\|\ **n**\|\ **r**\|\ **R**\|\ **w**\|\ **x**] ]
[ |-W|\ [**g**\|\ **h**\|\ **j**\|\ **n**\|\ **o**\|\ **O**\|\ **r**\|\ **R**\|\ **w**\|\ **x**] ]
[ |-Z|\ [*speed*][**+a**][**+i**][**+f**][**+t**\ *epoch*] ]
[ |SYN_OPT-b| ]
[ |SYN_OPT-d| ]
Expand Down Expand Up @@ -230,7 +230,7 @@ Optional Arguments

.. _-W:

**-W**\ [**g**\|\ **h**\|\ **j**\|\ **n**\|\ **r**\|\ **R**\|\ **w**\|\ **x**]
**-W**\ [**g**\|\ **h**\|\ **j**\|\ **n**\|\ **o**\|\ **O**\|\ **r**\|\ **R**\|\ **w**\|\ **x**]
Prints map width and height on standard output. No input files are read.
To only output the width or the height, append **w** or **h**, respectively.
To output the plot coordinates of a map point, give **g**\ *lon*/*lat*.
Expand All @@ -240,8 +240,11 @@ Optional Arguments
point is given as normalized positions in the 0-1 range, or **x**\ *px*/*py*,
where a plot point is given directly. To output the rectangular domain that
covers an oblique area as defined by **-R -J**, append **r**,
or use **R** to get the result in -Rw/e/s/n string format [Default returns
the width and height of the map].
or use **R** to get the result in -Rw/e/s/n string format. Similarly, if an
oblique domain is set via **-R**\ *xmin/xmax/ymin/ymax*\ **+u**\ *unit* then
use **o** to return the diagonal corner coordinates in degrees (in the order
*llx urx lly ury*) or use **O** to get the equivalent **-R** string as trailing
text [Default returns the width and height of the map].

.. _-Z:

Expand Down Expand Up @@ -377,6 +380,13 @@ defined by an oblique Mercator projection, try

gmt mapproject -R270/20/305/25+r -JOc280/25.5/22/69/2c -WR

To determine the oblique region string (in degrees) that corresponds to a rectangular
(but oblique) region specified in projected units defined by an oblique Mercator projection, try

::

gmt mapproject -R-2800/2400/-570/630+uk -Joc190/25/266/68/1:1 -WO

Restrictions
------------

Expand Down
28 changes: 22 additions & 6 deletions src/mapproject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ enum GMT_mp_Wcodes { /* Support for -W parsing */
GMT_MP_M_HEIGHT = 2, /* Return height */
GMT_MP_M_POINT = 3, /* Return user coordinates of point given in plot coordinates */
GMT_MP_M_REGION = 4, /* Return rectangular w/e/s/n for oblique -R -J setting */
GMT_MP_M_RSTRING = 5 /* As 4, but return string -Rw/e/s/n */
GMT_MP_M_RSTRING = 5, /* As 4, but return string -Rw/e/s/n */
GMT_MP_M_OREGION = 6, /* Converts -R<xmin/xmax/ymin/ymax>+u<unit> to <llx/lly/urx/ury> returned as llx urx lly ury */
GMT_MP_M_OSTRING = 7 /* As 6, but return string -Rw/e/s/n */
};

enum GMT_mp_Zcodes { /* Support for -Z parsing */
Expand Down Expand Up @@ -195,7 +197,7 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
if (level == GMT_MODULE_PURPOSE) return (GMT_NOERROR);
GMT_Usage (API, 0, "usage: %s <table> %s %s [-Ab|B|f|F|o|O[<lon0>/<lat0>][+v]] [-C[<dx></dy>][+m]] [-D%s] "
"[-E[<datum>]] [-F[<%s|%s>]] [-G[<lon0>/<lat0>][+a][+i][+u<unit>][+v]] [-I] [-L<table>[+p][+u<unit>]] "
"[-N[a|c|g|m]] [-Q[d|e]] [-S] [-T[h]<from>[/<to>]] [%s] [-W[g|h|j|n|r|R|w|x]] [-Z[<speed>][+a][+i][+f][+t<epoch>]] "
"[-N[a|c|g|m]] [-Q[d|e]] [-S] [-T[h]<from>[/<to>]] [%s] [-W[g|h|j|n|o|O|r|R|w|x]] [-Z[<speed>][+a][+i][+f][+t<epoch>]] "
"[%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s]\n",
name, GMT_J_OPT, GMT_Rgeo_OPT, GMT_DIM_UNITS_DISPLAY, GMT_LEN_UNITS2_DISPLAY, GMT_DIM_UNITS_DISPLAY, GMT_V_OPT,
GMT_b_OPT, GMT_d_OPT, GMT_e_OPT, GMT_f_OPT, GMT_g_OPT, GMT_h_OPT, GMT_i_OPT, GMT_j_OPT, GMT_o_OPT, GMT_p_OPT,
Expand Down Expand Up @@ -278,12 +280,13 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
"If <from> equals - we use WGS-84. If /<to> is not given we assume WGS-84. "
"Note: -T can be used as pre- or post- (-I) processing for -J -R.");
GMT_Option (API, "V");
GMT_Usage (API, 1, "\n-W[g|h|j|n|r|R|w|x]");
GMT_Usage (API, 1, "\n-W[g|h|j|n|o|O|r|R|w|x]");
GMT_Usage (API, -2, "Print map width and/or height or a reference point. No input files are read. Select optional directive:");
GMT_Usage (API, 3, "g: Print map coordinates of reference point <gx/gy>.");
GMT_Usage (API, 3, "h: Print map height (See -D for plot units).");
GMT_Usage (API, 3, "j: Print map coordinates of justification point given as 2-char justification code (BL, MC, etc.).");
GMT_Usage (API, 3, "n: Print map coordinates of reference point with normalized coordinates <rx/ry> in 0-1 range.");
GMT_Usage (API, 3, "o: Print oblique <llx>/<lly>/<urx>/<ury>+r coordinates and -R string for an oblique input region given via <xmin/xmax/ymin/ymax>+u<unit>.");
GMT_Usage (API, 3, "r: Print rectangular region for an oblique -R -J selection.");
GMT_Usage (API, 3, "R: Same as r but prints -Rw/e/s/n string as trailing text instead.");
GMT_Usage (API, 3, "w: Print map width (See -D for plot units).");
Expand Down Expand Up @@ -706,10 +709,12 @@ static int parse (struct GMT_CTRL *GMT, struct MAPPROJECT_CTRL *Ctrl, struct GMT
}
Ctrl->W.mode = GMT_MP_M_POINT;
break;
case 'o': Ctrl->W.mode = GMT_MP_M_OREGION; break;
case 'O': Ctrl->W.mode = GMT_MP_M_OSTRING; break;
case 'r': Ctrl->W.mode = GMT_MP_M_REGION; break;
case 'R': Ctrl->W.mode = GMT_MP_M_RSTRING; break;
default:
GMT_Report (API, GMT_MSG_ERROR, "Option -W: Expected -W[g|h|j|n|r|R|w|x]\n");
GMT_Report (API, GMT_MSG_ERROR, "Option -W: Expected -W[g|h|j|n|o|O|r|R|w|x]\n");
n_errors++;
break;
}
Expand Down Expand Up @@ -1049,6 +1054,13 @@ EXTERN_MSC int GMT_mapproject (void *V_API, int mode, void *args) {
}
gmt_free_refpoint (GMT, &Ctrl->W.refpoint);
n_output = 2; break;
case GMT_MP_M_OSTRING:
tmode = GMT_COL_FIX; /* Fall through on purpose here */
case GMT_MP_M_OREGION:
gmt_M_memcpy (w_out, GMT->common.R.wesn, 4, double);
if (w_out[XHI] < w_out[XLO]) w_out[XHI] += 360.0;
n_output = 4;
break;
case GMT_MP_M_RSTRING:
tmode = GMT_COL_FIX; /* Fall through on purpose here */
case GMT_MP_M_REGION:
Expand All @@ -1068,7 +1080,7 @@ EXTERN_MSC int GMT_mapproject (void *V_API, int mode, void *args) {
gmt_M_free (GMT, Out);
Return (API->error);
}
if ((error = GMT_Set_Columns (API, GMT_OUT, (unsigned int)(Ctrl->W.mode == GMT_MP_M_RSTRING ? 0 : n_output), tmode)) != GMT_NOERROR) {
if ((error = GMT_Set_Columns (API, GMT_OUT, (unsigned int)(Ctrl->W.mode == GMT_MP_M_OSTRING || Ctrl->W.mode == GMT_MP_M_RSTRING ? 0 : n_output), tmode)) != GMT_NOERROR) {
gmt_M_free (GMT, Out);
Return (error);
}
Expand All @@ -1080,7 +1092,11 @@ EXTERN_MSC int GMT_mapproject (void *V_API, int mode, void *args) {
gmt_M_free (GMT, Out);
Return (API->error);
}
if (Ctrl->W.mode == GMT_MP_M_RSTRING) {
if (Ctrl->W.mode == GMT_MP_M_OSTRING) {
sprintf (region, "-R%.16lg/%.16lg/%.16lg/%.16lg+r", w_out[XLO], w_out[YLO], w_out[XHI], w_out[YHI]);
Out->text = region;
}
else if (Ctrl->W.mode == GMT_MP_M_RSTRING) {
sprintf (region, "-R%.16lg/%.16lg/%.16lg/%.16lg", w_out[XLO], w_out[XHI], w_out[YLO], w_out[YHI]);
Out->text = region;
}
Expand Down