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

gisserver/features.py

@@ -1,14 +1,15 @@
-"""The configuration of a "feature type" in the WFS server.
+"""The main configuration for exposing model data in the WFS server.
 
 The "feature type" definitions define what models and attributes are exposed in the WFS server.
 When a model attribute is mentioned in the feature type, it can be exposed and queried against.
 Any field that is not mentioned in a definition, will therefore not be available, nor queryable.
 This metadata is used in the ``GetCapabilities`` call to advertise all available feature types.
 
-To handle other WFS request types besides ``GetCapabilities``, the "feature type" definition
-is translated internally into an internal XML Schema Definition (:mod:`gisserver.types`).
+The "feature type" definitions ares translated internally into
+an internal XML Schema Definition (made from :mod:`gisserver.types`).
 That schema maps all model attributes to a specific XML layout, and includes
 all XSD Complex Types, elements and attributes linked to the Django model metadata.
+
 The feature type classes (and field types) offer a flexible translation
 from attribute listings into a schema definition.
 For example, model relationships can be modelled to a different XML layout.
@@ -17,24 +18,28 @@ For example, model relationships can be modelled to a different XML layout.
 from __future__ import annotations
 
 import html
-import operator
+import itertools
+import logging
 from dataclasses import dataclass
-from functools import cached_property, lru_cache, reduce
-from typing import TYPE_CHECKING, Literal, Union
+from functools import cached_property, lru_cache
+from typing import TYPE_CHECKING, Literal
 
-from django.conf import settings
 from django.contrib.gis.db import models as gis_models
-from django.contrib.gis.db.models import Extent, GeometryField
+from django.contrib.gis.db.models import GeometryField
 from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured
 from django.db import models
-from django.db.models.fields.related import ForeignObjectRel  # Django 2.2 import
-
-from gisserver.db import conditional_transform
-from gisserver.exceptions import ExternalValueError
-from gisserver.geometries import CRS, WGS84, BoundingBox
+from django.http import HttpRequest
+
+from gisserver import conf
+from gisserver.compat import ArrayField, GeneratedField
+from gisserver.crs import CRS
+from gisserver.db import get_wgs84_bounding_box
+from gisserver.exceptions import ExternalValueError, InvalidParameterValue
+from gisserver.geometries import WGS84BoundingBox
+from gisserver.parsers.xml import parse_qname, xmlns
 from gisserver.types import (
+    GeometryXsdElement,
     GmlBoundedByElement,
-    GmlElement,
     GmlIdAttribute,
     GmlNameElement,
     XPathMatch,
@@ -44,35 +49,33 @@ from gisserver.types import (
     XsdTypes,
 )
 
-if "django.contrib.postgres" in settings.INSTALLED_APPS:
-    from django.contrib.postgres.fields import ArrayField
-else:
-    ArrayField = None
-
 if TYPE_CHECKING:
-    from gisserver.queries import FeatureRelation
-
-_all_ = Literal["__all__"]
+    from gisserver.projection import FeatureRelation
 
 __all__ = [
     "FeatureType",
     "field",
     "FeatureField",
     "ComplexFeatureField",
-    "get_basic_field_type",
 ]
 
+logger = logging.getLogger(__name__)
+
 XSD_TYPES = {
     models.CharField: XsdTypes.string,
     models.TextField: XsdTypes.string,
     models.BooleanField: XsdTypes.boolean,
     models.IntegerField: XsdTypes.integer,
+    models.PositiveIntegerField: XsdTypes.nonNegativeInteger,
+    models.PositiveBigIntegerField: XsdTypes.nonNegativeInteger,
+    models.PositiveSmallIntegerField: XsdTypes.nonNegativeInteger,
     models.AutoField: XsdTypes.integer,  # Only as of Django 3.0 this extends from IntegerField
     models.FloatField: XsdTypes.double,
     models.DecimalField: XsdTypes.decimal,
     models.TimeField: XsdTypes.time,
     models.DateTimeField: XsdTypes.dateTime,  # note: DateTimeField extends DateField!
     models.DateField: XsdTypes.date,
+    models.DurationField: XsdTypes.duration,
     models.URLField: XsdTypes.anyURI,
     gis_models.PointField: XsdTypes.gmlPointPropertyType,
     gis_models.PolygonField: XsdTypes.gmlSurfacePropertyType,
@@ -87,8 +90,8 @@ XSD_TYPES = {
 DEFAULT_XSD_TYPE = XsdTypes.anyType
 
 
-def get_basic_field_type(
-    field_name: str, model_field: models.Field | ForeignObjectRel
+def _get_basic_field_type(
+    field_name: str, model_field: models.Field | models.ForeignObjectRel
 ) -> XsdAnyType:
     """Determine the XSD field type for a Django field."""
     if ArrayField is not None and isinstance(model_field, ArrayField):
@@ -96,6 +99,10 @@ def get_basic_field_type(
         # The array notation is written as "is_many"
         model_field = model_field.base_field
 
+    if GeneratedField is not None and isinstance(model_field, GeneratedField):
+        # Allow things like: models.GeneratedField(SomeFunction("geofield"), output_field=models.GeometryField())
+        model_field = model_field.output_field
+
     try:
         # Direct instance, quickly resolved!
         return XSD_TYPES[model_field.__class__]
@@ -104,10 +111,10 @@ def get_basic_field_type(
 
     if isinstance(model_field, models.ForeignKey):
         # Don't let it query on the relation value yet
-        return get_basic_field_type(field_name, model_field.target_field)
-    elif isinstance(model_field, ForeignObjectRel):
+        return _get_basic_field_type(field_name, model_field.target_field)
+    elif isinstance(model_field, models.ForeignObjectRel):
         # e.g. ManyToOneRel descriptor of a foreignkey_id field.
-        return get_basic_field_type(field_name, model_field.remote_field.target_field)
+        return _get_basic_field_type(field_name, model_field.remote_field.target_field)
     else:
         # Subclass checks:
         for field_cls, xsd_type in XSD_TYPES.items():
@@ -124,7 +131,7 @@ def get_basic_field_type(
 
 def _get_model_fields(
     model: type[models.Model],
-    fields: _all_ | list[str],
+    fields: list[str] | Literal["__all__"],
     parent: ComplexFeatureField | None = None,
     feature_type: FeatureType | None = None,
 ):
@@ -141,12 +148,12 @@ def _get_model_fields(
                 feature_type=feature_type,
             )
             for f in model._meta.get_fields()
-            if not f.is_relation or f.many_to_one or f.one_to_one  # ForeignKey  # OneToOneField
+            if not f.is_relation or f.many_to_one or f.one_to_one  # ForeignKey, OneToOneField
         ]
     else:
         # Only defined fields
         fields = [f if isinstance(f, FeatureField) else FeatureField(f) for f in fields]
-        for field in fields:
+        for field in fields:  # type: FeatureField
             field.bind(model, parent=parent, feature_type=feature_type)
         return fields
 
@@ -172,10 +179,10 @@ class FeatureField:
     """
 
     #: Allow to override the XSD element type that this field will generate.
-    xsd_element_class: type[XsdElement] = XsdElement
+    xsd_element_class: type[XsdElement] = None
 
     model: type[models.Model] | None
-    model_field: models.Field | ForeignObjectRel | None
+    model_field: models.Field | models.ForeignObjectRel | None
 
     def __init__(
         self,
@@ -213,14 +220,20 @@ class FeatureField:
             self.xsd_element_class = xsd_class
 
         self._nillable_relation = False
+        self._nillable_output_field = False
         if model is not None:
             self.bind(model, parent=parent, feature_type=feature_type)
 
     def __repr__(self):
-        return f"<{self.__class__.__name__}: {self.name}>"
+        if self.model_field is None:
+            return f"<{self.__class__.__name__}: {self.name} (unbound)>"
+        else:
+            return (
+                f"<{self.__class__.__name__}: {self.name}, source={self.absolute_model_attribute}>"
+            )
 
     def _get_xsd_type(self):
-        return get_basic_field_type(self.name, self.model_field)
+        return _get_basic_field_type(self.name, self.model_field)
 
     def bind(
         self,
@@ -252,29 +265,48 @@ class FeatureField:
             field_path = self.model_attribute.split(".")
             try:
                 field: models.Field = self.model._meta.get_field(field_path[0])
+
+                for name in field_path[1:]:
+                    if field.null:
+                        self._nillable_relation = True
+
+                    if not field.is_relation:
+                        # Note this tests the previous loop variable, so it checks whether the
+                        # field can be walked into in order to resolve the next dotted name below.
+                        raise ImproperlyConfigured(
+                            f"FeatureField '{self.name}' has an invalid model_attribute: "
+                            f"field '{name}' is a '{field.__class__.__name__}', not a relation."
+                        )
+
+                    field = field.related_model._meta.get_field(name)
+                self.model_field = field
             except FieldDoesNotExist as e:
                 raise ImproperlyConfigured(
                     f"FeatureField '{self.name}' has an invalid"
                     f" model_attribute: '{self.model_attribute}' can't be"
                     f" resolved for model '{self.model.__name__}'."
                 ) from e
+        else:
+            try:
+                self.model_field = self.model._meta.get_field(self.name)
+                if GeneratedField is not None and isinstance(self.model_field, GeneratedField):
+                    self._nillable_output_field = self.model_field.output_field.null
+            except FieldDoesNotExist as e:
+                raise ImproperlyConfigured(
+                    f"FeatureField '{self.name}' can't be resolved for model '{self.model.__name__}'."
+                    " Either set 'model_attribute' or change the name."
+                ) from e
 
-            for name in field_path[1:]:
-                if field.null:
-                    self._nillable_relation = True
-
-                if not field.is_relation:
-                    # Note this tests the previous loop variable, so it checks whether the
-                    # field can be walked into in order to resolve the next dotted name below.
-                    raise ImproperlyConfigured(
-                        f"FeatureField '{field.name}' has an invalid model_attribute: "
-                        f"field '{name}' is a '{field.__class__.__name__}', not a relation."
-                    )
+    @cached_property
+    def absolute_model_attribute(self) -> str:
+        """Determine the full attribute of the field."""
+        if self.model_field is None:
+            raise RuntimeError(f"bind() was not called for {self!r}")
 
-                field = field.related_model._meta.get_field(name)
-            self.model_field = field
+        if self.parent is not None:
+            return f"{self.parent.absolute_model_attribute}.{self.model_attribute or self.name}"
         else:
-            self.model_field = self.model._meta.get_field(self.name)
+            return self.model_attribute or self.name
 
     @cached_property
     def xsd_element(self) -> XsdElement:
@@ -287,8 +319,10 @@ class FeatureField:
         if self.model_field is None:
             raise RuntimeError(f"bind() was not called for {self!r}")
 
+        xsd_type = self._get_xsd_type()
+
         # Determine max number of occurrences.
-        if isinstance(self.model_field, GeometryField):
+        if xsd_type.is_geometry:
             max_occurs = 1  # be explicit here, like mapserver does.
         elif self.model_field.many_to_many or self.model_field.one_to_many:
             max_occurs = "unbounded"  # M2M or reverse FK field
@@ -297,22 +331,27 @@ class FeatureField:
         else:
             max_occurs = None  # default is 1, but attribute can be left out.
 
-        return self.xsd_element_class(
+        # Determine which subclass to use for the element.
+        xsd_element_class = self.xsd_element_class or (
+            GeometryXsdElement if xsd_type.is_geometry else XsdElement
+        )
+
+        return xsd_element_class(
             name=self.name,
-            type=self._get_xsd_type(),
-            nillable=self.model_field.null or self._nillable_relation,
+            type=xsd_type,
+            namespace=self.feature_type.xml_namespace,  # keep all types in the same namespace for now.
+            nillable=(
+                self.model_field.null or self._nillable_relation or self._nillable_output_field
+            ),
             min_occurs=0,
             max_occurs=max_occurs,
             model_attribute=self.model_attribute,
+            absolute_model_attribute=self.absolute_model_attribute,
             source=self.model_field,
             feature_type=self.feature_type,
         )
 
 
-_FieldDefinition = Union[str, FeatureField]
-_FieldDefinitions = Union[_all_, list[_FieldDefinition]]
-
-
 class ComplexFeatureField(FeatureField):
     """The configuration for an embedded relation field.
 
@@ -324,12 +363,12 @@ class ComplexFeatureField(FeatureField):
     def __init__(
         self,
         name: str,
-        fields: _FieldDefinitions,
+        fields: list[str | FeatureField] | Literal["__all__"],
         model_attribute=None,
         model=None,
         abstract=None,
         xsd_class=None,
-        xsd_base_type=XsdTypes.gmlAbstractFeatureType,
+        xsd_base_type=None,
     ):
         """
         :param name: Name of the model field.
@@ -355,7 +394,9 @@ class ComplexFeatureField(FeatureField):
     @cached_property
     def fields(self) -> list[FeatureField]:
         """Provide all fields that will be rendered as part of this complex field."""
-        return _get_model_fields(self.target_model, self._fields, parent=self)
+        return _get_model_fields(
+            self.target_model, self._fields, parent=self, feature_type=self.feature_type
+        )
 
     def _get_xsd_type(self) -> XsdComplexType:
         """Generate the XSD description for the field with an object relation."""
@@ -363,6 +404,7 @@ class ComplexFeatureField(FeatureField):
 
         return XsdComplexType(
             name=f"{self.target_model._meta.object_name}Type",
+            namespace=self.feature_type.xml_namespace,  # keep all types in the same namespace for now.
             elements=[field.xsd_element for field in self.fields],
             attributes=[
                 # Add gml:id attribute definition, so it can be resolved in xpath
@@ -396,7 +438,7 @@ def field(
     *,
     model_attribute=None,
     abstract: str | None = None,
-    fields: _FieldDefinitions | None = None,
+    fields: list[str | FeatureField] | Literal["__all__"] | None = None,
     xsd_class: type[XsdElement] | None = None,
 ) -> FeatureField:
     """Shortcut to define a WFS field.
@@ -433,7 +475,7 @@ def field(
 class FeatureType:
     """Declare a feature that is exposed on the map.
 
-    All WFS operations use this class to read the feature ype.
+    All WFS operations use this class to read the feature type.
     You may subclass this class to provide extensions,
     such as redefining :meth:`get_queryset`.
 
@@ -447,7 +489,7 @@ class FeatureType:
         self,
         queryset: models.QuerySet,
         *,
-        fields: _FieldDefinitions | None = None,
+        fields: list[str | FeatureField] | Literal["__all__"] | None = None,
         display_field_name: str | None = None,
         geometry_field_name: str | None = None,
         name: str | None = None,
@@ -460,7 +502,7 @@ class FeatureType:
         metadata_url: str | None = None,
         # Settings
         show_name_field: bool = True,
-        xml_prefix: str = "app",
+        xml_namespace: str | None = None,
     ):
         """
         :param queryset: The queryset to retrieve the data.
@@ -477,7 +519,7 @@ class FeatureType:
         :param metadata_url: Used in WFS metadata.
         :param show_name_field: Whether to show the ``gml:name`` or the GeoJSON ``geometry_name``
             field. Default is to show a field when ``name_field`` is given.
-        :param xml_prefix: The XML namespace prefix to use.
+        :param xml_namespace: The XML namespace to use, will be set by :meth:`bind_namespace` otherwise.
         """
         if isinstance(queryset, models.QuerySet):
             self.queryset = queryset
@@ -502,23 +544,41 @@ class FeatureType:
 
         # Settings
         self.show_name_field = show_name_field
-        self.xml_prefix = xml_prefix
+        self.xml_namespace = xml_namespace
 
         # Validate that the name doesn't require XML escaping.
         if html.escape(self.name) != self.name or " " in self.name or ":" in self.name:
             raise ValueError(f"Invalid feature name for XML: <{self.xml_name}>")
 
-        self._cached_resolver = lru_cache(100)(self._inner_resolve_element)
+        self._cached_resolver = lru_cache(200)(self._inner_resolve_element)
 
-    def check_permissions(self, request):
+    def __repr__(self):
+        return (
+            f"<{self.__class__.__qualname__}: {self.xml_name},"
+            f" fields={self.fields!r},"
+            f" geometry_field_name={self.main_geometry_element.absolute_model_attribute!r}>"
+        )
+
+    def bind_namespace(self, default_xml_namespace: str):
+        """Make sure the feature type receives the settings from the parent view."""
+        if not self.xml_namespace:
+            self.xml_namespace = default_xml_namespace
+
+    def check_permissions(self, request: HttpRequest):
         """Hook that allows subclasses to reject access for datasets.
         It may raise a Django PermissionDenied error.
+
+        This can check for example whether ``request.user`` may access this feature.
+
+        The parsed WFS request is available as ``request.ows_request``.
+        Currently, this can be a :class:`~gisserver.parsers.wfs20.GetFeature`
+        or :class:`~gisserver.parsers.wfs20.GetPropertyValue` instance.
         """
 
     @cached_property
-    def xml_name(self):
-        """Return the feature name with xml namespace prefix."""
-        return f"{self.xml_prefix}:{self.name}"
+    def xml_name(self) -> str:
+        """Return the feature tag as XML Full Qualified name"""
+        return f"{{{self.xml_namespace}}}{self.name}" if self.xml_namespace else self.name
 
     @cached_property
     def supported_crs(self) -> list[CRS]:
@@ -526,20 +586,19 @@ class FeatureType:
         return [self.crs] + self.other_crs
 
     @cached_property
-    def geometry_elements(self) -> list[GmlElement]:
-        """Tell which fields of the XSD have a geometry field."""
-        return [ff.xsd_element for ff in self.fields if ff.xsd_element.is_geometry]
-
-    @cached_property
-    def geometry_fields(self) -> list[GeometryField]:
-        """Tell which fields of the model have a geometry field.
-        This only compares against fields that are mentioned in this feature type.
-        """
-        return [
-            ff.model_field or getattr(self.model, ff.model_attribute)
-            for ff in self.fields
-            if ff.xsd_element.is_geometry
-        ]
+    def all_geometry_elements(self) -> list[GeometryXsdElement]:
+        """Provide access to all geometry elements from *all* nested levels."""
+        return self.xsd_type.geometry_elements + list(
+            itertools.chain.from_iterable(
+                # Take the geometry elements at each object level.
+                xsd_element.type.geometry_elements
+                for xsd_element in self.xsd_type.all_complex_elements
+                # The 'None' level is the root node, which is already added before.
+                # For now, don't support geometry fields on an M2M relation.
+                # If that use-case is needed, it would require additional work to implement.
+                if xsd_element is not None and not xsd_element.is_many
+            )
+        )
 
     @cached_property
     def _local_model_field_names(self) -> list[str]:
@@ -555,6 +614,17 @@ class FeatureType:
     @cached_property
     def fields(self) -> list[FeatureField]:
         """Define which fields to render."""
+        if (
+            self._geometry_field_name
+            and "." in self._geometry_field_name
+            and (self._fields is None or self._fields == "__all__")
+        ):
+            # If you want to define more complex relationships, please be explicit in which fields you want.
+            # Allowing autoconfiguration of this is complex and likely not what you're looking for either.
+            raise ImproperlyConfigured(
+                "Using a geometry_field_name path requires defining 'fields' explicitly."
+            )
+
         # This lazy reading allows providing 'fields' as lazy value.
         if self._fields is None:
             # Autoconfig, no fields defined.
@@ -567,6 +637,7 @@ class FeatureType:
 
             return [FeatureField(self._geometry_field_name, model=self.model, feature_type=self)]
         else:
+            # Either __all__ or an explicit list.
             return _get_model_fields(self.model, self._fields, feature_type=self)
 
     @cached_property
@@ -578,56 +649,36 @@ class FeatureType:
             return self.model._meta.get_field(self.display_field_name)
 
     @cached_property
-    def geometry_field(self) -> gis_models.GeometryField:
-        """Give access to the Django field that holds the geometry."""
-        if not self.geometry_fields:
-            raise ImproperlyConfigured(
-                f"FeatureType '{self.name}' does not expose a geometry field."
-            ) from None
-
-        if self._geometry_field_name:
-            # Explicitly mentioned, use that field.
-            # Check whether the server is not accidentally exposing another field
-            # that is not part of the type definition.
-            field = next(
-                (
-                    field
-                    for field in self.geometry_fields
-                    if field.name == self._geometry_field_name
-                ),
-                None,
-            )
-            if field is None:
+    def main_geometry_element(self) -> GeometryXsdElement:
+        """Give access to the main geometry element."""
+        if not self._geometry_field_name:
+            try:
+                # Take the first element that has a geometry.
+                return self.all_geometry_elements[0]
+            except IndexError:
+                raise ImproperlyConfigured(
+                    f"FeatureType '{self.name}' does not expose any geometry field "
+                    f"as part of its definition."
+                ) from None
+        else:
+            try:
+                return next(
+                    e
+                    for e in self.all_geometry_elements
+                    if e.absolute_model_attribute == self._geometry_field_name
+                )
+            except StopIteration:
                 raise ImproperlyConfigured(
                     f"FeatureType '{self.name}' does not expose the geometry field "
                     f"'{self._geometry_field_name}' as part of its definition."
-                )
-
-            return field
-        else:
-            # Default: take the first geometry
-            return self.geometry_fields[0]
-
-    @cached_property
-    def main_geometry_element(self) -> GmlElement:
-        """Give access to the main geometry element."""
-        # NOTE: this property should make it easier to move away from having a main geometry field
-        # at the model level, and allow a geometry field in any depth of the data model.
-        return next((e for e in self.geometry_elements if e.source is self.geometry_field), None)
-
-    @cached_property
-    def geometry_field_name(self) -> str:
-        """Tell which field is the geometry field."""
-        # Due to internal reorganization this property is no longer needed,
-        # retained for backward compatibility and to reflect any used input parameters.
-        return self.geometry_field.name
+                ) from None
 
     @cached_property
     def crs(self) -> CRS:
         """Tell which projection the data should be presented at."""
         if self._crs is None:
             # Default CRS
-            return CRS.from_srid(self.geometry_field.srid)  # checks lookup too
+            return CRS.from_srid(self.main_geometry_element.source_srid)  # checks lookup too
         else:
             return self._crs
 
@@ -635,6 +686,11 @@ class FeatureType:
         """Return the queryset that is used as basis for this feature."""
         # Return a queryset that only retrieves the fields that are actually displayed.
         # That that without .only(), use at least `self.queryset.all()` so a clone is returned.
+        logger.debug(
+            "QuerySet for %s default only retrieves: %r",
+            self.queryset.model._meta.label,
+            self._local_model_field_names,
+        )
         return self.queryset.only(*self._local_model_field_names)
 
     def get_related_queryset(self, feature_relation: FeatureRelation) -> models.QuerySet:
@@ -645,51 +701,34 @@ class FeatureType:
                 f"source model is not defined for: {feature_relation.xsd_elements!r}"
             )
         # Return a queryset that only retrieves the fields that are displayed.
-        return self.filter_related_queryset(
-            feature_relation.related_model.objects.only(*feature_relation._local_model_field_names)
+        logger.debug(
+            "QuerySet for %s by default only retrieves: %r",
+            feature_relation.related_model._meta.label,
+            feature_relation._local_model_field_names,
         )
+        queryset = feature_relation.related_model.objects.only(
+            *feature_relation._local_model_field_names
+        )
+        return self.filter_related_queryset(queryset)  # Allow overriding by FeatureType subclasses
 
     def filter_related_queryset(self, queryset: models.QuerySet) -> models.QuerySet:
         """When a related object returns a queryset, this hook allows extra filtering."""
         return queryset
 
-    def get_bounding_box(self) -> BoundingBox | None:
+    def get_bounding_box(self) -> WGS84BoundingBox | None:
         """Returns a WGS84 BoundingBox for the complete feature.
 
         This is used by the GetCapabilities request. It may return ``None``
         when the database table is empty, or the custom queryset doesn't
         return any results.
-        """
-        if not self.geometry_fields:
-            return None
-
-        geo_expression = conditional_transform(
-            self.geometry_field.name, self.geometry_field.srid, WGS84.srid
-        )
-
-        bbox = self.get_queryset().aggregate(a=Extent(geo_expression))["a"]
-        return BoundingBox(*bbox, crs=WGS84) if bbox else None
-
-    def get_envelope(self, instance, crs: CRS | None = None) -> BoundingBox | None:
-        """Get the bounding box for a single instance.
 
-        This is only used for native Python rendering. When the database
-        rendering is enabled (GISSERVER_USE_DB_RENDERING=True), the calculation
-        is entirely performed within the query.
+        Note that the ``<ows:WGS84BoundingBox>`` element always uses longitude/latitude,
+        as it doesn't describe a CRS.
         """
-        geometries = [
-            geom
-            for geom in (getattr(instance, f.name) for f in self.geometry_fields)
-            if geom is not None
-        ]
-        if not geometries:
+        if not self.main_geometry_element:
             return None
 
-        # Perform the combining of geometries inside libgeos
-        geometry = geometries[0] if len(geometries) == 1 else reduce(operator.or_, geometries)
-        if crs is not None and geometry.srid != crs.srid:
-            crs.apply_to(geometry)  # avoid clone
-        return BoundingBox.from_geometry(geometry, crs=crs)
+        return get_wgs84_bounding_box(self.get_queryset(), self.main_geometry_element)
 
     def get_display_value(self, instance: models.Model) -> str:
         """Generate the display name value"""
@@ -709,12 +748,8 @@ class FeatureType:
         """
         pk_field = self.model._meta.pk
 
-        # Define <gml:boundedBy>, if the feature has a geometry
-        base_elements = []
-        if self.geometry_fields:
-            # Without a geometry, boundaries are not possible.
-            base_elements.append(GmlBoundedByElement(feature_type=self))
-
+        # Define <gml:boundedBy>
+        base_elements = [GmlBoundedByElement(feature_type=self)]
         if self.show_name_field:
             # Add <gml:name>
             gml_name = GmlNameElement(
@@ -724,12 +759,14 @@ class FeatureType:
             )
             base_elements.insert(0, gml_name)
 
+        # Write out the definition of XsdTypes.gmlAbstractFeatureType as actual class definition.
+        # By having these base elements, the XPath queries can also resolve these like any other feature field elements.
         return XsdComplexType(
-            prefix="gml",
             name="AbstractFeatureType",
+            namespace=xmlns.gml.value,
             elements=base_elements,
             attributes=[
-                # Add gml:id attribute definition so it can be resolved in xpath
+                # Add gml:id="..." attribute definition so it can be resolved in xpath
                 GmlIdAttribute(
                     type_name=self.name,
                     source=pk_field,
@@ -744,13 +781,14 @@ class FeatureType:
     def xsd_type(self) -> XsdComplexType:
         """Return the definition of this feature as an XSD Complex Type."""
         return self.xsd_type_class(
-            name=f"{self.name.title()}Type",
+            name=f"{self.name[0].upper()}{self.name[1:]}Type",
             elements=[field.xsd_element for field in self.fields],
+            namespace=self.xml_namespace,
             base=self.xsd_base_type,
             source=self.model,
         )
 
-    def resolve_element(self, xpath: str) -> XPathMatch:
+    def resolve_element(self, xpath: str, ns_aliases: dict[str, str]) -> XPathMatch:
         """Resolve the element, and the matching object.
 
         This is used to convert XPath references in requests
@@ -758,13 +796,28 @@ class FeatureType:
 
         Internally, this method caches results.
         """
-        nodes = self._cached_resolver(xpath)  # calls _inner_resolve_element
+        # When the XML POST request used xmlns="http://www.opengis.net/wfs/2.0",
+        # this will become the default namespace elements are translated into.
+        # However, the XPath elements should be interpreted within our application namespace instead.
+        # When the default namespace is missing, it should also resolve to our feature.
+        ns_aliases = ns_aliases.copy()
+        ns_aliases[""] = self.xml_namespace
+
+        if len(ns_aliases) > 10:
+            # Avoid filling memory by caching large namespace blobs.
+            nodes = self._inner_resolve_element(xpath, ns_aliases)
+        else:
+            # Go through lru_cache() for faster lookup of the same elements.
+            # Note 1: the cache will be less effective when clients use different namespace aliases.
+            # Note 2: when WFSView overrides get_feature_types() the cache may only exist per request.
+            nodes = self._cached_resolver(xpath, HDict(ns_aliases))
+
         if nodes is None:
             raise ExternalValueError(f"Field '{xpath}' does not exist.")
 
         return XPathMatch(self, nodes, query=xpath)
 
-    def _inner_resolve_element(self, xpath: str):
+    def _inner_resolve_element(self, xpath: str, ns_aliases: dict[str, str]):
         """Inner part of resolve_element() that is cached.
         This performs any additional checks that happen at the root-level only.
         """
@@ -781,16 +834,35 @@ class FeatureType:
         elif "(" in xpath:
             raise NotImplementedError(f"XPath selectors with functions are not supported: {xpath}")
 
-        # Allow /app:ElementName/.. as "absolute" path.
-        # Given our internal resolver logic, simple solution is to strip it.
-        for root_prefix in (
-            f"{self.name}/",
-            f"/{self.name}/",
-            f"{self.xml_name}/",
-            f"/{self.xml_name}/",
-        ):
-            if xpath.startswith(root_prefix):
-                xpath = xpath[len(root_prefix) :]
-                break
-
-        return self.xsd_type.resolve_element_path(xpath)
+        # Allow /app:ElementName/.. as "absolute" path, simply strip it for now.
+        # This is only actually needed to support join queries, which we don't.
+        xpath = xpath.lstrip("/")
+        root_name, _, _ = xpath.partition("/")
+        root_xml_name = parse_qname(root_name, ns_aliases)
+        if root_xml_name == self.xml_name:
+            xpath = xpath[len(root_name) + 1 :]
+
+        return self.xsd_type.resolve_element_path(xpath, ns_aliases)
+
+    def resolve_crs(self, crs: CRS, locator="") -> CRS:
+        """Check a parsed CRS against the list of supported types."""
+        try:
+            pos = self.supported_crs.index(crs)
+
+            # Replace the parsed CRS with the declared one, which may have a 'backend' configured.
+            return self.supported_crs[pos]
+        except ValueError:
+            if conf.GISSERVER_SUPPORTED_CRS_ONLY:
+                raise InvalidParameterValue(
+                    f"Feature '{self.name}' does not support SRID {crs.srid}.",
+                    locator=locator,
+                ) from None
+            else:
+                return crs
+
+
+class HDict(dict):
+    """Dict that can be used in lru_cache()."""
+
+    def __hash__(self):
+        return hash(frozenset(self.items()))