m_ui->buildInformationBox(tr("Data retrieval failed, please try again"), true);
break;
case SituareError::ADDRESS_RETRIEVAL_FAILED:
- case SituareError::ERROR_GEOLOCATION_REQUEST_FAIL:
- case SituareError::ERROR_GEOLOCATION_LONLAT_INVALID:
m_ui->toggleProgressIndicator(false);
m_ui->buildInformationBox(tr("Address retrieval failed"), true);
break;
m_ui->loggedIn(false);
m_facebookAuthenticator->clearAccountInformation(false); // clean all
break;
- case SituareError::ERROR_GEOLOCATION_SERVER_UNAVAILABLE:
- m_ui->toggleProgressIndicator(false);
- m_ui->buildInformationBox(tr("Address server not responding"), true);
- break;
case SituareError::ERROR_ROUTING_FAILED:
m_ui->toggleProgressIndicator(false);
m_ui->buildInformationBox(tr("Routing failed"), true);
break;
+ case SituareError::ERROR_LOCATION_SEARCH_FAILED:
+ m_ui->buildInformationBox(tr("No results found"), true);
+ break;
default:
m_ui->toggleProgressIndicator(false);
if(context == ErrorContext::NETWORK)
connect(m_geocodingService, SIGNAL(locationDataParsed(const QList<Location>&)),
m_ui, SIGNAL(locationDataParsed(const QList<Location>&)));
+
+ connect(m_geocodingService, SIGNAL(error(int, int)),
+ this, SLOT(error(int, int)));
}
void SituareEngine::signalsFromGPS()
MAP_IMAGE_DOWNLOAD_FAILED, // map image download failed from OSM
GPS_INITIALIZATION_FAILED, // GPS intialization failed
INVALID_JSON, // JSON parsing failed i.e. invalid JSON string
- ERROR_GEOLOCATION_SERVER_UNAVAILABLE = 501, // reverseGeo server not responding
- ERROR_GEOLOCATION_REQUEST_FAIL, // reverseGeo response failed
- ERROR_GEOLOCATION_LONLAT_INVALID, // reverseGeo failed, invalid lon/lat
- ERROR_ROUTING_FAILED // routing failed
+ ERROR_ROUTING_FAILED, // routing failed
+ ERROR_LOCATION_SEARCH_FAILED
};
}
#include "parser.h"
#include "coordinates/geocoordinate.h"
-#include "error.h"
+#include "../error.h"
#include "network/networkaccessmanager.h"
#include "geocodingservice.h"
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()) {
}
emit locationDataParsed(m_searchResults);
+ } else {
+ emit error(ErrorContext::SITUARE, SituareError::ERROR_LOCATION_SEARCH_FAILED);
}
}