1.1 --- a/epoc32/include/lbsposition.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/lbsposition.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
1.5 // All rights reserved.
1.6 // This component and the accompanying materials are made available
1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
1.8 +// under the terms of "Eclipse Public License v1.0"
1.9 // which accompanies this distribution, and is available
1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
1.12 //
1.13 // Initial Contributors:
1.14 // Nokia Corporation - initial contribution.
1.15 @@ -17,7 +17,7 @@
1.16 #define __LBSPOSITION_H__
1.17
1.18 #include <e32std.h>
1.19 -#include <lbs/lbsvariant.h>
1.20 +#include <lbsvariant.h>
1.21
1.22 /**
1.23 @publishedAll
1.24 @@ -75,11 +75,11 @@
1.25 void NormalizeCoordinate();
1.26
1.27 protected:
1.28 - /** Latitude, defaults to WGS-84 format. */
1.29 + /** Latitude, defaults to WGS-84 format. Represented in degree. */
1.30 TReal64 iLatitude;
1.31 - /** Longitude, defaults to WGS-84 format. */
1.32 + /** Longitude, defaults to WGS-84 format. Represented in degree. */
1.33 TReal64 iLongitude;
1.34 - /** Altitude, defaults to WGS-84 format. */
1.35 + /** Altitude, defaults to WGS-84 format. Represented in meters. */
1.36 TReal32 iAltitude;
1.37 /** The ID of the datum the coordinate is in, defaults to WGS-84 format. */
1.38 TPositionDatumId iDatum;
1.39 @@ -200,36 +200,49 @@
1.40 IMPORT_C TCourse();
1.41
1.42 IMPORT_C TReal32 Speed() const;
1.43 + IMPORT_C TReal32 VerticalSpeed() const;
1.44 IMPORT_C TReal32 Heading() const;
1.45 IMPORT_C TReal32 Course() const;
1.46 - IMPORT_C TReal32 SpeedAccuracy() const;
1.47 - IMPORT_C TReal32 HeadingAccuracy() const;
1.48 +
1.49 + IMPORT_C TReal32 SpeedAccuracy() const;
1.50 + IMPORT_C TReal32 VerticalSpeedAccuracy() const;
1.51 + IMPORT_C TReal32 HeadingAccuracy() const;
1.52 IMPORT_C TReal32 CourseAccuracy() const;
1.53 -
1.54 - IMPORT_C void SetSpeed(TReal32 aSpeed);
1.55 - IMPORT_C void SetHeading(TReal32 aHeading);
1.56 +
1.57 +
1.58 + IMPORT_C void SetSpeed(TReal32 aSpeed);
1.59 + IMPORT_C void SetVerticalSpeed(TReal32 aVerticalSpeed);
1.60 + IMPORT_C void SetHeading(TReal32 aHeading);
1.61 IMPORT_C void SetSpeedAccuracy(TReal32 aSpeedAccuracy);
1.62 + IMPORT_C void SetVerticalSpeedAccuracy(TReal32 aVerticalSpeedAccuracy);
1.63 IMPORT_C void SetHeadingAccuracy(TReal32 aHeadingAccuracy);
1.64 IMPORT_C void SetCourse(TReal32 aCourse);
1.65 IMPORT_C void SetCourseAccuracy(TReal32 aCourseAccuracy);
1.66 +
1.67 +
1.68 +
1.69
1.70 protected:
1.71 /** Speed, in metres per second. */
1.72 TReal32 iSpeed;
1.73 - /** Heading, in degrees. */
1.74 + /** True Heading, in degrees. */
1.75 TReal32 iHeading;
1.76 /** Speed accuracy, in metres per second. */
1.77 TReal32 iSpeedAccuracy;
1.78 /** Heading accuracy, in degrees. */
1.79 TReal32 iHeadingAccuracy;
1.80 - /** Course, in degrees. */
1.81 + /** True Course, in degrees. */
1.82 TReal32 iCourse;
1.83 /** Course accuracy, in degrees. */
1.84 TReal32 iCourseAccuracy;
1.85 -
1.86 + /** Vertical Speed, in metres per second. */
1.87 + TReal32 iVerticalSpeed;
1.88 + /** Vertical Speed accuracy, in metres per second. */
1.89 + TReal32 iVerticalSpeedAccuracy;
1.90 +
1.91 private:
1.92 /** Unused variable for future expansion. */
1.93 - TUint8 iReserved[__LBS_TCOURSE_RESERVED_SIZE];
1.94 + TUint8 iReserved[8];
1.95 };
1.96
1.97 #endif //__LBSPOSITION_H__