mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: move dive-site functions into class

Browse source 
In analogy to the previous commit for dive-site-table.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-11 15:01:37 +02:00 • committed by bstoeger
parent 76c52c87a3
commit 2de6f69c19
20 changed files with 69 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/parse.cpp
View file

@ -200,7 +200,7 @@ void dive_site_end(struct parser_state *state)
return;
struct dive_site *ds = state->log->sites->alloc_or_get(state->cur_dive_site->uuid);
merge_dive_site(ds, state->cur_dive_site.get());
ds->merge(*state->cur_dive_site);
if (verbose > 3)
printf("completed dive site uuid %x8 name {%s}\n", ds->uuid, ds->name.c_str());
@ -484,11 +484,11 @@ void add_dive_site(const char *ds_name, struct dive *dive, struct parser_state *
struct dive_site *exact_match = state->log->sites->get_by_gps_and_name(trimmed, &ds->location);
if (exact_match) {
unregister_dive_from_dive_site(dive);
add_dive_to_dive_site(dive, exact_match);
exact_match->add_dive(dive);
} else {
struct dive_site *newds = state->log->sites->create(trimmed.c_str());
unregister_dive_from_dive_site(dive);
add_dive_to_dive_site(dive, newds);
newds->add_dive(dive);
if (has_location(&state->cur_location)) {
// we started this uuid with GPS data, so lets use those
newds->location = state->cur_location;
@ -501,10 +501,10 @@ void add_dive_site(const char *ds_name, struct dive *dive, struct parser_state *
} else if (dive->dive_site != ds) {
// add the existing dive site to the current dive
unregister_dive_from_dive_site(dive);
add_dive_to_dive_site(dive, ds);
ds->add_dive(dive);
}
} else {
add_dive_to_dive_site(dive, state->log->sites->create(trimmed));
state->log->sites->create(trimmed)->add_dive(dive);
}
}
}