summaryrefslogtreecommitdiffstats
path: root/core/parse-xml.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-10-02 23:03:44 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-10-04 08:05:09 -0700
commit21d78121ade941adf9eaad399e6b8146298b421f (patch)
tree56cc4109f116d7b667163e960fcc7936fdf4c6aa /core/parse-xml.c
parentde10fd4021f7fa7e203782df29456c09e07165e8 (diff)
downloadsubsurface-21d78121ade941adf9eaad399e6b8146298b421f.tar.gz
Don't add separate country field, use taxonomy
The more I looked at the code that added the country to the dive site, the more it seemed redundant given what we have with the taxonomy. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/parse-xml.c')
-rw-r--r--core/parse-xml.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c
index 27b7b484f..ece85022b 100644
--- a/core/parse-xml.c
+++ b/core/parse-xml.c
@@ -1057,6 +1057,7 @@ static void divinglog_place(char *place, uint32_t *uuid)
if (*uuid == 0)
*uuid = create_dive_site(buffer, cur_dive->when);
+ // TODO: capture the country / city info in the taxonomy instead
city = NULL;
country = NULL;
}
@@ -1506,8 +1507,6 @@ static void try_to_fill_dive_site(struct dive_site **ds_p, const char *name, cha
return;
if (MATCH("name", utf8_string, &ds->name))
return;
- if (MATCH("country", utf8_string, &ds->country))
- return;
if (MATCH("description", utf8_string, &ds->description))
return;
if (MATCH("notes", utf8_string, &ds->notes))