diff -r f3533f6eae3f -r 96df3ab41000 locationdataharvester/maptileservice/src/maptileservice.cpp
--- a/locationdataharvester/maptileservice/src/maptileservice.cpp	Fri Jun 11 13:33:47 2010 +0300
+++ b/locationdataharvester/maptileservice/src/maptileservice.cpp	Wed Jun 23 18:07:15 2010 +0300
@@ -18,25 +18,72 @@
 
 
 #include <centralrepository.h> 
+#include <locationservicedefines.h>
+#include <qvaluespacepublisher.h>
+#include <qvaluespacesubscriber.h>
+#include "mylocationlogger.h"
 
 #include "maptileservice.h"
 #include "maptiledblookuptable.h"
-
+#include <QVariant>
 // CONSTANTS
 // Maptile interface uid
 const TUid KUidMapTileInterface = { 0x2002E6E8 };
+
 // Central Repository Key IDs
 const TInt KEnableLocationFeature  = 0x1;
 
+const char *MAPTILE_STATUS_RECEIVER = "/maptilestatuspublisher/name";
+const char *MAPTILE_STATUS_PUBLISHER = "/maptilepublisher";
+const char *MAPTILE_STATUS_CALENDAR_PUBLISHER = "/maptilecalpublisher";
 
+
+// -----------------------------------------------------------------------------
+// MapTileService::MapTileService()
+// Default constructor
+// -----------------------------------------------------------------------------
+//
+MapTileService::MapTileService():mCalPublisher(0)
+{
+   /* Constructs a QValueSpacePublisher that publishes values under path /mypublisher*/
+    mPublisher = NULL;    
+    mSubscriber = new QValueSpaceSubscriber( MAPTILE_STATUS_RECEIVER );
+    //Connect for maptile status change key
+    QObject::connect(mSubscriber, SIGNAL(contentsChanged()), this, SLOT(setMaptileStatus()));
+    
+}
+
+// -----------------------------------------------------------------------------
+// MapTileService::~MapTileService()
+// Destructor
+// -----------------------------------------------------------------------------
+//
+MapTileService::~MapTileService()
+{
+    if( mSubscriber )
+    {
+        delete mSubscriber;
+        mSubscriber = NULL;
+    }
+    
+    if( mPublisher )
+    {
+        delete mPublisher;
+        mPublisher = NULL;
+    }
+	if( mCalPublisher )
+	{
+	    delete mCalPublisher;
+		mCalPublisher = NULL;
+	}
+}
 // -----------------------------------------------------------------------------
 // MapTileService::isLocationFeatureEnabled()
 // Checks whether location feature is enabled or disabled
 // -----------------------------------------------------------------------------
 //
 bool MapTileService::isLocationFeatureEnabled(AppType appType)
-{ 
-   
+{    
     //Create the centrep with uid 0x2002C3A8
     bool iLocationFeatureEnabled = false;
     
@@ -76,55 +123,243 @@
 // Gets the maptile image path associated with a contact.
 // -----------------------------------------------------------------------------
 //
-QString MapTileService::getMapTileImage( int id, AddressType sourceType )    
+int MapTileService::getMapTileImage( int id, AddressType sourceType, QString& imagePath )    
 {
+    __TRACE_CALLSTACK;
+    
+    TLookupItem lookupItem;
+    
+    int addressCount = 0;  
+    int maptileStatus = MapTileFetchingUnknownError;
+
+    int error = readEntryFromMaptileDataBase( id, sourceType, lookupItem, addressCount );
+        
+    //if entry available returns the file path otherwise NULL. 
+    if ( KErrNone == error  )
+    {
+     
+        //Get the image path
+        QString imageFile((QChar*)lookupItem.iFilePath.Ptr(),
+                    lookupItem.iFilePath.Length());
+        imagePath = imageFile;
+            
+        maptileStatus = lookupItem.iFetchingStatus;
+        MYLOCLOGSTRING1("getMapTileImage maptileStatus  - %d ", maptileStatus );
+
+        if( maptileStatus == MapTileFetchingNetworkError ||
+                    maptileStatus == MapTileFetchingInProgress )
+        {
+            switch(sourceType)
+            {           
+                case AddressHome:            
+                case AddressPreference:           
+                case AddressWork:
+                {
+                    publishValue( id, sourceType, addressCount );
+                    break;
+                }
+                
+                case AddressPlain:
+                {
+                    publishCalEntry( id );
+                    break;
+                }
+                default:
+                    break;
+            };
+           		  
+        }
+                    
+
+    }
+    else if ( KErrNotFound == error )
+    {
+        MYLOCLOGSTRING("getMapTileImage entry not found, return MapTileFetchingInProgress" );
+        //If entry is not found , it will be a newly added entry.       
+        switch (sourceType) {
+            case AddressHome:
+            case AddressPreference:
+            case AddressWork:
+            {
+                publishValue(id, sourceType, addressCount);
+                break;
+            }
+    
+            case AddressPlain:
+            {
+                publishCalEntry(id);
+                break;
+            }
+            default:
+                break;
+        };
+        maptileStatus = MapTileFetchingInProgress;
+    }
+ 
+    //Return the maptile status
+    MYLOCLOGSTRING("getMapTileImage  returns MapTileFetchingUnknownError" );
+    return maptileStatus;
+
+}
+
+// -----------------------------------------------------------------------------
+// MapTileService::setMaptileStatus()
+// Gets call back from location engine , after maptile fetching done ,
+// to set status and emit signal . 
+// -----------------------------------------------------------------------------
+//
+void MapTileService::setMaptileStatus()
+{
+    __TRACE_CALLSTACK;
+    QString imagePath;
+    AddressType addressType = AddressUnknown;   
+    QStringList subPath = mSubscriber->subPaths();
+    QVariant value = mSubscriber->value(subPath.at(0));
+      
+    //Subscriber Protocol : [appid-addresstype-maptilestatus]
+    QStringList text = value.toString().split("-");
+    
+    int id = text.at(0).toInt();
+    int status = text.at(2).toInt();
+    
+    switch( text.at(1).toInt() )
+    {
+        case ESourceContactsPref:
+            addressType = AddressPreference;
+            break;
+        case ESourceContactsWork:
+            addressType = AddressWork;
+            break;        
+        case ESourceContactsHome:
+            addressType = AddressHome;
+            break;
+        case ESourceCalendar:           
+            addressType = AddressPlain;
+            break;
+        default:
+            break;
+    }
+            
+    //Emit the maptile status signal 
+    int type = addressType;
+    MYLOCLOGSTRING1("setMaptileStatus() status  - %d ", addressType );
+    if( mLastViewedEntryId == id )
+    {
+        emit maptileFetchingStatusUpdate( mLastViewedEntryId, type , status );
+	}
+  
+}
+
+// -----------------------------------------------------------------------------
+// MapTileService::publishValue()
+// publish the contact entry 
+// -----------------------------------------------------------------------------
+//
+void MapTileService::publishValue( int id, AddressType sourceType, int addressCount )
+{
+    __TRACE_CALLSTACK;
+    mLastViewedEntryId = id;
+    
+	int addressType = ESourceInvalid;    
+    switch( sourceType )
+    {
+        case AddressPreference:
+            addressType = ESourceContactsPref;
+            break;
+        case AddressWork:
+            addressType = ESourceContactsWork;
+            break;
+        case AddressHome:
+            addressType = ESourceContactsHome;
+            break;
+    }
+    
+    if ( !mPublisher )
+    {
+        /* Constructs a QValueSpacePublisher that publishes values under path /mypublisher*/
+        mPublisher = new QValueSpacePublisher( MAPTILE_STATUS_PUBLISHER, this);
+    }
    
-    //Image file to return;
-   
+    
+    /* Publisher protocol [appid-addresstype-count] */
+    QString addressId;
+    addressId.append( QVariant(id).toString());
+    addressId.append( QChar('-') );
+    addressId.append( QVariant(addressType).toString());
+    addressId.append( QChar('-') );
+    addressId.append( QVariant(addressCount).toString() );
+    mPublisher->setValue("name", addressId.toAscii() );
+    mPublisher->sync();
+    
+}
+
+// -----------------------------------------------------------------------------
+// MapTileService::publishValue()
+// publish the calendar entry 
+// -----------------------------------------------------------------------------
+//
+void MapTileService::publishCalEntry( int id)
+{
+    __TRACE_CALLSTACK;
+    mLastViewedEntryId = id;       
+    if ( NULL ==mCalPublisher )
+    {
+        /* Constructs a QValueSpacePublisher that publishes values under path /mypublisher*/
+        mCalPublisher = new QValueSpacePublisher( MAPTILE_STATUS_CALENDAR_PUBLISHER, this);
+    }    
+    mCalPublisher->setValue("name", id);
+    mCalPublisher->sync();
+}
+
+// -----------------------------------------------------------------------------
+// MapTileService::readEntryFromMaptileDataBase()
+// Read all entries from database
+// -----------------------------------------------------------------------------
+//
+int MapTileService::readEntryFromMaptileDataBase( 
+            int id, AddressType sourceType, TLookupItem& aLookupItem, int& aNoOfAddress )
+{
+    
     //Maptile database  instance
     CLookupMapTileDatabase* mapTileDatabase = NULL;
    
     TRAPD( err, mapTileDatabase = CLookupMapTileDatabase::NewL(
             KMapTileLookupDatabaseName ) );
+    
     if ( KErrNone == err )
-    {
-        TLookupItem lookupItem;
-        lookupItem.iUid = id;
-        switch( sourceType )
-        {
-            case AddressPlain:
-                lookupItem.iSource = ESourceCalendar;
-                break;
-           case AddressPreference:
-               lookupItem.iSource = ESourceContactsPref;
-               break;
-           case AddressWork:
-               lookupItem.iSource = ESourceContactsWork;
-               break;
-           case AddressHome:
-               lookupItem.iSource = ESourceContactsHome;
-               break;
-           default: 
-               break;
+    {     
+        TRAP( err,aNoOfAddress = mapTileDatabase->FindNumberOfAddressL(id) );
+        MYLOCLOGSTRING1("no of address  FindNumberOfAddressL returns - %d ", err );     
+       if ( KErrNone == err )
+       {
+            aLookupItem.iUid = id;
+            switch (sourceType)
+            {
+                case AddressPlain:
+                    aLookupItem.iSource = ESourceCalendar;
+                    break;
+                case AddressPreference:
+                    aLookupItem.iSource = ESourceContactsPref;
+                    break;
+                case AddressWork:
+                    aLookupItem.iSource = ESourceContactsWork;
+                    break;
+                case AddressHome:
+                    aLookupItem.iSource = ESourceContactsHome;
+                    break;
+                default:
+                    break;
+            }
+
+            TRAP( err , mapTileDatabase->FindEntryL( aLookupItem ) );
+
+            MYLOCLOGSTRING1("getMapTileImage FindEntryL returns - %d ", err );
         }
-       
-        TRAP( err , mapTileDatabase->FindEntryL( lookupItem ) );
-       
         //delet the database instance
         delete mapTileDatabase;
-       
-        //if entry available returns the file path otherwise NULL. 
-        if ( KErrNone == err  )
-        {
-           //Get the image path
-            QString imageFile((QChar*)lookupItem.iFilePath.Ptr(),
-                    lookupItem.iFilePath.Length());
-            return imageFile;
-        }
+           
     }
     
-    return QString();
+    return err;
 }
-
 // End of file
-