[poi-server]:remove unnecessary connection to enhanced position

3 files changed, 1 insertions, 107 deletions

diff --git a/.gitignore b/.gitignore
index aabf416..e983dc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ positioning/
 #files
 *~
 *.pro.user
-
+*.txt.user
 /.project
 
 CMakeFiles/
diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp
index 9717615..51e65ea 100644
--- a/src/poi-service/poi-server/main.cpp
+++ b/src/poi-service/poi-server/main.cpp
@@ -45,8 +45,6 @@ static const char* poiSearch_OBJECT_PATH = "/org/genivi/poiservice/POISearch";
 static const char* poiContentAccess_SERVICE_NAME = "org.genivi.poiservice.POIContentAccess";
 static const char* poiContentAccess_OBJECT_PATH = "/org/genivi/poiservice/POIContentAccess";
 static const char* contentAccessModule_OBJECT_PATH = "/org/genivi/poiservice/POIContentAccessModule";
-static const char* EnhancedPosition_SERVICE_NAME = "org.genivi.positioning.EnhancedPosition";
-static const char* EnhancedPosition_OBJECT_PATH = "/position";
 static const char* Routing_SERVICE_NAME = "org.genivi.navigationcore.Routing";
 static const char* Routing_OBJECT_PATH = "/org/genivi/navigationcore";
 
@@ -63,7 +61,6 @@ static DBus::Glib::BusDispatcher *dispatcher;
 static DBus::Connection *dbusConnection;
 static poiSearchServer *serverPoiSearch;
 static poiContentAccessServer *serverpoiContentAccess;
-static EnhancedPosition *clientEnhancedPosition;
 static Routing *clientRouting;
 
 // class Routing
@@ -108,63 +105,6 @@ void Routing::AlternativeRoutesAvailable (const std::vector<uint32_t>& routeHand
 }
 
 
-
-// class EnhancedPosition
-
-EnhancedPosition::EnhancedPosition(DBus::Connection &connection)
-    : DBus::ObjectProxy(connection,EnhancedPosition_OBJECT_PATH,EnhancedPosition_SERVICE_NAME)
-{
-    m_currentLocation.latitude = 48.85792; //by default center of Paris
-    m_currentLocation.longitude = 2.3383145;
-    m_currentLocation.altitude = 0;
-}
-EnhancedPosition::~EnhancedPosition()
-{
-}
-void EnhancedPosition::PositionUpdate(const std::vector< uint16_t >& changedValues)
-{
-    std::map< uint16_t, ::DBus::Variant > reply;
-    std::map< uint16_t, ::DBus::Variant >::iterator iter;
-
-    reply = GetPosition();
-    iter = reply.find(GENIVI_NAVIGATIONCORE_LATITUDE);
-    if (iter != reply.end())
-        m_currentLocation.latitude = reply.at(GENIVI_NAVIGATIONCORE_LATITUDE);
-    iter = reply.find(GENIVI_NAVIGATIONCORE_LONGITUDE);
-    if (iter != reply.end())
-        m_currentLocation.longitude = reply.at(GENIVI_NAVIGATIONCORE_LONGITUDE);
-    iter = reply.find(GENIVI_NAVIGATIONCORE_ALTITUDE);
-    if (iter != reply.end())
-        m_currentLocation.altitude = reply.at(GENIVI_NAVIGATIONCORE_ALTITUDE);
-}
-
-void EnhancedPosition::RotationRateUpdate(const std::vector< uint16_t >& changedValues)
-{
-
-}
-
-void EnhancedPosition::AccuracyUpdate(const std::vector< uint16_t >& changedValues)
-{
-
-}
-
-void EnhancedPosition::SatelliteInfoUpdate(const std::vector< uint16_t >& changedValues)
-{
-
-}
-
-void EnhancedPosition::StatusUpdate(const std::vector< uint16_t >& changedValues)
-{
-
-}
-
-// Specific methods
-
-DBus_geoCoordinate3D::geoCoordinate3D_t EnhancedPosition::GetCurrentLocation()
-{
-    return(m_currentLocation);
-}
-
 // class  contentAccessModule
 
 contentAccessModule::contentAccessModule(DBus::Connection &connection, const std::string& service)
@@ -1658,11 +1598,6 @@ std::vector< DBus_searchResultDetails::DBus_searchResultDetails_t > poiSearchSer
 
 // Specific methods
 
-void poiSearchServer::ConnectToEnhancedPositionClient(EnhancedPosition *client)
-{
-    mp_enhancedPosition = client; //link to the instance of enhancedPosition
-}
-
 void poiSearchServer::ConnectToRoutingClient(Routing *client)
 {
     mp_Routing = client; //link to the instance of routing
@@ -2089,12 +2024,6 @@ int main(int  argc , char**  argv )
                 // connect the serverPoiSearch to the serverpoiContentAccess
                 serverpoiContentAccess->ConnectTopoiSearchServer(serverPoiSearch);
 
-                // create a client for EnhancedPosition
-                clientEnhancedPosition = new EnhancedPosition(*dbusConnection);
-
-                // connect it to the POISearch server
-                serverPoiSearch->ConnectToEnhancedPositionClient(clientEnhancedPosition);
-
                 // create a client for Routing
                 clientRouting = new Routing(*dbusConnection);
 
@@ -2114,7 +2043,6 @@ int main(int  argc , char**  argv )
                 // clean memory
                 delete serverPoiSearch;
                 delete serverpoiContentAccess;
-                delete clientEnhancedPosition;
                 delete clientRouting;
                 delete dbusConnection;
                 delete dispatcher;
diff --git a/src/poi-service/poi-server/poi-server-class.h b/src/poi-service/poi-server/poi-server-class.h
index 9a62b2f..c792ca3 100644
--- a/src/poi-service/poi-server/poi-server-class.h
+++ b/src/poi-service/poi-server/poi-server-class.h
@@ -35,7 +35,6 @@
 #include "../../../api/include/genivi-poiservice-poisearch_adaptor.h"
 #include "../../../api/include/genivi-poiservice-poicontentaccess_adaptor.h"
 #include "../../../api/include/genivi-navigationcore-routing_proxy.h"
-#include "../../../api/include/genivi-positioning-enhancedposition_proxy.h"
 #include "../../../api/include/genivi-poiservice-contentaccessmodule_proxy.h"
 #include "../poi-common/common-data-model.h"
 #include <dbus-c++/glib-integration.h>
@@ -57,7 +56,6 @@ using namespace DBus;
 using namespace Glib;
 
 class Routing;
-class EnhancedPosition;
 class contentAccessModule;
 class poiSearchServer;
 class poiContentAccessServer;
@@ -87,35 +85,6 @@ class Routing
 
 };
 
-class EnhancedPosition
-: public org::genivi::positioning::EnhancedPosition_proxy,
-  public DBus::IntrospectableProxy,
-  public DBus::ObjectProxy
-{
-
-    public:
-
-    EnhancedPosition(DBus::Connection &connection);
-
-    ~EnhancedPosition();
-
-    void PositionUpdate(const std::vector< uint16_t >& changedValues);
-
-    void RotationRateUpdate(const std::vector< uint16_t >& changedValues);
-
-    void AccuracyUpdate(const std::vector< uint16_t >& changedValues);
-
-    void SatelliteInfoUpdate(const std::vector< uint16_t >& changedValues);
-
-    void StatusUpdate(const std::vector< uint16_t >& changedValues);
-
-    DBus_geoCoordinate3D::geoCoordinate3D_t GetCurrentLocation();
-
-    private:
-
-    DBus_geoCoordinate3D::geoCoordinate3D_t m_currentLocation;
-};
-
 class  contentAccessModule
 : public org::genivi::poiservice::POIContentAccessModule_proxy,
   public DBus::IntrospectableProxy,
@@ -250,8 +219,6 @@ public:
 
 //connection to the DBus proxy clients
 
-    void ConnectToEnhancedPositionClient(EnhancedPosition *client);
-
     void ConnectToRoutingClient(Routing *client);
 
 
@@ -349,7 +316,6 @@ private:
     uint16_t m_endSearchOffset;
     ushort m_searchStatus;
     uint32_t m_totalNumberOfSegments;
-    EnhancedPosition *mp_enhancedPosition;
     Routing *mp_Routing;
     poiContentAccessServer *mp_poiContentAccess;