diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-08-20 11:05:07 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-20 11:05:07 -0700 |
commit | a081ffe48e5c07505afaccde69dbdabe6f82054b (patch) | |
tree | 6291f7553520fc2591be6833a682136069704157 | |
parent | 0bb65a17cb77084a345f12581b5b39f4dafcae4a (diff) | |
download | subsurface-a081ffe48e5c07505afaccde69dbdabe6f82054b.tar.gz |
Always save taxonomy data, even if disabled in the prefs
Otherwise, if one of the systems used with cloud storage doesn't have the
preference for geo encoding enabled, the taxonomy data will be lost.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | save-git.c | 13 | ||||
-rw-r--r-- | save-xml.c | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/save-git.c b/save-git.c index 559666d0e..9ae1d572e 100644 --- a/save-git.c +++ b/save-git.c @@ -900,14 +900,13 @@ static void save_divesites(git_repository *repo, struct dir *tree) show_utf8(&b, "description ", ds->description, "\n"); show_utf8(&b, "notes ", ds->notes, "\n"); show_gps(&b, ds->latitude, ds->longitude); - if (prefs.geocoding.enable_geocoding) - for (int j = 0; j < ds->taxonomy.nr; j++) { - struct taxonomy *t = &ds->taxonomy.category[j]; - if (t->category != TC_NONE && t->value) { - put_format(&b, "geo cat %d origin %d ", t->category, t->origin); - show_utf8(&b, "", t->value, "\n" ); - } + for (int j = 0; j < ds->taxonomy.nr; j++) { + struct taxonomy *t = &ds->taxonomy.category[j]; + if (t->category != TC_NONE && t->value) { + put_format(&b, "geo cat %d origin %d ", t->category, t->origin); + show_utf8(&b, "", t->value, "\n" ); } + } blob_insert(repo, subdir, &b, mb_cstring(&site_file_name)); } } diff --git a/save-xml.c b/save-xml.c index 00f4626d3..67ae96a37 100644 --- a/save-xml.c +++ b/save-xml.c @@ -533,7 +533,7 @@ void save_dives_buffer(struct membuffer *b, const bool select_only) } show_utf8(b, ds->description, " description='", "'", 1); show_utf8(b, ds->notes, " notes='", "'", 1); - if (prefs.geocoding.enable_geocoding && ds->taxonomy.nr) { + if (ds->taxonomy.nr) { put_format(b, ">\n"); for (int j = 0; j < ds->taxonomy.nr; j++) { struct taxonomy *t = &ds->taxonomy.category[j]; |