Merge pull request #144 from maptiler/21_1_bugfixes

21/1 bugfixes

Author: lazaa32

browser_mapitem.py

@@ -111,8 +111,10 @@ def _is_apikey_valid(self):
 
     def _is_vector_json(self, json_url: str) -> bool:
         url_endpoint = json_url.split("?")[0]
-        if url_endpoint.endswith("style.json"):
-            return True
+        if url_endpoint.endswith(".json"):
+            style_json_data = converter.get_style_json(json_url)
+            if "sources" in style_json_data and "layers" in style_json_data:
+                return True
         # tiles.json
         else:
             json_data = json.loads(requests.get(json_url).text)

gl2qgis/converter.py

@@ -16,10 +16,9 @@
 import io
 import os
 
-from PIL import Image
-
 from .gl2qgis import parse_layers, parse_background, parse_interpolate_list_by_zoom
 from .gl2qgis import parse_interpolate_opacity_by_zoom, PropertyType
+from qgis.PyQt.QtWidgets import QMessageBox
 
 
 def get_sources_dict_from_style_json(style_json_data: dict) -> dict:
@@ -84,7 +83,7 @@ def get_sources_dict_from_style_json(style_json_data: dict) -> dict:
 
 def get_style_json(style_json_url: str) -> dict:
     url_endpoint = style_json_url.split("?")[0]
-    if url_endpoint.endswith("style.json"):
+    if url_endpoint.endswith(".json"):
         style_json_data = json.loads(requests.get(style_json_url).text)
         return style_json_data
     elif url_endpoint.endswith(".pbf"):
@@ -178,18 +177,25 @@ def write_sprite_imgs_from_style_json(style_json_data: dict, output_path: str):
     sprite_url = style_json_data.get("sprite")
     if sprite_url is None:
         return {}
-
-    sprite_json_dict = json.loads(requests.get(sprite_url + '.json').text)
-    sprite_img = Image.open(io.BytesIO(requests.get(sprite_url + '.png').content))
-    sprite_imgs_dict = {}
-
-    for key, value in sprite_json_dict.items():
-        left = int(value["x"])
-        top = int(value["y"])
-        right = left + int(value["width"])
-        bottom = top + int(value["height"])
-        cropped = sprite_img.crop((left, top, right, bottom))
-        sprite_imgs_dict[key] = cropped
-
-    for key, value in sprite_imgs_dict.items():
-        value.save(os.path.join(output_path, key + ".png"))
+    try:
+        from PIL import Image
+        sprite_json_dict = json.loads(requests.get(sprite_url + '.json').text)
+        sprite_img = Image.open(io.BytesIO(requests.get(sprite_url + '.png').content))
+        sprite_imgs_dict = {}
+
+        for key, value in sprite_json_dict.items():
+            left = int(value["x"])
+            top = int(value["y"])
+            right = left + int(value["width"])
+            bottom = top + int(value["height"])
+            cropped = sprite_img.crop((left, top, right, bottom))
+            sprite_imgs_dict[key] = cropped
+
+        for key, value in sprite_imgs_dict.items():
+            value.save(os.path.join(output_path, key + ".png"))
+    except ImportError:
+        import_error_message = "You do not have PIL/Pillow library installed on your system. "\
+                "Sprites will not be supported.\n"\
+                "MacOS users: To install Pillow library, run following code in terminal:\n"\
+                "/Applications/QGIS.app/Contents/MacOS/bin/pip3 install pillow -U"
+        QMessageBox.warning(None, 'Missing PIL/Pillow library', import_error_message)

gl2qgis/gl2qgis.py

@@ -18,6 +18,7 @@
 from PyQt5.QtGui import QColor, QFont
 from qgis.core import *
 from qgis.gui import *
+from qgis.PyQt.QtWidgets import QMessageBox
 
 # SCREEN SETTING
 screen = QgsApplication.primaryScreen()
@@ -67,7 +68,18 @@ def parse_color(json_color: str):
         assert len(lst) == 3
         return QColor(int(lst[0]), int(lst[1]), int(lst[2]))
     else:
-        raise ValueError("unknown color syntax", json_color)
+        try:
+            from PIL import ImageColor
+            image_color = ImageColor.getrgb(json_color)
+            return QColor(int(image_color[0]), int(image_color[1]), int(image_color[2]))
+        except ImportError:
+            import_error_message = "You do not have PIL/Pillow library installed on your system. " \
+                                   "Proper color name parsing might not be supported.\n" \
+                                   "MacOS users: To install Pillow library, run following code in terminal:\n" \
+                                   "/Applications/QGIS.app/Contents/MacOS/bin/pip3 install pillow -U"
+            QMessageBox.warning(None, 'Missing PIL/Pillow library', import_error_message)
+        except ValueError as e:
+            print(e("unknown color syntax", json_color))
 
 
 def parse_line_cap(json_line_cap):

metadata.txt

@@ -6,7 +6,7 @@
 name=MapTiler
 qgisMinimumVersion=3.0
 description=Street and satellite base maps with vector tiles
-version=1.1.3
+version=1.1.4
 author=MapTiler
 email=info@maptiler.com