FCL/sf/mw/mds: comparison locationmanager/locationtrail/src/clocationrecord.cpp

equal deleted inserted replaced

-:aa5a574040a4
+:a93990e5815e
 #include <lbserrors.h>
 #include <lbssatellite.h>
 #include <ecom.h>
 #include <centralrepository.h>
 #include <hwrmpowerstatesdkpskeys.h>
+#ifdef LOC_GEOTAGGING_CELLID
+#include <lbslocationinfo.h>
+#endif //LOC_GEOTAGGING_CELLID
 #include "rlocationtrail.h"
 #include "clocationrecord.h"
 #include "cnetworkinfo.h"
 #include "locationmanagerdebug.h"
 #ifdef LOC_REVERSEGEOCODE
 ,iConnectionOption(ESilent)
 	,iImageQuery(NULL)
 	,iTagQuery(NULL)
 ,iTagCreator( NULL )
+,iLastReverseGeocodeFails(EFalse)
 	,iRevGeocoderPlugin( NULL )
 #endif
 {
 iMaxTrailSize = KMaxTrailLength / KUpdateInterval;
 }
 iNetworkInfoTimer = CPeriodic::NewL( CActive::EPriorityStandard );
 #ifdef LOC_REVERSEGEOCODE
 iTagCreator = CTagCreator::NewL();
+iRevGeocoderPlugin = reinterpret_cast<CReverseGeoCoderPlugin*>(
-if (!iRevGeocoderPlugin)
+REComSession::CreateImplementationL(KReverseGeoCodeUid,iDtorKey));
-{
-iRevGeocoderPlugin = reinterpret_cast<CReverseGeoCoderPlugin*>(
+iRevGeocoderPlugin->AddObserverL(*this);
-REComSession::CreateImplementationL(KReverseGeoCodeUid,iDtorKey));
-if(iRevGeocoderPlugin)
-{
-iRevGeocoderPlugin->AddObserverL(*this);
-}
-}
 #endif
 TInt interval( 0 );
 #ifdef LOC_REVERSEGEOCODE
 iLocationItems.ResetAndDestroy();
 iLocationItems.Close();
 #endif
 delete iNetworkInfoChangeListener;
+iNetworkInfoChangeListener = NULL;
 delete iPositionInfo;
+iPositionInfo = NULL;
 delete iNetworkInfoTimer;
+iNetworkInfoTimer = NULL;
 #ifdef LOC_GEOTAGGING_CELLID
 if(iGeoConverter)
 {
 delete iGeoConverter;
 iGeoConverter = NULL;
 _LIT( KDateTimeFormat, "%Y/%M/%D %H:%T:%S" );
 const TInt DateTimeStrMaxLength = 20;
 LOG1( "CLocationRecord::GetLocationByTimeL - aTime: %Ld", aTime.Int64() );
 TBuf<DateTimeStrMaxLength> str1;
 aTime.FormatL( str1, KDateTimeFormat );
-// LOG1( "CLocationRecord::GetLocationByTimeL - aTime: %S", &str1 );
+LOG1( "CLocationRecord::GetLocationByTimeL - aTime: %S", &str1 );
 #endif
 TTimeIntervalSeconds interval;
 TTimeIntervalSeconds nextInterval;
 for ( TInt i(iTrail.Count()-1) ; i >= 0 && !posFound ; i-- )
 #ifdef _DEBUG
 LOG1( "CLocationRecord::GetLocationByTimeL - Trail timestamp: %Ld", iTrail[i]->iTimeStamp.Int64() );
 TBuf<DateTimeStrMaxLength> str;
 iTrail[i]->iTimeStamp.FormatL( str, KDateTimeFormat );
-//LOG1( "CLocationRecord::GetLocationByTimeL - Trail timestamp: %S", &str );
+LOG1( "CLocationRecord::GetLocationByTimeL - Trail timestamp: %S", &str );
 LOG1( "CLocationRecord::GetLocationByTimeL - timeDiff: %d", timeDiff );
 #endif
 if ( err == KErrNone && timeDiff <= KMaximumIntervalSeconds )
 {
 iNetwork = aNetworkInfo;
 if (iNetwork.iAccess == CTelephony::ENetworkAccessUtran)
 	{
 	iNetwork.iLocationAreaCode = 0;
 	}
+#ifdef LOC_GEOTAGGING_CELLID
 if ( iState == RLocationTrail::ETrailStarting && iTrailStarted )
 	{
 	SetCurrentState( RLocationTrail::ETrailStarted );
 	}
+#endif
 }
 else
 {
 LOG1("CLocationRecord::NetworkInfo - %d", aError );
 iNetwork = CTelephony::TNetworkInfoV1();
 LOG1( "CLocationRecord::SetCurrentState(), begin, state:%d", aState );
 iState = aState;
 if( iTrailStarted )
 {
 // Set the property only when trail is started to avoid icon flickering and wrong icon update in UI
-if( iGpsDataAvailableFlag  ||
+if( iGpsDataAvailableFlag
-iNetwork.iCellId > 0 &&
+#ifdef LOC_GEOTAGGING_CELLID
+|| ( iNetwork.iCellId > 0 &&
 ((iNetwork.iLocationAreaCode == 0 && iNetwork.iAccess == CTelephony::ENetworkAccessUtran) || // 3G
 (iNetwork.iLocationAreaCode > 0 && (iNetwork.iAccess == CTelephony::ENetworkAccessGsm ||  // 2G
 						iNetwork.iAccess == CTelephony::ENetworkAccessGsmCompact)))  &&
 iNetwork.iCountryCode.Length() > 0 &&
 iNetwork.iNetworkId.Length() > 0 )
+#endif // LOC_GEOTAGGING_CELLID
+)
 {
 // set the value 3 to have Geo tag available icon else not available.
 iProperty.Set( KPSUidLocationTrail, KLocationTrailState,
 (TInt) RLocationTrail::ETrailStarted );
 }
 				lastnet->iCountryCode == net->iCountryCode &&
 				lastnet->iNetworkId == net->iNetworkId )
 			{
 			// if both locations have valid coordinates, calculate distance between points
-			if ( !Math::IsNaN( lastLocationData.iPosition.Latitude() ) &&
+			if (
+#ifdef LOC_REVERSEGEOCODE
+!iLastReverseGeocodeFails &&
+#endif //LOC_REVERSEGEOCODE
+!Math::IsNaN( lastLocationData.iPosition.Latitude() ) &&
 					!Math::IsNaN( lastLocationData.iPosition.Longitude() ) &&
 					!Math::IsNaN( locationData.iPosition.Latitude() ) &&
 					!Math::IsNaN( locationData.iPosition.Longitude() ))
 				{
 				TReal32 distance;
 }
 const TReal64 KMeterInDegrees = 0.000009;
 const TReal64 KPi = 3.14159265358979;
 const TReal32 K180Degrees = 180.0;
-//TLocationData locationData = iMediaItems[0].iLocationData;
 TReal64 latitude = iMediaItems[0]->iLocationData.iPosition.Latitude();
 TReal64 longitude = iMediaItems[0]->iLocationData.iPosition.Longitude();
 // calculate distance in degrees
 TReal64 cosine;
 	// location related properties
 	if ( !Math::IsNaN( aLocationData.iPosition.Latitude() ) &&
 		 !Math::IsNaN( aLocationData.iPosition.Longitude() ))
 		{
+LOG1("Lan - %f", aLocationData.iPosition.Latitude());
+LOG1("Lon - %f", aLocationData.iPosition.Longitude());
 		locationObject->AddReal64PropertyL( *iLatitudeDef, aLocationData.iPosition.Latitude() );
 		locationObject->AddReal64PropertyL( *iLongitudeDef, aLocationData.iPosition.Longitude() );
 		}
 	if ( !Math::IsNaN( aLocationData.iPosition.Altitude() ) )
 		{
 		locationObject->AddReal32PropertyL( qualityDef, aLocationData.iQuality );
 		}
 	// network related properties
-	if ( aLocationData.iNetworkInfo.iAreaKnown )
+	if ( aLocationData.iNetworkInfo.iAccess != CTelephony::ENetworkAccessUnknown )
 		{
-		if ( aLocationData.iNetworkInfo.iAccess != CTelephony::ENetworkAccessUnknown )
+		LOG1("Cell id - %d", aLocationData.iNetworkInfo.iCellId);
-			{
+		locationObject->AddUint32PropertyL( cellIdDef, aLocationData.iNetworkInfo.iCellId );
-			locationObject->AddUint32PropertyL( cellIdDef, aLocationData.iNetworkInfo.iCellId );
+		}
+	if ( aLocationData.iNetworkInfo.iAreaKnown &&
-			}
+aLocationData.iNetworkInfo.iLocationAreaCode != 0 &&
-		if ( aLocationData.iNetworkInfo.iLocationAreaCode != 0 &&
+		aLocationData.iNetworkInfo.iAccess != CTelephony::ENetworkAccessUnknown )
-			aLocationData.iNetworkInfo.iAccess != CTelephony::ENetworkAccessUnknown )
+		{
-			{
+		LOG1("Areacode - %d", aLocationData.iNetworkInfo.iLocationAreaCode);
-			locationObject->AddUint32PropertyL( locationCodeDef,
+		locationObject->AddUint32PropertyL( locationCodeDef,
-					aLocationData.iNetworkInfo.iLocationAreaCode );
+				aLocationData.iNetworkInfo.iLocationAreaCode );
+		}
-			}
+#ifdef _DEBUG
-		if ( aLocationData.iNetworkInfo.iCountryCode.Length() > 0 )
+TLex lexer( aLocationData.iNetworkInfo.iCountryCode );
-			{
+TUint countryCode = 0;
-			locationObject->AddTextPropertyL( countryCodeDef,
-					aLocationData.iNetworkInfo.iCountryCode );
+User::LeaveIfError( lexer.Val( countryCode, EDecimal) );
+LOG1("Country code - %d", countryCode);
-			}
-		if ( aLocationData.iNetworkInfo.iNetworkId.Length() > 0 )
+//Set mobile network code
-			{
+lexer = aLocationData.iNetworkInfo.iNetworkId;
-			locationObject->AddTextPropertyL(networkCodeDef, aLocationData.iNetworkInfo.iNetworkId);
+TUint networkCode = 0;
+User::LeaveIfError( lexer.Val( networkCode, EDecimal) );
-			}
+LOG1("Network id - %d", networkCode);
+#endif
+	if ( aLocationData.iNetworkInfo.iCountryCode.Length() > 0 )
+		{
+		locationObject->AddTextPropertyL( countryCodeDef,
+				aLocationData.iNetworkInfo.iCountryCode );
+		}
+	if ( aLocationData.iNetworkInfo.iNetworkId.Length() > 0 )
+		{
+		locationObject->AddTextPropertyL(networkCodeDef, aLocationData.iNetworkInfo.iNetworkId);
 		}
 	// Add the location object to the database.
 	locationObjectId = iMdeSession->AddObjectL( *locationObject );
+LOG1("Location id - %d", locationObjectId);
 	CleanupStack::PopAndDestroy( locationObject );
 LOG( "CLocationRecord::DoCreateLocationL(), end" );
 	return locationObjectId;
 	}
 void CLocationRecord::HandleFindLocationFromDB()
 {
 LOG( "CLocationRecord::HandleFindLocationFromDB(), begin" );
 	if ( iMediaItems.Count() > 0 )
 	   {
-		//TODO: by module owner
 		TInt trapErr = KErrNone;
 		TRAP(trapErr,FindLocationFromDBL());
 		// no memory, don't proceed further
 		// other error sceenario, we can move the node to the end and process the next
 		if(trapErr != KErrNoMemory && trapErr != KErrNone)
 iGeoConverter->ConvertL(iMediaItems[0]->iLocationData.iNetworkInfo);
 iMediaHandlingFlag |= KSnapGeoConvertInProgress;
 iMediaHandlingFlag &= ~KSnapGeoConvertInPendingState;
 }
 #else
+// cell id based geo tagging is not supported.. go for remapping.
 locationId = DoCreateLocationL( iMediaItems[0]->iLocationData );
 iMediaItems[0]->iLocationId = locationId;
-CreateRelationL( iMediaItems[0]->iObjectId, locationId );
+TItemId relationId = CreateRelationL( iMediaItems[0]->iObjectId, locationId );
 TLocationSnapshotItem* firstPtr = iMediaItems[0];
+// Go for remapping.. get locationdata from trail with object time
+TTime timestamp = GetMdeObjectTimeL( iMediaItems[0]->iObjectId );
+TRemapItem remapItem;
+remapItem.iObjectId = iMediaItems[0]->iObjectId;
+remapItem.iTime = timestamp;
+remapItem.iLocationId = locationId;
+remapItem.iRelationId = relationId;
+iRemapper->Append( remapItem );
 iMediaItems.Remove(0);
 delete firstPtr;
 iMediaItems.Compress();
 iMediaHandlingFlag &= ~KLocationQueryInProgress;
 if ( iMediaItems.Count() > 0 )
 iNewItem.iLocationData.iPosition.SetCoordinate
 ( aPosition.Latitude(), aPosition.Longitude(), aPosition.Altitude());
 iNewItem.iLocationData.iQuality = aPosition.HorizontalAccuracy();
 TItemId locationId = DoCreateLocationL( iNewItem.iLocationData );
 iRemapper->UpdateRelationsL( locationId );
-// TODO: remap.
 #ifdef LOC_REVERSEGEOCODE
 if(!(iMediaHandlingFlag & KReverseGeoCodingInProgress))
 {
 iRemapState = ERemapRevGeoCodeInProgress;
 //Find the address by coordinate, results a call to ReverseGeocodeComplete()
 ( aPosition.Latitude(), aPosition.Longitude(), aPosition.Altitude());
 iMediaItems[0]->iLocationData.iQuality = aPosition.HorizontalAccuracy();
 TLocationSnapshotItem* item = iMediaItems[0];
 TItemId locationId = DoCreateLocationL( iMediaItems[0]->iLocationData );
 iMediaItems[0]->iLocationId = locationId;
-CreateRelationL( iMediaItems[0]->iObjectId, locationId );
+TItemId relationId = CreateRelationL( iMediaItems[0]->iObjectId, locationId );
+// Go for remapping.. get locationdata from trail with object time
+TTime timestamp = GetMdeObjectTimeL( iMediaItems[0]->iObjectId );
+TRemapItem remapItem;
+remapItem.iObjectId = iMediaItems[0]->iObjectId;
+remapItem.iTime = timestamp;
+remapItem.iLocationId = locationId;
+remapItem.iRelationId = relationId;
+iRemapper->Append( remapItem );
 if((iMediaItems[0]->iFlag & KSnapMediaFile) > 0)
 {
 iLastMediaItem = *(iMediaItems[0]);
 }
 iMediaItems.Remove(0);
 iRemapState = ERemapProgressNone;
 }
 else if ( iMediaItems.Count() > 0 )
 {
 TLocationSnapshotItem* item = iMediaItems[0];
+// Fails may be becuase of n/w reason..create location + relation so that we can handle at 3:00 AM.
+TItemId locationId = DoCreateLocationL( iMediaItems[0]->iLocationData );
+iMediaItems[0]->iLocationId = locationId;
+TItemId relationId = CreateRelationL( iMediaItems[0]->iObjectId, locationId );
+// Go for remapping.. get locationdata from trail with object time
+TTime timestamp = GetMdeObjectTimeL( iMediaItems[0]->iObjectId );
+TRemapItem remapItem;
+remapItem.iObjectId = iMediaItems[0]->iObjectId;
+remapItem.iTime = timestamp;
+remapItem.iLocationId = locationId;
+remapItem.iRelationId = relationId;
+iRemapper->Append( remapItem );
 iMediaItems.Remove(0);
 iMediaItems.Compress();
 iMediaHandlingFlag &= ~KLocationQueryInProgress;
 delete item;
 }
 cond.AddPropertyConditionL( networkCodeDef, ETextPropertyConditionCompareEquals,
 iMediaItems[0]->iLocationData.iNetworkInfo.iNetworkId );
 iNetLocationQuery->FindL(1, 1);
 iMediaHandlingFlag |= KLocationQueryInProgress;
-//    iMediaHandlingFlag |= KNetQueryInProgress;
 }
 else
 {
 TLocationSnapshotItem* firstPtr = iMediaItems[0];
 iMediaItems.Remove(0);
 TItemId countryTagId(0);
 TItemId cityTagId(0);
 iMediaHandlingFlag &= (~KReverseGeoCodingInProgress);
 	TLocationSnapshotItem* snapshotItem = NULL;
+LOG1("Error - %d", aErrorcode);
 if( aErrorcode == KErrNone )
 {
+iLastReverseGeocodeFails = EFalse;
 TPtrC countryPtr( aAddressInfo.GetCountryName() );
 TPtrC cityPtr( aAddressInfo.GetCity() );
 TRAP_IGNORE( iTagCreator->CreateLocationTagsL( countryPtr, countryTagId,
 cityPtr, cityTagId ) );
 if ( iRemapState == ERemapRevGeoCodeInProgress)
 iLocationItems[0]->iCityTagId = cityTagId;
 iLastLocationItem = (*iLocationItems[0]);
 TRAP_IGNORE( iTagCreator->AttachTagsL(
 iLocationItems[0]->iObjectId, countryTagId, cityTagId  ) );
+if ( (iLastMediaItem.iFlag & KSnapMediaFile) > 0
+&& iLastMediaItem.iLocationId == iLastLocationItem.iLocationId )
+{
+LOG("Updating country/city\n");
+iLastMediaItem.iCountryTagId = countryTagId;
+iLastMediaItem.iCityTagId = cityTagId;
+}
 }
 }
-if(iLastMediaItem.iFlag == 0)
-{
-LOG("Last media item is null\n");
-}
-if ( iLastMediaItem.iFlag > 0 && iLastMediaItem.iLocationId == iLastLocationItem.iLocationId )
-{
-LOG("Updating country/city\n");
-iLastMediaItem.iCountryTagId = countryTagId;
-iLastMediaItem.iCityTagId = cityTagId;
-}
 //check other items in the array has same location
 for ( TInt index = iLocationItems.Count() - 1; index > 0; index--)
 {
 if ( iLocationItems[index]->iLocationId == iLastLocationItem.iLocationId )
 {
 }
 }
 else
 {
 //handle error
+LOG("Reverse geo coding fails");
+iLastReverseGeocodeFails = ETrue;
 }
 //irrespective of error or not, remove current(first) item to proceed further
 if ( iLocationItems.Count() > 0 )
 {

changeset 45	a93990e5815e
parent 36	aa5a574040a4
child 52	40db28bb26b8