Merge pull request #2 from Pix4D/nuri/RAG-4829-mapbox-url

nuri-ra · web-flow · commit aac6b946f1f8 · 2020-05-20T21:21:58.000+02:00
RAG-4829: Update mapbox URL
diff --git a/src/GeoFileTileCache.cpp b/src/GeoFileTileCache.cpp
@@ -5,9 +5,11 @@
 
 GeoFileTileCache::GeoFileTileCache(const QList<QGeoMapType>& mapTypes,
     int scaleFactor,
+    bool enableLogging,
     const QString& directory,
     QObject* parent)
     : QGeoFileTileCache(directory, parent)
+    , m_enableLogging(enableLogging)
     , m_hasCacheDirectory(!directory.isEmpty())
     , m_mapTypes(mapTypes)
 {
@@ -58,72 +60,90 @@ QGeoTileSpec GeoFileTileCache::filenameToTileSpec(const QString& filename) const
     // @See QGeoFileTileCacheMapBox for more information for this function
     // General scheme is: plugin_name - map_type - zoom - x - y - @scale.png
     // For now the cached tiles names look like this: 
-    //   basemap_pix4d_100-mapbox.streets-satellite-13-4401-2685-@2x.png or 
-    //   basemap_pix4d_100-mapbox.satellite-16-35208-21496-@1x.png
+    //   basemap_pix4d_100-ck8zzfxb30vwp1jo04yktjtbg-13-4401-2685-@2x.png or
+    //   basemap_pix4d_100-ck8zz9gpq0vty1ip30bji3b5a-16-35208-21496-@1x.png
     // basemap_pix4d_100 = plugin name
-    // mapbox.streets-satellite / mapbox.satellite = map type
+    // ck8zzfxb30vwp1jo04yktjtbg = streets-satellite type map
+    // ck8zz9gpq0vty1ip30bji3b5a = street type map
     // 13 = zoom
     // 4401-2685 = x, y
 
     if (!m_hasCacheDirectory)
     {
+        if (m_enableLogging)
+        {
+            qWarning() << "GeoFileTileCache: No cache directory.";
+        }
         return QGeoTileSpec();
     }
 
     const QStringList parts = filename.split('.');
-    if (parts.length() != 3) // 3 because the map name has always a dot in it.
+    if (parts.length() != 2) // 2 because the map name has always a dot in it.
     {
+        if (m_enableLogging)
+        {
+            qWarning() << "GeoFileTileCache: This file doesn't have a file extension.";
+        }
         return QGeoTileSpec();
     }
 
-    // name = mapbox_pix4d_100-mapbox.streets-satellite-13-4401-2685-@2x (no extension)
-    const QString name = parts.at(0) + "." + parts.at(1);
+    // name = mapbox_pix4d_100-ck8zzfxb30vwp1jo04yktjtbg-13-4401-2685-@2x (no extension)
+    const QString name = parts.at(0);
     const QStringList fields = name.split('-');
 
     // must be at least 6 different fields
     if (fields.length() < 6)
     {
+        if (m_enableLogging)
+        {
+            qWarning() << "GeoFileTileCache: The file name without extension doesn't have 6 different fields.";
+        }
         return QGeoTileSpec();
     }
 
     const int length = fields.length();
     const int scaleIdx = fields.last().indexOf("@");
     if (scaleIdx < 0 || fields.last().size() <= (scaleIdx + 2))
     {
+        if (m_enableLogging)
+        {
+            qWarning() << "GeoFileTileCache: Scale is not last data in name.";
+        }
         return QGeoTileSpec();
     }
 
     int scaleFactor = fields.last()[scaleIdx + 1].digitValue();
     if (scaleFactor != m_scaleFactor)
     {
+        if (m_enableLogging)
+        {
+            qWarning() << "GeoFileTileCache: The last fields doesn't have scale factor.";
+        }
         return QGeoTileSpec();
     }
 
     QList<int> numbers;
-    int startIndex = 2;
-
-    // try to combine the fields from [1] and [2]. In case the map type 
-    // contains a '-' in it (e.g. mapbox.streets-satellite vs mapbox.satellite)
-    QString pluginName = fields.at(1);
-    if (m_mapNameToId.find(pluginName + "-" + fields.at(2)) != m_mapNameToId.end())
-    {
-        pluginName += "-" + fields.at(2);
-        startIndex = 3;
-    }
-
-    for (int i = startIndex; i < length - 1; ++i) // skipping -@_X
+    for (int i = 2; i < length - 1; ++i) // skipping -@_X
     {  
         bool ok = false;
         const int value = fields.at(i).toInt(&ok);
         if (!ok)
         {
+            if (m_enableLogging)
+            {
+                qWarning() << "GeoFileTileCache: The value of zoom/x/y must be integer.";
+            }
             return QGeoTileSpec();
         }
         numbers.append(value);
     }
 
     if (numbers.length() < 3)
     {
+        if (m_enableLogging)
+        {
+            qWarning() << "GeoFileTileCache: The cache file must have zoom/x/y value.";
+        }
         return QGeoTileSpec();
     }
 
@@ -134,5 +154,5 @@ QGeoTileSpec GeoFileTileCache::filenameToTileSpec(const QString& filename) const
     }
 
     return QGeoTileSpec(
-        fields.at(0), m_mapNameToId[pluginName], numbers.at(0), numbers.at(1), numbers.at(2), numbers.at(3));
-}
+        fields.at(0), m_mapNameToId[fields.at(1)], numbers.at(0), numbers.at(1), numbers.at(2), numbers.at(3));
+}
diff --git a/src/GeoFileTileCache.h b/src/GeoFileTileCache.h
@@ -8,14 +8,15 @@ class GeoFileTileCache : public QGeoFileTileCache
     Q_OBJECT
 
 public:
-    GeoFileTileCache(const QList<QGeoMapType>& mapTypes, int scaleFactor, const QString& directory = QString(), QObject* parent = nullptr);
+    GeoFileTileCache(const QList<QGeoMapType>& mapTypes, int scaleFactor, bool enableLogging, const QString& directory = QString(), QObject* parent = nullptr);
 
 protected:
     QString tileSpecToFilename(const QGeoTileSpec& spec, const QString& format, const QString& directory) const override;
     QGeoTileSpec filenameToTileSpec(const QString& filename) const override;
 
+    bool m_enableLogging{false};
     bool m_hasCacheDirectory{false};
     QList<QGeoMapType> m_mapTypes;
     QMap<QString, int> m_mapNameToId;
     int m_scaleFactor{0};
-};
+};
diff --git a/src/GeoTileFetcher.cpp b/src/GeoTileFetcher.cpp
@@ -154,7 +154,7 @@ QGeoTiledMapReply* GeoTileFetcher::getTileImage(const QGeoTileSpec& spec)
     {
         request.setUrl(
            QUrl(QStringLiteral("https://api.mapbox.com/styles/v1/cloudpix4d/")
-                + m_mapIds[(spec.mapId() > m_mapIds.size()) ? 0 : spec.mapId() - 1]
+                + ((spec.mapId() > m_mapIds.size()) ? PIX4D_STREET : m_mapIds[spec.mapId() - 1])
                 + QLatin1String("/tiles/256/")
                 + QString::number(spec.zoom())
                 + QLatin1Char('/')
diff --git a/src/GeoTileFetcher.h b/src/GeoTileFetcher.h
@@ -20,6 +20,11 @@ class GeoTileFetcher : public QGeoTileFetcher
 private:
     QGeoTiledMapReply* getTileImage(const QGeoTileSpec& spec);
 
+public:
+    // The list of map style ids
+    static constexpr const char* PIX4D_STREET = "ck8zz9gpq0vty1ip30bji3b5a";
+    static constexpr const char* PIX4D_STREETS_SATELLITE = "ck8zzfxb30vwp1jo04yktjtbg";
+
 private:
     QNetworkAccessManager* m_networkManager{nullptr};
     QByteArray m_userAgent;
diff --git a/src/GeoTiledMappingManagerEngine.cpp b/src/GeoTiledMappingManagerEngine.cpp
@@ -74,22 +74,22 @@ GeoTiledMappingManagerEngine::GeoTiledMappingManagerEngine(const QVariantMap& pa
     QVector<QString> mapIds;
     if (usingMapBox)
     {
-        mapTypes << QGeoMapType(QGeoMapType::HybridMap,
-            QStringLiteral("ck8zzfxb30vwp1jo04yktjtbg"),
-            QStringLiteral("Streets Satellite"),
-            false,
-            false,
-            mapTypes.size() + 1,
-            pluginName,
-            cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay,
+                                GeoTileFetcher::PIX4D_STREETS_SATELLITE,
+                                QStringLiteral("Satellite"),
+                                false,
+                                false,
+                                mapTypes.size() + 1,
+                                pluginName,
+                                cameraCaps);
         mapTypes << QGeoMapType(QGeoMapType::StreetMap,
-            QStringLiteral("ck8zz9gpq0vty1ip30bji3b5a"),
-            QStringLiteral("Street"),
-            false,
-            false,
-            mapTypes.size() + 1,
-            pluginName,
-            cameraCaps);
+                                GeoTileFetcher::PIX4D_STREET,
+                                QStringLiteral("Street"),
+                                false,
+                                false,
+                                mapTypes.size() + 1,
+                                pluginName,
+                                cameraCaps);
 
         for (const auto& type : mapTypes)
         {
@@ -130,7 +130,7 @@ GeoTiledMappingManagerEngine::GeoTiledMappingManagerEngine(const QVariantMap& pa
             cacheDirectory = QAbstractGeoTileCache::baseLocationCacheDirectory() + QLatin1String(pluginName);
         }
 
-        auto tileCache = new GeoFileTileCache(mapTypes, scaleFactor, cacheDirectory);
+        auto tileCache = new GeoFileTileCache(mapTypes, scaleFactor, enableLogging, cacheDirectory);
         tileCache->setCostStrategyDisk(QGeoFileTileCache::Unitary);
         tileCache->setCostStrategyMemory(QGeoFileTileCache::ByteSize);
         tileCache->setCostStrategyTexture(QGeoFileTileCache::ByteSize);

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ QGeoTiledMapReply* GeoTileFetcher::getTileImage(const QGeoTileSpec& spec)`
`154`	`154`	`{`
`155`	`155`	`request.setUrl(`
`156`	`156`	`QUrl(QStringLiteral("https://api.mapbox.com/styles/v1/cloudpix4d/")`
`157`		`- + m_mapIds[(spec.mapId() > m_mapIds.size()) ? 0 : spec.mapId() - 1]`
	`157`	`+ + ((spec.mapId() > m_mapIds.size()) ? PIX4D_STREET : m_mapIds[spec.mapId() - 1])`
`158`	`158`	`+ QLatin1String("/tiles/256/")`
`159`	`159`	`+ QString::number(spec.zoom())`
`160`	`160`	`+ QLatin1Char('/')`