FCL/sf/mw/qtextensions: comparison qtmobility/src/location/qgeopositioninfosource

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt Mobility Components.
 **
 return;
 }
 //update the list array with the available method initially
 updateDeviceStatus();
+// Set the PreferredPositioningMethods based on Supported methods
+QGeoPositionInfoSource::setPreferredPositioningMethods( mSupportedMethods );
 //devStatusUpdateAO->NotifyDeviceStatus(mStatusEvent);
 CleanupStack::PushL(mDevStatusUpdateAO);
 QGeoPositionInfo CQGeoPositionInfoSourceS60::lastKnownPosition(bool aFromSatellitePositioningMethodsOnly) const
 {
 QGeoPositionInfo posUpdate;
 TPosition pos;
-PositioningMethod type;
 TInt error = KErrNone;
 RPositioner iLastKnownpositioner;
 TRequestStatus status;
 error = iLastKnownpositioner.Open(*const_cast<RPositionServer*>(&mPositionServer));
 error = status.Int();
 iLastKnownpositioner.Close();
 if ((error == KErrNone) || (error == KPositionPartialUpdate)) {
-bool typeSet = false;
+TPositionModuleInfo modInfo;
-for (int i = 0;i < mListSize ;i++) {
+mPositionServer.GetModuleInfoById(posInfo.ModuleId(), modInfo);
-if (mList[i].mUid == posInfo.ModuleId()) {
-type = mList[i].mPosMethod;
+if(!aFromSatellitePositioningMethodsOnly || (aFromSatellitePositioningMethodsOnly && (modInfo.Capabilities() & TPositionModuleInfo::ECapabilitySatellite))){
-typeSet = true;
-break;
-}
-}
-if (!((aFromSatellitePositioningMethodsOnly == TRUE) && typeSet &&
-(type != SatellitePositioningMethods))) {
 QGeoCoordinate  coord;
 posInfo.GetPosition(pos);
 coord.setLatitude(pos.Latitude());
 //time taken for the subsequent fix
 time_to_next_fix = quality.TimeToNextFix();
 if ((i = checkModule(id)) == -1) {
+//update the properties of the module
+//TPositionModuleId of the module
+mList[mListSize].mUid = id;
+//positioning method method type
+mList[mListSize].mPosMethod = method;
+//status of the device
+mList[mListSize].mStatus = aStatus;
+//availablility of the module
+mList[mListSize].mIsAvailable = available;
+//horizontal accuracy of the module
+mList[mListSize].mHorizontalAccuracy = accuracy;
+//time required to get the first fix
+mList[mListSize].mTimeToFirstFix = time_to_first_fix;
+//time required for subsequent fix
+mList[mListSize].mTimeToNextFix = time_to_next_fix;
+//count on the mList array size
+mListSize++;
+//update the supported source types based on the device status
+updateAvailableTypes();
 //store the correct method in use from the mCurrentModuleId retireved earlier
 if (id == mCurrentModuleId) {
 mCurrentMethod = method;
-QGeoPositionInfoSource::setPreferredPositioningMethods(mCurrentMethod);
+}
-}
-//update the properties of the module
-//TPositionModuleId of the module
-mList[mListSize].mUid = id;
-//positioning method method type
-mList[mListSize].mPosMethod = method;
-//status of the device
-mList[mListSize].mStatus = aStatus;
-//availablility of the module
-mList[mListSize].mIsAvailable = available;
-//horizontal accuracy of the module
-mList[mListSize].mHorizontalAccuracy = accuracy;
-//time required to get the first fix
-mList[mListSize].mTimeToFirstFix = time_to_first_fix;
-//time required for subsequent fix
-mList[mListSize].mTimeToNextFix = time_to_next_fix;
-//count on the mList array size
-mListSize++;
 } else {
 //module's status has changed
 if (mList[i].mStatus != aStatus)
 mList[i].mStatus = aStatus;
 mList[i].mTimeToFirstFix = time_to_first_fix;
 //module's time to subsequent fix has changed
 if (mList[i].mTimeToNextFix != time_to_next_fix)
 mList[i].mTimeToFirstFix = time_to_next_fix;
+//update the supported source types based on the device status
+updateAvailableTypes();
 //if the mCurrentModuleId is NULL, try updating the reg update with the available
 //positioning method
 if (mCurrentModuleId == TUid::Null() && (available == TRUE) &&
 (aStatus != TPositionModuleStatus::EDeviceUnknown) &&
 mCurrentModuleId = mList[i].mUid;
 mCurrentMethod = mList[i].mPosMethod;
-QGeoPositionInfoSource::setPreferredPositioningMethods(mCurrentMethod);
 }
 }
 //check if the status of the currently used modules for regular update or
 //request update has changed
 //method
 mRegUpdateAO = temp;
 mCurrentModuleId = mList[index].mUid;
 mCurrentMethod = mList[index].mPosMethod;
-QGeoPositionInfoSource::setPreferredPositioningMethods(mCurrentMethod);
 mRegUpdateAO->setUpdateInterval(interval);
 //to be uncommented when startUpdates are done
 } else {
 //no methods available,clean up the resources
 mRegUpdateAO = NULL;
 mCurrentModuleId = TUid::Null();
 mCurrentMethod = PositioningMethod(0);
-QGeoPositionInfoSource::setPreferredPositioningMethods(mCurrentMethod);
 emit updateTimeout();
 }
 }
 }
 }   //end else
-//update the supported source types based on the device status
-updateAvailableTypes();
 }
 // Notification methods from active object. Notifies device status changes
 void CQGeoPositionInfoSourceS60::updateDeviceStatus(void)
 updateStatus(moduleInfo, moduleStatus.DeviceStatus());
 mModuleFlags |= (1 << i);
 }
 } else {
-//UpdateDeviceStatus() called afetr registering for NotifyModuleStatusEvent
+//UpdateDeviceStatus() called after registering for NotifyModuleStatusEvent
 //get the module id from the status event
 TPositionModuleId id = mStatusEvent.ModuleId();
 //get module information
 mRegUpdateAO->cancelUpdate();
 }
 void CQGeoPositionInfoSourceS60::setPreferredPositioningMethods(PositioningMethods aMethods)
 {
+QGeoPositionInfoSource::setPreferredPositioningMethods(aMethods);
 PositioningMethods preferredMethod(PositioningMethods(0));
 TInt index = -1;
 // the poistioning methods are not supported
 // if the preferred positioning method is the current poistioning
 //possibility of the minimumupdateinterval being changed
 if (value != updateInterval)
 QGeoPositionInfoSource::setUpdateInterval(value);
 }
-QGeoPositionInfoSource::setPreferredPositioningMethods(mCurrentMethod);
 }
 }
 void CQGeoPositionInfoSourceS60::setUpdateInterval(int aMilliSec)

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411