geoservercloud 0.8.6.dev16__tar.gz → 0.8.6.dev18__tar.gz

{geoservercloud-0.8.6.dev16 → geoservercloud-0.8.6.dev18}/PKG-INFO

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

{geoservercloud-0.8.6.dev16 → geoservercloud-0.8.6.dev18}/geoserver_acceptance_tests/compose/ci.compose.yaml

@@ -1,6 +1,6 @@
 services:
   geoserver:
-    image: docker.osgeo.org/geoserver:3.0.x
+    image: docker.osgeo.org/geoserver:3.0-RC
     ports:
       - "8080:8080"
     environment:

{geoservercloud-0.8.6.dev16 → geoservercloud-0.8.6.dev18}/geoservercloud/geoservercloud.py

@@ -20,7 +20,6 @@ from geoservercloud.models.wmssettings import WmsSettings
 from geoservercloud.models.wmsstore import WmsStore
 from geoservercloud.models.workspace import Workspace
 from geoservercloud.services import OwsService, RestService
-from geoservercloud.templates import Templates
 
 
 class GeoServerCloud:
@@ -826,9 +825,11 @@ class GeoServerCloud:
         abstract: str | dict | None = None,
         attributes: dict | None = None,
         epsg: int = 4326,
-        keywords: list[str] = [],
+        keywords: list[str] | None = None,
         time_dimension_info: TimeDimensionInfo | None = None,
-        layer_links: list[dict[str, str]] = [],
+        layer_links: list[dict[str, str]] | None = None,
+        native_name: str | None = None,
+        cql_filter: str | None = None,
     ) -> tuple[str, int]:
         """
         Create a feature type or update it if it already exists.
@@ -853,7 +854,10 @@ class GeoServerCloud:
         :type time_dimension_info: TimeDimensionInfo, optional
         :param layer_links: List of metadata links for the feature type, e.g. [{'content':"mymetadataurl", 'metadataType':"ISO19115:2003", 'type':"text/xml"}]
         :type layer_links: list of dict, optional
-
+        :param native_name: Native name of the feature type (default: same as layer_name)
+        :type native_name: str, optional
+        :param cql_filter: CQL filter to filter the data, e.g. key='Value'
+        :type cql_filter: str, optional
         :return: Tuple of (datastore_name, status_code)
         :rtype: tuple
 
@@ -863,6 +867,7 @@ class GeoServerCloud:
         ...     layer_name="mylayer",
         ...     workspace_name="myworkspace",
         ...     datastore_name="mystore",
+        ...     native_name="nativename",
         ...     title={"en": "English Title"},
         ...     abstract={"en": "English Abstract"},
         ...     attributes={
@@ -890,7 +895,8 @@ class GeoServerCloud:
         ...         presentation="LIST",
         ...         default_value_strategy="MAXIMUM",
         ...     ),
-        ...     layer_links=[{'content':"mymetadataurl", 'metadataType':"ISO19115:2003", 'type':"text/xml"}]
+        ...     layer_links=[{'content':"mymetadataurl", 'metadataType':"ISO19115:2003", 'type':"text/xml"}],
+        ...     cql_filter="key='Value'"
         ... )
         """
         workspace_name = workspace_name or self.default_workspace
@@ -909,7 +915,7 @@ class GeoServerCloud:
         ]
         feature_type = FeatureType(
             name=layer_name,
-            native_name=layer_name,
+            native_name=native_name or layer_name,
             workspace_name=workspace_name,
             store_name=datastore_name,
             srs=f"EPSG:{epsg}",
@@ -920,6 +926,7 @@ class GeoServerCloud:
             keywords=keywords,
             time_dimension_info=time_dimension_info,
             metadata_links=metadata_links,
+            cql_filter=cql_filter,
         )
         return self.rest_service.create_feature_type(feature_type=feature_type)
 

{geoservercloud-0.8.6.dev16 → geoservercloud-0.8.6.dev18}/geoservercloud/models/featuretype.py

@@ -45,6 +45,7 @@ class FeatureType(AbstractLayer):
         encode_measures: bool | None = None,
         metadata_links: list[MetadataLink] | None = None,
         time_dimension_info: TimeDimensionInfo | None = None,
+        cql_filter: str | None = None,
     ) -> None:
         super().__init__(
             name=name,
@@ -76,6 +77,7 @@ class FeatureType(AbstractLayer):
         self.circular_arc_present: bool | None = circular_arc_present
         self.encode_measures: bool | None = encode_measures
         self.time_dimension_info: TimeDimensionInfo | None = time_dimension_info
+        self.cql_filter: str | None = cql_filter
 
     @classmethod
     def from_get_response_payload(cls, content: dict):
@@ -153,6 +155,7 @@ class FeatureType(AbstractLayer):
             simple_conversion_enabled=feature_type.get("simpleConversionEnabled"),
             skip_number_match=feature_type.get("skipNumberMatch"),
             time_dimension_info=time_dimension_info,
+            cql_filter=feature_type.get("cqlFilter"),
         )
 
     def asdict(self) -> dict[str, Any]:
@@ -170,6 +173,7 @@ class FeatureType(AbstractLayer):
             "skipNumberMatch": self.skip_number_match,
             "circularArcPresent": self.circular_arc_present,
             "encodeMeasures": self.encode_measures,
+            "cqlFilter": self.cql_filter,
         }
         if self.time_dimension_info:
             metadata = {"entry": [self.time_dimension_info.asdict()]}

{geoservercloud-0.8.6.dev16 → geoservercloud-0.8.6.dev18}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geoservercloud"
-version = "0.8.6.dev16"
+version = "0.8.6.dev18"
 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"