[Qt] Added QMapboxGL::MapLoadingFailure enum

This commit is contained in:
Bruno de Oliveira Abinader
2018-03-05 13:47:31 -05:00
parent fc140e265b
commit 803a4d46ed
4 changed files with 53 additions and 5 deletions

View File

@@ -128,6 +128,13 @@ public:
MapChangeSourceDidChange
};
enum MapLoadingFailure {
StyleParseFailure,
StyleLoadFailure,
NotFoundFailure,
UnknownFailure
};
// Determines the orientation of the map.
enum NorthOrientation {
NorthUpwards, // Default
@@ -251,7 +258,7 @@ public slots:
signals:
void needsRendering();
void mapChanged(QMapboxGL::MapChange);
void mapLoadingFailed(const QString &reason);
void mapLoadingFailed(QMapboxGL::MapLoadingFailure, const QString &reason);
void copyrightsChanged(const QString &copyrightsHtml);
void staticRenderFinished(const QString &error);
@@ -263,5 +270,6 @@ private:
};
Q_DECLARE_METATYPE(QMapboxGL::MapChange);
Q_DECLARE_METATYPE(QMapboxGL::MapLoadingFailure);
#endif // QMAPBOXGL_H

View File

@@ -517,6 +517,19 @@ void QMapboxGLSettings::setResourceTransform(const std::function<std::string(con
\sa mapChanged()
*/
/*!
\enum QMapboxGL::MapLoadingFailure
This enum represents map loading failure type.
\value StyleParseFailure Failure to parse the style.
\value StyleLoadFailure Failure to load the style data.
\value NotFoundFailure Failure to obtain style resource file.
\value UnknownFailure Unknown map loading failure.
\sa mapLoadingFailed()
*/
/*!
\enum QMapboxGL::NorthOrientation
@@ -1612,6 +1625,13 @@ void QMapboxGL::connectionEstablished()
a map is fully loaded by analyzing the parameter \a change.
*/
/*!
\fn void QMapboxGL::mapLoadingFailed(QMapboxGL::MapLoadingFailure type, const QString &description)
This signal is emitted when a map loading failure happens. Details of the
failures are provided, including its \a type and textual \a description.
*/
/*!
\fn void QMapboxGL::copyrightsChanged(const QString &copyrightsHtml);
@@ -1649,7 +1669,7 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin
qRegisterMetaType<QMapboxGL::MapChange>("QMapboxGL::MapChange");
connect(m_mapObserver.get(), SIGNAL(mapChanged(QMapboxGL::MapChange)), q, SIGNAL(mapChanged(QMapboxGL::MapChange)));
connect(m_mapObserver.get(), SIGNAL(mapLoadingFailed(QString)), q, SIGNAL(mapLoadingFailed(QString)));
connect(m_mapObserver.get(), SIGNAL(mapLoadingFailed(QMapboxGL::MapLoadingFailure,QString)), q, SIGNAL(mapLoadingFailed(QMapboxGL::MapLoadingFailure,QString)));
connect(m_mapObserver.get(), SIGNAL(copyrightsChanged(QString)), q, SIGNAL(copyrightsChanged(QString)));
// Setup the Map object

View File

@@ -2,7 +2,7 @@
#include "qmapboxgl_p.hpp"
#include <mbgl/util/string.hpp>
#include <mbgl/util/exception.hpp>
#include <exception>
@@ -51,7 +51,27 @@ void QMapboxGLMapObserver::onDidFinishLoadingMap()
void QMapboxGLMapObserver::onDidFailLoadingMap(std::exception_ptr exception)
{
emit mapChanged(QMapboxGL::MapChangeDidFailLoadingMap);
emit mapLoadingFailed(QString::fromStdString(mbgl::util::toString(exception)));
QMapboxGL::MapLoadingFailure type;
QString description;
try {
std::rethrow_exception(exception);
} catch (const mbgl::util::StyleParseException& e) {
type = QMapboxGL::MapLoadingFailure::StyleParseFailure;
description = e.what();
} catch (const mbgl::util::StyleLoadException& e) {
type = QMapboxGL::MapLoadingFailure::StyleLoadFailure;
description = e.what();
} catch (const mbgl::util::NotFoundException& e) {
type = QMapboxGL::MapLoadingFailure::NotFoundFailure;
description = e.what();
} catch (const std::exception& e) {
type = QMapboxGL::MapLoadingFailure::UnknownFailure;
description = e.what();
}
emit mapLoadingFailed(type, description);
}
void QMapboxGLMapObserver::onWillStartRenderingFrame()

View File

@@ -36,7 +36,7 @@ public:
signals:
void mapChanged(QMapboxGL::MapChange);
void mapLoadingFailed(const QString &reason);
void mapLoadingFailed(QMapboxGL::MapLoadingFailure, const QString &reason);
void copyrightsChanged(const QString &copyrightsHtml);
private: