[Navit-cvs-commit] SF.net SVN: navit:[3717] trunk/navit/navit/track.c

[<mar...@us...>]

Revision: 3717
          http://navit.svn.sourceforge.net/navit/?rev=3717&view=rev
Author:   martin-s
Date:     2010-11-24 12:05:59 +0000 (Wed, 24 Nov 2010)

Log Message:
-----------
Add:Core:Avoid tracking calculation if result is ignored anyway

Modified Paths:
--------------
    trunk/navit/navit/track.c

Modified: trunk/navit/navit/track.c
===================================================================
--- trunk/navit/navit/track.c	2010-11-23 19:45:22 UTC (rev 3716)
+++ trunk/navit/navit/track.c	2010-11-24 12:05:59 UTC (rev 3717)
@@ -597,13 +597,13 @@
 		value += tracking_angle_delta(tr, tr->curr_angle, t->angle[offset], sd->flags)*tr->angle_pref>>4;
 	if (value >= min)
 		return value;
-	if (flags & 4) 
+	if ((flags & 4)  && tr->connected_pref)
 		value += tracking_is_connected(tr, tr->last, &sd->c[offset]);
-	if (flags & 8) 
+	if ((flags & 8)  && tr->nostop_pref)
 		value += tracking_is_no_stop(tr, lpnt, &tr->last_out);
 	if (value >= min)
 		return value;
-	if (flags & 16)
+	if ((flags & 16) && tr->route_pref)
 		value += tracking_is_on_route(tr, tr->rt, &sd->item);
 	if ((flags & 32) && tr->overspeed_percent_pref && tr->overspeed_pref ) {
 		struct roadprofile *roadprofile=g_hash_table_lookup(tr->vehicleprofile->roadprofile_hash, (void *)t->street->item.type);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.