From c934df0dbefe018a77074ebeb1ba2abb894d32b3 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 29 Jun 2023 13:56:03 +1000 Subject: [PATCH] Change provider key to 'cesiumtiles' --- .../tiledmesh/qgscesiumtilesdataprovider.cpp | 2 +- tests/src/python/test_qgstiledmeshlayer.py | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/tiledmesh/qgscesiumtilesdataprovider.cpp b/src/core/tiledmesh/qgscesiumtilesdataprovider.cpp index a7117860a185..d6ebb3a011ef 100644 --- 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 index a1e357ee57d0..33fa044810fb 100644 --- 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'),