Merge pull request #2854 from dogmaphobic/flickableInOfflineMaps

Flickable in Offline Maps
mavlink · Feb 20, 2016 · b4f0cd6 · b4f0cd6
2 parents 9612617 + 74ff671
commit b4f0cd6
Show file tree

Hide file tree

Showing 11 changed files with 296 additions and 285 deletions.
diff --git a/src/QtLocationPlugin/QGCMapTileSet.cpp b/src/QtLocationPlugin/QGCMapTileSet.cpp
@@ -29,13 +29,13 @@ This file is part of the QGROUNDCONTROL project
  *
  */
 
-#include <math.h>
-#include <QSettings>
-
 #include "QGCMapEngine.h"
 #include "QGCMapTileSet.h"
 #include "QGCMapEngineManager.h"
 
+#include <QSettings>
+#include <math.h>
+
 QGC_LOGGING_CATEGORY(QGCCachedTileSetLog, "QGCCachedTileSetLog")
 
 #define TILE_BATCH_SIZE      256

diff --git a/src/QtLocationPlugin/QGCMapUrlEngine.cpp b/src/QtLocationPlugin/QGCMapUrlEngine.cpp
@@ -27,15 +27,15 @@ This file is part of the QGROUNDCONTROL project
  *  Original work: The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
  */
 
+#include "QGCMapEngine.h"
+
 #include <QRegExp>
 #include <QNetworkReply>
 #include <QEventLoop>
 #include <QTimer>
 #include <QString>
 #include <QByteArray>
 
-#include "QGCMapEngine.h"
-
 //-----------------------------------------------------------------------------
 UrlFactory::UrlFactory()
     : _timeout(5 * 1000)

diff --git a/src/QtLocationPlugin/QGCTileCacheWorker.cpp b/src/QtLocationPlugin/QGCTileCacheWorker.cpp
@@ -29,6 +29,9 @@ This file is part of the QGROUNDCONTROL project
  *
  */
 
+#include "QGCMapEngine.h"
+#include "QGCMapTileSet.h"
+
 #include <QVariant>
 #include <QtSql/QSqlQuery>
 #include <QSqlError>
@@ -39,9 +42,6 @@ This file is part of the QGROUNDCONTROL project
 
 #include "time.h"
 
-#include "QGCMapEngine.h"
-#include "QGCMapTileSet.h"
-
 const char* kDefaultSet = "Default Tile Set";
 const QString kSession  = QLatin1String("QGeoTileWorkerSession");
 

diff --git a/src/QtLocationPlugin/QGeoCodeReplyQGC.cpp b/src/QtLocationPlugin/QGeoCodeReplyQGC.cpp
@@ -44,6 +44,8 @@
 **
 ****************************************************************************/
 
+#include "QGeoCodeReplyQGC.h"
+
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
@@ -54,8 +56,6 @@
 #include <QSet>
 #include <QDebug>
 
-#include "QGeoCodeReplyQGC.h"
-
 enum QGeoCodeTypeGoogle {
     GeoCodeTypeUnknown,
     StreetAddress, // indicates a precise street address.
@@ -193,7 +193,7 @@ void QGeoCodeReplyQGC::networkReplyFinished()
 
     QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll());
     QJsonObject object = document.object();
-    
+
     if (object.value(QStringLiteral("status")) != QStringLiteral("OK")) {
         QString error = object.value(QStringLiteral("status")).toString();
         qWarning() << m_reply->url() << "returned" << error;
@@ -210,13 +210,13 @@ void QGeoCodeReplyQGC::networkReplyFinished()
             continue;
 
         QJsonObject geocode = results[i].toObject();
-        
+
         QGeoAddress address;
         if (geocode.contains(QStringLiteral("formatted_address"))) {
             address.setText(geocode.value(QStringLiteral("formatted_address")).toString());
         }
-        
-        
+
+
         if (geocode.contains(QStringLiteral("address_components"))) {
             QJsonArray ac = geocode.value(QStringLiteral("address_components")).toArray();
 

diff --git a/src/QtLocationPlugin/QGeoCodingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoCodingManagerEngineQGC.cpp
@@ -44,6 +44,9 @@
 **
 ****************************************************************************/
 
+#include "QGeoCodingManagerEngineQGC.h"
+#include "QGeoCodeReplyQGC.h"
+
 #include <QtCore/QVariantMap>
 #include <QtCore/QUrl>
 #include <QtCore/QUrlQuery>
@@ -55,10 +58,6 @@
 #include <QtPositioning/QGeoAddress>
 #include <QtPositioning/QGeoShape>
 #include <QtPositioning/QGeoRectangle>
-#include <QDebug>
-
-#include "QGeoCodingManagerEngineQGC.h"
-#include "QGeoCodeReplyQGC.h"
 
 static QString addressToQuery(const QGeoAddress &address)
 {
@@ -120,7 +119,7 @@ QGeoCodeReply *QGeoCodingManagerEngineQGC::geocode(const QString &address, int l
     url.setQuery(query);
     request.setUrl(url);
     //qDebug() << url;
-    
+
     QNetworkReply *reply = m_networkManager->get(request);
     reply->setParent(0);
 

diff --git a/src/QtLocationPlugin/QGeoMapReplyQGC.cpp b/src/QtLocationPlugin/QGeoMapReplyQGC.cpp
@@ -44,13 +44,13 @@
 **
 ****************************************************************************/
 
+#include "QGCMapEngine.h"
+#include "QGeoMapReplyQGC.h"
+
 #include <QtLocation/private/qgeotilespec_p.h>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QFile>
 
-#include "QGCMapEngine.h"
-#include "QGeoMapReplyQGC.h"
-
 //-----------------------------------------------------------------------------
 QGeoTiledMapReplyQGC::QGeoTiledMapReplyQGC(QNetworkAccessManager *networkManager, const QNetworkRequest &request, const QGeoTileSpec &spec, QObject *parent)
     : QGeoTiledMapReply(spec, parent)

diff --git a/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp b/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp
@@ -44,13 +44,12 @@
 **
 ****************************************************************************/
 
-#include <QtLocation/private/qgeotiledmappingmanagerengine_p.h>
-
-#include "qdebug.h"
 #include "QGeoServiceProviderPluginQGC.h"
 #include "QGeoTiledMappingManagerEngineQGC.h"
 #include "QGeoCodingManagerEngineQGC.h"
 
+#include <QtLocation/private/qgeotiledmappingmanagerengine_p.h>
+
 Q_EXTERN_C Q_DECL_EXPORT const char *qt_plugin_query_metadata();
 Q_EXTERN_C Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance();
 

diff --git a/src/QtLocationPlugin/QGeoTileFetcherQGC.cpp b/src/QtLocationPlugin/QGeoTileFetcherQGC.cpp
@@ -44,14 +44,14 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QLocale>
-#include <QtNetwork/QNetworkRequest>
-#include <QtLocation/private/qgeotilespec_p.h>
-
 #include "QGCMapEngine.h"
 #include "QGeoTileFetcherQGC.h"
 #include "QGeoMapReplyQGC.h"
 
+#include <QtCore/QLocale>
+#include <QtNetwork/QNetworkRequest>
+#include <QtLocation/private/qgeotilespec_p.h>
+
 //-----------------------------------------------------------------------------
 QGeoTileFetcherQGC::QGeoTileFetcherQGC(QGeoTiledMappingManagerEngine *parent)
     : QGeoTileFetcher(parent)

diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
@@ -44,6 +44,10 @@
 **
 ****************************************************************************/
 
+#include "QGCMapEngine.h"
+#include "QGeoTiledMappingManagerEngineQGC.h"
+#include "QGeoTileFetcherQGC.h"
+
 #include <QtLocation/private/qgeocameracapabilities_p.h>
 #include <QtLocation/private/qgeomaptype_p.h>
 #if QT_VERSION < 0x050500
@@ -54,10 +58,6 @@
 #include <QDir>
 #include <QStandardPaths>
 
-#include "QGCMapEngine.h"
-#include "QGeoTiledMappingManagerEngineQGC.h"
-#include "QGeoTileFetcherQGC.h"
-
 #if QT_VERSION >= 0x050500
 //-----------------------------------------------------------------------------
 QGeoTiledMapQGC::QGeoTiledMapQGC(QGeoTiledMappingManagerEngine *engine, QObject *parent)