Fix broken helper function, move helper functions into the .c file (there really wasn't a good reason for these to be inline), fix the logic that decides if we want to create a new dive site or use an existing one. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
90 lines
2.0 KiB
C
90 lines
2.0 KiB
C
/* divesite.c */
|
|
#include "divesite.h"
|
|
#include "dive.h"
|
|
|
|
struct dive_site_table dive_site_table;
|
|
|
|
/* there could be multiple sites of the same name - return the first one */
|
|
uint32_t get_dive_site_uuid_by_name(const char *name, struct dive_site **dsp)
|
|
{
|
|
int i;
|
|
struct dive_site *ds;
|
|
for_each_dive_site (i, ds) {
|
|
if (same_string(ds->name, name)) {
|
|
if (dsp)
|
|
*dsp = ds;
|
|
return ds->uuid;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* there could be multiple sites at the same GPS fix - return the first one */
|
|
uint32_t get_dive_site_uuid_by_gps(degrees_t latitude, degrees_t longitude, struct dive_site **dsp)
|
|
{
|
|
int i;
|
|
struct dive_site *ds;
|
|
for_each_dive_site (i, ds) {
|
|
if (ds->latitude.udeg == latitude.udeg && ds->longitude.udeg == longitude.udeg) {
|
|
if (dsp)
|
|
*dsp = ds;
|
|
return ds->uuid;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* try to create a uniqe ID - fingers crossed */
|
|
static uint32_t dive_site_getUniqId()
|
|
{
|
|
uint32_t id = 0;
|
|
|
|
while (id == 0 || get_dive_site_by_uuid(id))
|
|
id = random() + random();
|
|
|
|
return id;
|
|
}
|
|
|
|
struct dive_site *alloc_dive_site()
|
|
{
|
|
int nr = dive_site_table.nr, allocated = dive_site_table.allocated;
|
|
struct dive_site **sites = dive_site_table.dive_sites;
|
|
|
|
if (nr >= allocated) {
|
|
allocated = (nr + 32) * 3 / 2;
|
|
sites = realloc(sites, allocated * sizeof(struct dive_site *));
|
|
if (!sites)
|
|
exit(1);
|
|
dive_site_table.dive_sites = sites;
|
|
dive_site_table.allocated = allocated;
|
|
}
|
|
struct dive_site *ds = calloc(1, sizeof(*ds));
|
|
if (!ds)
|
|
exit(1);
|
|
sites[nr] = ds;
|
|
dive_site_table.nr = nr + 1;
|
|
ds->uuid = dive_site_getUniqId();
|
|
return ds;
|
|
}
|
|
|
|
/* allocate a new site and add it to the table */
|
|
uint32_t create_dive_site(const char *name)
|
|
{
|
|
struct dive_site *ds = alloc_dive_site();
|
|
ds->name = copy_string(name);
|
|
|
|
return ds->uuid;
|
|
}
|
|
|
|
/* same as before, but with GPS data */
|
|
uint32_t create_dive_site_with_gps(const char *name, degrees_t latitude, degrees_t longitude)
|
|
{
|
|
struct dive_site *ds = alloc_dive_site();
|
|
ds->uuid = dive_site_getUniqId();
|
|
ds->name = copy_string(name);
|
|
ds->latitude = latitude;
|
|
ds->longitude = longitude;
|
|
|
|
return ds->uuid;
|
|
}
|