Merge pull request #150 from maptiler/v2-dev

Plugin v2
Closes #105.
Closes #108.
Closes #115.
Closes #131.
Closes #133.
Closes #138.
Closes #139.
Closes #143.
Closes #146.

Author: lazaa32

README.md

@@ -35,30 +35,9 @@ Then MapTiler should be added to your QGIS Browser.
 
 <img src='imgs/readme_01.png'>
 
-### Requirements
+## Requirements
 
-You need to have installed Python Pillow [Pillow](https://pillow.readthedocs.io/en/stable/)
-library to use MapTiler plugin.
-
-On Debian/Ubuntu systems you can install it by:
-
-`python3 -m pip install Pillow`
-
-### Known issue for macOS users
-
-Sometimes macOS users get following or similar error when running MapTiler plugin:
-```
-ImportError: dlopen(/Applications/QGIS.app/Contents/MacOS/lib/python3.7/site-packages/Pillow-7.2.0-py3.7-macosx-10.13.0-x86_64.egg/PIL/_imaging.cpython-37m-darwin.so, 2): Library not loaded: /opt/X11/lib/libxcb.1.dylib
-  Referenced from: /Applications/QGIS.app/Contents/MacOS/lib/python3.7/site-packages/Pillow-7.2.0-py3.7-macosx-10.13.0-x86_64.egg/PIL/_imaging.cpython-37m-darwin.so
-  Reason: image not found
-```
-
-macOS users need to upgrade their Pillow library from QGIS bundled Python:
-```
-/Applications/QGIS.app/Contents/MacOS/bin/pip3 install pillow -U
-```
-
-After running this command and restarting QGIS, MapTiler plugin should work. 
+For plugin version 2.0, you need QGIS 3.16 or higher.
 
 ---
 
@@ -95,6 +74,7 @@ MapTiler plugin supports loading maps via both vector and raster tiles.  You can
 You can choose the default type of tiles by checking/unchecking `Use vector tiles by default` in the Account dialog window.
 
 Vector tiles support requires QGIS 3.13 or higher.
+For the plugin version 2.0 and higher you need QGIS 3.16 or higher.
 
 You can read about the difference between vector and raster tiles here [https://www.maptiler.com/news/2019/02/what-are-vector-tiles-and-why-you-should-care/](https://www.maptiler.com/news/2019/02/what-are-vector-tiles-and-why-you-should-care/?utm_source=github.com&utm_medium=referral&utm_campaign=qgis-plugin)
 
@@ -141,5 +121,3 @@ The native vector tiles python APIs in QGIS was developed by @wonder-sk from [Lu
 If you have any idea or trouble, please [post an Issue](https://github.com/maptiler/qgis-maptiler-plugin/issues) first.
 
 We very much welcome contributions from all developers out there. This project is a community-driven open-source tool - please help us to make it better.
-
- 

browser_mapitem.py

@@ -1,12 +1,13 @@
 import os
-import sip
 import json
 import requests
 import webbrowser
-import shutil
-from qgis.PyQt.QtGui import QIcon
-from qgis.PyQt.QtWidgets import QAction, QMessageBox
+
 from qgis.core import *
+from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt.QtWidgets import QAction, QMessageBox, QPushButton
+from qgis.gui import QgsMessageViewer
+from qgis.utils import iface
 
 from .gl2qgis import converter
 
@@ -201,7 +202,6 @@ def _add_vector_to_canvas(self, data_key='vector'):
             self._add_vtlayer_from_tile_json(
                 tile_json_data, node_map, attribution_text)
 
-
     def _add_vtlayer_from_style_json(self,
                                      style_json_data: dict,
                                      target_node: QgsLayerTreeGroup,
@@ -211,27 +211,41 @@ def _add_vtlayer_from_style_json(self,
         os.makedirs(SPRITES_PATH, exist_ok=True)
         converter.write_sprite_imgs_from_style_json(style_json_data, SPRITES_PATH)
 
+        # Context
+        context = QgsMapBoxGlStyleConversionContext()
+        context.setTargetUnit(QgsUnitTypes.RenderMillimeters)
+        context.setPixelSizeConversionFactor(0.264583)  # 25.4 / 96.0
+        # context.setTargetUnit(QgsUnitTypes.RenderPixels)
+        # context.setPixelSizeConversionFactor(1)
+
         # Add other layers from sources
         sources = converter.get_sources_dict_from_style_json(
             style_json_data)
         ordered_sources = {k: v for k, v in sorted(sources.items(), key=lambda item: item[1]["order"])}
         for source_id, source_data in ordered_sources.items():
             zxy_url = source_data["zxy_url"]
             name = source_data["name"]
-            url = f"type=xyz&url={zxy_url}"
+            max_zoom = source_data["maxzoom"]
+            url = f"type=xyz&url={zxy_url}&zmax={max_zoom}"
             if source_data["type"] == "vector":
                 vector = QgsVectorTileLayer(url, name)
-                renderer, labeling = converter.get_renderer_labeling(
-                    source_id, style_json_data)
+                renderer, labeling, candidate_warnings = converter.convert(source_id, style_json_data, context)
                 vector.setLabeling(labeling)
                 vector.setRenderer(renderer)
                 vector.setAttribution(attribution_text)
                 proj.addMapLayer(vector, False)
                 target_node.insertLayer(source_data["order"], vector)
             elif source_data["type"] == "raster-dem":
-                # TODO solve layer style
-                raster = QgsRasterLayer(url, name, "wms")
-                raster.setAttribution(attribution_text)
+                # TODO remove this after RGB tiles implementation (Outdoor)
+                if source_data.get("name") == "Terrain RGB" and "https://api.maptiler.com/tiles/terrain-rgb/{z}/{x}/{y}.png?key=" in source_data.get("zxy_url"):
+                    url = f"zmin=0&zmax=12&type=xyz&url={source_data.get('zxy_url').replace('terrain-rgb', 'hillshades')}"
+                    raster = QgsRasterLayer(url, "hillshades", "wms")
+                    renderer = raster.renderer().clone()
+                    renderer.setOpacity(0.2)
+                    raster.setRenderer(renderer)
+                else:
+                    raster = QgsRasterLayer(url, name, "wms")
+                    raster.setAttribution(attribution_text)
                 proj.addMapLayer(raster, False)
                 target_node.insertLayer(source_data["order"], raster)
             elif source_data["type"] == "raster":
@@ -240,8 +254,7 @@ def _add_vtlayer_from_style_json(self,
                     min_zoom = source_data["minzoom"]
                     max_zoom = source_data["maxzoom"]
                     url = f"zmin={min_zoom}&zmax={max_zoom}&type=xyz&url={zxy_url}"
-                rlayers = converter.get_source_layers_by(
-                    source_id, style_json_data)
+                rlayers = converter.get_source_layers_by(source_id, style_json_data)
                 for rlayer_json in rlayers:
                     layer_id = rlayer_json.get("id", "NO_NAME")
                     raster = QgsRasterLayer(url, layer_id, "wms")
@@ -260,6 +273,37 @@ def _add_vtlayer_from_style_json(self,
                     proj.addMapLayer(raster, False)
                     target_node.insertLayer(source_data["order"], raster)
 
+        # Print conversion warnings
+        # Removed known warnings
+        if bool(candidate_warnings):
+            warnings = list()
+            for candidate in candidate_warnings:
+                if "Could not retrieve sprite ''" in candidate:
+                    continue
+                warnings.append(candidate)
+            # Print warnings during conversion
+            if bool(warnings):
+                widget = iface.messageBar().createMessage("Vector tiles:",
+                                                          "Style could not be completely converted")
+                button = QPushButton(widget)
+                button.setText("Details")
+
+                def show_warnings():
+                    warnings_dlg = QgsMessageViewer()
+                    warnings_dlg.setTitle("Vector Tiles")
+                    html_text = "<p>The following warnings were generated while converting the vector tile style:</p><ul>"
+                    for cw in warnings:
+                        # Skip known issues
+
+                        html_text += f"<li>{cw}</li>"
+                    html_text += "</ul>"
+                    warnings_dlg.setMessage(html_text, 1)
+                    warnings_dlg.showMessage()
+
+                button.pressed.connect(show_warnings)
+                widget.layout().addWidget(button)
+                iface.messageBar().pushWidget(widget, Qgis.Warning)
+
         # Add background layer as last if exists
         bg_renderer = converter.get_bg_renderer(style_json_data)
         if bg_renderer:
@@ -308,22 +352,6 @@ def _get_attribution_text(self, data_key, apikey) -> str:
 
         return attribution_text
 
-    def _get_attr_of_custom_json(self, custom_json_data) -> str:
-        attribution_text = ""
-
-        url_endpoint = custom_json_url.split("?")[0]
-        # get attribution from custom tiles or style json
-        if url_endpoint.endswith("style.json"):
-            sources = custom_json_data.get("sources")
-            maptiler_attribution = sources.get("maptiler_attribution")
-            if maptiler_attribution:
-                attribution = maptiler_attribution.get("attribution", "")
-                attribution_text = str(attribution)
-        else:
-            attribution_text = custom_json_data.get("attribution", "")
-
-        return attribution_text
-
     def _add_custom_to_canvas(self):
         json_url = self._dataset['custom']
         if json_url.endswith("?key="):

gl2qgis/converter.py

@@ -16,9 +16,9 @@
 import io
 import os
 
-from .gl2qgis import parse_layers, parse_background, parse_interpolate_list_by_zoom
-from .gl2qgis import parse_interpolate_opacity_by_zoom, PropertyType
+from .gl2qgis import parse_layers, parse_background
 from qgis.PyQt.QtWidgets import QMessageBox
+from qgis.core import QgsMapBoxGlStyleConversionContext
 
 
 def get_sources_dict_from_style_json(style_json_data: dict) -> dict:
@@ -93,16 +93,9 @@ def get_style_json(style_json_url: str) -> dict:
         raise Exception(f"Invalid url: {style_json_url}")
 
 
-def get_renderer_labeling(source_name: str, style_json_data: dict):
-    layers = style_json_data.get("layers")
-    source_layers = []
-    for layer in layers:
-        if "source" not in layer or layer["source"] != source_name:
-            continue
-        source_layers.append(layer)
-
-    renderer, labeling = parse_layers(source_layers, style_json_data.get('id'))
-    return renderer, labeling
+def convert(source_name: str, style_json_data: dict, context: QgsMapBoxGlStyleConversionContext):
+    renderer, labeling, warnings = parse_layers(source_name, style_json_data, context)
+    return renderer, labeling, warnings
 
 
 def get_bg_renderer(style_json_data: dict):