Merge branch 'master' into new_panels_with_context_buttons

[situare] / src / routing / geocodingservice.cpp

diff --git a/src/routing/geocodingservice.cpp b/src/routing/geocodingservice.cpp
index e38fc2a..165bc7b 100644 (file)
--- a/src/routing/geocodingservice.cpp
+++ b/src/routing/geocodingservice.cpp
@@ -23,7 +23,7 @@
 #include "parser.h"
 
 #include "coordinates/geocoordinate.h"
-#include "error.h"
+#include "../error.h"
 #include "network/networkaccessmanager.h"
 
 #include "geocodingservice.h"
@@ -50,7 +50,7 @@ void GeocodingService::parseSearchResults(const QByteArray &jsonReply)
     bool ok;
     QVariantMap result = parser.parse(jsonReply, &ok).toMap();
     if (!ok) {
-        emit error(ErrorContext::SITUARE, SituareError::INVALID_JSON);
+        emit error(ErrorContext::SITUARE, SituareError::ERROR_LOCATION_SEARCH_FAILED);
         return;
     } else if(result.value("status") != NO_DATA) {
         foreach(QVariant hitVariant, result["results"].toList()) {
@@ -86,6 +86,8 @@ void GeocodingService::parseSearchResults(const QByteArray &jsonReply)
         }
 
         emit locationDataParsed(m_searchResults);
+    } else {
+        emit error(ErrorContext::SITUARE, SituareError::ERROR_LOCATION_SEARCH_FAILED);
     }
 }