load vector tiles from style only

Author: 3nids

swiss_locator/core/filters/swiss_locator_filter.py

@@ -45,6 +45,7 @@
     QgsFeedback,
     QgsRasterLayer,
     QgsVectorTileLayer,
+    QgsVectorTileUtils,
 )
 from qgis.gui import QgsRubberBand, QgisInterface
 
@@ -440,8 +441,9 @@ def triggerResult(self, result: QgsLocatorResult):
         # Vector tiles
         elif type(swiss_result) == VectorTilesLayerResult:
             params = dict()
-            params["styleUrl"] = swiss_result.style or ""
-            params["url"] = swiss_result.url
+            params["styleUrl"] = swiss_result.style
+            if Qgis.QGIS_VERSION_INT < 33900:
+                params["url"] = swiss_result.url
             params["type"] = "xyz"
             # Max and min zoom levels cound be retrieved from metadata JSON files like:
             # https://vectortiles.geo.admin.ch/tiles/ch.swisstopo.base.vt/v1.0.0/tiles.json
@@ -451,6 +453,11 @@ def triggerResult(self, result: QgsLocatorResult):
 
             url_with_params = "&".join([f"{k}={v}" for (k, v) in params.items()])
 
+            if Qgis.QGIS_VERSION_INT >= 33900:
+                url_with_params = QgsVectorTileUtils.updateUriSources(
+                    url_with_params, True
+                )
+
             self.info(f"Loading layer: {url_with_params}")
             ch_layer = QgsVectorTileLayer(url_with_params, result.displayString)
 

swiss_locator/core/results.py

@@ -132,7 +132,7 @@ def __init__(
         self,
         layer,
         title,
-        url,
+        url: str = None,
         style: str = None,
     ):
         self.title = title