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

geobox/enums.py

@@ -399,4 +399,34 @@ class RangeBound(Enum):
 
 class DistanceUnit(Enum):
     GEO = 'GEO'
-    PIXEL = 'PIXEL'
+    PIXEL = 'PIXEL'
+
+
+class GroupByAggFunction(Enum):
+    COUNT = 'count'
+    SUM = 'sum'
+    MIN = 'min'
+    MAX = 'max'
+    AVG = 'avg'
+
+
+class NetworkTraceDirection(Enum):
+    UP = "up"
+    DOWN = "down"
+
+
+class SpatialAggFunction(Enum):
+    COLLECT = 'collect'
+    UNION = 'union'
+    EXTENT = 'extent'
+    MAKELINE = 'makeline'
+
+
+class SpatialPredicate(Enum):
+    INTERSECT = 'Intersect'
+    CONTAIN = 'Contain'
+    CROSS = 'Cross'
+    EQUAL = 'Equal'
+    OVERLAP = 'Overlap'
+    TOUCH = 'Touch'
+    WITHIN = 'Within'

geobox/feature.py

@@ -7,7 +7,7 @@ from .enums import FeatureType
 if TYPE_CHECKING:
     from .vectorlayer import VectorLayer
     from .aio import AsyncGeoboxClient
-    from .aio.feature import Feature as AsyncFeature
+    from .aio.feature import AsyncFeature
 
 
 class Feature(Base):
@@ -16,7 +16,7 @@ class Feature(Base):
 
     def __init__(self, 
                  layer: 'VectorLayer', 
-                 srid: Optional[int] = 3857,
+                 srid: Optional[int] = BASE_SRID,
                  data: Optional[Dict] = {}):
         """
         Constructs all the necessary attributes for the Feature object.
@@ -30,7 +30,17 @@ class Feature(Base):
             >>> from geobox import GeoboxClient, Feature
             >>> client = GeoboxClient()
             >>> layer = client.get_vector(uuid="12345678-1234-5678-1234-567812345678")
-            >>> feature = Feature(layer=layer, srid=4326) # example srid set to 4326
+            >>> geojson = {
+            ...     "type": "Feature",
+            ...     "geometry": {
+            ...         "type": "Point",
+            ...         "coordinates": [58.4, 23.6]
+            ...     },
+            ...     "properties": {
+            ...         "name": "Test feature"
+            ...     }
+            ... }
+            >>> feature = Feature(layer=layer, data=geojson, srid=4326) # example srid set to 4326
             >>> feature.save()
         """
         super().__init__(api=layer.api)
@@ -65,8 +75,9 @@ class Feature(Base):
         Returns:
             str: A string representation of the Feature object.
         """
-        return f"Feature(id={self.id}, type={self.feature_type})"
-    
+        feature_id = getattr(self, "id", "-1")
+        return f"Feature(id={feature_id}, type={self.feature_type})"
+        
 
     def __getattr__(self, name: str) -> Any:
         """
@@ -217,18 +228,28 @@ class Feature(Base):
             >>> feature.save()
         """
         data = self.data.copy()
+        srid = self.srid
+
         try:
             if self.id:
                 if self.srid != self.BASE_SRID:
-                    self.data['geometry'] = self.original_geometry
+                    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)
             endpoint = urljoin(self.layer.endpoint, 'features/')
-            response = self.layer.api.post(endpoint, data)
+            request_data = self.data.copy()
+            response = self.layer.api.post(endpoint, request_data)
             self.endpoint = urljoin(self.layer.endpoint, f'features/{response["id"]}/')        
             self.data.update(response)
 
+        self.data['geometry'] = data['geometry']
+        self._srid = srid
+
+
 
     def delete(self) -> None:
         """
@@ -244,7 +265,7 @@ class Feature(Base):
             >>> feature = layer.get_feature(id=1)
             >>> feature.delete()
         """
-        super().delete(self.endpoint)
+        super()._delete(self.endpoint)
 
 
     def update(self, geojson: Dict) -> Dict:
@@ -511,7 +532,7 @@ class Feature(Base):
             async_client (AsyncGeoboxClient): The async version of the GeoboxClient instance for making requests.
 
         Returns:
-            geobox.aio.feature.Feature: the async instance of the feature.
+            AsyncFeature: the async instance of the feature.
 
         Example:
             >>> from geobox import Geoboxclient
@@ -522,7 +543,7 @@ class Feature(Base):
             >>> async with AsyncGeoboxClient() as async_client:
             >>>     async_feature = feature.to_async(async_client)
         """
-        from .aio.feature import Feature as AsyncFeature
+        from .aio.feature import AsyncFeature
 
         async_layer = self.layer.to_async(async_client=async_client)
         return AsyncFeature(layer=async_layer, srid=self.srid, data=self.data)