geobox 2.2.3__tar.gz → 2.2.5__tar.gz

{geobox-2.2.3 → geobox-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geobox
-Version: 2.2.3
+Version: 2.2.5
 Summary: SDK for Geobox's APIs
 Author-email: Hamid Heydari <heydari.h62@gmail.com>
 License: MIT

{geobox-2.2.3 → geobox-2.2.5}/geobox/aio/query.py

@@ -483,7 +483,7 @@ class AsyncQuery(AsyncBase):
             "sql": kwargs.get('sql'),
             "params": kwargs.get('params')
         }
-        await super()._update(self.endpoint, data)
+        return await super()._update(self.endpoint, data)
 
 
     async def save(self) -> None:

{geobox-2.2.3 → geobox-2.2.5}/geobox/aio/vectorlayer.py

@@ -658,10 +658,14 @@ class AsyncVectorLayer(AsyncBase):
         return response
 
 
-    async def get_features(self, **kwargs) -> Union[List['AsyncFeature'], int]:
+    async def get_features(self, geojson: bool = False, **kwargs) -> Union[List['AsyncFeature'], Dict, int]:
         """
         [async] Get features from the layer with optional filtering and pagination.
         
+        Args:
+            geojson (bool, optional): If True, returns the raw API response (GeoJSON dict). 
+                            If False, returns a list of Feature objects. default: False.
+
         Keyword Args:
             quant_factor (int): Quantization factor. This parameter is only used by topojson encoder and is ignored for other formats. Higher quantizaion value means higher geometry precision. default is 1000000.
             skip (int): Number of features to skip. default is 0.
@@ -681,7 +685,7 @@ class AsyncVectorLayer(AsyncBase):
             bbox_srid (int): srid (epsg code) of bbox. e.g. 4326. default is 3857.
                 
         Returns:
-            List[Feature] | int: A list of Feature instances or the features count if return_count is True.
+            List[Feature] | Dict | int: A list of Feature instances or the geojson api response if geojson=True or the features count if return_count is True.
 
         Example:
             >>> from geobox.aio import AsyncGeoboxClient
@@ -718,8 +722,13 @@ class AsyncVectorLayer(AsyncBase):
             'bbox_srid': kwargs.get('bbox_srid', 3857)
         }
 
+        endpoint = f'{self.endpoint}features/'
+
+        if geojson:
+            return await self.api.get(endpoint)
+
         return await super()._get_list(api=self.api,
-            endpoint=f'{self.endpoint}features/',
+            endpoint=endpoint,
             params=params,
             factory_func=lambda api, item, srid: AsyncFeature(self, srid, item),
             geojson=True)

{geobox-2.2.3 → geobox-2.2.5}/geobox/aio/view.py

@@ -451,10 +451,14 @@ class AsyncVectorLayerView(AsyncVectorLayer):
         return await super().calculate_field(target_field, expression, q, bbox, bbox_srid, feature_ids, run_async, user_id)
     
 
-    async def get_features(self, **kwargs) -> Union[List['AsyncFeature'], int]:
+    async def get_features(self, geojson: bool = False, **kwargs) -> Union[List['AsyncFeature'], Dict, int]:
         """
         [async] Get features from the layer with optional filtering and pagination.
         
+        Args:
+            geojson (bool, optional): If True, returns the raw API response (GeoJSON dict). 
+                            If False, returns a list of Feature objects. default: False.
+
         Keyword Args:
             quant_factor (int): Quantization factor. This parameter is only used by topojson encoder and is ignored for other formats. Higher quantizaion value means higher geometry precision. default is 1000000.
             skip (int): Number of features to skip. default is 0.
@@ -474,7 +478,7 @@ class AsyncVectorLayerView(AsyncVectorLayer):
             bbox_srid (int): srid (epsg code) of bbox. e.g. 4326. default is 3857.
                 
         Returns:
-            List[AsyncFeature] | int: A list of Feature instances or the features count if return_count is True.
+            List[Feature] | Dict | int: A list of Feature instances or the geojson api response if geojson=True or the features count if return_count is True.
             
 
         Example:
@@ -491,7 +495,7 @@ class AsyncVectorLayerView(AsyncVectorLayer):
             ...         out_srid=4326, 
             ...         bbox_srid=4326)
         """ 
-        return await super().get_features(**kwargs)
+        return await super().get_features(geojson=geojson, **kwargs)
     
 
     async def get_feature(self, feature_id: int, out_srid: int = AsyncFeature.BASE_SRID) -> 'AsyncFeature':

{geobox-2.2.3 → geobox-2.2.5}/geobox/enums.py

@@ -3,16 +3,16 @@ from enum import Enum
 # File Enums
 class InputGeomType(Enum):
     POINT = 'POINT'
-    LINE = 'LINE'
+    LINESTRING = 'LINESTRING'
     POLYGON = 'POLYGON'
     MULTIPOINT = 'MULTIPOINT'
-    MULTILINE = 'MULTILINE'
+    MULTILINESTRING = 'MULTILINESTRING'
     MULTIPOLYGON = 'MULTIPOLYGON'
     POINT_Z = 'POINTZ'
-    LINE_Z = 'LINEZ'
+    LINESTRING_Z = 'LINESTRINGZ'
     POLYGON_Z = 'POLYGONZ'
     MULTIPOINT_Z = 'MULTIPOINTZ'
-    MULTILINE_Z = 'MULTILINEZ'
+    MULTILINESTRING_Z = 'MULTILINESTRINGZ'
     MULTIPOLYGON_Z = 'MULTIPOLYGONZ'
     
 class PublishFileType(Enum):

{geobox-2.2.3 → geobox-2.2.5}/geobox/query.py

@@ -482,7 +482,7 @@ class Query(Base):
             "sql": kwargs.get('sql'),
             "params": kwargs.get('params')
         }
-        super()._update(self.endpoint, data)
+        return super()._update(self.endpoint, data)
 
 
     def save(self) -> None:

{geobox-2.2.3 → geobox-2.2.5}/geobox/vectorlayer.py

@@ -660,10 +660,14 @@ class VectorLayer(Base):
         return response
 
 
-    def get_features(self, **kwargs) -> Union[List['Feature'], int]:
+    def get_features(self, geojson: bool = False, **kwargs) -> Union[List['Feature'], Dict, int]:
         """
         Get features from the layer with optional filtering and pagination.
         
+        Args:
+            geojson (bool, optional): If True, returns the raw API response (GeoJSON dict). 
+                            If False, returns a list of Feature objects. default: False.
+
         Keyword Args:
             quant_factor (int): Quantization factor. This parameter is only used by topojson encoder and is ignored for other formats. Higher quantizaion value means higher geometry precision. default is 1000000.
             skip (int): Number of features to skip. default is 0.
@@ -683,7 +687,7 @@ class VectorLayer(Base):
             bbox_srid (int): srid (epsg code) of bbox. e.g. 4326. default is 3857.
                 
         Returns:
-            List[Feature] | int: A list of Feature instances or the features count if return_count is True.
+            List[Feature] | Dict | int: A list of Feature instances or the geojson api response if geojson=True or the features count if return_count is True.
 
         Example:
             >>> from geobox import GeoboxClient
@@ -691,13 +695,13 @@ class VectorLayer(Base):
             >>> client = GeoboxClient()
             >>> layer = VectorLayer.get_vector(api=client, uuid="12345678-1234-5678-1234-567812345678")
             >>> features = layer.get_features(quant_factor=1000000, 
-            ...                                 skip=0, 
-            ...                                 limit=100, 
-            ...                                 skip_geometry=False, 
-            ...                                 return_count=False, 
-            ...                                 select_fields="fclass, osm_id", 
-            ...                                 out_srid=3857, 
-            ...                                 bbox_srid=3857)
+            ...    skip=0, 
+            ...    limit=100, 
+            ...    skip_geometry=False, 
+            ...    return_count=False, 
+            ...    select_fields="fclass, osm_id", 
+            ...    out_srid=3857, 
+            ...    bbox_srid=3857)
         """
         params = {
             'f': 'json',
@@ -719,11 +723,16 @@ class VectorLayer(Base):
             'bbox_srid': kwargs.get('bbox_srid', 3857)
         }
 
+        endpoint = f'{self.endpoint}features/'
+
+        if geojson:
+            return self.api.get(endpoint)
+
         return super()._get_list(api=self.api,
-                            endpoint=f'{self.endpoint}features/',
-                            params=params,
-                            factory_func=lambda api, item, srid: Feature(self, srid, item),
-                            geojson=True)
+            endpoint=endpoint,
+            params=params,
+            factory_func=lambda api, item, srid: Feature(self, srid, item),
+            geojson=True)
 
 
     def get_feature(self, feature_id: int, out_srid: int = Feature.BASE_SRID) -> 'Feature':

{geobox-2.2.3 → geobox-2.2.5}/geobox/view.py

@@ -445,10 +445,14 @@ class VectorLayerView(VectorLayer):
         return super().calculate_field(target_field, expression, q, bbox, bbox_srid, feature_ids, run_async, user_id)
     
 
-    def get_features(self, **kwargs) -> Union[List['Feature'], int]:
+    def get_features(self, geojson: bool = False, **kwargs) -> Union[List['Feature'], Dict, int]:
         """
         Get features from the layer with optional filtering and pagination.
         
+        Args:
+            geojson (bool, optional): If True, returns the raw API response (GeoJSON dict). 
+                            If False, returns a list of Feature objects. default: False.
+
         Keyword Args:
             quant_factor (int): Quantization factor. This parameter is only used by topojson encoder and is ignored for other formats. Higher quantizaion value means higher geometry precision. default is 1000000.
             skip (int): Number of features to skip. default is 0.
@@ -468,7 +472,7 @@ class VectorLayerView(VectorLayer):
             bbox_srid (int): srid (epsg code) of bbox. e.g. 4326. default is 3857.
                 
         Returns:
-            List[Feature] | int: A list of Feature instances or the features count if return_count is True.
+            List[Feature] | Dict | int: A list of Feature instances or the geojson api response if geojson=True or the features count if return_count is True.
             
 
         Example:
@@ -477,15 +481,15 @@ class VectorLayerView(VectorLayer):
             >>> client = GeoboxClient()
             >>> layer = VectorLayerView(api=client, name="my_layer", layer_type=LayerType.Point)
             >>> features = layer.get_features(quant_factor=1000000, 
-            ...                                 skip=0, 
-            ...                                 limit=100, 
-            ...                                 skip_geometry=False, 
-            ...                                 return_count=False, 
-            ...                                 select_fields="fclass, osm_id", 
-            ...                                 out_srid=4326, 
-            ...                                 bbox_srid=4326)
-        """
-        return super().get_features(**kwargs)
+            ...    skip=0, 
+            ...    limit=100, 
+            ...    skip_geometry=False, 
+            ...    return_count=False, 
+            ...    select_fields="fclass, osm_id", 
+            ...    out_srid=4326, 
+            ...    bbox_srid=4326)
+        """
+        return super().get_features(geojson=geojson, **kwargs)
     
 
     def get_feature(self, feature_id: int, out_srid: int = Feature.BASE_SRID) -> 'Feature':

{geobox-2.2.3 → geobox-2.2.5}/geobox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geobox
-Version: 2.2.3
+Version: 2.2.5
 Summary: SDK for Geobox's APIs
 Author-email: Hamid Heydari <heydari.h62@gmail.com>
 License: MIT

{geobox-2.2.3 → geobox-2.2.5}/pyproject.toml

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

{geobox-2.2.3 → geobox-2.2.5}/tests/test_vectorlayer.py

@@ -381,7 +381,8 @@ def test_get_features(api, mock_vector_data, layer_type, mock_feature_data):
     """Test getting a specific feature."""
     layer = VectorLayer(api, uuid=mock_vector_data['uuid'], data=mock_vector_data, layer_type=layer_type)
     layer.create_feature(geojson=mock_feature_data[FeatureType.Polygon.value])
-    api.get.return_value = {
+    geojson = {
+        'type': 'FeatureCollection',
         'features': [mock_feature_data[FeatureType.Polygon.value]],
         'crs': {
             'properties': {
@@ -389,6 +390,7 @@ def test_get_features(api, mock_vector_data, layer_type, mock_feature_data):
             }
         }
     }
+    api.get.return_value = geojson
     params = clean_data({
         'f': 'json',
         'quant_factor': 1000000,
@@ -413,6 +415,10 @@ def test_get_features(api, mock_vector_data, layer_type, mock_feature_data):
     assert features[0].layer == layer
     assert features[0].data == mock_feature_data[FeatureType.Polygon.value]
     assert features[0].endpoint == f'vectorLayers/{mock_vector_data["uuid"]}/features/{mock_feature_data[FeatureType.Polygon.value]["id"]}/'
+    # get geojson
+    result = layer.get_features(geojson=True)
+    assert type(result) == dict
+    assert result == geojson
     # return count
     api.get.return_value = {'count': 1}
     count = layer.get_features(return_count=True)

{geobox-2.2.3 → geobox-2.2.5}/tests/test_view.py

@@ -357,7 +357,8 @@ def test_get_features(api, mock_view_data, layer_type, mock_feature_data):
         data=mock_view_data
     )
     view.create_feature(geojson=mock_feature_data[FeatureType.Polygon.value])
-    api.get.return_value = {
+    geojson = {
+        'type': 'FeatureCollection',
         'features': [mock_feature_data[FeatureType.Polygon.value]],
         'crs': {
             'properties': {
@@ -365,6 +366,7 @@ def test_get_features(api, mock_view_data, layer_type, mock_feature_data):
             }
         }
     }
+    api.get.return_value = geojson
     params = clean_data({
         'f': 'json',
         'quant_factor': 1000000,
@@ -389,6 +391,10 @@ def test_get_features(api, mock_view_data, layer_type, mock_feature_data):
     assert features[0].layer == view
     assert features[0].data == mock_feature_data[FeatureType.Polygon.value]
     assert features[0].endpoint == f'vectorLayerViews/{mock_view_data["uuid"]}/features/{mock_feature_data[FeatureType.Polygon.value]["id"]}/'
+    # get geojson
+    result = view.get_features(geojson=True)
+    assert type(result) == dict
+    assert result == geojson
     # return count
     api.get.return_value = {'count': 1}
     count = view.get_features(return_count=True)