Skip to content

Let country names also have the continent code. #8873

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
joa-quim merged 1 commit into from
Jan 23, 2026
+11 −4
Merged

Let country names also have the continent code. #8873

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/gmt_dcw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ struct GMT_DATASET *gmt_DCW_operation(struct GMT_CTRL *GMT, struct GMT_DCW_SELEC
bool done, want_state, outline, fill = false, is_Antarctica = false, hole, new_CN_codes = false;
bool dtype_is_float = false, ALL = false;
char TAG[GMT_LEN16] = {""}, dim[GMT_LEN16] = {""}, xname[GMT_LEN16] = {""};
char yname[GMT_LEN16] = {""}, code[GMT_LEN16] = {""}, state[GMT_LEN16] = {""}, datatype[GMT_LEN8] = {""};
char yname[GMT_LEN16] = {""}, code[GMT_LEN32] = {""}, state[GMT_LEN16] = {""}, datatype[GMT_LEN8] = {""};
char msg[GMT_BUFSIZ] = {""}, path[PATH_MAX] = {""}, list[GMT_BUFSIZ] = {""}, dcw_name[GMT_LEN256] = {""};
char version[GMT_LEN32] = {""}, gmtversion[GMT_LEN32] = {""}, source[GMT_LEN256] = {""}, title[GMT_LEN256] = {""};
char label[GMT_LEN256] = {""}, header[GMT_LEN256] = {""}, ISO[GMT_LEN8] = {""};
Expand All @@ -482,6 +482,10 @@ struct GMT_DATASET *gmt_DCW_operation(struct GMT_CTRL *GMT, struct GMT_DCW_SELEC

for (j = ks = 0; j < F->n_items; j++) {
if (!F->item[j]->codes || F->item[j]->codes[0] == '\0') continue;
if (F->item[j]->codes && strlen(F->item[j]->codes) > 30) { /* This also protects from a crash due to 'code' overflow. */
GMT_Report(GMT->parent, GMT_MSG_ERROR, "Code \"%s\" too long (> 30). We don't have that long codes\n", F->item[j]->codes);
continue;
}
ks++; /* Gave some codes */
}
if (ks == 0) return NULL; /* No countries requested */
Expand Down Expand Up @@ -731,7 +735,7 @@ struct GMT_DATASET *gmt_DCW_operation(struct GMT_CTRL *GMT, struct GMT_DCW_SELEC
else {
snprintf(TAG, GMT_LEN16, "%s", GMT_DCW_country[k].code);
if (F->mode & GMT_DCW_ZHEADER)
snprintf(msg, GMT_BUFSIZ, "-Z%s %s\n", TAG, GMT_DCW_country[k].name);
snprintf(msg, GMT_BUFSIZ, "-Z%s %s (%s)\n", TAG, GMT_DCW_country[k].name, GMT_DCW_country[k].continent);
else
snprintf(msg, GMT_BUFSIZ, "%s\n", GMT_DCW_country[k].name);
}
Expand Down Expand Up @@ -867,10 +871,13 @@ struct GMT_DATASET *gmt_DCW_operation(struct GMT_CTRL *GMT, struct GMT_DCW_SELEC
P->n_rows = last - first + 1; /* Number of points in this segment */
P->data[GMT_X] = &lon[first];
P->data[GMT_Y] = &lat[first];
sprintf(label, " %s Segment %" PRIu64, msg, seg);
if (GMT->parent->external && F->mode & GMT_DCW_ZHEADER)
sprintf(label, " %s", msg);
else
sprintf(label, " %s Segment %" PRIu64, msg, seg);
header[0] = '\0';
if (hole)
strcat (header, "-Ph");
strcat(header, "-Ph");

if (mode & GMT_DCW_DUMP) { /* Dump the coordinates to stdout */
strcat(header, label);
Expand Down
Loading