Add Ocean RGB to Terrain (#186)

* Use one ramp for ocean, one for terrain, both with transparency.

* Read transparency from color ramp.
Enable float values.

* Add Ocean RGB to predefined maps.

* Set correct color-ramp based on tileset.

* Update metadata

* Add Terrain as a group of two layers.

* Use raster_dem.type()

* Update minor version

* Update READme

Author: lazaa32

README.md

@@ -67,7 +67,7 @@ MapTiler plugin provides several preset maps. Some of them are visible from QGIS
     - OpenStreetMap
     - Outdoor
     - Satellite
-    - Terrain RGB
+    - Terrain
     - Toner
     - Topo
     - Voyager

browser_mapitem.py

@@ -21,7 +21,8 @@
 IMGS_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "imgs")
 DATA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "data")
 BG_VECTOR_PATH = os.path.join(DATA_PATH, "background.geojson")
-COLOR_RAMP_PATH = os.path.join(DATA_PATH, "mt-terrain-color-ramp.txt")
+TERRAIN_COLOR_RAMP_PATH = os.path.join(DATA_PATH, "terrain-color-ramp.txt")
+OCEAN_COLOR_RAMP_PATH = os.path.join(DATA_PATH, "ocean-color-ramp.txt")
 SPRITES_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "gl2qgis", "sprites")
 
 
@@ -52,6 +53,8 @@ def handleDoubleClick(self):
             self._add_vector_to_canvas()
         elif 'raster-dem' in self._dataset:
             self._add_raster_dem_to_canvas()
+        elif 'terrain-group' in self._dataset:
+            self._add_terrain_group_to_canvas()
         else:
             self._add_raster_to_canvas()
         return True
@@ -198,7 +201,7 @@ def _add_raster_dem_to_canvas(self, data_key='raster-dem'):
             tile_json_url = self._dataset[data_key]
             tile_json_data = utils.qgis_request_json(tile_json_url)
             layer_zxy_url = tile_json_data.get("tiles")[0]
-            if layer_zxy_url.startswith("https://api.maptiler.com/tiles/terrain-rgb"):
+            if layer_zxy_url.startswith("https://api.maptiler.com/tiles/terrain-rgb") or layer_zxy_url.startswith("https://api.maptiler.com/tiles/ocean-rgb"):
                 smanager = SettingsManager()
                 auth_cfg_id = smanager.get_setting('auth_cfg_id')
                 intprt = "maptilerterrain"
@@ -212,10 +215,13 @@ def _add_raster_dem_to_canvas(self, data_key='raster-dem'):
             raster_dem = QgsRasterLayer(uri, self._name, "wms")
 
             # Color ramp
-            min_ramp_value, max_ramp_value, color_ramp = utils.load_color_ramp_from_file(COLOR_RAMP_PATH)
+            if layer_zxy_url.startswith("https://api.maptiler.com/tiles/terrain-rgb"):
+                min_ramp_value, max_ramp_value, color_ramp = utils.load_color_ramp_from_file(TERRAIN_COLOR_RAMP_PATH)
+            elif layer_zxy_url.startswith("https://api.maptiler.com/tiles/ocean-rgb"):
+                min_ramp_value, max_ramp_value, color_ramp = utils.load_color_ramp_from_file(OCEAN_COLOR_RAMP_PATH)
             fnc = QgsColorRampShader(min_ramp_value, max_ramp_value)
             fnc.setColorRampType(QgsColorRampShader.Interpolated)
-            fnc.setClassificationMode(QgsColorRampShader.EqualInterval)
+            fnc.setClassificationMode(QgsColorRampShader.Continuous)
             fnc.setColorRampItemList(color_ramp)
             lgnd = QgsColorRampLegendNodeSettings()
             lgnd.setUseContinuousLegend(True)
@@ -247,6 +253,69 @@ def _add_raster_dem_to_canvas(self, data_key='raster-dem'):
         except utils.MapTilerApiException as e:
             self._display_exception(e)
 
+
+    def _add_terrain_group_to_canvas(self, data_key='terrain-group'):
+        """add raster layer from tiles.json"""
+        if not self._are_credentials_valid() and data_key == 'terrain-group':
+            self._openConfigureDialog()
+            return
+
+        try:
+            root = QgsProject().instance().layerTreeRoot()
+            node_map = root.addGroup(self._name)
+            node_map.setExpanded(True)
+
+            sources = converter.get_sources_dict_from_terrain_group(self._dataset[data_key])
+            for source_name, source_data in sources.items():
+                layer_zxy_url = source_data.get('zxy_url')
+                smanager = SettingsManager()
+                auth_cfg_id = smanager.get_setting('auth_cfg_id')
+                intprt = "maptilerterrain"
+                layer_zxy_url = f"{layer_zxy_url.split('?')[0]}?usage={{usage}}"
+                uri = f"type=xyz&url={layer_zxy_url}&authcfg={auth_cfg_id}&interpretation={intprt}"
+                zmax = source_data.get("maxzoom")
+                if zmax:
+                    uri = f"{uri}&zmax={zmax}"
+                raster_dem = QgsRasterLayer(uri, source_name, "wms")
+
+                # Color ramp
+                if layer_zxy_url.startswith("https://api.maptiler.com/tiles/terrain-rgb"):
+                    min_ramp_value, max_ramp_value, color_ramp = utils.load_color_ramp_from_file(
+                        TERRAIN_COLOR_RAMP_PATH)
+                elif layer_zxy_url.startswith("https://api.maptiler.com/tiles/ocean-rgb"):
+                    min_ramp_value, max_ramp_value, color_ramp = utils.load_color_ramp_from_file(OCEAN_COLOR_RAMP_PATH)
+                fnc = QgsColorRampShader(min_ramp_value, max_ramp_value)
+                fnc.setColorRampType(QgsColorRampShader.Interpolated)
+                fnc.setClassificationMode(QgsColorRampShader.Continuous)
+                fnc.setColorRampItemList(color_ramp)
+                lgnd = QgsColorRampLegendNodeSettings()
+                lgnd.setUseContinuousLegend(True)
+                lgnd.setOrientation(1)
+                fnc.setLegendSettings(lgnd)
+                # Shader
+                shader = QgsRasterShader()
+                shader.setRasterShaderFunction(fnc)
+
+                # Renderer
+                renderer = QgsSingleBandPseudoColorRenderer(raster_dem.dataProvider(), raster_dem.type(), shader)
+                raster_dem.setRenderer(renderer)
+
+                resampleFilter = raster_dem.resampleFilter()
+                resampleFilter.setZoomedInResampler(QgsBilinearRasterResampler())
+                resampleFilter.setZoomedOutResampler(QgsBilinearRasterResampler())
+
+                # add Copyright
+                attribution_text = source_data.get("attribution")
+                raster_dem.setAttribution(attribution_text)
+                QgsProject.instance().addMapLayer(raster_dem, False)
+                node_map.insertLayer(-1, raster_dem)
+                layerNode = node_map.findLayer(raster_dem.id())
+                layerNode.setExpanded(False)
+
+        except utils.MapTilerApiException as e:
+            self._display_exception(e)
+
+
     def _add_vector_to_canvas(self, data_key='vector'):
         if data_key == "vector":
             if not self._are_credentials_valid():

data/mt-terrain-color-ramp.txt

@@ -0,0 +1,28 @@
+# QGIS Generated Color Map Export File
+INTERPOLATION:INTERPOLATED
+-12000,8,48,107,255,-12000
+-11500,8,62,128,255,-11500
+-11000,8,76,148,255,-11000
+-10500,13,88,161,255,-10500
+-10000,22,98,170,255,-10000
+-9500,30,110,178,255,-9500
+-9000,40,120,185,255,-9000
+-8500,51,131,190,255,-8500
+-8000,62,142,196,255,-8000
+-7500,74,151,201,255,-7500
+-7000,87,161,206,255,-7000
+-6500,100,169,211,255,-6500
+-6000,115,179,216,255,-6000
+-5500,131,187,219,255,-5500
+-5000,148,196,223,255,-5000
+-4500,159,203,226,255,-4500
+-4000,162,207,230,255,-4000
+-3500,164,211,234,255,-3500
+-3000,169,214,237,255,-3000
+-2500,177,220,240,255,-2500
+-2000,185,225,243,255,-2000
+-1500,193,231,247,255,-1500
+-1000,199,235,250,255,-1000
+-500,200,238,252,255,-500
+-0.1,214,246,255,255,-0
+0,214,246,255,1,0