geoservercloud 0.3.1.dev29__tar.gz → 0.3.1.dev32__tar.gz

{geoservercloud-0.3.1.dev29 → geoservercloud-0.3.1.dev32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geoservercloud
-Version: 0.3.1.dev29
+Version: 0.3.1.dev32
 Summary: Lightweight Python client to interact with GeoServer Cloud REST API, GeoServer ACL and OGC services
 License: BSD-2-Clause
 Author: Camptocamp

{geoservercloud-0.3.1.dev29 → geoservercloud-0.3.1.dev32}/geoservercloud/geoservercloud.py

@@ -392,6 +392,16 @@ class GeoServerCloud:
         )
         return self.rest_service.create_feature_type(feature_type=feature_type)
 
+    def delete_feature_type(
+        self, workspace_name: str, datastore_name: str, layer_name: str
+    ) -> tuple[str, int]:
+        """
+        Delete a feature type and associated layer
+        """
+        return self.rest_service.delete_feature_type(
+            workspace_name, datastore_name, layer_name
+        )
+
     def create_layer_group(
         self,
         group: str,

{geoservercloud-0.3.1.dev29 → geoservercloud-0.3.1.dev32}/geoservercloud/models/featuretype.py

@@ -108,9 +108,9 @@ class FeatureType(EntityModel):
         feature_type = content["featureType"]
         workspace_name = feature_type["store"]["name"].split(":")[0]
         store_name = feature_type["store"]["name"].split(":")[1]
-        title = feature_type.get("title", feature_type.get("internationalTitle"))
+        title = feature_type.get("internationalTitle", feature_type.get("title"))
         abstract = feature_type.get(
-            "abstract", feature_type.get("internationalAbstract")
+            "internationalAbstract", feature_type.get("abstract")
         )
         if feature_type.get("metadataLinks"):
             metadata_links_payload = feature_type["metadataLinks"]["metadataLink"]
@@ -201,7 +201,13 @@ class FeatureType(EntityModel):
         return {"featureType": content}
 
     def put_payload(self) -> dict[str, Any]:
-        return self.post_payload()
+        content = self.post_payload()
+        # Force a null value on non-i18ned attributes, otherwise GeoServer sets it to the first i18n value
+        if content["featureType"].get("internationalTitle"):
+            content["featureType"]["title"] = None
+        if content["featureType"].get("internationalAbstract"):
+            content["featureType"]["abstract"] = None
+        return content
 
     def __repr__(self):
         return json.dumps(self.post_payload(), indent=4)

{geoservercloud-0.3.1.dev29 → geoservercloud-0.3.1.dev32}/geoservercloud/services/restservice.py

@@ -288,6 +288,15 @@ class RestService:
             )
         return response.content.decode(), response.status_code
 
+    def delete_feature_type(
+        self, workspace_name: str, datastore_name: str, layer_name: str
+    ) -> tuple[str, int]:
+        response: Response = self.rest_client.delete(
+            self.rest_endpoints.featuretype(workspace_name, datastore_name, layer_name),
+            params={"recurse": "true"},
+        )
+        return response.content.decode(), response.status_code
+
     def create_layer_group(
         self,
         group: str,

{geoservercloud-0.3.1.dev29 → geoservercloud-0.3.1.dev32}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geoservercloud"
-version = "0.3.1.dev29"
+version = "0.3.1.dev32"
 description = "Lightweight Python client to interact with GeoServer Cloud REST API, GeoServer ACL and OGC services"
 authors = ["Camptocamp <info@camptocamp.com>"]
 license = "BSD-2-Clause"