Skip to content

Commit

Permalink
fix SchemaArrayField/SchemaArrayData mismatch (#1177)
Browse files Browse the repository at this point in the history
* fix SchemaArrayField/SchemaArrayData mismatch

related to IGC additions from #1060 and #1054.

* retire global trait collection

* use class member to store track traits instead of fs data.

* fiddle with kml accumlate hash

* compute number of wp_fields

* correct bug concerning track specific traits.

* simplify multi-track array decisions.

* simplify kml multi-track schema decisions.
  • Loading branch information
tsteven4 authored Sep 14, 2023
1 parent 0a981dc commit 926f207
Show file tree
Hide file tree
Showing 10 changed files with 240 additions and 302 deletions.
25 changes: 0 additions & 25 deletions defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -248,30 +248,6 @@ class wp_flags
unsigned int marked_for_deletion:1; /* True if schedulded for deletion. */
};

// These are dicey as they're collected on read. Subsequent filters may change
// things, though it's unlikely to matter in practical terms. Don't use these
// if a false positive would be deleterious.
#
class global_trait
{
public:
global_trait() :
trait_geocaches(0),
trait_heartrate(0),
trait_cadence(0),
trait_power(0),
trait_depth(0),
trait_temperature(0),
trait_sat(0) {}
unsigned int trait_geocaches:1;
unsigned int trait_heartrate:1;
unsigned int trait_cadence:1;
unsigned int trait_power:1;
unsigned int trait_depth:1;
unsigned int trait_temperature:1;
unsigned int trait_sat:1;
};

/*
* Bounding box information.
*/
Expand Down Expand Up @@ -509,7 +485,6 @@ class WaypointList : private QList<Waypoint*>
using QList<Waypoint*>::size_type;
};

const global_trait* get_traits();
void waypt_init();
//void update_common_traits(const Waypoint* wpt);
void waypt_add(Waypoint* wpt);
Expand Down
Loading

0 comments on commit 926f207

Please sign in to comment.