FCL/sf/app/contacts: comparison phonebookui/Phonebook2/MapExtension/src/cpmapcmd.cpp

equal deleted inserted replaced

-:6b5524b4f673
+:38bb213f60ba
 #include <MPbk2CommandObserver.h>
 #include <MPbk2CommandHandler.h>
 #include <MPbk2ApplicationServices.h>
 #include <MPbk2AppUi.h>
 #include <CPbk2FieldPropertyArray.h>
-#include <pbk2mapuires.rsg>
+#include <Pbk2MapUIRes.rsg>
 #include <MPbk2ContactEditorControl.h>
 #include <MPbk2ContactEditorField.h>
 #include <Pbk2UIControls.hrh>
 #include <Pbk2Commands.hrh>
-#include <pbk2uicontrols.rsg>
+#include <Pbk2UIControls.rsg>
 #include <TPbk2AddressSelectParams.h>
 #include <CPbk2AddressSelect.h>
 #include <Pbk2AddressTools.h>
+#include <Pbk2UIControls.rsg>
 #include <CPbk2ApplicationServices.h>
 #include <pbk2mapcommands.hrh>
-#include <MPbk2DialogEliminator.h>
 // Virtual Phonebook
 #include <MVPbkBaseContactField.h>
 #include <MVPbkStoreContact.h>
 #include <MVPbkContactAttributeManager.h>
 #include <CVPbkFieldTypeSelector.h>
 #include <CVPbkFieldFilter.h>
 #include <MVPbkStoreContactField.h>
 #include <MVPbkContactFieldData.h>
 #include <MVPbkContactFieldTextData.h>
-#include <vpbkeng.rsg>
+#include <VPbkEng.rsg>
 #include <MVPbkFieldType.h>
 #include <TVPbkFieldVersitProperty.h>
 #include <MVPbkStoreContactFieldCollection.h>
 #include <TVPbkFieldTypeParameters.h>
 #include "MPbk2ContactEditorControlExtension.h"
 #include <StringLoader.h>
 // Debugging headers
 #include <Pbk2Debug.h>
-_LIT( KGeoSeparator, ",");
+_LIT(KGeoSeparator, ",");
+_LIT( KDecimalSepratorEnglish, "." );
 const TInt KGeoSeparatorLength = 1;
 const TReal32 KGeoHorizontalAccuracy = 0;
 const TInt KGeoMaxSize = 60;
 const TInt KGeoFormatWidth = 11;
 // CPmapCmd::~CPmapCmd
 // --------------------------------------------------------------------------
 //
 CPmapCmd::~CPmapCmd()
 {
-if ( iAddressSelectEliminator )
-{
-iAddressSelectEliminator->ForceExit();
-}
 Cancel();
 if(iMapView)
 {
 iMapView->ResetLandmarksToShow();
 delete iMapView;
 if( iUiControl )
 	    {
 	    iUiControl->RegisterCommand( NULL );
 	    }
 delete iMapViewProvider;
-//Indication that the object has been deleted.
-if ( iThisPtrDestroyed )
-{
-*iThisPtrDestroyed = ETrue;
-}
 }
 // --------------------------------------------------------------------------
 // CPmapCmd::NewL
 // --------------------------------------------------------------------------
 void CPmapCmd::ExecuteL()
 {
 PBK2_DEBUG_PRINT(PBK2_DEBUG_STRING
 ("CPmapCmd::ExecuteLD"));
-TBool amIDestroyed( EFalse );
-iThisPtrDestroyed = &amIDestroyed;
 iAddressUpdatePrompt = ETrue;
 TPbk2FieldGroupId groupId = EPbk2FieldGroupIdNone;
 if( !IsAddressInContact() )
 	{
 	if( iCommandId == EPbk2ExtensionShowOnMap )
 if( groupId == EPbk2FieldGroupIdNone )
 	{
 	groupId = SelectAddressL();
 	}
-//This object could have been deleted because of some external activity
-//Dont proceed if this object is destroyed
-if ( amIDestroyed )
-{
-return;
-}
-iThisPtrDestroyed = NULL;
 if( groupId != EPbk2FieldGroupIdNone )
 	{
 	    TVPbkFieldTypeParameter addressType = Pbk2AddressTools::MapAddressToVersitParam( groupId );
 	    if( iCommandId == EPbk2ExtensionShowOnMap )
 params.iCommMethod = VPbkFieldTypeSelectorFactory::EAssignFromMapSelector;
 	}
 CleanupStack::PopAndDestroy( appServices );
 CPbk2AddressSelect* addressSelect = CPbk2AddressSelect::NewL( params );
-// Execute
-iAddressSelectEliminator = addressSelect;
-iAddressSelectEliminator->ResetWhenDestroyed
-( &iAddressSelectEliminator );
 MVPbkStoreContactField* selectedField = addressSelect->ExecuteLD();
 CleanupStack::PopAndDestroy(); // resReader
 if ( selectedField )
 	{
 // --------------------------------------------------------------------------
 //
 TBool CPmapCmd::DoFillGeoLandmarkL(
 		CPosLandmark& aLandmark, const TDesC& aDataText )
 	{
+HBufC* locationText = aDataText.AllocLC();
 	TBool result = EFalse;
-	TInt separator = aDataText.Find( KGeoSeparator );
+TInt separator = locationText->Find( KGeoSeparator );
 	if ( separator != KErrNotFound )
 		{
+TLocale localeFethcer;
+TChar currentDecimalSeparator = localeFethcer.DecimalSeparator();
+TBuf<1> currentLangDecSeprator;
+currentLangDecSeprator.Append( currentDecimalSeparator );
+TBuf< KGeoMaxSize > strLatitude;
+strLatitude.Copy( locationText->Left( separator ) );
+TInt descimalSepratorPos = strLatitude.Find( KDecimalSepratorEnglish );
+if( descimalSepratorPos != KErrNotFound )
+{
+strLatitude.Delete( descimalSepratorPos, 1 );
+strLatitude.Insert( descimalSepratorPos,currentLangDecSeprator );
+}
 		TReal64 latitude = 0;
 		TReal64 logitude = 0;
-TLex lexLatitude( aDataText.Left( separator ) );
+TLex lexLatitude( strLatitude );
-		TLex lexLogitude( aDataText.Right( aDataText.Length()
-				- separator - KGeoSeparatorLength ) );
+TBuf< KGeoMaxSize > strLongitude;
-		if ( lexLatitude.Val( latitude ) == KErrNone
+strLongitude.Copy( locationText->Right( locationText->Length()
-				&& lexLogitude.Val( logitude ) == KErrNone )
+- separator - KGeoSeparatorLength ) );
+descimalSepratorPos = strLongitude.Find( KDecimalSepratorEnglish );
+if( descimalSepratorPos != KErrNotFound )
+{
+strLongitude.Delete( descimalSepratorPos, 1 );
+strLongitude.Insert( descimalSepratorPos,currentLangDecSeprator );
+}
+TLex lexLogitude( strLongitude );
+if ( lexLatitude.Val( latitude, currentDecimalSeparator ) == KErrNone
+&& lexLogitude.Val( logitude, currentDecimalSeparator ) == KErrNone )
 			{
 			TLocality loc( TCoordinate( latitude, logitude ),
 					KGeoHorizontalAccuracy );
 			aLandmark.SetPositionL( loc );
 TInt separator2 = aDataText.Right( aDataText.Length() - separator - KGeoSeparatorLength ).Find( KGeoSeparator );
 if(separator2 != KErrNotFound)
 {
 separator += separator2;
-aLandmark.SetPositionFieldL(EPositionFieldCountryCode,aDataText.Right( aDataText.Length() - separator - (KGeoSeparatorLength * 2) ));
+aLandmark.SetPositionFieldL( EPositionFieldCountryCode,
+locationText->Right( locationText->Length()
+- separator - ( KGeoSeparatorLength * 2 ) ) );
 }
 result = ETrue;
 }
 		}
+CleanupStack::PopAndDestroy( locationText );
 	return result;
 	}
 // --------------------------------------------------------------------------
 // CPmapCmd::EditorAssignFromMapsL
 	CleanupClosePushL( textNumber );
 	geoData.CreateL( KGeoMaxSize );
 	textNumber.CreateL( KGeoMaxSize );
 	TRealFormat format( KGeoFormatWidth );
 	textNumber.Num( latitude, format );
+TLocale localeFetcer;
+TChar currentDecimalSeparator;
+currentDecimalSeparator = localeFetcer.DecimalSeparator();
+TInt descimalSepratorPos = textNumber.Locate( currentDecimalSeparator );
+if( descimalSepratorPos != KErrNotFound )
+{
+textNumber.Replace( descimalSepratorPos , 1 , KDecimalSepratorEnglish );
+}
 	geoData = textNumber;
 	geoData += KGeoSeparator();
 	textNumber.Num( longitude, format );
-	geoData += textNumber;
+descimalSepratorPos = textNumber.Locate( currentDecimalSeparator );
+if( descimalSepratorPos != KErrNotFound )
+{
+textNumber.Replace( descimalSepratorPos , 1 , KDecimalSepratorEnglish );
+}
+geoData += textNumber;
 if(aLandmark.IsPositionFieldAvailable( EPositionFieldCountryCode ))
 {
 TPtrC countryCode;
 aLandmark.GetPositionField(EPositionFieldCountryCode,countryCode);
 EVPbkVersitSubFieldStreet, iAddressType );
 UpdateFieldL( *result, EPositionFieldPostalCode,
 EVPbkVersitSubFieldPostalCode, iAddressType );
 UpdateFieldL( *result, EPositionFieldLocality,
 EVPbkVersitSubFieldRegion, iAddressType );
+UpdateFieldL( *result, EPositionFieldState,
+EVPbkVersitSubFieldRegion, iAddressType );
 UpdateFieldL( *result, EPositionFieldNone,
 EVPbkVersitSubFieldPostOfficeAddress, iAddressType );
 UpdateFieldL( *result, EPositionFieldNone,
 EVPbkVersitSubFieldExtendedAddress, iAddressType );

branch	RCL_3
changeset 85	38bb213f60ba
parent 68	9da50d567e3c