Merge branch 'master' into indicator

[situare] / src / engine / engine.cpp

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index b252818..e7eed41 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -32,9 +32,11 @@
 #endif
 
 #include "common.h"
+#include "error.h"
 #include "facebookservice/facebookauthentication.h"
 #include "gps/gpsposition.h"
 #include "map/mapengine.h"
+#include "routing/geocodingservice.h"
 #include "routing/routingservice.h"
 #include "mce.h"
 #include "network/networkaccessmanager.h"
@@ -89,8 +91,12 @@ SituareEngine::SituareEngine()
     // build routing service
     m_routingService = new RoutingService(this); // create this when needed, not in constructor!
 
+    // build geocoding service
+    m_geocodingService = new GeocodingService(this);
+
     // connect signals
     signalsFromMapEngine();
+    signalsFromGeocodingService();
     signalsFromGPS();
     signalsFromRoutingService();
     signalsFromSituareService();
@@ -299,9 +305,9 @@ void SituareEngine::error(const int context, const int error)
     default:
         m_ui->toggleProgressIndicator(false);
         if(context == ErrorContext::NETWORK)
-            qCritical() << "QNetworkReply::NetworkError: " << error;
+            qCritical() << __PRETTY_FUNCTION__ << "QNetworkReply::NetworkError: " << error;
         else
-            qCritical() << "Unknown error: " << error;
+            qCritical() << __PRETTY_FUNCTION__ << "Unknown error: " << error;
 
         break;
     }
@@ -368,7 +374,7 @@ void SituareEngine::locationSearch(QString location)
     qDebug() << __PRETTY_FUNCTION__;
 
     if(!location.isEmpty())
-        m_routingService->requestLocation(location);
+        m_geocodingService->requestLocation(location);
 }
 
 void SituareEngine::loginActionPressed()
@@ -566,6 +572,14 @@ void SituareEngine::signalsFromFacebookAuthenticator()
             m_ui, SLOT(loginUsingCookies()));
 }
 
+void SituareEngine::signalsFromGeocodingService()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    connect(m_geocodingService, SIGNAL(locationDataParsed(QList<Location>&)),
+            this, SLOT(locationDataReady(QList<Location>&)));
+}
+
 void SituareEngine::signalsFromGPS()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -691,12 +705,8 @@ void SituareEngine::signalsFromRoutingService()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    connect(m_routingService, SIGNAL(locationDataParsed(QList<Location>&)),
-            this, SLOT(locationDataReady(QList<Location>&)));
-
     connect(m_routingService, SIGNAL(routeParsed(Route&)),
             m_mapEngine, SLOT(setRoute(Route&)));
-
 }
 
 void SituareEngine::signalsFromSituareService()