diff -r d508aa856878 -r d30183af6ca6 phonebookui/pbkcommonui/src/cntaddressmodel.cpp
--- a/phonebookui/pbkcommonui/src/cntaddressmodel.cpp	Wed Aug 11 09:06:35 2010 +0300
+++ b/phonebookui/pbkcommonui/src/cntaddressmodel.cpp	Mon Aug 23 16:06:28 2010 +0300
@@ -18,7 +18,7 @@
 #include "cntaddressmodel.h"
 #include "cntdetailmodelitem.h"
 #include "cntdetailconst.h"
-#include <cntmaptileservice.h> 
+#include <maptileservice.h> 
 
 CntAddressModel::CntAddressModel( QContact* aContact ):
 CntDetailEditorModel( aContact ),
@@ -27,7 +27,7 @@
 mAddressWork(NULL),
 mIsLocationPickerEnabled( false )
     {
-    mMaptileInterface = new CntMapTileService;
+    mMaptileInterface = new MapTileService;
     HbDataFormModelItem* address = appendDataFormGroup(hbTrId("txt_phob_formlabel_address"), invisibleRootItem());
     HbDataFormModelItem* addressHome = appendDataFormGroup(hbTrId("txt_phob_formlabel_address_home"), invisibleRootItem());
     HbDataFormModelItem* addressWork = appendDataFormGroup(hbTrId("txt_phob_formlabel_address_work"), invisibleRootItem());
@@ -91,7 +91,7 @@
 void CntAddressModel::createAddressItems( HbDataFormModelItem* aGroup, QContactAddress* aAddress )
     {
 	//Show the location picker button only if location feature enabled
-    if( mMaptileInterface->isLocationFeatureEnabled() )
+    if( mMaptileInterface->isLocationFeatureEnabled(MapTileService::AppTypeContacts) )
     {
         // custom item for map button
         HbDataFormModelItem* mapButton = new HbDataFormModelItem( HbDataFormModelItem::CustomItemBase );
@@ -190,7 +190,7 @@
 bool CntAddressModel::saveAddressItems( HbDataFormModelItem* aGroup, QContactAddress* aAddress )
 {
     int offset = 0;
-    if( mMaptileInterface->isLocationFeatureEnabled() )
+    if( mMaptileInterface->isLocationFeatureEnabled(MapTileService::AppTypeContacts) )
     {
         offset = 1;
     }