Create generic, add Eniro and Esri

src/QtLocationPlugin/EsriMapProvider.cpp

@@ -0,0 +1,61 @@
+#include "EsriMapProvider.h"
+#include "QGCApplication.h"
+#include "QGCMapEngine.h"
+#include "SettingsManager.h"
+
+QNetworkRequest
+EsriMapProvider::getTileURL(int x, int y, int zoom,
+                            QNetworkAccessManager* networkManager) {
+    //-- Build URL
+    QNetworkRequest request;
+    QString         url = _getURL(x, y, zoom, networkManager);
+    if (url.isEmpty()) {
+        return request;
+    }
+    request.setUrl(QUrl(url));
+    request.setRawHeader("Accept", "*/*");
+    QByteArray token = qgcApp()
+                           ->toolbox()
+                           ->settingsManager()
+                           ->appSettings()
+                           ->esriToken()
+                           ->rawValue()
+                           .toString()
+                           .toLatin1();
+    request.setRawHeader("User-Agent",
+                         QByteArrayLiteral("Qt Location based application"));
+    request.setRawHeader("User-Token", token);
+    return request;
+}
+
+QString
+EsriWorldStreetMapProvider::_getURL(int x, int y, int zoom,
+                                    QNetworkAccessManager* networkManager) {
+    Q_UNUSED(networkManager);
+    return QString("http://services.arcgisonline.com/ArcGIS/rest/services/"
+                   "World_Street_Map/MapServer/tile/%1/%2/%3")
+        .arg(zoom)
+        .arg(y)
+        .arg(x);
+}
+
+QString
+EsriWorldSatelliteMapProvider::_getURL(int x, int y, int zoom,
+                                       QNetworkAccessManager* networkManager) {
+    Q_UNUSED(networkManager);
+    return QString("http://server.arcgisonline.com/ArcGIS/rest/"
+                   "services/World_Imagery/MapServer/tile/%1/%2/%3")
+        .arg(zoom)
+        .arg(y)
+        .arg(x);
+}
+
+QString EsriTerrainMapProvider::_getURL(int x, int y, int zoom,
+                                        QNetworkAccessManager* networkManager) {
+    Q_UNUSED(networkManager);
+    return QString("http://server.arcgisonline.com/ArcGIS/rest/services/"
+                   "World_Terrain_Base/MapServer/tile/%1/%2/%3")
+        .arg(zoom)
+        .arg(y)
+        .arg(x);
+}

src/QtLocationPlugin/EsriMapProvider.h

@@ -0,0 +1,49 @@
+#pragma once
+
+#include "MapProvider.h"
+
+#include <QByteArray>
+#include <QMutex>
+#include <QNetworkProxy>
+#include <QNetworkReply>
+#include <QPoint>
+#include <QString>
+
+class EsriMapProvider : public MapProvider {
+    Q_OBJECT
+  public:
+    using MapProvider::MapProvider;
+
+    QNetworkRequest getTileURL(int x, int y, int zoom,
+                               QNetworkAccessManager* networkManager);
+};
+
+class EsriWorldStreetMapProvider : public EsriMapProvider {
+    Q_OBJECT
+  public:
+    EsriWorldStreetMapProvider(QObject* parent)
+        : EsriMapProvider(QString(""), QString(""), AVERAGE_TILE_SIZE,
+                          QGeoMapType::StreetMap, parent) {}
+    QString _getURL(int x, int y, int zoom,
+                    QNetworkAccessManager* networkManager);
+};
+
+class EsriWorldSatelliteMapProvider : public EsriMapProvider {
+    Q_OBJECT
+  public:
+    EsriWorldSatelliteMapProvider(QObject* parent)
+        : EsriMapProvider(QString(""), QString(""), AVERAGE_TILE_SIZE,
+                          QGeoMapType::SatelliteMapDay, parent) {}
+    QString _getURL(int x, int y, int zoom,
+                    QNetworkAccessManager* networkManager);
+};
+
+class EsriTerrainMapProvider : public EsriMapProvider {
+    Q_OBJECT
+  public:
+    EsriTerrainMapProvider(QObject* parent)
+        : EsriMapProvider(QString(""), QString(""), AVERAGE_TILE_SIZE,
+                          QGeoMapType::TerrainMap, parent) {}
+    QString _getURL(int x, int y, int zoom,
+                    QNetworkAccessManager* networkManager);
+};

src/QtLocationPlugin/GenericMapProvider.cpp

@@ -1,15 +1,5 @@
-#include "StatkartMapProvider.h"
-#if defined(DEBUG_GOOGLE_MAPS)
-#include <QFile>
-#include <QStandardPaths>
-#endif
 #include "QGCMapEngine.h"
-
+#include "GenericMapProvider.h"
-StatkartMapProvider::StatkartMapProvider(QObject* parent)
-    : MapProvider(QString("https://www.norgeskart.no/"), QString("png"),
-                  AVERAGE_TILE_SIZE, QGeoMapType::StreetMap, parent) {}
-
-StatkartMapProvider::~StatkartMapProvider() {}
 
 QString StatkartMapProvider::_getURL(int x, int y, int zoom,
                                      QNetworkAccessManager* networkManager) {
@@ -21,3 +11,12 @@ QString StatkartMapProvider::_getURL(int x, int y, int zoom,
         .arg(y);
 }
 
+QString EniroMapProvider::_getURL(int x, int y, int zoom,
+                                  QNetworkAccessManager* networkManager) {
+    Q_UNUSED(networkManager);
+    return QString("http://map.eniro.com/geowebcache/service/tms1.0.0/map/%1/"
+                   "%2/%3.png")
+        .arg(zoom)
+        .arg(x)
+        .arg((1 << zoom) - 1 - y);
+}

src/QtLocationPlugin/GenericMapProvider.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include "MapProvider.h"
+
+#include <QByteArray>
+#include <QMutex>
+#include <QNetworkProxy>
+#include <QNetworkReply>
+#include <QPoint>
+#include <QString>
+
+class StatkartMapProvider : public MapProvider {
+    Q_OBJECT
+  public:
+    StatkartMapProvider(QObject* parent)
+        : MapProvider(QString("https://www.norgeskart.no/"), QString("png"),
+                      AVERAGE_TILE_SIZE, QGeoMapType::StreetMap, parent) {}
+
+    QString _getURL(int x, int y, int zoom,
+                    QNetworkAccessManager* networkManager);
+};
+
+class EniroMapProvider : public MapProvider {
+    Q_OBJECT
+  public:
+    EniroMapProvider(QObject* parent)
+        : MapProvider(QString("https://www.eniro.se/"), QString("png"),
+                      AVERAGE_TILE_SIZE, QGeoMapType::StreetMap, parent) {}
+
+    QString _getURL(int x, int y, int zoom,
+                    QNetworkAccessManager* networkManager);
+};

src/QtLocationPlugin/MapProvider.h

@@ -19,9 +19,9 @@ const quint32 AVERAGE_AIRMAP_ELEV_SIZE  = 2786;
 class MapProvider : public QObject {
     Q_OBJECT
   public:
-    MapProvider(QString referrer, QString imageFormat, quint32 averageSize,
+    MapProvider(
-                QGeoMapType::MapStyle _mapType = QGeoMapType::CustomMap,
+        QString referrer, QString imageFormat, quint32 averageSize,
-                QObject*              parent   = nullptr);
+        QGeoMapType::MapStyle _mapType = QGeoMapType::CustomMap, QObject* parent = nullptr);
 
     QNetworkRequest getTileURL(int x, int y, int zoom,
                                QNetworkAccessManager* networkManager);

src/QtLocationPlugin/QGCLocationPlugin.pri

@@ -25,7 +25,8 @@ HEADERS += \
     $$PWD/MapProvider.h \
     $$PWD/GoogleMapProvider.h \
     $$PWD/BingMapProvider.h \
-    $$PWD/StatkartMapProvider.h \
+    $$PWD/GenericMapProvider.h \
+    $$PWD/EsriMapProvider.h \
 
 SOURCES += \
     $$PWD/QGCMapEngine.cpp \
@@ -41,7 +42,8 @@ SOURCES += \
     $$PWD/MapProvider.cpp \
     $$PWD/GoogleMapProvider.cpp \
     $$PWD/BingMapProvider.cpp \
-    $$PWD/StatkartMapProvider.cpp \
+    $$PWD/GenericMapProvider.cpp \
+    $$PWD/EsriMapProvider.cpp \
 
 OTHER_FILES += \
     $$PWD/qgc_maps_plugin.json

src/QtLocationPlugin/QGCMapUrlEngine.cpp

@@ -37,7 +37,8 @@ UrlFactory::UrlFactory() : _timeout(5 * 1000) {
     // BingMaps
     //_versionBingMaps             = "563";
 
-    // Warning : in _providersTable, keys needs to follow this format : "Provider Type"
+    // Warning : in _providersTable, keys needs to follow this format :
+    // "Provider Type"
 #ifndef QGC_NO_GOOGLE_MAPS
     _providersTable["Google Street Map"] = new GoogleStreetMapProvider(this);
     _providersTable["Google Satellite"]  = new GoogleSatelliteMapProvider(this);
@@ -50,6 +51,13 @@ UrlFactory::UrlFactory() : _timeout(5 * 1000) {
     _providersTable["Bing Hybrid"]    = new BingHybridMapProvider(this);
 
     _providersTable["Statkart Topo"] = new StatkartMapProvider(this);
+
+    _providersTable["Eniro Topo"] = new EniroMapProvider(this);
+
+    // To be add later on Token entry !
+    //_providersTable["Esri World Street"] = new EsriWorldStreetMapProvider(this);
+    //_providersTable["Esri World Satellite"] = new EsriWorldSatelliteMapProvider(this);
+    //_providersTable["Esri Terrain"] = new EsriTerrainMapProvider(this);
 }
 
 void UrlFactory::registerProvider(QString name, MapProvider* provider) {
@@ -219,7 +227,6 @@ UrlFactory::_getURL(QString type, int x, int y, int zoom, QNetworkAccessManager*
     break;
     case EniroTopo:
     {
-    	return QString("http://map.eniro.com/geowebcache/service/tms1.0.0/map/%1/%2/%3.png").arg(zoom).arg(x).arg((1<<zoom)-1-y);
     }
     break;
     /*
@@ -274,11 +281,6 @@ UrlFactory::_getURL(QString type, int x, int y, int zoom, QNetworkAccessManager*
     break;
     */
     case EsriWorldStreet:
-        return QString("http://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/%1/%2/%3").arg(zoom).arg(y).arg(x);
-    case EsriWorldSatellite:
-        return QString("http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/%1/%2/%3").arg(zoom).arg(y).arg(x);
-    case EsriTerrain:
-        return QString("http://server.arcgisonline.com/ArcGIS/rest/services/World_Terrain_Base/MapServer/tile/%1/%2/%3").arg(zoom).arg(y).arg(x);
 
     case MapboxStreets:
     case MapboxLight:

src/QtLocationPlugin/QGCMapUrlEngine.h

@@ -18,7 +18,8 @@
 
 #include "GoogleMapProvider.h"
 #include "BingMapProvider.h"
-#include "StatkartMapProvider.h"
+#include "GenericMapProvider.h"
+#include "EsriMapProvider.h"
 
 #define MAX_MAP_ZOOM (20.0)
 

src/QtLocationPlugin/StatkartMapProvider.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "MapProvider.h"
-
-#include <QByteArray>
-#include <QMutex>
-#include <QNetworkProxy>
-#include <QNetworkReply>
-#include <QPoint>
-#include <QString>
-
-class StatkartMapProvider : public MapProvider {
-
-    Q_OBJECT
-  public:
-    StatkartMapProvider(QObject* parent);
-    ~StatkartMapProvider();
-
-  protected:
-    QString _getURL(int x, int y, int zoom,
-                    QNetworkAccessManager* networkManager);
-};
-