Rework style settings and make QMapLibre::Settings more future-proof

maplibre · Nov 4, 2023 · 1451c42 · 1451c42
1 parent 80fe60e
commit 1451c42
Show file tree

Hide file tree

Showing 21 changed files with 691 additions and 138 deletions.
diff --git a/examples/quick/main.qml b/examples/quick/main.qml
@@ -40,7 +40,7 @@ Window {
         name: "maplibre"
         // specify plugin parameters if necessary
         PluginParameter {
-            name: "maplibre.map.style_urls"
+            name: "maplibre.map.styles"
             value: "https://demotiles.maplibre.org/style.json"
         }
     }

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -49,7 +49,7 @@ target_sources(
         renderer_backend.cpp renderer_backend_p.hpp
         renderer_observer_p.hpp
         scheduler.cpp scheduler_p.hpp
-        settings.cpp
+        settings.cpp settings_p.hpp
         types.cpp
         utils.cpp
 )

diff --git a/src/core/map.cpp b/src/core/map.cpp
@@ -128,10 +128,17 @@ mbgl::MapOptions mapOptionsFromSettings(const QMapLibre::Settings &settings, con
 }
 
 mbgl::ResourceOptions resourceOptionsFromSettings(const QMapLibre::Settings &settings) {
+    if (settings.tileServerOptions() == nullptr) {
+        return std::move(mbgl::ResourceOptions()
+                             .withAssetPath(settings.assetPath().toStdString())
+                             .withCachePath(settings.cacheDatabasePath().toStdString())
+                             .withMaximumCacheSize(settings.cacheDatabaseMaximumSize()));
+    }
+
     return std::move(mbgl::ResourceOptions()
                          .withApiKey(settings.apiKey().toStdString())
                          .withAssetPath(settings.assetPath().toStdString())
-                         .withTileServerOptions(*settings.tileServerOptionsInternal())
+                         .withTileServerOptions(*settings.tileServerOptions())
                          .withCachePath(settings.cacheDatabasePath().toStdString())
                          .withMaximumCacheSize(settings.cacheDatabaseMaximumSize()));
 }
@@ -1236,14 +1243,6 @@ void Map::connectionEstablished() {
     mbgl::NetworkStatus::Reachable();
 }
 
-/*!
-    Returns a list containing a pair of string objects, representing the style
-    URL and name, respectively.
-*/
-const QVector<QPair<QString, QString>> &Map::defaultStyles() const {
-    return d_ptr->defaultStyles;
-}
-
 /*!
     \fn void QMapLibre::Map::needsRendering()
 
@@ -1303,11 +1302,6 @@ MapPrivate::MapPrivate(Map *q, const Settings &settings, const QSize &size, qrea
     connect(m_mapObserver.get(), &MapObserver::copyrightsChanged, q, &Map::copyrightsChanged);
 
     auto resourceOptions = resourceOptionsFromSettings(settings);
-    for (auto style : resourceOptions.tileServerOptions().defaultStyles()) {
-        defaultStyles.append(
-            QPair<QString, QString>(QString::fromStdString(style.getUrl()), QString::fromStdString(style.getName())));
-    }
-
     auto clientOptions = clientOptionsFromSettings(settings);
 
     // Setup the Map object.

diff --git a/src/core/map.hpp b/src/core/map.hpp
@@ -169,8 +169,6 @@ class Q_MAPLIBRE_CORE_EXPORT Map : public QObject {
     void destroyRenderer();
     void setFramebufferObject(quint32 fbo, const QSize &size);
 
-    const QVector<QPair<QString, QString>> &defaultStyles() const;
-
 public slots:
     void render();
     void connectionEstablished();

diff --git a/src/core/map_p.hpp b/src/core/map_p.hpp
@@ -47,7 +47,6 @@ class MapPrivate : public QObject, public mbgl::RendererFrontend {
 
     mbgl::EdgeInsets margins;
     std::unique_ptr<mbgl::Map> mapObj{};
-    QVector<QPair<QString, QString>> defaultStyles;
 
 public slots:
     void requestRendering();