Implemented map tiles support

Vladyslav Stelmakhovskyi · Vladyslav Stelmakhovskyi · commit 19321cbedf76 · 2016-01-08T15:10:50.000+01:00
diff --git a/googlemaps.pro b/googlemaps.pro
@@ -13,7 +13,11 @@ HEADERS += \
     qgeoroutereplygooglemaps.h \
     qplacemanagerenginegooglemaps.h \
     qplacesearchreplygooglemaps.h \
-    qplacecategoriesreplygooglemaps.h
+    qplacecategoriesreplygooglemaps.h \
+    qgeomapreplygooglemaps.h \
+    qgeotiledmapgooglemaps.h \
+    qgeotiledmappingmanagerenginegooglemaps.h \
+    qgeotilefetchergooglemaps.h
 
 SOURCES += \
     qgeoserviceproviderplugingooglemaps.cpp \
@@ -23,7 +27,11 @@ SOURCES += \
     qgeoroutereplygooglemaps.cpp \
     qplacemanagerenginegooglemaps.cpp \
     qplacesearchreplygooglemaps.cpp \
-    qplacecategoriesreplygooglemaps.cpp
+    qplacecategoriesreplygooglemaps.cpp \
+    qgeomapreplygooglemaps.cpp \
+    qgeotiledmapgooglemaps.cpp \
+    qgeotiledmappingmanagerenginegooglemaps.cpp \
+    qgeotilefetchergooglemaps.cpp
 
 
 OTHER_FILES += \
diff --git a/googlemaps_plugin.json b/googlemaps_plugin.json
@@ -7,6 +7,8 @@
         "OnlineGeocodingFeature",
         "ReverseGeocodingFeature",
         "OnlineRoutingFeature",
-        "OnlinePlacesFeature"
+        "AlternativeRoutesFeature",
+        "OnlinePlacesFeature",
+        "OnlineMappingFeature"
     ]
 }
diff --git a/qgeomapreplygooglemaps.cpp b/qgeomapreplygooglemaps.cpp
@@ -0,0 +1,68 @@
+#include "qgeomapreplygooglemaps.h"
+#include <QNetworkAccessManager>
+#include <QNetworkCacheMetaData>
+#include <QDateTime>
+
+QT_BEGIN_NAMESPACE
+
+QGeoMapReplyGooglemaps::QGeoMapReplyGooglemaps(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent)
+        : QGeoTiledMapReply(spec, parent),
+        m_reply(reply)
+{
+    connect(m_reply,
+            SIGNAL(finished()),
+            this,
+            SLOT(networkFinished()));
+
+    connect(m_reply,
+            SIGNAL(error(QNetworkReply::NetworkError)),
+            this,
+            SLOT(networkError(QNetworkReply::NetworkError)));
+}
+
+QGeoMapReplyGooglemaps::~QGeoMapReplyGooglemaps()
+{
+}
+
+QNetworkReply *QGeoMapReplyGooglemaps::networkReply() const
+{
+    return m_reply;
+}
+
+void QGeoMapReplyGooglemaps::abort()
+{
+    if (!m_reply)
+        return;
+
+    m_reply->abort();
+}
+
+void QGeoMapReplyGooglemaps::networkFinished()
+{
+    if (!m_reply)
+        return;
+
+    if (m_reply->error() != QNetworkReply::NoError)
+        return;
+
+    setMapImageData(m_reply->readAll());
+    setMapImageFormat("png");
+    setFinished(true);
+
+    m_reply->deleteLater();
+    m_reply = 0;
+}
+
+void QGeoMapReplyGooglemaps::networkError(QNetworkReply::NetworkError error)
+{
+    if (!m_reply)
+        return;
+
+    if (error != QNetworkReply::OperationCanceledError)
+        setError(QGeoTiledMapReply::CommunicationError, m_reply->errorString());
+    setFinished(true);
+    m_reply->deleteLater();
+    m_reply = 0;
+}
+
+QT_END_NAMESPACE
diff --git a/qgeomapreplygooglemaps.h b/qgeomapreplygooglemaps.h
@@ -0,0 +1,33 @@
+#ifndef QGEOMAPREPLYGOOGLEMAPS_H
+#define QGEOMAPREPLYGOOGLEMAPS_H
+
+#include <QtNetwork/QNetworkReply>
+#include <QtLocation/private/qgeotilespec_p.h>
+#include <QtLocation/private/qgeotiledmapreply_p.h>
+#include <QtCore/QPointer>
+
+QT_BEGIN_NAMESPACE
+
+class QGeoMapReplyGooglemaps : public QGeoTiledMapReply
+{
+    Q_OBJECT
+
+public:
+    QGeoMapReplyGooglemaps(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = 0);
+    ~QGeoMapReplyGooglemaps();
+
+    void abort();
+
+    QNetworkReply *networkReply() const;
+
+private Q_SLOTS:
+    void networkFinished();
+    void networkError(QNetworkReply::NetworkError error);
+
+private:
+    QPointer<QNetworkReply> m_reply;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/qgeoserviceproviderplugingooglemaps.cpp b/qgeoserviceproviderplugingooglemaps.cpp
@@ -2,6 +2,8 @@
 #include "qgeocodingmanagerenginegooglemaps.h"
 #include "qgeoroutingmanagerenginegooglemaps.h"
 #include "qplacemanagerenginegooglemaps.h"
+#include "qgeotiledmappingmanagerenginegooglemaps.h"
+
 
 QGeoCodingManagerEngine *QGeoServiceProviderFactoryGooglemaps::createGeocodingManagerEngine(
     const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
@@ -20,3 +22,11 @@ QPlaceManagerEngine *QGeoServiceProviderFactoryGooglemaps::createPlaceManagerEng
 {
     return new QPlaceManagerEngineGooglemaps(parameters, error, errorString);
 }
+
+QGeoMappingManagerEngine *QGeoServiceProviderFactoryGooglemaps::createMappingManagerEngine(
+        const QVariantMap &parameters,
+        QGeoServiceProvider::Error *error,
+        QString *errorString) const
+{
+    return new QGeoTiledMappingManagerEngineGooglemaps(parameters, error, errorString);
+}
diff --git a/qgeoserviceproviderplugingooglemaps.h b/qgeoserviceproviderplugingooglemaps.h
@@ -1,5 +1,5 @@
-#ifndef QGEOSERVICEPROVIDER_GOOGLEMAPS_H
-#define QGEOSERVICEPROVIDER_GOOGLEMAPS_H
+#ifndef QGEOSERVICEPROVIDERGOOGLEMAPS_H
+#define QGEOSERVICEPROVIDERGOOGLEMAPS_H
 
 #include <QtCore/QObject>
 #include <QtLocation/QGeoServiceProviderFactory>
@@ -21,6 +21,10 @@ class QGeoServiceProviderFactoryGooglemaps: public QObject, public QGeoServicePr
     QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap &parameters,
                                                   QGeoServiceProvider::Error *error,
                                                   QString *errorString) const;
+    QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap &parameters,
+                                                         QGeoServiceProvider::Error *error,
+                                                         QString *errorString) const;
+
 };
 
 #endif
diff --git a/qgeotiledmapgooglemaps.cpp b/qgeotiledmapgooglemaps.cpp
@@ -0,0 +1,33 @@
+#include "qgeotiledmapgooglemaps.h"
+#include "qgeotiledmappingmanagerenginegooglemaps.h"
+#include "QtLocation/private/qgeomapcontroller_p.h"
+
+#include <QDebug>
+#include <QObject>
+#include <QColor>
+#include <QFont>
+#include <QPainter>
+#include <QImage>
+#include <QRect>
+
+#include <QStaticText>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+ Constructs a new tiled map data object, which stores the map data required by
+ \a geoMap and makes use of the functionality provided by \a engine.
+ */
+QGeoTiledMapGooglemaps::QGeoTiledMapGooglemaps(QGeoTiledMappingManagerEngineGooglemaps *engine, QObject *parent /*= 0*/) :
+    QGeoTiledMap(engine, parent),
+    m_engine(engine)
+{}
+
+QGeoTiledMapGooglemaps::~QGeoTiledMapGooglemaps() {}
+
+void QGeoTiledMapGooglemaps::evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles)
+{
+    Q_UNUSED(visibleTiles);
+}
+
+QT_END_NAMESPACE
diff --git a/qgeotiledmapgooglemaps.h b/qgeotiledmapgooglemaps.h
@@ -0,0 +1,33 @@
+#ifndef QGEOMAPGOOGLEMAPS_H
+#define QGEOMAPGOOGLEMAPS_H
+
+#include "QtLocation/private/qgeotiledmap_p.h"
+#include <QtGui/QImage>
+#include <QtCore/QPointer>
+
+QT_BEGIN_NAMESPACE
+
+class QGeoTiledMappingManagerEngineGooglemaps;
+
+class QGeoTiledMapGooglemaps: public QGeoTiledMap
+{
+Q_OBJECT
+public:
+    QGeoTiledMapGooglemaps(QGeoTiledMappingManagerEngineGooglemaps *engine, QObject *parent = 0);
+    ~QGeoTiledMapGooglemaps();
+
+    QString getViewCopyright();
+    void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles);
+
+private:
+    //QImage m_logo;
+    QImage m_copyrightsSlab;
+    QString m_lastCopyrightsString;
+    QPointer<QGeoTiledMappingManagerEngineGooglemaps> m_engine;
+
+    Q_DISABLE_COPY(QGeoTiledMapGooglemaps)
+};
+
+QT_END_NAMESPACE
+
+#endif // QGEOMAPGOOGLEMAPS_H
diff --git a/qgeotiledmappingmanagerenginegooglemaps.cpp b/qgeotiledmappingmanagerenginegooglemaps.cpp
@@ -0,0 +1,78 @@
+#include "QtLocation/private/qgeocameracapabilities_p.h"
+#include "qgeotiledmappingmanagerenginegooglemaps.h"
+#include "qgeotiledmapgooglemaps.h"
+#include "qgeotilefetchergooglemaps.h"
+#include "QtLocation/private/qgeotilespec_p.h"
+#include "QtLocation/private/qgeofiletilecache_p.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QVariant>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/qmath.h>
+#include <QtCore/qstandardpaths.h>
+
+QT_BEGIN_NAMESPACE
+
+QGeoTiledMappingManagerEngineGooglemaps::QGeoTiledMappingManagerEngineGooglemaps(const QVariantMap &parameters,
+    QGeoServiceProvider::Error *error,
+    QString *errorString)
+    : QGeoTiledMappingManagerEngine()
+{
+    Q_UNUSED(error);
+    Q_UNUSED(errorString);
+
+    QGeoCameraCapabilities capabilities;
+
+    capabilities.setMinimumZoomLevel(0.0);
+    capabilities.setMaximumZoomLevel(21.0);
+
+    setCameraCapabilities(capabilities);
+
+    setTileSize(QSize(256, 256));
+
+    QList<QGeoMapType> types;
+    types << QGeoMapType(QGeoMapType::StreetMap, tr("Street Map"), tr("Normal map view in daylight mode"), false, false, 1);
+    types << QGeoMapType(QGeoMapType::SatelliteMapDay, tr("Satellite Map"), tr("Satellite map view in daylight mode"), false, false, 2);
+    types << QGeoMapType(QGeoMapType::TerrainMap, tr("Terrain Map"), tr("Terrain map view in daylight mode"), false, false, 3);
+    types << QGeoMapType(QGeoMapType::HybridMap, tr("Hybrid Map"), tr("Satellite map view with streets in daylight mode"), false, false, 4);
+    setSupportedMapTypes(types);
+
+    QGeoTileFetcherGooglemaps *fetcher = new QGeoTileFetcherGooglemaps(parameters, this, tileSize());
+    setTileFetcher(fetcher);
+
+    m_cacheDirectory = QAbstractGeoTileCache::baseCacheDirectory() + QLatin1String("googlemaps");
+
+    QAbstractGeoTileCache *tileCache = new QGeoFileTileCache(m_cacheDirectory);
+    setTileCache(tileCache);
+
+    populateMapSchemes();
+}
+
+QGeoTiledMappingManagerEngineGooglemaps::~QGeoTiledMappingManagerEngineGooglemaps()
+{
+}
+
+void QGeoTiledMappingManagerEngineGooglemaps::populateMapSchemes()
+{
+    m_mapSchemes[0] = QStringLiteral("roadmap");
+    m_mapSchemes[1] = QStringLiteral("roadmap");
+    m_mapSchemes[2] = QStringLiteral("satellite");
+    m_mapSchemes[3] = QStringLiteral("terrain");
+    m_mapSchemes[4] = QStringLiteral("hybrid");
+}
+
+QString QGeoTiledMappingManagerEngineGooglemaps::getScheme(int mapId)
+{
+    return m_mapSchemes[mapId];
+}
+
+QGeoMap *QGeoTiledMappingManagerEngineGooglemaps::createMap()
+{
+    return new QGeoTiledMapGooglemaps(this);
+}
+
+QT_END_NAMESPACE
+
diff --git a/qgeotiledmappingmanagerenginegooglemaps.h b/qgeotiledmappingmanagerenginegooglemaps.h
@@ -0,0 +1,43 @@
+#ifndef QGEOTILEDMAPPINGMANAGERENGINEGOOGLEMAPS_H
+#define QGEOTILEDMAPPINGMANAGERENGINEGOOGLEMAPS_H
+
+#include "QtLocation/private/qgeotiledmappingmanagerengine_p.h"
+#include <QtPositioning/QGeoRectangle>
+#include "QtLocation/private/qgeomaptype_p.h"
+
+#include <QGeoServiceProvider>
+
+#include <QList>
+#include <QHash>
+#include <QSet>
+
+QT_BEGIN_NAMESPACE
+
+class QByteArray;
+class QGeoTileSpec;
+class QGeoNetworkAccessManager;
+
+class QGeoTiledMappingManagerEngineGooglemaps : public QGeoTiledMappingManagerEngine
+{
+    Q_OBJECT
+
+public:
+    QGeoTiledMappingManagerEngineGooglemaps(const QVariantMap &parameters,
+                                       QGeoServiceProvider::Error *error,
+                                       QString *errorString);
+    ~QGeoTiledMappingManagerEngineGooglemaps();
+
+    virtual QGeoMap *createMap();
+    QString getScheme(int mapId);
+
+private:
+    void initialize();
+    void populateMapSchemes();
+
+    QHash<int, QString> m_mapSchemes;
+    QString m_cacheDirectory;
+};
+
+QT_END_NAMESPACE
+
+#endif // QGEOTILEDMAPPINGMANAGERENGINEGOOGLEMAPS_H
diff --git a/qgeotilefetchergooglemaps.cpp b/qgeotilefetchergooglemaps.cpp
diff --git a/qgeotilefetchergooglemaps.h b/qgeotilefetchergooglemaps.h

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`"OnlineGeocodingFeature",`
`8`	`8`	`"ReverseGeocodingFeature",`
`9`	`9`	`"OnlineRoutingFeature",`
`10`		`- "OnlinePlacesFeature"`
	`10`	`+ "AlternativeRoutesFeature",`
	`11`	`+ "OnlinePlacesFeature",`
	`12`	`+ "OnlineMappingFeature"`
`11`	`13`	`]`
`12`	`14`	`}`