django-gisserver 1.2.7__py3-none-any.whl → 1.4.0__py3-none-any.whl

gisserver/output/gml32.py

@@ -2,19 +2,24 @@
 
 Note that the Django format_html() / mark_safe() logic is not used here,
 as it's quite a performance improvement to just use html.escape().
+
+We've tried replacing this code with lxml and that turned out to be much slower.
+As some functions will be called 5000x, this code is also designed to avoid making
+much extra method calls per field. Some bits are non-DRY inlined for this reason.
 """
+
 from __future__ import annotations
 
 import itertools
-import re
-from datetime import date, datetime, time
-from html import escape
+from datetime import date, datetime, time, timezone
+from decimal import Decimal as D
+from io import StringIO
+from operator import itemgetter
 from typing import cast
 
 from django.contrib.gis import geos
 from django.db import models
 from django.http import HttpResponse
-from django.utils.timezone import utc
 
 from gisserver.db import (
     AsGML,
@@ -29,21 +34,13 @@ from gisserver.exceptions import NotFound
 from gisserver.features import FeatureRelation, FeatureType
 from gisserver.geometries import CRS
 from gisserver.parsers.fes20 import ValueReference
-from gisserver.types import XsdComplexType, XsdElement
+from gisserver.types import XsdComplexType, XsdElement, XsdNode
 
 from .base import OutputRenderer
-from .buffer import StringBuffer
 from .results import SimpleFeatureCollection
 
 GML_RENDER_FUNCTIONS = {}
-RE_GML_ID = re.compile(r'gml:id="[^"]+"')
-
-
-def default_if_none(value, default):
-    if value is None:
-        return default
-    else:
-        return value
+AUTO_STR = (int, float, D, date, time)
 
 
 def register_geos_type(geos_type):
@@ -54,11 +51,49 @@ def register_geos_type(geos_type):
     return _inc
 
 
+def _tag_escape(s: str):
+    return s.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
+
+
+def _attr_escape(s: str):
+    # Slightly faster then html.escape() as it doesn't replace single quotes.
+    # Having tried all possible variants, this code still outperforms other forms of escaping.
+    return s.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace('"', "&quot;")
+
+
+def _value_to_xml_string(value):
+    # Simple scalar value
+    if isinstance(value, str):  # most cases
+        return _tag_escape(value)
+    elif isinstance(value, datetime):
+        return value.astimezone(timezone.utc).isoformat()
+    elif isinstance(value, bool):
+        return "true" if value else "false"
+    elif isinstance(value, AUTO_STR):
+        return value  # no need for _tag_escape(), and f"{value}" works faster.
+    else:
+        return _tag_escape(str(value))
+
+
+def _value_to_text(value):
+    # Simple scalar value, no XML escapes
+    if isinstance(value, str):  # most cases
+        return value
+    elif isinstance(value, datetime):
+        return value.astimezone(timezone.utc).isoformat()
+    elif isinstance(value, bool):
+        return "true" if value else "false"
+    else:
+        return value  # f"{value} works faster and produces the right format.
+
+
 class GML32Renderer(OutputRenderer):
     """Render the GetFeature XML output in GML 3.2 format"""
 
     content_type = "text/xml; charset=utf-8"
     xml_collection_tag = "FeatureCollection"
+    chunk_size = 40_000
+    gml_seq = 0
 
     def get_response(self):
         """Render the output as streaming response."""
@@ -67,12 +102,12 @@ class GML32Renderer(OutputRenderer):
         if isinstance(self.source_query, GetFeatureById):
             # WFS spec requires that GetFeatureById output only returns the contents.
             # The streaming response is avoided here, to allow returning a 404.
-            return self.get_standalone_response()
+            return self.get_by_id_response()
         else:
             # Use default streaming response, with render_stream()
             return super().get_response()
 
-    def get_standalone_response(self):
+    def get_by_id_response(self):
         """Render a standalone item, for GetFeatureById"""
         sub_collection = self.collection.results[0]
         self.start_collection(sub_collection)
@@ -80,27 +115,27 @@ class GML32Renderer(OutputRenderer):
         if instance is None:
             raise NotFound("Feature not found.")
 
-        body = self.render_wfs_member_contents(
+        self.output = StringIO()
+        self._write = self.output.write
+        self.write_by_id_response(
+            sub_collection, instance, extra_xmlns=self.render_xmlns_standalone()
+        )
+        content = self.output.getvalue()
+        return HttpResponse(content, content_type=self.content_type)
+
+    def write_by_id_response(self, sub_collection: SimpleFeatureCollection, instance, extra_xmlns):
+        """Default behavior for standalone response is writing a feature (can be changed by GetPropertyValue)"""
+        self._write('<?xml version="1.0" encoding="UTF-8"?>\n')
+        self.write_feature(
             feature_type=sub_collection.feature_type,
             instance=instance,
-            extra_xmlns=self.render_xmlns_standalone(),
-        ).lstrip(" ")
-
-        if body.startswith("<"):
-            return HttpResponse(
-                content=f'<?xml version="1.0" encoding="UTF-8"?>\n{body}',
-                content_type=self.content_type,
-            )
-        else:
-            # Best guess for GetFeatureById combined with
-            # GetPropertyValue&VALUEREFERENCE=@gml:id
-            return HttpResponse(body, content_type="text/plain")
+            extra_xmlns=extra_xmlns,
+        )
 
     def render_xmlns(self):
         """Generate the xmlns block that the document needs"""
         xsd_typenames = ",".join(
-            sub_collection.feature_type.name
-            for sub_collection in self.collection.results
+            sub_collection.feature_type.name for sub_collection in self.collection.results
         )
         schema_location = [
             f"{self.app_xml_namespace} {self.server_url}?SERVICE=WFS&VERSION=2.0.0&REQUEST=DescribeFeatureType&TYPENAMES={xsd_typenames}",  # noqa: E501
@@ -115,15 +150,15 @@ class GML32Renderer(OutputRenderer):
             'xmlns:app="{app_xml_namespace}" '
             'xsi:schemaLocation="{schema_location}"'
         ).format(
-            app_xml_namespace=escape(self.app_xml_namespace),
-            schema_location=escape(" ".join(schema_location)),
+            app_xml_namespace=_attr_escape(self.app_xml_namespace),
+            schema_location=_attr_escape(" ".join(schema_location)),
         )
 
     def render_xmlns_standalone(self):
         """Generate the xmlns block that the document needs"""
         # xsi is needed for "xsi:nil="true"' attributes.
         return (
-            f' xmlns:app="{escape(self.app_xml_namespace)}"'
+            f' xmlns:app="{_attr_escape(self.app_xml_namespace)}"'
             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'
             ' xmlns:gml="http://www.opengis.net/gml/3.2"'
         )
@@ -133,20 +168,19 @@ class GML32Renderer(OutputRenderer):
         This renders the standard <wfs:FeatureCollection> / <wfs:ValueCollection>
         """
         collection = self.collection
-        output = StringBuffer()
+        self.output = output = StringIO()
+        self._write = self.output.write
         xmlns = self.render_xmlns().strip()
         number_matched = collection.number_matched
-        number_matched = (
-            int(number_matched) if number_matched is not None else "unknown"
-        )
+        number_matched = int(number_matched) if number_matched is not None else "unknown"
         number_returned = collection.number_returned
         next = previous = ""
         if collection.next:
-            next = f' next="{escape(collection.next)}"'
+            next = f' next="{_attr_escape(collection.next)}"'
         if collection.previous:
-            previous = f' previous="{escape(collection.previous)}"'
+            previous = f' previous="{_attr_escape(collection.previous)}"'
 
-        output.write(
+        self._write(
             f"""<?xml version='1.0' encoding="UTF-8" ?>\n"""
             f"<wfs:{self.xml_collection_tag} {xmlns}"
             f' timeStamp="{collection.timestamp}"'
@@ -161,7 +195,7 @@ class GML32Renderer(OutputRenderer):
             for sub_collection in collection.results:
                 self.start_collection(sub_collection)
                 if has_multiple_collections:
-                    output.write(
+                    self._write(
                         f"<wfs:member>\n"
                         f"<wfs:{self.xml_collection_tag}"
                         f' timeStamp="{collection.timestamp}"'
@@ -170,193 +204,175 @@ class GML32Renderer(OutputRenderer):
                     )
 
                 for instance in sub_collection:
-                    output.write(
-                        self.render_wfs_member(sub_collection.feature_type, instance)
-                    )
+                    self.gml_seq = 0  # need to increment this between write_xml_field calls
+                    self._write("<wfs:member>\n")
+                    self.write_feature(sub_collection.feature_type, instance)
+                    self._write("</wfs:member>\n")
 
                     # Only perform a 'yield' every once in a while,
                     # as it goes back-and-forth for writing it to the client.
-                    if output.is_full():
-                        yield output.flush()
+                    if output.tell() > self.chunk_size:
+                        xml_chunk = output.getvalue()
+                        output.seek(0)
+                        output.truncate(0)
+                        yield xml_chunk
 
                 if has_multiple_collections:
-                    output.write(f"</wfs:{self.xml_collection_tag}>\n</wfs:member>\n")
+                    self._write(f"</wfs:{self.xml_collection_tag}>\n</wfs:member>\n")
 
-        output.write(f"</wfs:{self.xml_collection_tag}>\n")
-        yield output.flush()
+        self._write(f"</wfs:{self.xml_collection_tag}>\n")
+        yield output.getvalue()
 
     def start_collection(self, sub_collection: SimpleFeatureCollection):
         """Hook to allow initialization per feature type"""
-        pass
 
-    def render_wfs_member(
+    def write_feature(
         self, feature_type: FeatureType, instance: models.Model, extra_xmlns=""
-    ):
-        """Write the full <wfs:member> block."""
-        body = self.render_wfs_member_contents(
-            feature_type, instance, extra_xmlns=extra_xmlns
-        )
-        return f"<wfs:member>\n{body}</wfs:member>\n"
-
-    def render_wfs_member_contents(
-        self, feature_type: FeatureType, instance: models.Model, extra_xmlns=""
-    ) -> str:
+    ) -> None:
         """Write the contents of the object value.
 
         This output is typically wrapped in <wfs:member> tags
         unless it's used for a GetPropertyById response.
         """
-        self.gml_seq = 0  # need to increment this between render_xml_field calls
-
         # Write <app:FeatureTypeName> start node
-        pk = escape(str(instance.pk))
-        output = StringBuffer()
-        output.write(
-            f'<{feature_type.xml_name} gml:id="{feature_type.name}.{pk}"{extra_xmlns}>\n'
-        )
-
-        # Add all base class members, in their correct ordering
-        # By having these as XsdElement objects instead of hard-coded writes,
-        # the query/filter logic also works for these elements.
-        if feature_type.xsd_type.base.is_complex_type:
-            for xsd_element in feature_type.xsd_type.base.elements:
+        pk = _tag_escape(str(instance.pk))
+        self._write(f'<{feature_type.xml_name} gml:id="{feature_type.name}.{pk}"{extra_xmlns}>\n')
+
+        # Write all fields, both base class and local elements.
+        for xsd_element in feature_type.xsd_type.all_elements:
+            # Note that writing 5000 features with 30 tags means this code make 150.000 method calls.
+            # Hence, branching to different rendering styles is branched here instead of making such
+            # call into a generic "write_field()" function and stepping out from there.
+            if xsd_element.is_geometry:
                 if xsd_element.xml_name == "gml:boundedBy":
                     # Special case for <gml:boundedBy>, so it will render with
                     # the output CRS and can be overwritten with DB-rendered GML.
-                    gml = self.render_bounds(feature_type, instance)
-                    if gml is not None:
-                        output.write(gml)
+                    self.write_bounds(feature_type, instance)
+                else:
+                    # Separate call which can be optimized (no need to overload write_xml_field() for all calls).
+                    self.write_gml_field(feature_type, xsd_element, instance)
+            else:
+                value = xsd_element.get_value(instance)
+                if xsd_element.is_many:
+                    self.write_many(feature_type, xsd_element, value)
                 else:
                     # e.g. <gml:name>, or all other <app:...> nodes.
-                    output.write(
-                        self.render_element(feature_type, xsd_element, instance)
-                    )
+                    self.write_xml_field(feature_type, xsd_element, value)
 
-        # Add all members
-        for xsd_element in feature_type.xsd_type.elements:
-            output.write(self.render_element(feature_type, xsd_element, instance))
+        self._write(f"</{feature_type.xml_name}>\n")
 
-        output.write(f"</{feature_type.xml_name}>\n")
-        return output.getvalue()
-
-    def render_bounds(self, feature_type, instance) -> str | None:
+    def write_bounds(self, feature_type, instance) -> None:
         """Render the GML bounds for the complete instance"""
         envelope = feature_type.get_envelope(instance, self.output_crs)
         if envelope is not None:
             lower = " ".join(map(str, envelope.lower_corner))
             upper = " ".join(map(str, envelope.upper_corner))
-            return f"""<gml:boundedBy><gml:Envelope srsDimension="2" srsName="{self.xml_srs_name}">
+            self._write(
+                f"""<gml:boundedBy><gml:Envelope srsDimension="2" srsName="{self.xml_srs_name}">
                 <gml:lowerCorner>{lower}</gml:lowerCorner>
                 <gml:upperCorner>{upper}</gml:upperCorner>
               </gml:Envelope></gml:boundedBy>\n"""
-
-    def render_element(
-        self, feature_type, xsd_element: XsdElement, instance: models.Model
-    ):
-        """Rendering of a single field."""
-        value = xsd_element.get_value(instance)
-        if xsd_element.is_geometry and value is not None:
-            # None check happens here to avoid incrementing for none values
-            self.gml_seq += 1
-            return self.render_gml_field(
-                feature_type,
-                xsd_element,
-                value,
-                gml_id=self.get_gml_id(feature_type, instance.pk, seq=self.gml_seq),
             )
-        else:
-            return self.render_xml_field(feature_type, xsd_element, value)
 
-    def render_xml_field(
-        self, feature_type: FeatureType, xsd_element: XsdElement, value, extra_xmlns=""
-    ) -> str:
-        """Write the value of a single field."""
-        if xsd_element.is_many:
-            if value is None:
-                # No tag for optional element (see PropertyIsNull), otherwise xsi:nil node.
-                if xsd_element.min_occurs == 0:
-                    return ""
-                else:
-                    return f'<{xsd_element.xml_name} xsi:nil="true"{extra_xmlns}/>\n'
-            else:
-                # Render the tag multiple times
-                if xsd_element.type.is_complex_type:
-                    # If the retrieved QuerySet was not filtered yet, do so now. This can't
-                    # be done in get_value() because the FeatureType is not known there.
-                    value = feature_type.filter_related_queryset(value)
-
-                return "".join(
-                    self._render_xml_field(
-                        feature_type, xsd_element, value=item, extra_xmlns=extra_xmlns
-                    )
-                    for item in value
-                )
+    def write_many(self, feature_type: FeatureType, xsd_element: XsdElement, value) -> None:
+        """Write a node that has multiple values (e.g. array or queryset)."""
+        # some <app:...> node that has multiple values
+        if value is None:
+            # No tag for optional element (see PropertyIsNull), otherwise xsi:nil node.
+            if xsd_element.min_occurs:
+                self._write(f'<{xsd_element.xml_name} xsi:nil="true"/>\n')
         else:
-            return self._render_xml_field(
-                feature_type, xsd_element, value, extra_xmlns=extra_xmlns
-            )
+            # Render the tag multiple times
+            if xsd_element.type.is_complex_type:
+                # If the retrieved QuerySet was not filtered yet, do so now. This can't
+                # be done in get_value() because the FeatureType is not known there.
+                value = feature_type.filter_related_queryset(value)
+
+            for item in value:
+                self.write_xml_field(feature_type, xsd_element, value=item)
 
-    def _render_xml_field(
+    def write_xml_field(
         self, feature_type: FeatureType, xsd_element: XsdElement, value, extra_xmlns=""
-    ) -> str:
+    ):
+        """Write the value of a single field."""
         xml_name = xsd_element.xml_name
         if value is None:
-            return f'<{xml_name} xsi:nil="true"{extra_xmlns}/>\n'
+            self._write(f'<{xml_name} xsi:nil="true"{extra_xmlns}/>\n')
         elif xsd_element.type.is_complex_type:
             # Expanded foreign relation / dictionary
-            return self.render_xml_complex_type(feature_type, xsd_element, value)
-        elif isinstance(value, datetime):
-            value = value.astimezone(utc).isoformat()
-        elif isinstance(value, (date, time)):
-            value = value.isoformat()
-        elif isinstance(value, bool):
-            value = "true" if value else "false"
+            self.write_xml_complex_type(feature_type, xsd_element, value, extra_xmlns=extra_xmlns)
         else:
-            value = escape(str(value))
-
-        return f"<{xml_name}{extra_xmlns}>{value}</{xml_name}>\n"
-
-    def render_xml_complex_type(self, feature_type, xsd_element, value) -> str:
+            # As this is likely called 150.000 times during a request, this is optimized.
+            # Avoided a separate call to _value_to_xml_string() and avoided isinstance() here.
+            value_cls = value.__class__
+            if value_cls is str:  # most cases
+                value = _tag_escape(value)
+            elif value_cls is datetime:
+                value = value.astimezone(timezone.utc).isoformat()
+            elif value_cls is bool:
+                value = "true" if value else "false"
+            elif (
+                value_cls is not int
+                and value_cls is not float
+                and value_cls is not D
+                and value_cls is not date
+                and value_cls is not time
+            ):
+                # Non-string or custom field that extended a scalar.
+                # Any of the other types have a faster f"{value}" translation that produces the correct text.
+                value = _value_to_xml_string(value)
+
+            self._write(f"<{xml_name}{extra_xmlns}>{value}</{xml_name}>\n")
+
+    def write_xml_complex_type(self, feature_type, xsd_element, value, extra_xmlns="") -> None:
         """Write a single field, that consists of sub elements"""
         xsd_type = cast(XsdComplexType, xsd_element.type)
-        output = StringBuffer()
-        output.write(f"<{xsd_element.xml_name}>\n")
+        self._write(f"<{xsd_element.xml_name}{extra_xmlns}>\n")
         for sub_element in xsd_type.elements:
-            output.write(self.render_element(feature_type, sub_element, instance=value))
-        output.write(f"</{xsd_element.xml_name}>\n")
-        return output.getvalue()
-
-    def render_gml_field(
-        self,
-        feature_type: FeatureType,
-        xsd_element: XsdElement,
-        value,
-        gml_id,
-        extra_xmlns="",
-    ) -> str:
-        """Write the value of an GML tag"""
+            sub_value = sub_element.get_value(value)
+            if sub_element.is_many:
+                self.write_many(feature_type, sub_element, sub_value)
+            else:
+                self.write_xml_field(feature_type, sub_element, sub_value)
+        self._write(f"</{xsd_element.xml_name}>\n")
+
+    def write_gml_field(
+        self, feature_type, xsd_element: XsdElement, instance: models.Model, extra_xmlns=""
+    ) -> None:
+        """Separate method to allow overriding this for db-performance optimizations."""
+        # Need to have instance.pk data here (and instance['pk'] for value rendering)
+        value = xsd_element.get_value(instance)
         xml_name = xsd_element.xml_name
-        gml = self.render_gml_value(value, gml_id=gml_id)
-        return f"<{xml_name}{extra_xmlns}>{gml}</{xml_name}>\n"
+        if value is None:
+            # Avoid incrementing gml_seq
+            self._write(f'<{xml_name} xsi:nil="true"{extra_xmlns}/>\n')
+            return
+
+        gml_id = self.get_gml_id(feature_type, instance.pk)
 
-    def render_gml_value(
-        self, value: geos.GEOSGeometry, gml_id: str, extra_xmlns=""
-    ) -> str:
-        """Convert a Geometry into GML syntax."""
+        # the following is somewhat faster, but will render GML 2, not GML 3.2:
+        # gml = value.ogr.gml
+        # pos = gml.find(">")  # Will inject the gml:id="..." tag.
+        # gml = f"{gml[:pos]} gml:id="{_attr_escape(gml_id)}"{gml[pos:]}"
+
+        gml = self.render_gml_value(gml_id, value)
+        self._write(f"<{xml_name}{extra_xmlns}>{gml}</{xml_name}>\n")
+
+    def render_gml_value(self, gml_id, value: geos.GEOSGeometry | None, extra_xmlns="") -> str:
+        """Normal case: 'value' is raw geometry data.."""
+        # In case this is a standalone response, this will be the top-level element, hence includes the xmlns.
+        base_attrs = f' gml:id="{_attr_escape(gml_id)}" srsName="{self.xml_srs_name}"{extra_xmlns}'
         self.output_crs.apply_to(value)
-        base_attrs = (
-            f' gml:id="{escape(gml_id)}" srsName="{self.xml_srs_name}"{extra_xmlns}'
-        )
-        return self._render_gml_type(value, base_attrs)
+        return self._render_gml_type(value, base_attrs=base_attrs)
 
     def _render_gml_type(self, value: geos.GEOSGeometry, base_attrs=""):
+        """Render an GML value (this is also called from MultiPolygon)."""
         try:
             # Avoid isinstance checks, do a direct lookup
             method = GML_RENDER_FUNCTIONS[value.__class__]
         except KeyError:
             return f"<!-- No rendering implemented for {value.geom_type} -->"
-        else:
-            return method(self, value, base_attrs=base_attrs)
+        return method(self, value, base_attrs=base_attrs)
 
     @register_geos_type(geos.Point)
     def render_gml_point(self, value: geos.Point, base_attrs=""):
@@ -372,7 +388,7 @@ class GML32Renderer(OutputRenderer):
     def render_gml_polygon(self, value: geos.Polygon, base_attrs=""):
         # lol: http://erouault.blogspot.com/2014/04/gml-madness.html
         ext_ring = self.render_gml_linear_ring(value.exterior_ring)
-        buf = StringBuffer()
+        buf = StringIO()
         buf.write(f"<gml:Polygon{base_attrs}><gml:exterior>{ext_ring}</gml:exterior>")
         for i in range(value.num_interior_rings):
             buf.write("<gml:interior>")
@@ -410,6 +426,7 @@ class GML32Renderer(OutputRenderer):
 
     @register_geos_type(geos.LinearRing)
     def render_gml_linear_ring(self, value: geos.LinearRing, base_attrs=""):
+        # NOTE: this is super slow. value.tuple performs a C-API call for every point!
         coords = " ".join(map(str, itertools.chain.from_iterable(value.tuple)))
         dim = "3" if value.hasz else "2"
         # <gml:coordinates> is still valid in GML3, but deprecated (part of GML2).
@@ -421,6 +438,7 @@ class GML32Renderer(OutputRenderer):
 
     @register_geos_type(geos.LineString)
     def render_gml_line_string(self, value: geos.LineString, base_attrs=""):
+        # NOTE: this is super slow. value.tuple performs a C-API call for every point!
         coords = " ".join(map(str, itertools.chain.from_iterable(value.tuple)))
         dim = "3" if value.hasz else "2"
         return (
@@ -429,12 +447,36 @@ class GML32Renderer(OutputRenderer):
             "</gml:LineString>"
         )
 
-    def get_gml_id(self, feature_type: FeatureType, object_id, seq) -> str:
+    def get_gml_id(self, feature_type: FeatureType, object_id) -> str:
         """Generate the gml:id value, which is required for GML 3.2 objects."""
-        return f"{feature_type.name}.{object_id}.{seq}"
+        self.gml_seq += 1
+        return f"{feature_type.name}.{object_id}.{self.gml_seq}"
+
+
+class DBGMLRenderingMixin:
+
+    def render_gml_value(self, gml_id, value: str, extra_xmlns=""):
+        """DB optimized: 'value' is pre-rendered GML XML string."""
+        # Write the gml:id inside the first tag
+        end_pos = value.find(">")
+        gml_tag = value[:end_pos]
+        id_pos = gml_tag.find("gml:id=")
+        if id_pos == -1:
+            # Inject
+            return f'{gml_tag} gml:id="{_attr_escape(gml_id)}"{extra_xmlns}{value[end_pos:]}'
+        else:
+            # Replace
+            end_pos1 = gml_tag.find('"', id_pos + 8)
+            return (
+                f"{gml_tag[:id_pos]}"
+                f'gml:id="{_attr_escape(gml_id)}'
+                f"{value[end_pos1:end_pos]}"  # from " right until >
+                f"{extra_xmlns}"  # extra namespaces?
+                f"{value[end_pos:]}"  # from > and beyond
+            )
 
 
-class DBGML32Renderer(GML32Renderer):
+class DBGML32Renderer(DBGMLRenderingMixin, GML32Renderer):
     """Faster GetFeature renderer that uses the database to render GML 3.2"""
 
     @classmethod
@@ -449,18 +491,14 @@ class DBGML32Renderer(GML32Renderer):
         This is far more efficient then GeoDjango's logic, which performs a
         C-API call for every single coordinate of a geometry.
         """
-        queryset = super().decorate_queryset(
-            feature_type, queryset, output_crs, **params
-        )
+        queryset = super().decorate_queryset(feature_type, queryset, output_crs, **params)
 
         # Retrieve geometries as pre-rendered instead.
         gml_elements = feature_type.xsd_type.geometry_elements
         geo_selects = get_db_geometry_selects(gml_elements, output_crs)
         if geo_selects:
             queryset = queryset.defer(*geo_selects.keys()).annotate(
-                _as_envelope_gml=cls.get_db_envelope_as_gml(
-                    feature_type, queryset, output_crs
-                ),
+                _as_envelope_gml=cls.get_db_envelope_as_gml(feature_type, queryset, output_crs),
                 **build_db_annotations(geo_selects, "_as_gml_{name}", AsGML),
             )
 
@@ -523,67 +561,49 @@ class DBGML32Renderer(GML32Renderer):
             using=queryset.db,
         )
 
-    def render_element(
-        self, feature_type, xsd_element: XsdElement, instance: models.Model
-    ):
-        if xsd_element.is_geometry:
-            # Optimized path, pre-rendered GML
-            value = get_db_annotation(instance, xsd_element.name, "_as_gml_{name}")
-            if value is None:
-                # Avoid incrementing gml_seq
-                return f'<{xsd_element.xml_name} xsi:nil="true"/>\n'
-
-            self.gml_seq += 1
-            return self.render_db_gml_field(
-                feature_type,
-                xsd_element,
-                value,
-                gml_id=self.get_gml_id(feature_type, instance.pk, seq=self.gml_seq),
-            )
-        else:
-            return super().render_element(feature_type, xsd_element, instance)
+    def write_gml_field(
+        self, feature_type, xsd_element: XsdElement, instance: models.Model, extra_xmlns=""
+    ) -> None:
+        """Write the value of an GML tag.
 
-    def render_db_gml_field(
-        self,
-        feature_type: FeatureType,
-        xsd_element: XsdElement,
-        value,
-        gml_id,
-        extra_xmlns="",
-    ) -> str:
-        """Write the value of an GML tag"""
+        This optimized version takes a pre-rendered XML from the database query.
+        """
+        value = get_db_annotation(instance, xsd_element.name, "_as_gml_{name}")
         xml_name = xsd_element.xml_name
         if value is None:
-            return f'<{xml_name} xsi:nil="true"{extra_xmlns}/>\n'
+            # Avoid incrementing gml_seq
+            self._write(f'<{xml_name} xsi:nil="true"{extra_xmlns}/>\n')
+            return
 
-        # Write the gml:id inside the first tag
-        pos = value.find(">")
-        first_tag = value[:pos]
-        if "gml:id" in first_tag:
-            first_tag = RE_GML_ID.sub(f'gml:id="{escape(gml_id)}"', first_tag, 1)
-        else:
-            first_tag += f' gml:id="{escape(gml_id)}"'
+        gml_id = self.get_gml_id(feature_type, instance.pk)
+        gml = self.render_gml_value(gml_id, value, extra_xmlns=extra_xmlns)
+        self._write(f"<{xml_name}{extra_xmlns}>{gml}</{xml_name}>\n")
 
-        gml = first_tag + value[pos:]
-        return f"<{xml_name}{extra_xmlns}>{gml}</{xml_name}>\n"
-
-    def render_bounds(self, feature_type, instance):
+    def write_bounds(self, feature_type, instance) -> None:
         """Generate the <gml:boundedBy> from DB prerendering."""
         gml = instance._as_envelope_gml
         if gml is not None:
-            return f"<gml:boundedBy>{gml}</gml:boundedBy>\n"
+            self._write(f"<gml:boundedBy>{gml}</gml:boundedBy>\n")
 
 
 class GML32ValueRenderer(GML32Renderer):
-    """Render the GetPropertyValue XML output in GML 3.2 format"""
+    """Render the GetPropertyValue XML output in GML 3.2 format.
+
+    Geoserver seems to generate the element tag inside each <wfs:member> element. We've applied this one.
+    The GML standard demonstrates to render only their content inside a <wfs:member> element
+    (either plain text or an <gml:...> tag). Not sure what is right here.
+    """
 
     content_type = "text/xml; charset=utf-8"
+    content_type_plain = "text/plain; charset=utf-8"
     xml_collection_tag = "ValueCollection"
+    _escape_value = staticmethod(_value_to_xml_string)
+    gml_value_getter = itemgetter("member")
 
     def __init__(self, *args, value_reference: ValueReference, **kwargs):
         self.value_reference = value_reference
         super().__init__(*args, **kwargs)
-        self.xsd_node = None
+        self.xsd_node: XsdNode | None = None
 
     @classmethod
     def decorate_queryset(
@@ -594,6 +614,7 @@ class GML32ValueRenderer(GML32Renderer):
         **params,
     ):
         # Don't optimize queryset, it only retrieves one value
+        # The data is already limited to a ``queryset.values()`` in ``QueryExpression.get_queryset()``.
         return queryset
 
     def start_collection(self, sub_collection: SimpleFeatureCollection):
@@ -601,60 +622,84 @@ class GML32ValueRenderer(GML32Renderer):
         match = sub_collection.feature_type.resolve_element(self.value_reference.xpath)
         self.xsd_node = match.child
 
-    def render_wfs_member(
-        self, feature_type: FeatureType, instance: dict, extra_xmlns=""
+    def write_by_id_response(
+        self, sub_collection: SimpleFeatureCollection, instance: dict, extra_xmlns
     ):
-        """Overwritten to handle attribute support."""
+        """The value rendering only renders the value. not a complete feature"""
         if self.xsd_node.is_attribute:
-            # When GetPropertyValue selects an attribute, it's value is rendered
-            # as plain-text (without spaces!) inside a <wfs:member> element.
-            # The format_value() is needed for @gml:id
-            body = self.xsd_node.format_value(instance["member"])
-            return f"<wfs:member>{body}</wfs:member>\n"
+            # Output as plain text
+            self.content_type = self.content_type_plain  # change for this instance!
+            self._escape_value = _value_to_text  # avoid XML escaping
         else:
-            # The call to GetPropertyValue selected an element.
-            # Render this single element tag inside the <wfs:member> parent.
-            body = self.render_wfs_member_contents(feature_type, instance)
-            return f"<wfs:member>\n{body}</wfs:member>\n"
-
-    def render_wfs_member_contents(
-        self, feature_type: FeatureType, instance: dict, extra_xmlns=""
-    ) -> str:
+            self._write('<?xml version="1.0" encoding="UTF-8"?>\n')
+
+        # Write the single tag, no <wfs:member> around it.
+        self.write_feature(sub_collection.feature_type, instance, extra_xmlns=extra_xmlns)
+
+    def write_feature(self, feature_type: FeatureType, instance: dict, extra_xmlns="") -> None:
         """Write the XML for a single object.
         In this case, it's only a single XML tag.
         """
-        value = instance["member"]
         if self.xsd_node.is_geometry:
-            gml_id = self.get_gml_id(feature_type, instance["pk"], seq=1)
-            return self.render_gml_field(
+            self.write_gml_field(
                 feature_type,
-                self.xsd_node,
-                value=value,
-                gml_id=gml_id,
+                cast(XsdElement, self.xsd_node),
+                instance,
                 extra_xmlns=extra_xmlns,
             )
+        elif self.xsd_node.is_attribute:
+            value = instance["member"]
+            if value is not None:
+                value = self.xsd_node.format_raw_value(instance["member"])  # for gml:id
+                value = self._escape_value(value)
+                self._write(value)
+        elif self.xsd_node.is_array:
+            if (value := instance["member"]) is not None:
+                # <wfs:member> doesn't allow multiple items as children, for new render as separate members.
+                xml_name = self.xsd_node.xml_name
+                first = True
+                for item in value:
+                    if item is not None:
+                        if not first:
+                            self._write("</wfs:member>\n<wfs:member>")
+
+                        item = self._escape_value(item)
+                        self._write(f"<{xml_name}>{item}</{xml_name}>\n")
+                        first = False
+        elif self.xsd_node.type.is_complex_type:
+            raise NotImplementedError("GetPropertyValue with complex types is not implemented")
+            # self.write_xml_complex_type(feature_type, self.xsd_node, instance['member'])
         else:
-            # The xsd_element is needed so render_xml_field() can render complex types.
-            value = self.xsd_node.format_value(value)  # needed for @gml:id
-            if self.xsd_node.is_attribute:
-                # For GetFeatureById, allow returning raw values
-                return str(value)
-            else:
-                return self.render_xml_field(
-                    feature_type,
-                    cast(XsdElement, self.xsd_node),
-                    value,
-                    extra_xmlns=extra_xmlns,
-                )
+            self.write_xml_field(
+                feature_type,
+                cast(XsdElement, self.xsd_node),
+                value=instance["member"],
+                extra_xmlns=extra_xmlns,
+            )
 
+    def write_gml_field(
+        self, feature_type, xsd_element: XsdElement, instance: dict, extra_xmlns=""
+    ) -> None:
+        """Overwritten to allow dict access instead of model access."""
+        value = self.gml_value_getter(instance)  # "member" or "gml_member"
+        xml_name = xsd_element.xml_name
+        if value is None:
+            # Avoid incrementing gml_seq
+            self._write(f'<{xml_name} xsi:nil="true"{extra_xmlns}/>\n')
+            return
+
+        gml_id = self.get_gml_id(feature_type, instance["pk"])
+        gml = self.render_gml_value(gml_id, value, extra_xmlns=extra_xmlns)
+        self._write(f"<{xml_name}{extra_xmlns}>{gml}</{xml_name}>\n")
 
-class DBGML32ValueRenderer(DBGML32Renderer, GML32ValueRenderer):
+
+class DBGML32ValueRenderer(DBGMLRenderingMixin, GML32ValueRenderer):
     """Faster GetPropertyValue renderer that uses the database to render GML 3.2"""
 
+    gml_value_getter = itemgetter("gml_member")
+
     @classmethod
-    def decorate_queryset(
-        cls, feature_type: FeatureType, queryset, output_crs, **params
-    ):
+    def decorate_queryset(cls, feature_type: FeatureType, queryset, output_crs, **params):
         """Update the queryset to let the database render the GML output."""
         value_reference = params["valueReference"]
         match = feature_type.resolve_element(value_reference.xpath)
@@ -665,21 +710,3 @@ class DBGML32ValueRenderer(DBGML32Renderer, GML32ValueRenderer):
             )
         else:
             return queryset
-
-    def render_wfs_member(
-        self, feature_type: FeatureType, instance: dict, extra_xmlns=""
-    ) -> str:
-        """Write the XML for a single object."""
-        if "gml_member" in instance:
-            gml_id = self.get_gml_id(feature_type, instance["pk"], seq=1)
-            body = self.render_db_gml_field(
-                feature_type,
-                self.xsd_node,
-                instance["gml_member"],
-                gml_id=gml_id,
-            )
-            return f"<wfs:member>\n{body}</wfs:member>\n"
-        else:
-            return super().render_wfs_member(
-                feature_type, instance, extra_xmlns=extra_xmlns
-            )