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>
This commit is contained in:
Dirk Hohndel 2017-10-02 23:03:44 -07:00
parent de10fd4021
commit 21d78121ad
8 changed files with 21 additions and 24 deletions

View file

@ -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))