Change provider key to 'cesiumtiles'

nyalldawson · Jun 29, 2023 · c934df0 · c934df0
1 parent d58b881
commit c934df0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/core/tiledmesh/qgscesiumtilesdataprovider.cpp b/src/core/tiledmesh/qgscesiumtilesdataprovider.cpp
@@ -26,7 +26,7 @@
 
 ///@cond PRIVATE
 
-#define PROVIDER_KEY QStringLiteral( "cesium" )
+#define PROVIDER_KEY QStringLiteral( "cesiumtiles" )
 #define PROVIDER_DESCRIPTION QStringLiteral( "Cesium 3D Tiles data provider" )
 
 QgsCesiumTilesDataProvider::QgsCesiumTilesDataProvider( const QString &uri, const ProviderOptions &providerOptions, ReadFlags flags )

diff --git a/tests/src/python/test_qgstiledmeshlayer.py b/tests/src/python/test_qgstiledmeshlayer.py
@@ -36,18 +36,18 @@ def test_data_provider(self):
         """
         Test data provider creation
         """
-        layer = QgsTiledMeshLayer('/home/me/test/tileset.json', 'my layer', 'cesium')
-        self.assertEqual(layer.providerType(), 'cesium')
+        layer = QgsTiledMeshLayer('/home/me/test/tileset.json', 'my layer', 'cesiumtiles')
+        self.assertEqual(layer.providerType(), 'cesiumtiles')
         self.assertIsInstance(layer.dataProvider(), QgsTiledMeshDataProvider)
-        self.assertEqual(layer.dataProvider().name(), 'cesium')
+        self.assertEqual(layer.dataProvider().name(), 'cesiumtiles')
         self.assertEqual(layer.dataProvider().dataSourceUri(), '/home/me/test/tileset.json')
 
     def test_read_write_xml(self):
         """
         Test saving and restoring layer from xml
         """
-        layer = QgsTiledMeshLayer('uri', 'my layer', 'cesium')
-        self.assertEqual(layer.providerType(), 'cesium')
+        layer = QgsTiledMeshLayer('uri', 'my layer', 'cesiumtiles')
+        self.assertEqual(layer.providerType(), 'cesiumtiles')
         layer.setOpacity(0.25)
         layer.setBlendMode(QPainter.CompositionMode_Darken)
 
@@ -57,7 +57,7 @@ def test_read_write_xml(self):
 
         layer2 = QgsTiledMeshLayer('uri2', 'my layer 2', 'xtiled_meshx')
         layer2.readXml(elem, QgsReadWriteContext())
-        self.assertEqual(layer2.providerType(), 'cesium')
+        self.assertEqual(layer2.providerType(), 'cesiumtiles')
         self.assertEqual(layer2.opacity(), 0.25)
         self.assertEqual(layer2.blendMode(),
                          QPainter.CompositionMode_Darken)
@@ -66,14 +66,14 @@ def test_clone(self):
         """
         Test cloning layers
         """
-        layer = QgsTiledMeshLayer('uri', 'my layer', 'cesium')
-        self.assertEqual(layer.providerType(), 'cesium')
+        layer = QgsTiledMeshLayer('uri', 'my layer', 'cesiumtiles')
+        self.assertEqual(layer.providerType(), 'cesiumtiles')
         layer.setOpacity(0.25)
         layer.setBlendMode(QPainter.CompositionMode_Darken)
 
         layer2 = layer.clone()
         self.assertEqual(layer2.source(), 'uri')
-        self.assertEqual(layer2.providerType(), 'cesium')
+        self.assertEqual(layer2.providerType(), 'cesiumtiles')
         self.assertEqual(layer2.opacity(), 0.25)
         self.assertEqual(layer2.blendMode(),
                          QPainter.CompositionMode_Darken)
@@ -150,11 +150,11 @@ def test_cesium_provider_metadata(self):
         Test cesium provider metadata methods
         """
         self.assertIn(
-            'cesium',
+            'cesiumtiles',
             QgsProviderRegistry.instance().providersForLayerType(Qgis.LayerType.TiledMesh)
         )
 
-        metadata = QgsProviderRegistry.instance().providerMetadata('cesium')
+        metadata = QgsProviderRegistry.instance().providerMetadata('cesiumtiles')
         self.assertIsNotNone(metadata)
 
         self.assertEqual(metadata.decodeUri('/home/me/test/tileset.json'),