geobox 2.2.3__py3-none-any.whl → 2.2.5__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → geobox-2.2.5.dist-info}/METADATA

@@ -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.dist-info → geobox-2.2.5.dist-info}/RECORD

@@ -5,7 +5,7 @@ geobox/attachment.py,sha256=HA_UUBr4buuivCDI3rizmHqil8olCea3Lv3daRAfMY4,13274
 geobox/base.py,sha256=paE3-Wshzp4ykpkbXdIZ6MVPDwyTRgrr-OTYd9BK2o8,13353
 geobox/basemap.py,sha256=BSDb7mJm-Pmm5GRqvsHxKiqBNL_wfzy_GVv1qqTVFLc,5746
 geobox/dashboard.py,sha256=Gkt66_WqJEco2olFfZ7W8ux3IhhbbudVqfLlB3t8MCs,13039
-geobox/enums.py,sha256=jA5KwOdTMkFhXEBgcP-8bgi0cFyD1NFN4QpLelow0HA,8044
+geobox/enums.py,sha256=02QRtUeHSaf3iyLSIcmFKkZNcRA_HWSwAGVI6PxTOEQ,8092
 geobox/exception.py,sha256=jvpnv0M2Ck1FpxHTL_aKYWxGvLnCQ3d9vOrMIktjw1U,1507
 geobox/feature.py,sha256=YP-wCSxEin93ji6Hq72LG7j1VjGC0Jk05g06IOW_W8I,20455
 geobox/field.py,sha256=_5CS3kj3P-BKCbtAUd7dtkPBnN0D0H1ZKPlKx8DValw,11188
@@ -16,7 +16,7 @@ geobox/map.py,sha256=SUHGA5GEGeCHsjZbRgnd7RGTKqSxpk3oyC1RKZfK-FA,39042
 geobox/model3d.py,sha256=ygzPuFFkXIERm2dMQE5U_kwW_fsS9OLIE_XrPMsw54I,15318
 geobox/mosaic.py,sha256=ImJ6D2T63v86NKUKMEzWToed0jnfFtFz7HqO4mJU7DQ,25817
 geobox/plan.py,sha256=-Mw5QkLK7Sd1SoTnwQ_FHIXUyDNCGVZcK8Ba_naIuP0,13348
-geobox/query.py,sha256=Bv9PsXRzcPldm0iX_f2xBXu2swiIoesLB6FMWFCRuz0,25997
+geobox/query.py,sha256=TaVHF2l9T3bpUyqUQMJbkx-E_NZdOMPmOS4_-9VmKzw,26004
 geobox/raster.py,sha256=3Vl4eX60DVRGgVI51A2AF_o5eaKsM8LLn5ODGE6Dspg,33805
 geobox/raster_analysis.py,sha256=yoWA5_-GixyAJMpo8cHmZcYrEYUvwo2395BwrGlUBaA,34920
 geobox/route.py,sha256=cKZTTHBHM8woWbhHIpCvrRX_doJcTkGktouee0z7oG0,2723
@@ -29,9 +29,9 @@ geobox/usage.py,sha256=nnFq95fB4jdR8Uo0T09izejrrv14jpqoqbvQ8nixajg,9185
 geobox/user.py,sha256=1tbIfBRko56kHk3BKp3-Jjqm61xlqcmKZq6aKqbxNAY,17953
 geobox/utils.py,sha256=JmlRqDVIo0vBikzH1XakRrCrEIfLA7_eTJnBWBvGhJI,2243
 geobox/vector_tool.py,sha256=q6bKhuUI6Zy6DVJU7s5OnooGlfdCRa1EPHnaLXfjeZo,86273
-geobox/vectorlayer.py,sha256=QYa_-eBk9WdMYUdGeC8MaqsYm1P6tk5J2tgejrzgv_g,58701
+geobox/vectorlayer.py,sha256=R4EFFrfJkGbIj63VnqKE2YW1Io-FqGET2lb6DEv1N5I,58803
 geobox/version.py,sha256=KcPCSe9vD6rc11qaTVO8UxYwXRX-0r0tQVaF-CJPfB0,10797
-geobox/view.py,sha256=DJL1wdccZC_ZR6V5hYDYDFZCC9lqle4wheaIOxOa__I,43266
+geobox/view.py,sha256=GLC2ZA7SN_I8bP8KkZjUKYDZHw9RMg00Y7x7LQNyEJY,43361
 geobox/workflow.py,sha256=SWq4y6J4-6GwYn8uKWTAdYj0rX6romF_s20C0Cth8d0,12931
 geobox/aio/__init__.py,sha256=4Ufsv-VOW7FQGD1OmSRKH7E3sLCaKC0MpEMsSMBC3ro,1933
 geobox/aio/api.py,sha256=am3Yl77WWBVibSOuid4vh-L6vca_Y4q4Ff_0Fgd-t0I,110041
@@ -49,7 +49,7 @@ geobox/aio/map.py,sha256=YZNaOBh9E38-bbeYsLxKjiVHhC-hoi3KDbG1fgIJsRs,41228
 geobox/aio/model3d.py,sha256=KFm5h2lW_WR6BvFshRtfVnniCc0yOS1F9Djhj_Q-tOA,16440
 geobox/aio/mosaic.py,sha256=07DLl1xO92OXlJxAsxHO1NmBWRlfyWo5aBgoX6hlVxc,27960
 geobox/aio/plan.py,sha256=3RrDjDHWBlFO3fA-FdL_IWC5W5mtZjm8SeJA2NzuJOE,13879
-geobox/aio/query.py,sha256=1rackooJ46llzrw0cxAhfw0_1asNo7RKSIVuJnVrT9I,27770
+geobox/aio/query.py,sha256=d2voJ7A38wxdlRZH7Hv5xJXJUqzDrsUFe7FECjsadjg,27777
 geobox/aio/raster.py,sha256=t4oY5As0_3o1Z2JVYwwyQ_Rks-Oa4t4zJkWVTnD_C_g,35912
 geobox/aio/raster_analysis.py,sha256=aSU_E8TXrex2x9w3S4WCWGTu0q81qOBN0rXo5uG5IgM,36672
 geobox/aio/route.py,sha256=dkKsK4ZjL7XikgoZ3lJfkr2UXwrmxct4Qt2DzZg0upE,2860
@@ -61,12 +61,12 @@ geobox/aio/tileset.py,sha256=t2pcC2NmS1uVrpJqci9XUuSKEuq4v05fW2AS5QBTK3w,27639
 geobox/aio/usage.py,sha256=_I153m0uza7ZooMdHInBVmTt14SCu1qmvvmr80zmVLM,9506
 geobox/aio/user.py,sha256=-7DJW-mi6_wrJFIfL3oto7YqNoLTg7fLAZEFn9yiAhQ,19056
 geobox/aio/vector_tool.py,sha256=_6sFu7WllK82M7E6zl0Tteb7at05OsgMnWUEDlD41sk,92886
-geobox/aio/vectorlayer.py,sha256=d7BAPjp1MsFWhrgDh3gJ8LBAIA_2-vCGCT0ji9-e1O4,59426
+geobox/aio/vectorlayer.py,sha256=qucLKg76sVSZt6WxU9PL5C6ROJ4uxdxSBXm5dUfIsBA,59801
 geobox/aio/version.py,sha256=Yt7tKUqHS8rKfTPAm77yAaDajFn0ZEo0UWhA5DN7_uM,11422
-geobox/aio/view.py,sha256=CMULdkierGeIvRWdyfqy6FO_9_fgQeSAA1-xdcrl9Uw,45146
+geobox/aio/view.py,sha256=u6TpBsd5PzqCLv6XRJtReeB68C7mxS-WqqDt2BDtxPs,45439
 geobox/aio/workflow.py,sha256=UwOVMDRjJIiveXbYB8rGO02s5A7fn2BhEvQXkWMSApU,13707
-geobox-2.2.3.dist-info/licenses/LICENSE,sha256=AvFB7W94sJYKLDhBxLRshL3upexCOG8HQY_1JibB96w,1063
-geobox-2.2.3.dist-info/METADATA,sha256=rhrWYWX5FpB_3a3LdlHJd-X_tiWw3CZcy25EJdgysJU,3082
-geobox-2.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-geobox-2.2.3.dist-info/top_level.txt,sha256=ppXH8Bu2mlB-pLQ6lsoWEm2Gr6wZx1uzkhetsYA5ins,7
-geobox-2.2.3.dist-info/RECORD,,
+geobox-2.2.5.dist-info/licenses/LICENSE,sha256=AvFB7W94sJYKLDhBxLRshL3upexCOG8HQY_1JibB96w,1063
+geobox-2.2.5.dist-info/METADATA,sha256=XZQ7x4T4IW7YYNsnDIxeJi_ItmBOowmqNIIAP7o49FQ,3082
+geobox-2.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+geobox-2.2.5.dist-info/top_level.txt,sha256=ppXH8Bu2mlB-pLQ6lsoWEm2Gr6wZx1uzkhetsYA5ins,7
+geobox-2.2.5.dist-info/RECORD,,