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

equal deleted inserted replaced

-:f23c07ec56e2
+:85f623e1ef41
 iGpsDataAvailableFlag = EFalse;
 if ( !iTrailStarted || iState == RLocationTrail::ETrailStopped)
 {
-	LOG("CLocationRecord::Position(), trail not started/stopped");
+	LOG("trail not started/stopped");
 iPositionInfo->Stop();
 return;
 }
 // all cases store the location..
 StoreLocation( positionSatelliteInfo );
 {
 case KPositionPartialUpdate: // fall through
 case KPositionQualityLoss:
 {
 // Location is stored, even if it may not be valid.
-LOG("CLocationRecord::Position(), Partial update");
+LOG("Partial update");
 if ( iState != RLocationTrail::EWaitingGPSData &&
 	 iState != RLocationTrail::ETrailStopping )
 {
 SetCurrentState( RLocationTrail::EWaitingGPSData );
-	LOG("CLocationRecord::Position(), Trail waiting for gps");
+	LOG("Trail waiting for gps");
 }
 break;
 }
 case KErrNone:
 {
-LOG("CLocationRecord::Position(), Good GPS coordinates");
+LOG("Good GPS coordinates");
 iGpsDataAvailableFlag = ETrue;
 if ( iState != RLocationTrail::ETrailStarted )
 {
 if ( iRemapper )
 	{
-	LOG("CLocationRecord::Position(), Start remapping");
+	LOG("Start remapping");
 		iRemapper->StartRemappingObjects( iNewItem.iLocationData );
 if( iObserver->WaitForPositioningStopTimeout() && !RemappingNeeded() )
 		    {
 iObserver->RemapedCompleted();
 }
 break;
 }
 default:
 {
-LOG1("CLocationRecord::Position(), Searching GPS, aError %d", aError );
+LOG1("Searching GPS, aError %d", aError );
 if ( iState != RLocationTrail::ESearchingGPS &&
 	 iState != RLocationTrail::ETrailStopping )
 {
 SetCurrentState( RLocationTrail::ESearchingGPS );
 	LOG("Trail searching gps");
 }
 break;
 }
 }
 TBool fixState = CheckGPSFix( positionSatelliteInfo );
-LOG1( "CLocationRecord::Position(), fixState %d", fixState );
+LOG1( "fixState %d", fixState );
-LOG1( "CLocationRecord::Position(), iLastGPSFixState %d", iLastGPSFixState );
+LOG1( "iLastGPSFixState %d", iLastGPSFixState );
 if ( iObserver && iLastGPSFixState != fixState )
 	{
-	LOG("CLocationRecord::Position(), Quality changed");
+	LOG("Quality changed");
 	iObserver->GPSSignalQualityChanged( positionSatelliteInfo );
 	}
 	iLastGPSFixState = fixState;
 net->iCountryCode.Length() == 0 &&
 net->iNetworkId.Length() == 0 )
 {
 // no n/w info... put it into remap.
 // remove the last appended element.
-LOG("CLocationRecord::LocationSnapshotL(), No network info (offline mode + no GPS fix), keep for remapping");
+LOG("No network info (offline mode + no GPS fix), keep for remapping");
 			TRemapItem remapItem;
 			remapItem.iObjectId = aObjectId;
 			remapItem.iTime = timestamp;
 			iRemapper->Append( remapItem );
 			TLocationSnapshotItem* firstPtr = iMediaItems[iMediaItems.Count() - 1];
 			iMediaItems.Remove(iMediaItems.Count() - 1);
 			iMediaItems.Compress();
-if( firstPtr == newItem)
+			delete firstPtr;
-{
-newItem = NULL;
-}
-delete firstPtr;
-firstPtr = NULL;
 }
 else
 {
 // n/w info available
 NetworkInfoSnapshotL();
 }
 		}
 	else if ( Math::IsNaN( locationData.iPosition.Latitude() ) &&
 			Math::IsNaN( locationData.iPosition.Longitude() ))
 		{
-LOG("CLocationRecord::LocationSnapshotL(), coordinates empty with or without cellular info")
 	    // coordinates empty, with or without cellular info
 		if ( net->iCellId == 0 &&
 				net->iLocationAreaCode == 0 &&
 				net->iCountryCode.Length() == 0 &&
 				net->iNetworkId.Length() == 0 )
 			{
-LOG("CLocationRecord::LocationSnapshotL(), No network info (offline mode + no GPS fix), keep for remapping");
+LOG("No network info (offline mode + no GPS fix), keep for remapping");
 			TRemapItem remapItem;
 			remapItem.iObjectId = aObjectId;
 			remapItem.iTime = timestamp;
 			iRemapper->Append( remapItem );
 			TLocationSnapshotItem* firstPtr = iMediaItems[iMediaItems.Count() - 1];
 			iMediaItems.Remove(iMediaItems.Count() - 1);
 			iMediaItems.Compress();
-if( firstPtr == newItem)
+			delete firstPtr;
-{
-newItem = NULL;
-}
-delete firstPtr;
-firstPtr = NULL;
 			}
 		// check match for last created locationobject
 #ifdef LOC_REVERSEGEOCODE
 		else if ( (iLastMediaItem.iFlag & KSnapMediaFile) > 0 &&
 iLastMediaItem.iCountryTagId > 0)
 #else
 else if ( (iLastMediaItem.iFlag & KSnapMediaFile) > 0)
 #endif //LOC_REVERSEGEOCODE
 			{
-LOG("CLocationRecord::LocationSnapshotL(), last created locationobject match" );
 			TLocationData lastLocationData = iLastMediaItem.iLocationData;
 			CTelephony::TNetworkInfoV1* lastnet = &lastLocationData.iNetworkInfo;
 			// networkinfo changed from last location
 			if ( lastnet->iCellId == net->iCellId &&
 #endif //LOC_REVERSEGEOCODE
 // remove the current item.
 				TLocationSnapshotItem* firstPtr = iMediaItems[iMediaItems.Count() - 1];
 				iMediaItems.Remove(iMediaItems.Count() - 1);
 				iMediaItems.Compress();
-	            if( firstPtr == newItem)
+				delete firstPtr;
-	                {
-	                newItem = NULL;
-	                }
-	            delete firstPtr;
-	            firstPtr = NULL;
 				}
 			}
-if (  newItem && !previousMatch )
+		if ( !previousMatch )
 		    {
 			// go for n/w based
 newItem->iFlag |= KNetQueryBit;
 		    }
 		}
 	// valid coordinates found
 	else if ( lastLocationId != 0 &&
 ((iLastMediaItem.iFlag & KSnapMediaFile) > 0))
 		{
-LOG("CLocationRecord::LocationSnapshotL(), valid coordinates found");
 TLocationData lastLocationData = iLastMediaItem.iLocationData;
 		CTelephony::TNetworkInfoV1* lastnet = &lastLocationData.iNetworkInfo;
 		// first check if networkinfo matches last created location
 		if ( lastnet->iCellId == net->iCellId &&
 				TReal32 distance;
 				TInt err = locationData.iPosition.Distance(lastLocationData.iPosition, distance);
 				if ( distance < iLocationDelta )
 					{
-					LOG("CLocationRecord::LocationSnapshotL(), location close to the previous one");
+					LOG("location close to the previous one");
 					previousMatch = ETrue;
 					CreateRelationL( aObjectId, lastLocationId );
 #ifdef LOC_REVERSEGEOCODE
 					// attach same tags associated to last location
 					    iTagCreator->AttachTagsL(
 					          aObjectId, iLastMediaItem.iCountryTagId, iLastMediaItem.iCityTagId );
 TLocationSnapshotItem* firstPtr = iMediaItems[iMediaItems.Count() - 1];
 iMediaItems.Remove(iMediaItems.Count() - 1);
 iMediaItems.Compress();
-if( firstPtr == newItem)
+delete firstPtr;
-{
-newItem = NULL;
-}
-delete firstPtr;
-firstPtr = NULL;
 					    }
-					else if (newItem)
+					else
 					    {
 					    // country tag not found.. go for reverse geocoding..
 					    newItem->iLocationId = lastLocationId;
 					    iLocationItems.Append( newItem );
 						iMediaItems.Remove(iMediaItems.Count() - 1);
 #else
 // remove from the queue
 TLocationSnapshotItem* firstPtr = iMediaItems[iMediaItems.Count() - 1];
 iMediaItems.Remove(iMediaItems.Count() - 1);
 iMediaItems.Compress();
-if( firstPtr == newItem)
+delete firstPtr;
-{
-newItem = NULL;
-}
-delete firstPtr;
-firstPtr = NULL;
 #endif //LOC_REVERSEGEOCODE
 					}
 				}
 			}
 LOG( "CLocationRecord::FindLocationFromDBL(), begin" );
 if(((iMediaHandlingFlag & KLocationQueryInProgress)> 0)
 	     || (iMediaItems.Count() <= 0))
 {
 		// query is in progress or queue is empty
-		LOG1( "CLocationRecord::FindLocationFromDBL(), Count - %d", iMediaItems.Count() );
+		LOG1( "query is in progress or queue is empty. Count - %d", iMediaItems.Count() );
 return;
 }
 if ( (iMediaItems[0]->iFlag & KNetQueryBit) > 0 )
 {
 		 // n/w based.
 iLocationQuery = iMdeSession->NewObjectQueryL( *iNamespaceDef, *iLocationObjectDef, this );
 CMdELogicCondition& cond = iLocationQuery->Conditions();
 cond.SetOperator( ELogicConditionOperatorAnd );
-LOG1( "CLocationRecord::FindLocationFromDBL(), latitude: %f", latitude);
+LOG1( "latitude: %f", latitude);
-LOG1( "CLocationRecord::FindLocationFromDBL(), latdelta: %f", latDelta);
+LOG1( "latdelta: %f", latDelta);
-LOG1( "CLocationRecord::FindLocationFromDBL(), longitude: %f", longitude);
+LOG1( "longitude: %f", longitude);
-LOG1( "CLocationRecord::FindLocationFromDBL(), londelta: %f", lonDelta);
+LOG1( "londelta: %f", lonDelta);
 cond.AddPropertyConditionL( *iLatitudeDef,
 TMdERealBetween( latitude - latDelta, latitude + latDelta ));
 cond.AddPropertyConditionL( *iLongitudeDef,
 TMdERealBetween( longitude - lonDelta, longitude + lonDelta ));
 	locationObject->AddTimePropertyL( modifiedDef, timestamp );
 	locationObject->AddUint32PropertyL( sizeDef, 0 ); // always zero size for location objects
 	locationObject->AddTextPropertyL( itemTypeDef, Location::KLocationItemType );
 	locationObject->AddInt16PropertyL( offSetDef, timeOffset.Int() / 60 );
-	LOG1( "CLocationRecord::DoCreateLocationL(), Location created with stamp: %Ld", timestamp.Int64() );
+	LOG1( "Location created with stamp: %Ld", timestamp.Int64() );
 	// location related properties
 	if ( !Math::IsNaN( aLocationData.iPosition.Latitude() ) &&
 		 !Math::IsNaN( aLocationData.iPosition.Longitude() ))
 		{
-LOG1("CLocationRecord::DoCreateLocationL(), Lan - %f", aLocationData.iPosition.Latitude());
+LOG1("Lan - %f", aLocationData.iPosition.Latitude());
-LOG1("CLocationRecord::DoCreateLocationL(), Lon - %f", aLocationData.iPosition.Longitude());
+LOG1("Lon - %f", aLocationData.iPosition.Longitude());
 		locationObject->AddReal64PropertyL( *iLatitudeDef, aLocationData.iPosition.Latitude() );
 		locationObject->AddReal64PropertyL( *iLongitudeDef, aLocationData.iPosition.Longitude() );
 		}
 	if ( !Math::IsNaN( aLocationData.iPosition.Altitude() ) )
 		}
 	// network related properties
 	if ( aLocationData.iNetworkInfo.iAccess != CTelephony::ENetworkAccessUnknown )
 		{
-		LOG1("CLocationRecord::DoCreateLocationL(), Cell id - %d", aLocationData.iNetworkInfo.iCellId);
+		LOG1("Cell id - %d", aLocationData.iNetworkInfo.iCellId);
 		locationObject->AddUint32PropertyL( cellIdDef, aLocationData.iNetworkInfo.iCellId );
 		}
 	if ( aLocationData.iNetworkInfo.iAreaKnown &&
 aLocationData.iNetworkInfo.iLocationAreaCode != 0 &&
 		aLocationData.iNetworkInfo.iAccess != CTelephony::ENetworkAccessUnknown )
 		{
-		LOG1("CLocationRecord::DoCreateLocationL(), Areacode - %d", aLocationData.iNetworkInfo.iLocationAreaCode);
+		LOG1("Areacode - %d", aLocationData.iNetworkInfo.iLocationAreaCode);
 		locationObject->AddUint32PropertyL( locationCodeDef,
 				aLocationData.iNetworkInfo.iLocationAreaCode );
 		}
 #ifdef _DEBUG
+TLex lexer( aLocationData.iNetworkInfo.iCountryCode );
-if ( aLocationData.iNetworkInfo.iCountryCode.Length() > 0 )
+TUint countryCode = 0;
-{
-TLex lexer( aLocationData.iNetworkInfo.iCountryCode );
+User::LeaveIfError( lexer.Val( countryCode, EDecimal) );
-TUint countryCode = 0;
+LOG1("Country code - %d", countryCode);
-TRAP_IGNORE(lexer.Val( countryCode, EDecimal));
-LOG1("CLocationRecord::DoCreateLocationL(), Country code - %d", countryCode);
-}
-else
-{
-LOG("CLocationRecord::DoCreateLocationL(), No Country code");
-}
 //Set mobile network code
-if ( aLocationData.iNetworkInfo.iNetworkId.Length() > 0 )
+lexer = aLocationData.iNetworkInfo.iNetworkId;
-{
+TUint networkCode = 0;
-TLex lexer = aLocationData.iNetworkInfo.iNetworkId;
+User::LeaveIfError( lexer.Val( networkCode, EDecimal) );
-TUint networkCode = 0;
+LOG1("Network id - %d", networkCode);
-TRAP_IGNORE(lexer.Val( networkCode, EDecimal));
-LOG1("CLocationRecord::DoCreateLocationL(), Network id - %d", networkCode);
-}
-else
-{
-LOG("CLocationRecord::DoCreateLocationL(), No network code");
-}
 #endif
 	if ( aLocationData.iNetworkInfo.iCountryCode.Length() > 0 )
 		{
 		locationObject->AddTextPropertyL( countryCodeDef,
 				aLocationData.iNetworkInfo.iCountryCode );
 		locationObject->AddTextPropertyL(networkCodeDef, aLocationData.iNetworkInfo.iNetworkId);
 		}
 	// Add the location object to the database.
 	locationObjectId = iMdeSession->AddObjectL( *locationObject );
-LOG1("CLocationRecord::DoCreateLocationL(), Location id - %d", locationObjectId);
+LOG1("Location id - %d", locationObjectId);
 	CleanupStack::PopAndDestroy( locationObject );
 LOG( "CLocationRecord::DoCreateLocationL(), end" );
 	return locationObjectId;
 	}
 CMdEObject* object = NULL;
 CMdEProperty* property = NULL;
 object = iMdeSession->GetObjectL( aObjectId );
-if( !object )
-{
-User::Leave( KErrNotFound );
-}
 CleanupStack::PushL( object );
 object->Property( timeDef, property, 0 );
 if ( !property )
 {
 User::Leave( KErrNotFound );
 }
 const TTime timeValue( property->TimeValueL() );
 CleanupStack::PopAndDestroy( object );
-LOG( "CLocationRecord::GetMdeObjectTimeL(), end" );
 return timeValue;
 }
 // --------------------------------------------------------------------------

branch	RCL_3
changeset 50	85f623e1ef41
parent 49	f23c07ec56e2
child 53	29d87345eaeb