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

geobox/aio/feature.py

@@ -29,7 +29,11 @@ class AsyncFeature(AsyncBase):
         super().__init__(api=layer.api)
         self.layer = layer
         self._srid = srid
-        self.data = data or {}
+        self.data = data or {
+            "type": "Feature",
+            "geometry": {},
+            "properties": {}
+        }
         self.original_geometry = self.data.get('geometry')
         self.endpoint = urljoin(layer.endpoint, f'features/{self.data.get("id")}/') if self.data.get('id') else None
 
@@ -215,11 +219,8 @@ class AsyncFeature(AsyncBase):
 
         try:
             if self.id:
-                if self.srid != self.BASE_SRID:
-                    self = self.transform(self.BASE_SRID)
-                self.data['geometry'] = self.original_geometry
                 await self.update(self.data)
-                self.coordinates = data['geometry']['coordinates']
+
         except AttributeError:
             if self.srid != self.BASE_SRID:
                 self = self.transform(self.BASE_SRID)
@@ -273,17 +274,28 @@ class AsyncFeature(AsyncBase):
             ...     }   
             >>>     await feature.update(geojson)
         """
-        return await super()._update(self.endpoint, geojson, clean=False)
+        self.data = geojson
+        data = self.data.copy()
+        srid = self.srid
+
+        if self.srid != self.BASE_SRID:
+            self = self.transform(self.BASE_SRID)
+
+        await super()._update(self.endpoint, self.data, clean=False)
+        self.data['geometry'] = data['geometry']
+        self._srid = srid
+        return self.data
     
 
     @classmethod
-    async def create_feature(cls, layer: 'VectorLayer', geojson: Dict) -> 'AsyncFeature':
+    async def create_feature(cls, layer: 'VectorLayer', geojson: Dict, srid: int = 3857) -> 'AsyncFeature':
         """
         [async] Create a new feature in the vector layer.
 
         Args:
             layer (VectorLayer): The vector layer to create the feature in
             geojson (Dict): The GeoJSON data for the feature
+            srid (int, optional): the feature srid. default: 3857
 
         Returns:
             AsyncFeature: The created feature instance
@@ -299,8 +311,19 @@ class AsyncFeature(AsyncBase):
             ...     }
             >>>     feature = await Feature.create_feature(layer, geojson)
         """
+        feature = AsyncFeature(layer, srid=srid, data=geojson)
+        data = feature.data.copy()
+        srid = feature.srid
+
+        if feature.srid != feature.BASE_SRID:
+            feature = feature.transform(feature.BASE_SRID)
+
         endpoint = urljoin(layer.endpoint, 'features/')
-        return await cls._create(layer.api, endpoint, geojson, factory_func=lambda api, item: AsyncFeature(layer, data=item))
+        
+        feature = await cls._create(layer.api, endpoint, feature.data, factory_func=lambda api, item: AsyncFeature(layer, data=item))
+        feature.data['geometry'] = data['geometry']
+        feature._srid = srid
+        return feature
 
 
     @classmethod
@@ -360,10 +383,7 @@ class AsyncFeature(AsyncBase):
                 "Install it with: pip install geobox[geometry]"
             )
         
-        if not self.data:
-            return None
-        
-        elif not self.data.get('geometry'):
+        if not self.data.get('geometry'):
             raise ValueError("Geometry is not present in the feature data")
         
         elif not isinstance(self.data['geometry'], dict):

geobox/aio/task.py

@@ -2,6 +2,7 @@ import time
 import asyncio
 from urllib.parse import urljoin
 from typing import Optional, Dict, List, Optional, Union, TYPE_CHECKING
+import logging
 
 from .base import AsyncBase
 from ..enums import TaskStatus
@@ -16,6 +17,8 @@ if TYPE_CHECKING:
     from ..api import GeoboxClient
     from ..task import Task
 
+logger = logging.getLogger(__name__)
+
 
 class AsyncTask(AsyncBase):
 
@@ -233,7 +236,7 @@ class AsyncTask(AsyncBase):
                 return await self._wait(timeout, interval, progress_bar)
             except Exception as e:
                 last_exception = e
-                print(f"[Retry {attempt}/{retry}] Task wait failed: {e}")
+                logger.warning(f"[Retry {attempt}/{retry}] Task wait failed: {e}")
                 time.sleep(interval)
         raise last_exception
 

geobox/aio/vectorlayer.py

@@ -755,12 +755,13 @@ class AsyncVectorLayer(AsyncBase):
         return feature
 
 
-    async def create_feature(self, geojson: Dict)-> 'AsyncFeature':
+    async def create_feature(self, geojson: Dict, srid: int = AsyncFeature.BASE_SRID)-> 'AsyncFeature':
         """
         [async] Create a new feature in the layer.
         
         Args:
             geojson (Dict): The feature data including properties and geometry.
+            srid (int, optional): the feature srid. default: 3857
             
         Returns:
             Feature: The newly created feature instance.
@@ -780,7 +781,7 @@ class AsyncVectorLayer(AsyncBase):
             ...     }
             >>>     feature = await layer.create_feature(geojson=geojson)
         """
-        return await AsyncFeature.create_feature(self, geojson)
+        return await AsyncFeature.create_feature(self, geojson, srid=srid)
 
 
     async def delete_features(self, 

geobox/feature.py

@@ -34,7 +34,7 @@ class Feature(Base):
             ...     "type": "Feature",
             ...     "geometry": {
             ...         "type": "Point",
-            ...         "coordinates": [58.4, 23.6]
+            ...         "coordinates": [10.0, 10.0]
             ...     },
             ...     "properties": {
             ...         "name": "Test feature"
@@ -46,7 +46,11 @@ class Feature(Base):
         super().__init__(api=layer.api)
         self.layer = layer
         self._srid = srid
-        self.data = data or {}
+        self.data = data or {
+            "type": "Feature",
+            "geometry": {},
+            "properties": {}
+        }
         self.original_geometry = self.data.get('geometry')
         self.endpoint = urljoin(layer.endpoint, f'features/{self.data.get("id")}/') if self.data.get('id') else None
 
@@ -232,11 +236,8 @@ class Feature(Base):
 
         try:
             if self.id:
-                if self.srid != self.BASE_SRID:
-                    self = self.transform(self.BASE_SRID)
-                self.data['geometry'] = self.original_geometry
                 self.update(self.data)
-                self.coordinates = data['geometry']['coordinates']
+                
         except AttributeError:
             if self.srid != self.BASE_SRID:
                 self = self.transform(self.BASE_SRID)
@@ -291,17 +292,28 @@ class Feature(Base):
             ... }
             >>> feature.update(geojson)
         """
-        return super()._update(self.endpoint, geojson, clean=False)
+        self.data = geojson
+        data = self.data.copy()
+        srid = self.srid
+
+        if self.srid != self.BASE_SRID:
+            self = self.transform(self.BASE_SRID)
+
+        super()._update(self.endpoint, self.data, clean=False)
+        self.data['geometry'] = data['geometry']
+        self._srid = srid
+        return self.data
     
 
     @classmethod
-    def create_feature(cls, layer: 'VectorLayer', geojson: Dict) -> 'Feature':
+    def create_feature(cls, layer: 'VectorLayer', geojson: Dict, srid: int = 3857) -> 'Feature':
         """
         Create a new feature in the vector layer.
 
         Args:
             layer (VectorLayer): The vector layer to create the feature in
             geojson (Dict): The GeoJSON data for the feature
+            srid (int, optional): the feature srid. default: 3857
 
         Returns:
             Feature: The created feature instance
@@ -318,8 +330,19 @@ class Feature(Base):
             ... }
             >>> feature = Feature.create_feature(layer, geojson)
         """
+        feature = Feature(layer, srid=srid, data=geojson)
+        data = feature.data.copy()
+        srid = feature.srid
+
+        if feature.srid != feature.BASE_SRID:
+            feature = feature.transform(feature.BASE_SRID)
+
         endpoint = urljoin(layer.endpoint, 'features/')
-        return cls._create(layer.api, endpoint, geojson, factory_func=lambda api, item: Feature(layer, data=item))
+        
+        feature = cls._create(layer.api, endpoint, feature.data, factory_func=lambda api, item: Feature(layer, data=item))
+        feature.data['geometry'] = data['geometry']
+        feature._srid = srid
+        return feature
 
 
     @classmethod
@@ -380,10 +403,8 @@ class Feature(Base):
                 "Install it with: pip install geobox[geometry]"
             )
         
-        if not self.data:
-            return None
         
-        elif not self.data.get('geometry'):
+        if not self.data.get('geometry'):
             raise ValueError("Geometry is not present in the feature data")
         
         elif not isinstance(self.data['geometry'], dict):

geobox/task.py

@@ -1,6 +1,7 @@
 from urllib.parse import urljoin, urlencode
 from typing import Optional, Dict, List, Optional, Union, TYPE_CHECKING
 import time
+import logging
 
 from .base import Base
 from .enums import TaskStatus
@@ -15,6 +16,8 @@ if TYPE_CHECKING:
     from .aio import AsyncGeoboxClient
     from .aio.task import AsyncTask
 
+logger = logging.getLogger(__name__)
+
 
 class Task(Base):
 
@@ -230,7 +233,7 @@ class Task(Base):
                 return self._wait(timeout, interval, progress_bar)
             except Exception as e:
                 last_exception = e
-                print(f"[Retry {attempt}/{retry}] Task wait failed: {e}")
+                logger.warning(f"[Retry {attempt}/{retry}] Task wait failed: {e}")
                 time.sleep(interval)
         raise last_exception
 

geobox/vectorlayer.py

@@ -756,12 +756,13 @@ class VectorLayer(Base):
         return feature
 
 
-    def create_feature(self, geojson: Dict)-> 'Feature':
+    def create_feature(self, geojson: Dict, srid: int = Feature.BASE_SRID)-> 'Feature':
         """
         Create a new feature in the layer.
         
         Args:
             geojson (Dict): The feature data including properties and geometry.
+            srid (int, optional): the feature srid. default: 3857
             
         Returns:
             Feature: The newly created feature instance.
@@ -781,7 +782,7 @@ class VectorLayer(Base):
             ... }
             >>> feature = layer.create_feature(geojson=geojson)
         """
-        return Feature.create_feature(self, geojson)
+        return Feature.create_feature(self, geojson, srid=srid)
 
 
     def delete_features(self, q: str = None, bbox: str = None, bbox_srid: int = None, feature_ids: List[int] = None, 

{geobox-2.2.1.dist-info → geobox-2.2.3.dist-info}/METADATA

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

{geobox-2.2.1.dist-info → geobox-2.2.3.dist-info}/RECORD

@@ -7,7 +7,7 @@ geobox/basemap.py,sha256=BSDb7mJm-Pmm5GRqvsHxKiqBNL_wfzy_GVv1qqTVFLc,5746
 geobox/dashboard.py,sha256=Gkt66_WqJEco2olFfZ7W8ux3IhhbbudVqfLlB3t8MCs,13039
 geobox/enums.py,sha256=jA5KwOdTMkFhXEBgcP-8bgi0cFyD1NFN4QpLelow0HA,8044
 geobox/exception.py,sha256=jvpnv0M2Ck1FpxHTL_aKYWxGvLnCQ3d9vOrMIktjw1U,1507
-geobox/feature.py,sha256=63AaEUkCnT9kbiEIh7LUqnuy2Op0qUPN_oQik0tjfFY,19924
+geobox/feature.py,sha256=YP-wCSxEin93ji6Hq72LG7j1VjGC0Jk05g06IOW_W8I,20455
 geobox/field.py,sha256=_5CS3kj3P-BKCbtAUd7dtkPBnN0D0H1ZKPlKx8DValw,11188
 geobox/file.py,sha256=cPj3cYjK85BqWIROfA-c1B-yw6d7Gu5ZzyCmFqAJSVY,20191
 geobox/layout.py,sha256=qnmFYFeVK-_mMjbzPJHAh9DcoMAdz-tzLDoHMpHST-Q,12608
@@ -22,14 +22,14 @@ geobox/raster_analysis.py,sha256=yoWA5_-GixyAJMpo8cHmZcYrEYUvwo2395BwrGlUBaA,349
 geobox/route.py,sha256=cKZTTHBHM8woWbhHIpCvrRX_doJcTkGktouee0z7oG0,2723
 geobox/scene.py,sha256=NEeXfOJGj8o7zIMZQjgLGf0FSzba-UMd3P-7KfkGwTs,12621
 geobox/settings.py,sha256=rYxBdiDUtQTuca5e12j6jyQYafW7gDUeb1U9ES-sk64,6999
-geobox/task.py,sha256=Fn2YqyWd9DeZVR92SJO4OQzmz1PfEegA7_VyJ1jgyws,14870
+geobox/task.py,sha256=X78BA90F4Q1yfMdxNYBKXWfwk5O3m_p6clhEiJPEiHA,14935
 geobox/tile3d.py,sha256=mMRwwpWmHoCyR4UFKrRnM-xLPacmLrPASYhphP0W8u8,12351
 geobox/tileset.py,sha256=p6fmOyAunwfWKhmjSgWGc060jM2MVfrnQGC_qoE_AIw,25006
 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=OaCWg8n1dvlzNIJ_c98WFU2BEGQBRW_AJxJt4bNxz_8,58593
+geobox/vectorlayer.py,sha256=QYa_-eBk9WdMYUdGeC8MaqsYm1P6tk5J2tgejrzgv_g,58701
 geobox/version.py,sha256=KcPCSe9vD6rc11qaTVO8UxYwXRX-0r0tQVaF-CJPfB0,10797
 geobox/view.py,sha256=DJL1wdccZC_ZR6V5hYDYDFZCC9lqle4wheaIOxOa__I,43266
 geobox/workflow.py,sha256=SWq4y6J4-6GwYn8uKWTAdYj0rX6romF_s20C0Cth8d0,12931
@@ -40,7 +40,7 @@ geobox/aio/attachment.py,sha256=4IzC8Vnt_LJHSzhfhyMtGqrv1AHibkLWO-mOCCtRyO8,1336
 geobox/aio/base.py,sha256=H9CB-5Gas3c1Xp14nW-PS-syoGNBpyRLN2iujlSxWLU,9455
 geobox/aio/basemap.py,sha256=7NeEihNGjVZgc6TRfM2w_3RuAGNXRRpEFItmMlR4e4A,6092
 geobox/aio/dashboard.py,sha256=L91YkVHtcb9QMozoIBOjiobskDM1NfxasVcTZs6hV3U,13843
-geobox/aio/feature.py,sha256=6YYZvKXccJ2chnhsyhOIrSCn3aaGEiVgvHRgslKEJ9Y,20012
+geobox/aio/feature.py,sha256=BouLyHGqpHsxMkSEs5EEPwzyzDdkzqnxlWZ7td1b-tY,20523
 geobox/aio/field.py,sha256=KTN6P1edmPj7NlLEyUHx2BW6dY0TLPdHjCefB6_4L5g,11512
 geobox/aio/file.py,sha256=RaygwYB4fkmxQyIG__NZZCdnXc7olOY2UC9qGQ3UhkQ,21217
 geobox/aio/layout.py,sha256=IasLEPVq5U_9VbTPPo-JqxKL4rPxWrVFoHbRdQZk9iY,13471
@@ -55,18 +55,18 @@ geobox/aio/raster_analysis.py,sha256=aSU_E8TXrex2x9w3S4WCWGTu0q81qOBN0rXo5uG5IgM
 geobox/aio/route.py,sha256=dkKsK4ZjL7XikgoZ3lJfkr2UXwrmxct4Qt2DzZg0upE,2860
 geobox/aio/scene.py,sha256=28R3cig3HZPPEhcOlb6_WQ210hxPIYgVg14ae8tnCPg,13402
 geobox/aio/settings.py,sha256=w3QcncZ2OposVHQeQKYOTowj-zFAWuEHN-2ZMzKOe14,7009
-geobox/aio/task.py,sha256=aE1OjhZOAl_xAy3OVhXan-wxWc1-wVEbyJ7UeFQF_2c,15868
+geobox/aio/task.py,sha256=ghw_1RU7QkGI2XEwQhz2WRZ6DWqdmwa0yTFx-CBeOAE,15933
 geobox/aio/tile3d.py,sha256=bN7IqmNzIfW0ofZUh49FjnakV2tuPUQnQgiA83zqrmE,13266
 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=flA3MQFD1Qm6TohftcTXfDQ5VGZztHr1K3zhZZ0x2og,59313
+geobox/aio/vectorlayer.py,sha256=d7BAPjp1MsFWhrgDh3gJ8LBAIA_2-vCGCT0ji9-e1O4,59426
 geobox/aio/version.py,sha256=Yt7tKUqHS8rKfTPAm77yAaDajFn0ZEo0UWhA5DN7_uM,11422
 geobox/aio/view.py,sha256=CMULdkierGeIvRWdyfqy6FO_9_fgQeSAA1-xdcrl9Uw,45146
 geobox/aio/workflow.py,sha256=UwOVMDRjJIiveXbYB8rGO02s5A7fn2BhEvQXkWMSApU,13707
-geobox-2.2.1.dist-info/licenses/LICENSE,sha256=AvFB7W94sJYKLDhBxLRshL3upexCOG8HQY_1JibB96w,1063
-geobox-2.2.1.dist-info/METADATA,sha256=_XDz9bfQYs0hAhFYWLxfCsemT183cW5YBPVPcZ_wbZo,3082
-geobox-2.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-geobox-2.2.1.dist-info/top_level.txt,sha256=ppXH8Bu2mlB-pLQ6lsoWEm2Gr6wZx1uzkhetsYA5ins,7
-geobox-2.2.1.dist-info/RECORD,,
+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,,