diff -r b73a2e62868f -r 6752808b2036 locationmanager/locationtrail/inc/locationtraildefs.h
--- a/locationmanager/locationtrail/inc/locationtraildefs.h	Tue Feb 02 00:24:33 2010 +0200
+++ b/locationmanager/locationtrail/inc/locationtraildefs.h	Fri Feb 19 23:14:48 2010 +0200
@@ -34,11 +34,15 @@
 
 const TInt KTrackLogBufSize = 10;
 
-const TInt KLocationTrailShutdownDelay = 180;
+const TInt KLocationTrailShutdownDelay = 60;
+
+const TInt KLocationTrailRemappingCheckDelay = 15;
 
-const TInt KLocationDelta = 30;
+const TInt KLocationTrailRemapShutdownDelay = 360;
 
-const TInt KRemappingTime = 600;
+const TInt KLocationDelta = 20;
+
+const TInt KRemappingTime = 480;
 
 const TInt KFirstInterval = 1000000; // 1 second
 
@@ -116,6 +120,12 @@
  */
 const TUint32 KRemappingTimeKey = 0x00000006;
 
+/**
+ * Key for reading location trail timeout value from 
+ * Central repository if items are still to be remapped.
+ */
+const TUint32 KLocationTrailRemapShutdownTimer = 0x00000007;
+
 #endif // __LOCATIONTRAILDEFS_H__
 
 // End of file.