geobox 1.3.3__tar.gz → 1.3.4__tar.gz

{geobox-1.3.3 → geobox-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geobox
-Version: 1.3.3
+Version: 1.3.4
 Summary: SDK for Geobox's APIs
 Author-email: Hamid Heydari <heydari.h62@gmail.com>
 License: MIT
@@ -31,6 +31,8 @@ Geobox® is a cloud-based GIS platform that enables users (local governments, co
 
 Geobox python SDK provides seamless integration with the Geobox API, enabling developers to work with geospatial data and services programmatically. This comprehensive toolkit empowers applications to leverage advanced geospatial capabilities including data management and analysis.
 
+[Here](https://geobox.readthedocs.io) you can find the official documentation for Geobox Python SDK.
+
 Installation
 ============
 

{geobox-1.3.3 → geobox-1.3.4}/README.md

@@ -5,6 +5,8 @@ Geobox® is a cloud-based GIS platform that enables users (local governments, co
 
 Geobox python SDK provides seamless integration with the Geobox API, enabling developers to work with geospatial data and services programmatically. This comprehensive toolkit empowers applications to leverage advanced geospatial capabilities including data management and analysis.
 
+[Here](https://geobox.readthedocs.io) you can find the official documentation for Geobox Python SDK.
+
 Installation
 ============
 

{geobox-1.3.3 → geobox-1.3.4}/geobox/attachment.py

@@ -31,7 +31,7 @@ class Attachment(Base):
         """
         super().__init__(api, data=data)
         self.attachment_id = attachment_id
-        self.endpoint = urljoin(self.BASE_ENDPOINT, str(self.attachment_id))
+        self.endpoint = f"{self.BASE_ENDPOINT}{str(self.attachment_id)}/"
 
 
     def __repr__(self) -> str:
@@ -293,6 +293,5 @@ class Attachment(Base):
             >>> attachment.thumbnail
             'https://example.com/thumbnail.png'
         """
-        endpoint = f"{self.api.base_url}{self.endpoint}thumbnail"
-        return endpoint
+        return super().thumbnail(format='')
     

{geobox-1.3.3 → geobox-1.3.4}/geobox/base.py

@@ -362,3 +362,24 @@ class Base:
         
         # If all parsing fails, return the original string
         return date_string
+
+
+    def thumbnail(self, format='.png') -> str:
+        """
+        Get the thumbnail URL of the resource.
+        
+        Returns:
+            str: The thumbnail URL
+
+        Raises:
+            ValueError: 
+        """
+        endpoint = f'{self.api.base_url}{self.endpoint}thumbnail{format}'
+        
+        if not self.api.access_token and self.api.apikey:
+            endpoint = f'{endpoint}?apikey={self.api.apikey}'
+            
+        elif not self.api.access_token and not self.api.apikey:
+            raise ValueError("either access_token or apikey must be available for this action.")
+        
+        return endpoint

{geobox-1.3.3 → geobox-1.3.4}/geobox/basemap.py

@@ -23,7 +23,7 @@ class Basemap(Base):
             data (Dict): The data of the basemap.
         """
         super().__init__(api, data=data)
-        self.endpoint = f"{self.BASE_ENDPOINT}{self.data.get('name')}"
+        self.endpoint = f"{self.BASE_ENDPOINT}{self.data.get('name')}/"
 
 
     @classmethod
@@ -107,7 +107,11 @@ class Basemap(Base):
         Returns:
             str: the wmts url
         """
-        endpoint = f"{self.api.base_url}{self.endpoint}/wmts" 
+        endpoint = urljoin(self.api.base_url, f'{self.endpoint}wmts/')
+
+        if not self.api.access_token and self.api.apikey:
+            endpoint = f"{endpoint}?apikey={self.api.apikey}"
+            
         return endpoint
     
 

{geobox-1.3.3 → geobox-1.3.4}/geobox/dashboard.py

@@ -243,8 +243,7 @@ class Dashboard(Base):
             >>> dashboard.thumbnail
             'https://example.com/thumbnail.png'
         """
-        endpoint = urljoin(self.api.base_url, f'{self.endpoint}thumbnail.png')
-        return endpoint
+        return super().thumbnail()
     
 
     def share(self, users: List['User']) -> None:

{geobox-1.3.3 → geobox-1.3.4}/geobox/map.py

@@ -2,7 +2,7 @@ from typing import Dict, List, Optional, Union, TYPE_CHECKING
 from urllib.parse import urljoin, urlencode
 
 from .base import Base
-from .utils import clean_data
+from .utils import clean_data, join_url_params
 from .model3d import Model
 
 if TYPE_CHECKING:
@@ -276,8 +276,7 @@ class Map(Base):
             >>> map.thumbnail
             'https://example.com/thumbnail.png'
         """
-        endpoint = f"{self.api.base_url}{self.endpoint}thumbnail.png"
-        return endpoint
+        return super().thumbnail()
     
 
     def set_readonly(self, readonly: bool) -> None:
@@ -351,6 +350,10 @@ class Map(Base):
         endpoint = urljoin(self.api.base_url, f'{self.endpoint}wmts/')
         if scale:
             endpoint = f"{endpoint}?scale={scale}"
+
+        if not self.api.access_token and self.api.apikey:
+            endpoint = join_url_params(endpoint, {"apikey": self.api.apikey})
+
         return endpoint
 
     

{geobox-1.3.3 → geobox-1.3.4}/geobox/model3d.py

@@ -258,11 +258,7 @@ class Model(Base):
             >>> model = Model.get_model(api=client, uuid="12345678-1234-5678-1234-567812345678")
             >>> model.thumbnail
         """
-        if not self.uuid:
-            raise ValueError("Model UUID is required.")
-        
-        endpoint = urljoin(self.api.base_url, f'{self.endpoint}/thumbnail.png')
-        return endpoint
+        return super().thumbnail()
     
 
     def share(self, users: List['User']) -> None:

{geobox-1.3.3 → geobox-1.3.4}/geobox/mosaic.py

@@ -295,14 +295,14 @@ class Mosaic(Raster):
         return super().get_point(lat, lng)
 
 
-    def get_render_png_url(self, x: int, y: int, z: int, **kwargs) -> str:
+    def get_render_png_url(self, x: int = '{x}', y: int = '{y}', z: int = '{z}', **kwargs) -> str:
         """
         Get the tile render URL of the mosaic.
 
         Args:
-            x (int): The x coordinate of the tile.
-            y (int): The y coordinate of the tile.
-            z (int): The zoom level of the tile.
+            x (int, optional): The x coordinate of the tile.
+            y (int, optional): The y coordinate of the tile.
+            z (int, optional): The zoom level of the tile.
 
         Keyword Args:
             indexes (str, optional): list of comma separated band indexes to be rendered. e.g. 1, 2, 3
@@ -326,14 +326,14 @@ class Mosaic(Raster):
         return super().get_render_png_url(x, y, z, **kwargs)
     
 
-    def get_tile_png_url(self, x: int, y: int, z: int) -> str:
+    def get_tile_png_url(self, x: int = '{x}', y: int = '{y}', z: int = '{z}') -> str:
         """
         Get the tile PNG URL of the mosaic.
 
         Args:
-            x (int): The x coordinate of the tile.
-            y (int): The y coordinate of the tile.
-            z (int): The zoom level of the tile.
+            x (int, optional): The x coordinate of the tile.
+            y (int, optional): The y coordinate of the tile.
+            z (int, optional): The zoom level of the tile.
 
         Returns:
             str: The tile PNG URL of the mosaic.

{geobox-1.3.3 → geobox-1.3.4}/geobox/query.py

@@ -620,8 +620,7 @@ class Query(Base):
             str: The thumbnail URL.
         """
         self._check_access()
-        endpoint = f'{self.api.base_url}{self.endpoint}thumbnail.png'
-        return endpoint
+        return super().thumbnail()
 
 
     def save_as_layer(self, layer_name: str, layer_type: 'QueryGeometryType' = None) -> Task:

{geobox-1.3.3 → geobox-1.3.4}/geobox/raster.py

@@ -6,7 +6,7 @@ import requests
 import sys
 
 from .base import Base
-from .utils import clean_data
+from .utils import clean_data, join_url_params
 from .task import Task
 
 if TYPE_CHECKING:
@@ -231,8 +231,7 @@ class Raster(Base):
             >>> raster = Raster.get_raster(client, uuid="12345678-1234-5678-1234-567812345678")
             >>> raster.thumbnail
         """
-        endpoint = urljoin(self.api.base_url, f'{self.endpoint}thumbnail/')
-        return endpoint
+        return super().thumbnail(format='')
     
     
     @property
@@ -511,19 +510,20 @@ class Raster(Base):
             'colormap': kwargs.get('colormap')
         })
         query_string = urlencode(params)
-        endpoint = urljoin(self.api.base_url, f'{self.endpoint}render/{z}/{x}/{y}.png')
-        endpoint = urljoin(endpoint, f'?{query_string}')
+        endpoint = f'{self.api.base_url}{self.endpoint}render/{z}/{x}/{y}.png'
+        if query_string:
+            endpoint = f'{endpoint}?{query_string}'
         return endpoint
     
 
-    def get_tile_pbf_url(self, x: int, y: int, z: int, indexes: str = None) -> str:
+    def get_tile_pbf_url(self, x: int = '{x}', y: int = '{y}', z: int = '{z}', indexes: str = None) -> str:
         """
         Get the URL of the tile.
 
         Args:
-            x (int): The x coordinate of the tile.
-            y (int): The y coordinate of the tile.
-            z (int): The zoom level of the tile.
+            x (int, optional): The x coordinate of the tile.
+            y (int, optional): The y coordinate of the tile.
+            z (int, optional): The zoom level of the tile.
             indexes (str, optional): list of comma separated band indexes to be rendered. e.g. 1, 2, 3
 
         Returns:
@@ -542,17 +542,21 @@ class Raster(Base):
         query_string = urlencode(params)
         endpoint = urljoin(self.api.base_url, f'{self.endpoint}tiles/{z}/{x}/{y}.pbf')
         endpoint = urljoin(endpoint, f'?{query_string}')
+
+        if not self.api.access_token and self.api.apikey:
+            endpoint = join_url_params(endpoint, {"apikey": self.api.apikey})
+
         return endpoint
     
 
-    def get_tile_png_url(self, x: int, y: int, z: int) -> str:
+    def get_tile_png_url(self, x: int = 'x', y: int = 'y', z: int = 'z') -> str:
         """
         Get the URL of the tile.
 
         Args:
-            x (int): The x coordinate of the tile.
-            y (int): The y coordinate of the tile.
-            z (int): The zoom level of the tile.
+            x (int, optional): The x coordinate of the tile.
+            y (int, optional): The y coordinate of the tile.
+            z (int, optional): The zoom level of the tile.
 
         Returns:
             str: The URL of the tile.
@@ -564,7 +568,11 @@ class Raster(Base):
             >>> raster = Raster.get_raster(client, uuid="12345678-1234-5678-1234-567812345678")
             >>> raster.get_tile_png_url(x=10, y=20, z=1)
         """
-        endpoint = urljoin(self.api.base_url, f'{self.endpoint}tiles/{z}/{x}/{y}.png')
+        endpoint = f'{self.api.base_url}{self.endpoint}tiles/{z}/{x}/{y}.png'
+            
+        if not self.api.access_token and self.api.apikey:
+            endpoint = f'{endpoint}?apikey={self.api.apikey}'
+
         return endpoint
 
 
@@ -606,6 +614,10 @@ class Raster(Base):
         endpoint = urljoin(self.api.base_url, f'{self.endpoint}wmts/')
         if scale:
             endpoint = f"{endpoint}?scale={scale}"
+
+        if not self.api.access_token and self.api.apikey:
+            endpoint = join_url_params(endpoint, {"apikey": self.api.apikey})
+
         return endpoint
 
 

{geobox-1.3.3 → geobox-1.3.4}/geobox/scene.py

@@ -244,8 +244,7 @@ class Scene(Base):
             >>> scene.thumbnail
             'https://example.com/thumbnail.png'
         """
-        endpoint = urljoin(self.api.base_url, f'{self.endpoint}thumbnail.png')
-        return endpoint
+        return super().thumbnail()
     
 
     def share(self, users: List['User']) -> None:

{geobox-1.3.3 → geobox-1.3.4}/geobox/tile3d.py

@@ -1,10 +1,10 @@
 from typing import List, Dict, Optional, TYPE_CHECKING, Union
-from urllib.parse import urljoin
 
 from .base import Base
 
 if TYPE_CHECKING:
     from . import GeoboxClient
+    from .user import User
 
 
 class Tile3d(Base):
@@ -199,8 +199,7 @@ class Tile3d(Base):
             >>> tile.thumbnail
             'https://example.com/thumbnail.png'
         """
-        endpoint = urljoin(self.api.base_url, f'{self.endpoint}thumbnail.png')
-        return endpoint
+        return super().thumbnail()
 
 
     def get_item(self, path: str) -> Dict:

{geobox-1.3.3 → geobox-1.3.4}/geobox/tileset.py

@@ -43,7 +43,7 @@ class Tileset(Base):
         Args:
             api (GeoboxClient): The GeoboxClient instance for making requests.
             name (str): The name of the tileset.
-            layers (List['VectorLayer' | 'VectorLayerView']): list of vectorlayer and view objects to add to tileset.
+            layers (List[VectorLayer | VectorLayerView]): list of vectorlayer and view objects to add to tileset.
             display_name (str, optional): The display name of the tileset.
             description (str, optional): The description of the tileset.
             min_zoom (int, optional): The minimum zoom level of the tileset.
@@ -526,14 +526,14 @@ class Tileset(Base):
         return self.api.post(endpoint)
 
 
-    def get_tile(self, x: int, y: int, z: int) -> str:
+    def get_tile_pbf_url(self, x: 'int' = '{x}', y: int = '{y}', z: int = '{z}') -> str:
         """
         Retrieves a tile from the tileset.
 
         Args:
-            x (int): The x coordinate of the tile.
-            y (int): The y coordinate of the tile.
-            z (int): The zoom level of the tile.
+            x (int, optional): The x coordinate of the tile.
+            y (int, optioanl): The y coordinate of the tile.
+            z (int, optional): The zoom level of the tile.
 
         Returns:
             str: The url of the tile.
@@ -545,7 +545,11 @@ class Tileset(Base):
             >>> tileset = Tileset.get_tileset(client, uuid="12345678-1234-5678-1234-567812345678")
             >>> tileset.get_tile_tileset(x=1, y=1, z=1)
         """
-        endpoint = urljoin(self.endpoint, f'tiles/{z}/{x}/{y}.pbf') 
+        endpoint = f'{self.api.base_url}{self.endpoint}tiles/{z}/{x}/{y}.pbf'
+
+        if not self.api.access_token and self.api.apikey:
+            endpoint = f'{endpoint}?apikey={self.api.apikey}'
+
         return endpoint
 
 
@@ -561,7 +565,7 @@ class Tileset(Base):
             user_id (int, optional): The user ID.
 
         Returns:
-            List[Task]: The task object.
+            List[Task]: list of task objects.
 
         Raises:
             ValueError: If the number of workers is not one of the following: 1, 2, 4, 8, 12, 16, 20, 24.
@@ -583,14 +587,26 @@ class Tileset(Base):
         return super()._seed_cache(endpoint=self.endpoint, data=data)
 
 
-    def update_cache(self) -> List['Task']:
+    def update_cache(self, from_zoom: int, to_zoom: int, extents: List[List[float]] = None, user_id: int = 0) -> List['Task']:
         """
         Updates the cache of the tileset.
 
+        Args:
+            from_zoom (int): The starting zoom level.
+            to_zoom (int): The ending zoom level.
+            extents (List[List[float]], optional): The list of extents to update the cache for.
+            user_id (int, optional): The user ID.
+
         Returns:
-            None
+            List[Task]: list of task objects.
         """
-        return super()._update_cache(endpoint=self.endpoint)
+        data = {
+            "from_zoom": from_zoom,
+            "to_zoom": to_zoom,
+            "extents": extents,
+            "user_id": user_id
+        }
+        return super()._update_cache(endpoint=self.endpoint, data=data)
 
 
     @property

{geobox-1.3.3 → geobox-1.3.4}/geobox/vectorlayer.py

@@ -1000,17 +1000,17 @@ class VectorLayer(Base):
                             factory_func=lambda api, item: VectorLayerView(api, item['uuid'], self.layer_type, item))
 
 
-    def get_tile(self, x: int, y: int, z: int) -> str:
+    def get_tile_pbf_url(self, x: int = '{x}', y: int = '{y}', z: int = '{z}') -> str:
         """
         Get a vector tile for the layer.
         
         Args:
-            x (int): X coordinate of the tile.
-            y (int): Y coordinate of the tile.
-            z (int): Zoom level of the tile.
+            x (int, optional): X coordinate of the tile.
+            y (int, optional): Y coordinate of the tile.
+            z (int, optioanl): Zoom level of the tile.
 
         Returns:
-            str: The vector tile data.
+            str: The vector tile url.
 
         Example:
             >>> from geobox import GeoboxClient
@@ -1019,7 +1019,11 @@ class VectorLayer(Base):
             >>> layer = VectorLayer.get_vector(api=client, uuid="12345678-1234-5678-1234-567812345678")
             >>> tile = layer.get_tile(x=10, y=20, z=1)
         """
-        endpoint = f'{self.BASE_ENDPOINT}{self.endpoint}tiles/{z}/{x}/{y}.pbf'
+        endpoint = f'{self.api.base_url}{self.endpoint}tiles/{z}/{x}/{y}.pbf'
+
+        if not self.api.access_token and self.api.apikey:
+            endpoint = f'{endpoint}?apikey={self.api.apikey}'
+
         return endpoint
 
 

{geobox-1.3.3 → geobox-1.3.4}/geobox/view.py

@@ -663,7 +663,7 @@ class VectorLayerView(VectorLayer):
                                        bbox, out_srid, zipped, feature_ids, bbox_srid, q, fields)
 
     
-    def get_tile(self, x: int, y: int, z: int) -> Dict:
+    def get_tile_pbf_url(self, x: int, y: int, z: int) -> str:
         """
         Get a vector tile for the layer.
         
@@ -673,7 +673,7 @@ class VectorLayerView(VectorLayer):
             z (int): Zoom level of the tile.
 
         Returns:
-            Dict: The vector tile data.
+            str: the vector tile url.
 
         Example:
             >>> from geobox import GeoboxClient
@@ -682,7 +682,7 @@ class VectorLayerView(VectorLayer):
             >>> view = VectorLayerView.get_view(client, uuid="12345678-1234-5678-1234-567812345678")
             >>> tile = view.get_tile(x=10, y=20, z=1)
         """
-        return super().get_tile(x, y, z)
+        return super().get_tile_pbf_url(x, y, z)
     
 
     def get_tile_json(self) -> Dict:

{geobox-1.3.3 → geobox-1.3.4}/geobox/workflow.py

@@ -242,8 +242,7 @@ class Workflow(Base):
             >>> workflow.thumbnail
             'https://example.com/thumbnail.png'
         """
-        endpoint = f"{self.api.base_url}{self.endpoint}thumbnail.png"
-        return endpoint
+        return super().thumbnail()
     
 
     def share(self, users: List['User']) -> None:

{geobox-1.3.3 → geobox-1.3.4}/geobox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geobox
-Version: 1.3.3
+Version: 1.3.4
 Summary: SDK for Geobox's APIs
 Author-email: Hamid Heydari <heydari.h62@gmail.com>
 License: MIT
@@ -31,6 +31,8 @@ Geobox® is a cloud-based GIS platform that enables users (local governments, co
 
 Geobox python SDK provides seamless integration with the Geobox API, enabling developers to work with geospatial data and services programmatically. This comprehensive toolkit empowers applications to leverage advanced geospatial capabilities including data management and analysis.
 
+[Here](https://geobox.readthedocs.io) you can find the official documentation for Geobox Python SDK.
+
 Installation
 ============
 

{geobox-1.3.3 → geobox-1.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "geobox"
-version = "1.3.3"
+version = "1.3.4"
 description = "SDK for Geobox's APIs"
 authors = [
   {name = "Hamid Heydari", email = "heydari.h62@gmail.com"}

{geobox-1.3.3 → geobox-1.3.4}/tests/test_attachment.py

@@ -13,7 +13,7 @@ def test_init(api, mock_attachment_data):
     assert attachment.name == mock_attachment_data['name']
     assert attachment.attachment_id == mock_attachment_data['id']
     assert attachment.data == mock_attachment_data
-    assert attachment.endpoint == f'{Attachment.BASE_ENDPOINT}{attachment.attachment_id}'
+    assert attachment.endpoint == f'{Attachment.BASE_ENDPOINT}{attachment.attachment_id}/'
 
 
 def test_repr(api, mock_attachment_data):

{geobox-1.3.3 → geobox-1.3.4}/tests/test_basemap.py

@@ -10,7 +10,7 @@ def test_init(api, mock_basemap_data):
     basemap = Basemap(api, mock_basemap_data)
     assert basemap.name == mock_basemap_data['name']
     assert basemap.data == mock_basemap_data
-    assert basemap.endpoint == f'{Basemap.BASE_ENDPOINT}{basemap.name}'
+    assert basemap.endpoint == f'{Basemap.BASE_ENDPOINT}{basemap.name}/'
 
 
 def test_get_basemaps(api, mock_basemap_data, mock_basemap_list_data):
@@ -48,7 +48,12 @@ def test_thumbnail(api, mock_basemap_data):
 def test_wmts(api, mock_basemap_data):
     basemap = Basemap(api, mock_basemap_data)
     wmts_url = basemap.wmts
-    assert wmts_url == f"{api.base_url}{basemap.endpoint}/wmts"
+    assert wmts_url == f"{api.base_url}{basemap.endpoint}wmts/"
+    # apikey
+    api.access_token = ''
+    api.apikey = 'apikey_1234'
+    wmts_url = basemap.wmts
+    assert wmts_url == f"{api.base_url}{basemap.endpoint}wmts/?apikey=apikey_1234"
 
 
 def test_server_url(api, mock_basemap_data):

{geobox-1.3.3 → geobox-1.3.4}/tests/test_map.py

@@ -154,9 +154,15 @@ def test_style(api, mock_map_data):
 
 
 def test_thumbnail(api, mock_map_data):
+    api.access_token = ''
+    api.apikey = 'apikey_1234'
     map = Map(api, uuid=mock_map_data['uuid'], data=mock_map_data)
     thumbnail_url = map.thumbnail
-    assert thumbnail_url == f'{api.base_url}{map.endpoint}thumbnail.png'
+    assert thumbnail_url == f'{api.base_url}{map.endpoint}thumbnail.png?apikey=apikey_1234'
+    # error
+    api.apikey = ''
+    with pytest.raises(ValueError):
+        map.thumbnail
 
 
 def test_set_readonly(api, mock_map_data):
@@ -183,6 +189,11 @@ def test_wmts(api, mock_map_data):
     map = Map(api, uuid=mock_map_data['uuid'], data=mock_map_data)
     wmts_url = map.wmts(scale=1)
     assert wmts_url == f'{api.base_url}{map.endpoint}wmts/?scale=1'
+    # apikey
+    api.access_token = ''
+    api.apikey = 'apikey_1234'
+    wmts_url = map.wmts(scale=1)
+    assert wmts_url == f"{api.base_url}{map.endpoint}wmts/?scale=1&apikey=apikey_1234"
 
 
 def test_share(api, mock_map_data, mock_user_data):

{geobox-1.3.3 → geobox-1.3.4}/tests/test_model3d.py

@@ -155,10 +155,6 @@ def test_get_content(api, mock_model_data):
 def test_thumbnail(api, mock_model_data):
     model = Model(api, uuid=mock_model_data['uuid'], data=mock_model_data)
     assert model.thumbnail == f"{api.base_url}{model.endpoint}thumbnail.png"
-    # error
-    model.uuid = None
-    with pytest.raises(ValueError):
-        model.thumbnail
 
 
 def test_share(api, mock_model_data, mock_user_data):

{geobox-1.3.3 → geobox-1.3.4}/tests/test_mosaic.py

@@ -125,7 +125,7 @@ def test_thumbnail(api, mock_mosaic_data):
     
     thumbnail = mosaic.thumbnail
     
-    assert thumbnail == f"{api.base_url}{mosaic.endpoint}thumbnail/"
+    assert thumbnail == f"{api.base_url}{mosaic.endpoint}thumbnail"
 
 
 def test_get_point(api, mock_mosaic_data):

{geobox-1.3.3 → geobox-1.3.4}/tests/test_raster.py

@@ -119,7 +119,7 @@ def test_thumbnail(api, mock_raster_data):
     """Test getting raster thumbnail URL."""
     raster = Raster(api, uuid=mock_raster_data['uuid'], data=mock_raster_data)
     thumbnail_url = raster.thumbnail
-    assert thumbnail_url == f"{api.base_url}{raster.endpoint}thumbnail/"
+    assert thumbnail_url == f"{api.base_url}{raster.endpoint}thumbnail"
 
 
 def test_raster_info(api, mock_raster_data):
@@ -247,8 +247,20 @@ def test_get_content(api, mock_raster_data):
 def test_get_render_png_url(api, mock_raster_data):
     """Test getting tile PNG URL."""
     raster = Raster(api, uuid=mock_raster_data['uuid'], data=mock_raster_data)
-    url = raster.get_render_png_url(x=10, y=20, z=1)
-    assert url == f"{raster.api.base_url}{raster.endpoint}render/1/10/20.png"
+    url = raster.get_render_png_url(x=10, y=20, z=1, indexes=1)
+    assert url == f"{raster.api.base_url}{raster.endpoint}render/1/10/20.png?indexes=1"
+
+
+def test_get_tile_png_url(api, mock_raster_data):
+    """Test getting tile PNG URL."""
+    raster = Raster(api, uuid=mock_raster_data['uuid'], data=mock_raster_data)
+    url = raster.get_tile_png_url(x=10, y=20, z=1)
+    assert url == f"{raster.api.base_url}{raster.endpoint}tiles/1/10/20.png"
+    # apikey
+    api.access_token = ''
+    api.apikey = 'apikey_1234'
+    url = raster.get_tile_png_url(x=10, y=20, z=1)
+    assert url == f"{raster.api.base_url}{raster.endpoint}tiles/1/10/20.png?apikey=apikey_1234"
 
 
 def test_get_tile_pbf_url(api, mock_raster_data):
@@ -256,6 +268,11 @@ def test_get_tile_pbf_url(api, mock_raster_data):
     raster = Raster(api, uuid=mock_raster_data['uuid'], data=mock_raster_data)
     url = raster.get_tile_pbf_url(x=10, y=20, z=1)
     assert url == f"{raster.api.base_url}{raster.endpoint}tiles/1/10/20.pbf"
+    # apikey
+    api.access_token = ''
+    api.apikey = 'apikey_1234'
+    url = raster.get_tile_pbf_url(x=10, y=20, z=1)
+    assert url == f"{raster.api.base_url}{raster.endpoint}tiles/1/10/20.pbf?apikey=apikey_1234"
 
 
 def test_get_tile_json(api, mock_raster_data):
@@ -272,6 +289,11 @@ def test_wmts(api, mock_raster_data):
     raster = Raster(api, uuid=mock_raster_data['uuid'], data=mock_raster_data)
     url = raster.wmts(scale=1)
     assert url == f'{raster.api.base_url}{raster.endpoint}wmts/?scale=1'
+    # apikey
+    api.access_token = ''
+    api.apikey = 'apikey_1234'
+    url = raster.wmts(scale=1)
+    assert url == f'{raster.api.base_url}{raster.endpoint}wmts/?scale=1&apikey=apikey_1234'
 
 
 def test_settings(api, mock_raster_data):

{geobox-1.3.3 → geobox-1.3.4}/tests/test_tileset.py

@@ -273,12 +273,16 @@ def test_update_tileset_extent(api, mock_tileset_data):
         api.post.assert_called_once_with(endpoint)
 
 
-def test_get_tile(api, mock_tileset_data):
+def test_get_tile_pbf_url(api, mock_tileset_data):
     """Test getting tile from tileset."""
-    url = f"tilesets/{mock_tileset_data['uuid']}/tiles/1/1/1.pbf"
     tileset = Tileset(api, uuid=mock_tileset_data['uuid'], data=mock_tileset_data)
-    tile_url = tileset.get_tile(x=1, y=1, z=1)
-    assert tile_url == url
+    url = tileset.get_tile_pbf_url(x=1, y=1, z=1)
+    assert url == f"{api.base_url}{tileset.endpoint}tiles/1/1/1.pbf"
+    # apikey
+    api.access_token = ''
+    api.apikey = 'apikey_1234'
+    url = tileset.get_tile_pbf_url(x=1, y=1, z=1)
+    assert url == f"{api.base_url}{tileset.endpoint}tiles/1/1/1.pbf?apikey=apikey_1234"
 
 
 def test_seed_cache(api, mock_tileset_data, mock_success_task_data):
@@ -308,16 +312,16 @@ def test_update_cache(api, mock_tileset_data, mock_success_task_data):
 
     api.get.return_value = mock_success_task_data
 
-    task = tileset.update_cache()[0]
+    task = tileset.update_cache(from_zoom=0, to_zoom=2, extents=[[1, 2, 3, 4]], user_id=1)[0]
     assert isinstance(task, Task)
-    api.post.assert_called_once_with(f'{tileset.endpoint}cache/update/', {})
+    api.post.assert_called_once_with(f'{tileset.endpoint}cache/update/', {'from_zoom': 0, 'to_zoom': 2, 'extents': [[1, 2, 3, 4]], 'user_id': 1})
     # error
     api.post.return_value = [1, 2, 3]
 
     api.get.return_value = mock_success_task_data
 
     with pytest.raises(ValueError, match="Failed to update cache"):
-        task = tileset.update_cache()
+        task = tileset.update_cache(from_zoom=0, to_zoom=2)
         
 
 def test_clear_cache(api, mock_tileset_data):

{geobox-1.3.3 → geobox-1.3.4}/tests/test_vectorlayer.py

@@ -592,11 +592,16 @@ def test_create_view(api, mock_vector_data, layer_type, mock_view_data):
 
 
 @pytest.mark.parametrize("layer_type", [type for type in LayerType])
-def test_get_tile(api, mock_vector_data, layer_type):
+def test_get_tile_pbf_url(api, mock_vector_data, layer_type):
     """Test getting a vector tile."""
     layer = VectorLayer(api, uuid=mock_vector_data['uuid'], data=mock_vector_data, layer_type=layer_type)
-    endpoint = layer.get_tile(x=1, y=2, z=3)
-    assert endpoint == f'{layer.BASE_ENDPOINT}{layer.endpoint}tiles/3/1/2.pbf'
+    url = layer.get_tile_pbf_url(x=1, y=2, z=3)
+    assert url == f'{layer.api.base_url}{layer.endpoint}tiles/3/1/2.pbf'
+    # apikey
+    api.access_token = ''
+    api.apikey = 'apikey_1234'
+    url = layer.get_tile_pbf_url(x=1, y=2, z=3)
+    assert url == f'{layer.api.base_url}{layer.endpoint}tiles/3/1/2.pbf?apikey=apikey_1234'
 
 
 @pytest.mark.parametrize("layer_type", [type for type in LayerType])

{geobox-1.3.3 → geobox-1.3.4}/tests/test_view.py

@@ -520,7 +520,7 @@ def test_export_features(api, mock_view_data, layer_type, mock_success_task_data
 
 
 @pytest.mark.parametrize("layer_type", [type for type in LayerType])
-def test_get_tile(api, mock_view_data, layer_type):
+def test_get_tile_pbf_url(api, mock_view_data, layer_type):
     """Test getting a vector tile."""
     view = VectorLayerView(
         api=api,
@@ -528,8 +528,8 @@ def test_get_tile(api, mock_view_data, layer_type):
         layer_type=layer_type,
         data=mock_view_data
     )
-    endpoint = view.get_tile(x=1, y=2, z=3)
-    assert endpoint == f'{view.BASE_ENDPOINT}{view.endpoint}tiles/3/1/2.pbf'
+    endpoint = view.get_tile_pbf_url(x=1, y=2, z=3)
+    assert endpoint == f'{view.api.base_url}{view.endpoint}tiles/3/1/2.pbf'
 
 
 @pytest.mark.parametrize("layer_type", [type for type in LayerType])