if ( tr->name )
g_free ( tr->name );
- if ( name && name[0] != '\0' )
- tr->name = g_strdup(name);
- else
- tr->name = NULL;
+ tr->name = g_strdup(name);
}
void vik_track_set_comment(VikTrack *tr, const gchar *comment)
g_free ( tr );
}
-VikTrack *vik_track_copy ( const VikTrack *tr )
+/**
+ * vik_track_copy:
+ * @tr: The Track to copy
+ * @copy_points: Whether to copy the track points or not
+ *
+ * Normally for copying the track it's best to copy all the trackpoints
+ * However for some operations such as splitting tracks the trackpoints will be managed separately, so no need to copy them.
+ *
+ * Returns: the copied VikTrack
+ */
+VikTrack *vik_track_copy ( const VikTrack *tr, gboolean copy_points )
{
VikTrack *new_tr = vik_track_new();
VikTrackpoint *new_tp;
GList *tp_iter = tr->trackpoints;
new_tr->visible = tr->visible;
new_tr->is_route = tr->is_route;
+ new_tr->has_color = tr->has_color;
+ new_tr->color = tr->color;
+ new_tr->bbox = tr->bbox;
new_tr->trackpoints = NULL;
- while ( tp_iter )
+ if ( copy_points )
{
- new_tp = g_malloc ( sizeof ( VikTrackpoint ) );
- *new_tp = *((VikTrackpoint *)(tp_iter->data));
- new_tr->trackpoints = g_list_append ( new_tr->trackpoints, new_tp );
- tp_iter = tp_iter->next;
+ while ( tp_iter )
+ {
+ new_tp = g_malloc ( sizeof ( VikTrackpoint ) );
+ *new_tp = *((VikTrackpoint *)(tp_iter->data));
+ new_tr->trackpoints = g_list_append ( new_tr->trackpoints, new_tp );
+ tp_iter = tp_iter->next;
+ }
}
vik_track_set_name(new_tr,tr->name);
vik_track_set_comment(new_tr,tr->comment);
return rv;
}
+/**
+ * track_recalculate_bounds_last_tp:
+ * @trk: The track to consider the recalculation on
+ *
+ * A faster bounds check, since it only considers the last track point
+ */
+static void track_recalculate_bounds_last_tp ( VikTrack *trk )
+{
+ GList *tpl = g_list_last ( trk->trackpoints );
+
+ if ( tpl ) {
+ struct LatLon ll;
+ // See if this trackpoint increases the track bounds and update if so
+ vik_coord_to_latlon ( &(VIK_TRACKPOINT(tpl->data)->coord), &ll );
+ if ( ll.lat > trk->bbox.north )
+ trk->bbox.north = ll.lat;
+ if ( ll.lon < trk->bbox.west )
+ trk->bbox.west = ll.lon;
+ if ( ll.lat < trk->bbox.south )
+ trk->bbox.south = ll.lat;
+ if ( ll.lon > trk->bbox.east )
+ trk->bbox.east = ll.lon;
+ }
+}
+
+/**
+ * vik_track_add_trackpoint:
+ * @tr: The track to which the trackpoint will be added
+ * @tp: The trackpoint to add
+ * @recalculate: Whether to perform any associated properties recalculations
+ * Generally one should avoid recalculation via this method if adding lots of points
+ * (But ensure calculate_bounds() is called after adding all points!!)
+ *
+ * The trackpoint is added to the end of the existing trackpoint list
+ */
+void vik_track_add_trackpoint ( VikTrack *tr, VikTrackpoint *tp, gboolean recalculate )
+{
+ tr->trackpoints = g_list_append ( tr->trackpoints, tp );
+ if ( recalculate )
+ track_recalculate_bounds_last_tp ( tr );
+}
+
gdouble vik_track_get_length(const VikTrack *tr)
{
gdouble len = 0.0;
gulong vik_track_get_tp_count(const VikTrack *tr)
{
- gulong num = 0;
- GList *iter = tr->trackpoints;
- while ( iter )
- {
- num++;
- iter = iter->next;
- }
- return num;
+ return g_list_length(tr->trackpoints);
}
gulong vik_track_get_dup_point_count ( const VikTrack *tr )
else
iter = iter->next;
}
+
+ // NB isn't really be necessary as removing duplicate points shouldn't alter the bounds!
+ vik_track_calculate_bounds ( tr );
+
return num;
}
else
iter = iter->next;
}
+
+ vik_track_calculate_bounds ( tr );
+
return num;
}
}
rv = g_malloc ( segs * sizeof(VikTrack *) );
- tr = vik_track_copy ( t );
+ tr = vik_track_copy ( t, TRUE );
rv[0] = tr;
iter = tr->trackpoints;
{
iter->prev->next = NULL;
iter->prev = NULL;
- rv[i] = vik_track_new();
- // TODO: consider new naming strategy here
- if ( tr->name )
- vik_track_set_name ( rv[i], tr->name );
- if ( tr->comment )
- vik_track_set_comment ( rv[i], tr->comment );
- if ( tr->description )
- vik_track_set_description ( rv[i], tr->description );
- rv[i]->visible = tr->visible;
- rv[i]->is_route = tr->is_route;
+ rv[i] = vik_track_copy ( tr, FALSE );
rv[i]->trackpoints = iter;
+
+ vik_track_calculate_bounds ( rv[i] );
+
i++;
}
}
void vik_track_reverse ( VikTrack *tr )
{
- GList *iter;
+ if ( ! tr->trackpoints )
+ return;
+
tr->trackpoints = g_list_reverse(tr->trackpoints);
/* fix 'newsegment' */
- iter = g_list_last ( tr->trackpoints );
+ GList *iter = g_list_last ( tr->trackpoints );
while ( iter )
{
if ( ! iter->next ) /* last segment, was first, cancel newsegment. */
pts[current_chunk] = current_gradient;
+ g_free ( altitudes );
+
return pts;
}
if (VIK_TRACKPOINT(iter->data)->timestamp > t_pos) {
if (iter->prev == NULL) /* first trackpoint */
break;
- time_t t_before = t_pos - VIK_TRACKPOINT(iter->prev)->timestamp;
+ time_t t_before = t_pos - VIK_TRACKPOINT(iter->prev->data)->timestamp;
time_t t_after = VIK_TRACKPOINT(iter->data)->timestamp - t_pos;
if (t_before <= t_after)
iter = iter->prev;
/* basic properties: */
new_tr->visible = ((VikTrack *)data)->visible;
new_tr->is_route = ((VikTrack *)data)->is_route;
+ new_tr->has_color = ((VikTrack *)data)->has_color;
+ new_tr->color = ((VikTrack *)data)->color;
+ new_tr->bbox = ((VikTrack *)data)->bbox;
data += sizeof(*new_tr);
return new_tr;
}
+/**
+ * (Re)Calculate the bounds of the given track,
+ * updating the track's bounds data.
+ * This should be called whenever a track's trackpoints are changed
+ */
+void vik_track_calculate_bounds ( VikTrack *trk )
+{
+ GList *tp_iter;
+ tp_iter = trk->trackpoints;
+
+ struct LatLon topleft, bottomright, ll;
+
+ // Set bounds to first point
+ if ( tp_iter ) {
+ vik_coord_to_latlon ( &(VIK_TRACKPOINT(tp_iter->data)->coord), &topleft );
+ vik_coord_to_latlon ( &(VIK_TRACKPOINT(tp_iter->data)->coord), &bottomright );
+ }
+ while ( tp_iter ) {
+
+ // See if this trackpoint increases the track bounds.
+
+ vik_coord_to_latlon ( &(VIK_TRACKPOINT(tp_iter->data)->coord), &ll );
+
+ if ( ll.lat > topleft.lat) topleft.lat = ll.lat;
+ if ( ll.lon < topleft.lon) topleft.lon = ll.lon;
+ if ( ll.lat < bottomright.lat) bottomright.lat = ll.lat;
+ if ( ll.lon > bottomright.lon) bottomright.lon = ll.lon;
+
+ tp_iter = tp_iter->next;
+ }
+
+ g_debug ( "Bounds of track: '%s' is: %f,%f to: %f,%f", trk->name, topleft.lat, topleft.lon, bottomright.lat, bottomright.lon );
+
+ trk->bbox.north = topleft.lat;
+ trk->bbox.east = bottomright.lon;
+ trk->bbox.south = bottomright.lat;
+ trk->bbox.west = topleft.lon;
+}
+
+/**
+ *
+ */
void vik_track_apply_dem_data ( VikTrack *tr )
{
GList *tp_iter;
}
}
-/*
+/**
+ * vik_track_apply_dem_data_last_trackpoint:
* Apply DEM data (if available) - to only the last trackpoint
*/
void vik_track_apply_dem_data_last_trackpoint ( VikTrack *tr )
}
}
-/* appends t2 to t1, leaving t2 with no trackpoints */
+/**
+ * vik_track_steal_and_append_trackpoints:
+ *
+ * appends t2 to t1, leaving t2 with no trackpoints
+ */
void vik_track_steal_and_append_trackpoints ( VikTrack *t1, VikTrack *t2 )
{
if ( t1->trackpoints ) {
- GList *tpiter = t1->trackpoints;
- while ( tpiter->next )
- tpiter = tpiter->next;
- tpiter->next = t2->trackpoints;
- t2->trackpoints->prev = tpiter;
+ t1->trackpoints = g_list_concat ( t1->trackpoints, t2->trackpoints );
} else
t1->trackpoints = t2->trackpoints;
t2->trackpoints = NULL;
+
+ // Trackpoints updated - so update the bounds
+ vik_track_calculate_bounds ( t1 );
}
-/* starting at the end, looks backwards for the last "double point", a duplicate trackpoint.
+/**
+ * vik_track_cut_back_to_double_point:
+ *
+ * starting at the end, looks backwards for the last "double point", a duplicate trackpoint.
* If there is no double point, deletes all the trackpoints.
- * Returns the new end of the track (or the start if there are no double points)
+ *
+ * Returns: the new end of the track (or the start if there are no double points)
*/
VikCoord *vik_track_cut_back_to_double_point ( VikTrack *tr )
{
projects / andy / viking.git / blobdiff