django-gisserver 1.4.1__py3-none-any.whl → 1.5.0__py3-none-any.whl

gisserver/templates/gisserver/wfs/2.0.0/get_capabilities.xml

@@ -97,8 +97,8 @@
       </ows:Keywords>{% endif %}
       <DefaultCRS>{{ feature_type.crs }}</DefaultCRS>{% for crs in feature_type.other_crs %}
       <OtherCRS>{{ crs }}</OtherCRS>{% endfor %}
-      <OutputFormats>{% for output in feature_output_formats %}
-        <Format>{{ output }}</Format>{% endfor %}
+      <OutputFormats>{% for output in feature_output_formats %}{% if output.in_capabilities %}
+        <Format>{{ output }}</Format>{% endif %}{% endfor %}
       </OutputFormats>
       {% if BOUNDING_BOX %}{% with bbox=feature_type.get_bounding_box %}{% if bbox %}<ows:WGS84BoundingBox dimensions="2">
         <ows:LowerCorner>{{ bbox.lower_corner|join:" " }}</ows:LowerCorner>

gisserver/types.py

@@ -32,7 +32,7 @@ from dataclasses import dataclass, field
 from decimal import Decimal as D
 from enum import Enum
 from functools import cached_property
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal, cast
 
 from django.conf import settings
 from django.contrib.gis.db.models import F, GeometryField
@@ -48,12 +48,7 @@ from django.utils import dateparse
 from gisserver.exceptions import ExternalParsingError, OperationProcessingFailed
 from gisserver.geometries import CRS, WGS84  # noqa: F401 / for backwards compatibility
 
-try:
-    from typing import Literal  # Python 3.8
-
-    _unbounded = Literal["unbounded"]
-except ImportError:
-    _unbounded = str
+_unbounded = Literal["unbounded"]
 
 if "django.contrib.postgres" in settings.INSTALLED_APPS:
     from django.contrib.postgres.fields import ArrayField
@@ -61,6 +56,9 @@ else:
     ArrayField = None
 
 __all__ = [
+    "GmlElement",
+    "GmlIdAttribute",
+    "GmlNameElement",
     "ORMPath",
     "XPathMatch",
     "XsdAnyType",
@@ -167,7 +165,7 @@ class XsdTypes(XsdAnyType, Enum):
     #: A direct geometry value (used as function argument type)
     gmlAbstractGeometryType = "gml:AbstractGeometryType"
 
-    #: A feature that has an gml:name and gml:boundedBy as possible child element.
+    #: A feature that has a gml:name and gml:boundedBy as possible child element.
     gmlAbstractFeatureType = "gml:AbstractFeatureType"
     gmlAbstractGMLType = "gml:AbstractGMLType"  # base class of gml:AbstractFeatureType
 
@@ -183,7 +181,7 @@ class XsdTypes(XsdAnyType, Enum):
 
     @cached_property
     def is_geometry(self):
-        """Whether the value represents a element which contains a GML element."""
+        """Whether the value represents an element which contains a GML element."""
         return self.prefix == "gml" and self.value.endswith("PropertyType")
 
     @cached_property
@@ -267,6 +265,10 @@ class XsdNode:
     #: This supports dot notation to access related attributes.
     model_attribute: str | None
 
+    #: A link back to the parent that described the featuyre this node is a part of.
+    #: This helps to perform additional filtering in side meth:get_value: based on user policies.
+    feature_type: FeatureType | None
+
     def __init__(
         self,
         name: str,
@@ -275,6 +277,7 @@ class XsdNode:
         prefix: str | None = "app",
         source: models.Field | ForeignObjectRel | None = None,
         model_attribute: str | None = None,
+        feature_type: FeatureType | None = None,
     ):
         # Using plain assignment instead of dataclass turns out to be needed
         # for flexibility and easier subclassing.
@@ -283,6 +286,8 @@ class XsdNode:
         self.prefix = prefix
         self.source = source
         self.model_attribute = model_attribute or self.name
+        # link back to parent, some get_value() functions need it.
+        self.feature_type = feature_type
 
         if ":" in self.name:
             raise ValueError("Use 'prefix' argument for namespaces")
@@ -317,7 +322,7 @@ class XsdNode:
         if field.value_from_object.__func__ is models.Field.value_from_object:
             # No custom value_from_object(), this can be fully emulated with attrgetter() too.
             # Still allow the final node to have a custom attname,
-            # # which is what Field.value_from_object() does.
+            # which is what Field.value_from_object() does.
             names = model_attribute.split(".")
             names[-1] = field.attname
             return operator.attrgetter(".".join(names))
@@ -368,7 +373,7 @@ class XsdNode:
         """The direct ORM field that provides this property."""
         if self.model_attribute is None:
             raise ValueError(f"Node {self.xml_name} has no 'model_attribute' set.")
-        return self.model_attribute.split(".", 1)[0]
+        return self.model_attribute.partition(".")[0]
 
     @cached_property
     def orm_relation(self) -> tuple[str | None, str]:
@@ -376,10 +381,9 @@ class XsdNode:
         if self.model_attribute is None:
             raise ValueError(f"Node {self.xml_name} has no 'model_attribute' set.")
 
-        try:
-            path, field = self.model_attribute.rsplit(".", 1)
-        except ValueError:
-            return None, self.model_attribute
+        path, _, field = self.model_attribute.rpartition(".")
+        if not path:
+            return None, field
         else:
             return path.replace(".", "__"), field
 
@@ -407,6 +411,8 @@ class XsdNode:
                 if self.is_many and isinstance(value, models.Manager):
                     # Make sure callers can read the individual items by iterating over the value.
                     value = value.all()
+                    if self.feature_type is not None:
+                        return self.feature_type.filter_related_queryset(value)
                 return value
             else:
                 # the _valuegetter() supports value_from_object() on custom fields.
@@ -462,8 +468,8 @@ class XsdNode:
                 and self.source.target_field.get_lookup(lookup) is None
             ):
                 raise OperationProcessingFailed(
-                    "filter",
                     f"Operator '{tag}' is not supported for the '{self.name}' property.",
+                    locator="filter",
                     status_code=400,  # not HTTP 500 here. Spec allows both.
                 )
 
@@ -489,7 +495,7 @@ class XsdElement(XsdNode):
 
     nillable: bool | None
     min_occurs: int | None
-    max_occurs: int | None
+    max_occurs: int | _unbounded | None
 
     def __init__(
         self,
@@ -502,8 +508,16 @@ class XsdElement(XsdNode):
         max_occurs: int | _unbounded | None = None,
         source: models.Field | ForeignObjectRel | None = None,
         model_attribute: str | None = None,
+        feature_type: FeatureType | None = None,
     ):
-        super().__init__(name, type, prefix=prefix, source=source, model_attribute=model_attribute)
+        super().__init__(
+            name,
+            type,
+            prefix=prefix,
+            source=source,
+            model_attribute=model_attribute,
+            feature_type=feature_type,
+        )
         self.nillable = nillable
         self.min_occurs = min_occurs
         self.max_occurs = max_occurs
@@ -567,11 +581,28 @@ class XsdAttribute(XsdNode):
         use: str = "optional",
         source: models.Field | ForeignObjectRel | None = None,
         model_attribute: str | None = None,
+        feature_type: FeatureType | None = None,
     ):
-        super().__init__(name, type, prefix=prefix, source=source, model_attribute=model_attribute)
+        super().__init__(
+            name,
+            type,
+            prefix=prefix,
+            source=source,
+            model_attribute=model_attribute,
+            feature_type=feature_type,
+        )
         self.use = use
 
 
+class GmlElement(XsdElement):
+    """Essentially the same as an XsdElement, but guarantee it returns a GeoDjango model field.
+
+    This only exists as "protocol" for the type annotations.
+    """
+
+    source: GeometryField
+
+
 class GmlIdAttribute(XsdAttribute):
     """A virtual 'gml:id' attribute that can be queried.
     This subclass has overwritten get_value() logic to format the value.
@@ -584,8 +615,15 @@ class GmlIdAttribute(XsdAttribute):
         type_name: str,
         source: models.Field | ForeignObjectRel | None = None,
         model_attribute="pk",
+        feature_type: FeatureType | None = None,
     ):
-        super().__init__(prefix="gml", name="id", source=source, model_attribute=model_attribute)
+        super().__init__(
+            prefix="gml",
+            name="id",
+            source=source,
+            model_attribute=model_attribute,
+            feature_type=feature_type,
+        )
         object.__setattr__(self, "type_name", type_name)
 
     def get_value(self, instance: models.Model):
@@ -606,6 +644,8 @@ class GmlNameElement(XsdElement):
     (although that would make comparisons on ``element@gml:name`` more complex).
     """
 
+    is_geometry = False  # Override type
+
     def __init__(
         self,
         model_attribute: str,
@@ -620,8 +660,8 @@ class GmlNameElement(XsdElement):
             min_occurs=0,
             source=source,
             model_attribute=model_attribute,
+            feature_type=feature_type,
         )
-        self.feature_type = feature_type
 
     def get_value(self, instance: models.Model):
         """Override value retrieval to retrieve the value from the feature type."""
@@ -650,8 +690,8 @@ class GmlBoundedByElement(XsdElement):
             name="boundedBy",
             type=XsdTypes.gmlBoundingShapeType,
             min_occurs=0,
+            feature_type=feature_type,
         )
-        self.feature_type = feature_type
         self.model_attribute = None
 
     def build_lhs_part(self, compiler: CompiledQuery, match: ORMPath):
@@ -735,7 +775,7 @@ class XsdComplexType(XsdAnyType):
             return self.elements
 
     @cached_property
-    def geometry_elements(self) -> list[XsdElement]:
+    def geometry_elements(self) -> list[GmlElement]:
         """Shortcut to get all geometry elements"""
         return [e for e in self.elements if e.is_geometry]
 
@@ -749,6 +789,20 @@ class XsdComplexType(XsdAnyType):
         """Shortcut to get all elements with a flattened model attribite"""
         return [e for e in self.elements if e.is_flattened]
 
+    @cached_property
+    def elements_with_children(self) -> dict[_XsdElement_WithComplexType, list[XsdElement]]:
+        """Shortcut to get all elements with children.
+        This mainly exists to provide a structure to mimic what's used
+        when PROPERTYNAME is part of the request.
+        """
+        child_nodes = {}
+        for xsd_element in self.elements:
+            if xsd_element.type.is_complex_type:
+                sub_type = cast(XsdComplexType, xsd_element.type)
+                child_nodes[xsd_element] = sub_type.elements
+                child_nodes.update(sub_type.elements_with_children)
+        return child_nodes
+
     def resolve_element_path(self, xpath: str) -> list[XsdNode] | None:
         """Resolve a xpath reference to the actual node.
         This returns the whole path, including in-between relations, if a match was found.
@@ -884,7 +938,7 @@ class ORMPath:
 class XPathMatch(ORMPath):
     """The ORM path result from am XPath query.
 
-    This result object defines how to resolve an XPath to a ORM object.
+    This result object defines how to resolve an XPath to an ORM object.
     """
 
     #: The matched element, with all it's parents.

gisserver/views.py

@@ -7,7 +7,6 @@ from urllib.parse import urlencode
 
 from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
 from django.core.exceptions import PermissionDenied as Django_PermissionDenied
-from django.http import HttpResponse
 from django.shortcuts import render
 from django.views import View
 
@@ -49,7 +48,7 @@ class GISView(View):
     #: Metadata of the service:
     service_description: ServiceDescription | None = None
 
-    #: Template to render a HTML welcome page for non-OGC requests.
+    #: Template to render an HTML welcome page for non-OGC requests.
     index_template_name = None
 
     #: Whether to render GET HTML pages
@@ -70,22 +69,12 @@ class GISView(View):
         When nothing is returned, the exception is raised instead.
         """
         if isinstance(exc, Django_PermissionDenied):
-            exc = PermissionDenied("typeNames", text=str(exc) or None)
-            return HttpResponse(
-                exc.as_xml().encode("utf-8"),
-                content_type="text/xml; charset=utf-8",
-                status=exc.status_code,
-                reason=exc.reason,
-            )
+            exc = PermissionDenied(str(exc) or None, locator="typeNames")
+            return exc.as_response()
         elif isinstance(exc, OWSException):
             # Wrap our XML-based exception into a response.
             exc.version = self.version  # Use negotiated version
-            return HttpResponse(
-                exc.as_xml().encode("utf-8"),
-                content_type="text/xml; charset=utf-8",
-                status=exc.status_code,
-                reason=exc.reason,
-            )
+            return exc.as_response()
         else:
             return None
 
@@ -106,7 +95,7 @@ class GISView(View):
         if version and version in self.accept_versions:
             self.set_version(version)
 
-        # Allow for an user-friendly opening page (hence the version check above)
+        # Allow for a user-friendly opening page (hence the version check above)
         if self.use_html_templates and self.is_index_request():
             return self.render_index()
 
@@ -192,12 +181,12 @@ class GISView(View):
         except KeyError:
             allowed = ", ".join(sorted(self.accept_operations.keys()))
             raise InvalidParameterValue(
-                "service",
                 f"'{service}' is an invalid service, supported are: {allowed}.",
+                locator="service",
             ) from None
 
         # Resolve the operation
-        # In mapserver, the operation name is case insensitive.
+        # In mapserver, the operation name is case-insensitive.
         operation = self._get_required_arg("REQUEST").upper()
         uc_methods = {name.upper(): method for name, method in operations.items()}
 
@@ -206,8 +195,8 @@ class GISView(View):
         except KeyError:
             allowed = ", ".join(operations.keys())
             raise OperationNotSupported(
-                "request",
                 f"'{operation.lower()}' is not implemented, supported are: {allowed}.",
+                locator="request",
             ) from None
 
     def call_operation(self, wfs_method_cls: type[base.WFSMethod]):
@@ -222,7 +211,7 @@ class GISView(View):
         except KeyError:
             if default is not None:
                 return default
-            raise MissingParameterValue(argname.lower()) from None
+            raise MissingParameterValue(locator=argname.lower()) from None
 
     def get_service_description(self, service: str) -> ServiceDescription:
         """Provide the (dynamically generated) service description."""

django_gisserver-1.4.1.dist-info/RECORD

@@ -1,53 +0,0 @@
-gisserver/__init__.py,sha256=ouhGKnkyYnTmywjuiv3RGvKgca9hYJc5FP0cJxrQDgo,40
-gisserver/conf.py,sha256=3LSfeDRTdJCLuopAOD14Y5m2iPhovreIaNI9zbaukpo,2343
-gisserver/db.py,sha256=iuj43NonqNdKkLrerdzTucy-Lu5NmqymuE0bkwR6XWs,5318
-gisserver/exceptions.py,sha256=TZVdmwKI90Ga-9l8A1H0u65V5yNvgg2TDgyN_LCQ2zI,4597
-gisserver/features.py,sha256=GFbi-ap4NjlJh2Ka6Ssh-OjgZClLzVZyBqYqmolAtfI,32171
-gisserver/geometries.py,sha256=VQVEFk0oRiqdxG28llb51aayf5m9cbyLljR3PrZfMTg,12400
-gisserver/types.py,sha256=vyHPkUXEADikTJfRq7Nodqt0BCo7YV91dNyZw6GIMO4,35087
-gisserver/views.py,sha256=A7TwUsG8NKdnjTbOXPbio1K-XRg6IIpy_xH__zwW8xI,13193
-gisserver/operations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gisserver/operations/base.py,sha256=tIEvQvFRRX2esfeP48EmcwB27-MkShtjl6A1v9TJASE,16827
-gisserver/operations/wfs20.py,sha256=lYkEq4DZYTSxNdwdZBAGOb7vtN5qMnwxOp8OD1G3jR4,18426
-gisserver/output/__init__.py,sha256=EVzgFN-PqKZKwbGVgWBUbIzGIXo69HSDMQ37szgr6cw,2097
-gisserver/output/base.py,sha256=NYyV78JgNDV7uUmnk6HNbbLTkt_N60YKPh2z1o-AuzM,7791
-gisserver/output/csv.py,sha256=7UKnyhFyAH1yeOh719Ov3SkzoLF1Zzlp_0-wxRDU9bI,6222
-gisserver/output/geojson.py,sha256=KB4w6DU_Dn7ZNDM5INDEtz7zhOAN75v03lUayPDzGPE,11296
-gisserver/output/gml32.py,sha256=kaTljrRKIlxIshiJTtzmsWWJExzQSL4hEX_Q1i17k_4,30496
-gisserver/output/results.py,sha256=HOmeSKLb0Tzsd9AamuXEPZyRmoXxHj7fKBqIbk1J5Co,13301
-gisserver/output/utils.py,sha256=VR8nOAv1obhfumQy77RnpJpE3FopzuIJrkfosBq16w4,6569
-gisserver/output/xmlschema.py,sha256=ltCglrQ4YXJ_dpMrkXb06dFfHc5a_nGog7fb-K25aeQ,4579
-gisserver/parsers/__init__.py,sha256=g72D8EtR-QkhcemzY5-Qty-nhHPKza83Sz3KZm8bfq0,290
-gisserver/parsers/base.py,sha256=eK32lw004v-lU82JihnH5LF-3wSh8M-L4JSayDt2gJM,4835
-gisserver/parsers/tags.py,sha256=NyJhbt-U2zTewfhghH4LRslTaDK2UOq9Vgk83pWfJh0,3553
-gisserver/parsers/values.py,sha256=ypNPl4HduiVzexsL59ukZntlwXk5gHuSvQO6yhLeXD4,1016
-gisserver/parsers/fes20/__init__.py,sha256=l8OutRicZ8E2cpyFtJj6wTFNArYoFaLiXABGyZYyKvQ,624
-gisserver/parsers/fes20/expressions.py,sha256=kXfIpOP94WOzvT3PZyIKrZSawQJZUPYyJ1TF5MoKsUQ,9694
-gisserver/parsers/fes20/filters.py,sha256=HdWguZvAT2L4Xm-bNa4XPh7MEymqTB6fo8r47Z-Bjuw,3511
-gisserver/parsers/fes20/functions.py,sha256=Qn72GI5qLqDSbREmsGUDiAPN2u1eo4c8AFttJMDnJX4,8724
-gisserver/parsers/fes20/identifiers.py,sha256=vcPrMYcsemSlB9ziSUdVulhoI5PGFAh8vqeADBCWd60,2864
-gisserver/parsers/fes20/operators.py,sha256=MVyoo2Hq45Lyqjh1cX9P_Zy9ARceCs28xDNL5ql_Yd0,23206
-gisserver/parsers/fes20/query.py,sha256=IQU0k4ZG-sAjWEWvSXw6H_wYODwtCMsF8RrbVdik4KE,10069
-gisserver/parsers/fes20/sorting.py,sha256=y0QJxFE0OC-GsaqrD0ZCI4CI16roUZrSW3fAG7BOKwA,2146
-gisserver/parsers/gml/__init__.py,sha256=lNK0SXWkmTKdeJD9xdK6B-N-Y7wwGL4NRBI3dzoJDNI,1463
-gisserver/parsers/gml/base.py,sha256=cMyXAoc1mhLp3Dqf1f65gNBhjETQWyUx--AHPsPCwBU,1066
-gisserver/parsers/gml/geometries.py,sha256=cgV3WogA7LyC_H_NF7dGoGLvLdQRACG6AlThRkX_jhU,3171
-gisserver/queries/__init__.py,sha256=zBLHOWKcU7PvBj6NHfGqcdUKCFJdL_np3_Mdn3bx-nE,893
-gisserver/queries/adhoc.py,sha256=hhLh3xB0UU--2tZwRgOWzonrjHM8OxCF2YYbl7NsxhE,7087
-gisserver/queries/base.py,sha256=w0hXefxX516oN3qdPYvM7huTewqrwxJmAseHHJ_BOgk,5891
-gisserver/queries/stored.py,sha256=RasXxlHlMCFtpO3EjIeMH6XPaDNvWbqJP23itR_byuU,7060
-gisserver/static/gisserver/index.css,sha256=fiQuCMuiWUhhrNQD6bbUJaX5vH5OpG9qgPdELPB8cpI,163
-gisserver/templates/gisserver/index.html,sha256=yliku8jDqAOcenkbe1YnvJBnuS13MvzzsoDV8sQZ3GM,866
-gisserver/templates/gisserver/service_description.html,sha256=3EHLnQx27_nTDZFD2RH6E10EWnTN90s1DGuEj9PeBrg,993
-gisserver/templates/gisserver/wfs/feature_field.html,sha256=H5LsTAxGVGQqEpOZdEUTszQmFAZSpB9ggRJUsTdjYnw,538
-gisserver/templates/gisserver/wfs/feature_type.html,sha256=pIfa1cMsTlNIrzNiEOaq9LjzzF7_vZ9C7eN6KDBLOHE,788
-gisserver/templates/gisserver/wfs/2.0.0/describe_stored_queries.xml,sha256=4Hxw1kCnxfWXTVPbHf8IW9_qiSeIEtnxHK6z6TS3-zA,1041
-gisserver/templates/gisserver/wfs/2.0.0/get_capabilities.xml,sha256=KKrI0YYQqZWtTOyOkm-ZHuNyfwipdx0i0N8p7fggPU8,8675
-gisserver/templates/gisserver/wfs/2.0.0/list_stored_queries.xml,sha256=CIBVQrKXmGMQ6BKbX4_0ru4lXtWnW5EIgHUbIi1V0Vc,636
-gisserver/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gisserver/templatetags/gisserver_tags.py,sha256=RFGqEj-EQi9FrJiFJ7HHAQqlU4fDKVKTtZrPNwURXgA,204
-django_gisserver-1.4.1.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-django_gisserver-1.4.1.dist-info/METADATA,sha256=SpfcYIXvQiqTubhTKOAlarsHoGcMj9XeZQQRx1CJrW0,5874
-django_gisserver-1.4.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-django_gisserver-1.4.1.dist-info/top_level.txt,sha256=8zFCEMmkpixE4TPiOAlxSq3PD2EXvAeFKwG4yZoIIOQ,10
-django_gisserver-1.4.1.dist-info/RECORD,,