django-gisserver 1.2.7__tar.gz → 1.4.0__tar.gz

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/CHANGES.md

@@ -1,3 +1,23 @@
+# 2024-07-01 (1.4.0)
+
+* Added `GISSERVER_COUNT_NUMBER_MATCHED` setting to allow disabling "numberReturned" counting.
+  This will avoid an expensive PostgreSQL COUNT query, speeding up returning large sets.
+* Added basic support for array fields in `GetPropertyValue`.
+* Optimized GML rendering performance (around 15-20% faster on large datasets).
+* Optimized overall rendering performance, which improved GeoJSON/CSV output too.
+* Developers: updated pre-commit hooks
+* Cleaned up leftover Python 3.7 compat code.
+
+# 2023-06-08 (1.3.0)
+
+* Django 5 support added.
+
+## Contributors
+We would like to thank the following contributors
+for their work on this release.
+
+   - [tomdtp](https://github.com/tomdtp)
+
 # 2023-06-08 (1.2.7)
 
 * WFS endpoints now accept a GML version number in their OUTPUTFORMAT.
@@ -31,7 +51,7 @@
 # 2022-04-13 (1.2.1)
 
 * Fixed regression for auto-correcting xmlns for `<Filter>` tags that have leading whitespace.
-* Fixed weird crashes when geometry field is not provided. 
+* Fixed weird crashes when geometry field is not provided.
 * Simplify `FeatureType.geometry_field` logic.
 
 

{django-gisserver-1.2.7/django_gisserver.egg-info → django-gisserver-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-gisserver
-Version: 1.2.7
+Version: 1.4.0
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor
@@ -12,10 +12,10 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 3.2
 Classifier: Framework :: Django :: 4.0

{django-gisserver-1.2.7 → django-gisserver-1.4.0/django_gisserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-gisserver
-Version: 1.2.7
+Version: 1.4.0
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor
@@ -12,10 +12,10 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 3.2
 Classifier: Framework :: Django :: 4.0

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/django_gisserver.egg-info/SOURCES.txt

@@ -2,7 +2,7 @@ CHANGES.md
 LICENSE
 MANIFEST.in
 README.md
-setup.cfg
+pyproject.toml
 setup.py
 django_gisserver.egg-info/PKG-INFO
 django_gisserver.egg-info/SOURCES.txt
@@ -23,10 +23,10 @@ gisserver/operations/base.py
 gisserver/operations/wfs20.py
 gisserver/output/__init__.py
 gisserver/output/base.py
-gisserver/output/buffer.py
 gisserver/output/csv.py
 gisserver/output/geojson.py
 gisserver/output/gml32.py
+gisserver/output/gml32_lxml.py
 gisserver/output/results.py
 gisserver/output/utils.py
 gisserver/output/xmlschema.py

django-gisserver-1.4.0/gisserver/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.4.0"  # follows PEP440

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/gisserver/conf.py

@@ -23,31 +23,28 @@ GISSERVER_DB_PRECISION = getattr(settings, "GISSERVER_DB_PRECISION", 15)
 # Otherwise, all database-supported SRID's are allowed.
 GISSERVER_SUPPORTED_CRS_ONLY = getattr(settings, "GISSERVER_SUPPORTED_CRS_ONLY", True)
 
+# Whether the total results need to be counted.
+# By disabling this, clients just need to fetch more pages
+# 0 = No counting, 1 = all pages, 2 = only for the first page.
+GISSERVER_COUNT_NUMBER_MATCHED = getattr(settings, "GISSERVER_COUNT_NUMBER_MATCHED", 1)
+
 # -- max page size
 
 # Allow tuning the page size without having to override code.
 # This corresponds with the "DefaultMaxFeatures" setting.
-GISSERVER_DEFAULT_MAX_PAGE_SIZE = getattr(
-    settings, "GISSERVER_DEFAULT_MAX_PAGE_SIZE", 5000
-)
+GISSERVER_DEFAULT_MAX_PAGE_SIZE = getattr(settings, "GISSERVER_DEFAULT_MAX_PAGE_SIZE", 5000)
 
 # CSV exports have a higher default page size, as these results can be streamed.
-GISSERVER_GEOJSON_MAX_PAGE_SIZE = getattr(
-    settings, "GISSERVER_GEOJSON_MAX_PAGE_SIZE", math.inf
-)
+GISSERVER_GEOJSON_MAX_PAGE_SIZE = getattr(settings, "GISSERVER_GEOJSON_MAX_PAGE_SIZE", math.inf)
 GISSERVER_CSV_MAX_PAGE_SIZE = getattr(settings, "GISSERVER_CSV_MAX_PAGE_SIZE", math.inf)
 
 # -- debugging
 
 # Whether to follow the WFS standards strictly (breaks CITE conformance testing)
-GISSERVER_WFS_STRICT_STANDARD = getattr(
-    settings, "GISSERVER_WFS_STRICT_STANDARD", False
-)
+GISSERVER_WFS_STRICT_STANDARD = getattr(settings, "GISSERVER_WFS_STRICT_STANDARD", False)
 
 # Whether to wrap filter errors in a nice response, or raise an exception
-GISSERVER_WRAP_FILTER_DB_ERRORS = getattr(
-    settings, "GISSERVER_WRAP_FILTER_DB_ERRORS", True
-)
+GISSERVER_WRAP_FILTER_DB_ERRORS = getattr(settings, "GISSERVER_WRAP_FILTER_DB_ERRORS", True)
 
 
 @receiver(setting_changed)

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/gisserver/db.py

@@ -1,7 +1,8 @@
 """Internal module for additional GIS database functions."""
+
 from __future__ import annotations
 
-from functools import reduce
+from functools import lru_cache, reduce
 from typing import cast
 
 from django.contrib.gis.db.models import GeometryField, functions
@@ -114,6 +115,7 @@ def get_db_annotation(instance: models.Model, name: str, name_template: str):
         ) from e
 
 
+@lru_cache
 def escape_xml_name(name: str, template="{name}") -> str:
     """Escape an XML name to be used as annotation name."""
     return template.format(name=name.replace(".", "_"))
@@ -132,19 +134,13 @@ def get_db_geometry_selects(
     }
 
 
-def _get_db_geometry_target(
-    xsd_element: XsdElement, output_crs: CRS
-) -> str | functions.Transform:
+def _get_db_geometry_target(xsd_element: XsdElement, output_crs: CRS) -> str | functions.Transform:
     """Wrap the selection of a geometry field in a CRS Transform if needed."""
     field = cast(GeometryField, xsd_element.source)
-    return conditional_transform(
-        xsd_element.orm_path, field.srid, output_srid=output_crs.srid
-    )
+    return conditional_transform(xsd_element.orm_path, field.srid, output_srid=output_crs.srid)
 
 
 def get_db_geometry_target(xpath_match: XPathMatch, output_crs: CRS):
     """Based on a resolved element, build the proper geometry field select clause."""
     field = cast(GeometryField, xpath_match.child.source)
-    return conditional_transform(
-        xpath_match.orm_path, field.srid, output_srid=output_crs.srid
-    )
+    return conditional_transform(xpath_match.orm_path, field.srid, output_srid=output_crs.srid)

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/gisserver/exceptions.py

@@ -7,6 +7,7 @@ See:
 https://docs.opengeospatial.org/is/09-025r2/09-025r2.html#35
 https://docs.opengeospatial.org/is/09-025r2/09-025r2.html#411
 """
+
 from django.conf import settings
 from django.utils.html import format_html
 

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/gisserver/features.py

@@ -13,14 +13,15 @@ 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.
 """
+
 from __future__ import annotations
 
 import html
 import operator
 from collections import defaultdict
 from dataclasses import dataclass
-from functools import lru_cache, reduce
-from typing import List, Union
+from functools import cached_property, lru_cache, reduce
+from typing import Union
 
 from django.conf import settings
 from django.contrib.gis.db import models as gis_models
@@ -28,7 +29,6 @@ from django.contrib.gis.db.models import Extent, 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 django.utils.functional import cached_property  # py3.8: functools
 
 from gisserver.db import conditional_transform
 from gisserver.exceptions import ExternalValueError
@@ -138,9 +138,7 @@ def _get_model_fields(model, fields, parent=None):
                 parent=parent,
             )
             for f in model._meta.get_fields()
-            if not f.is_relation
-            or f.many_to_one  # ForeignKey
-            or f.one_to_one  # OneToOneField
+            if not f.is_relation or f.many_to_one or f.one_to_one  # ForeignKey  # OneToOneField
         ]
     else:
         # Only defined fields
@@ -291,7 +289,7 @@ class FeatureField:
 
 
 _FieldDefinition = Union[str, FeatureField]
-_FieldDefinitions = Union[_all_, List[_FieldDefinition]]
+_FieldDefinitions = Union[_all_, list[_FieldDefinition]]
 
 
 class ComplexFeatureField(FeatureField):
@@ -455,15 +453,15 @@ class FeatureType:
         queryset: models.QuerySet,
         *,
         fields: _FieldDefinitions | None = None,
-        display_field_name: str = None,
-        geometry_field_name: str = None,
-        name: str = None,
+        display_field_name: str | None = None,
+        geometry_field_name: str | None = None,
+        name: str | None = None,
         # WFS Metadata:
-        title: str = None,
-        abstract: str = None,
-        keywords: list[str] = None,
-        crs: CRS = None,
-        other_crs: list[CRS] = None,
+        title: str | None = None,
+        abstract: str | None = None,
+        keywords: list[str] | None = None,
+        crs: CRS | None = None,
+        other_crs: list[CRS] | None = None,
         metadata_url: str | None = None,
         # Settings
         show_name_field: bool = True,
@@ -521,7 +519,6 @@ class FeatureType:
         """Hook that allows subclasses to reject access for datasets.
         It may raise a Django PermissionDenied error.
         """
-        pass
 
     @cached_property
     def xml_name(self):
@@ -551,7 +548,7 @@ class FeatureType:
         This gives an object layout based on the XSD elements,
         that can be used for prefetching data.
         """
-        models = dict()
+        models = {}
         fields = defaultdict(set)
         elements = defaultdict(list)
 
@@ -677,9 +674,7 @@ class FeatureType:
         # That that without .only(), use at least `self.queryset.all()` so a clone is returned.
         return self.queryset.only(*self._local_model_field_names)
 
-    def get_related_queryset(
-        self, feature_relation: FeatureRelation
-    ) -> models.QuerySet:
+    def get_related_queryset(self, feature_relation: FeatureRelation) -> models.QuerySet:
         """Return the queryset that is used for prefetching related data."""
         if feature_relation.related_model is None:
             raise RuntimeError(
@@ -688,9 +683,7 @@ class FeatureType:
             )
         # 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
-            )
+            feature_relation.related_model.objects.only(*feature_relation._local_model_field_names)
         )
 
     def filter_related_queryset(self, queryset: models.QuerySet) -> models.QuerySet:
@@ -730,9 +723,7 @@ class FeatureType:
             return None
 
         # Perform the combining of geometries inside libgeos
-        geometry = (
-            geometries[0] if len(geometries) == 1 else reduce(operator.or_, geometries)
-        )
+        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)
@@ -824,9 +815,7 @@ class FeatureType:
                 f"XPath selectors with expanded syntax are not supported: {xpath}"
             )
         elif "(" in xpath:
-            raise NotImplementedError(
-                f"XPath selectors with functions are not supported: {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.

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/gisserver/geometries.py

@@ -3,6 +3,7 @@
 This includes the CRS parsing, coordinate transforms and bounding box object.
 The bounding box can be calculated within Python, or read from a database result.
 """
+
 from __future__ import annotations
 
 import re
@@ -10,7 +11,7 @@ from dataclasses import dataclass, field
 from decimal import Decimal
 from functools import lru_cache
 
-from django.contrib.gis.gdal import AxisOrder, CoordTransform, SpatialReference
+from django.contrib.gis.gdal import CoordTransform, SpatialReference
 from django.contrib.gis.geos import GEOSGeometry, Polygon
 
 from gisserver.exceptions import ExternalParsingError, ExternalValueError
@@ -101,9 +102,7 @@ class CRS:
         self.__dict__["has_custom_backend"] = self.backend is not None
 
     @classmethod
-    def from_string(
-        cls, uri: str | int, backend: SpatialReference | None = None
-    ) -> CRS:
+    def from_string(cls, uri: str | int, backend: SpatialReference | None = None) -> CRS:
         """
         Parse an CRS (Coordinate Reference System) URI, which preferably follows the URN format
         as specified by `the OGC consortium <http://www.opengeospatial.org/ogcUrnPolicy>`_
@@ -146,17 +145,13 @@ class CRS:
         """Instantiate this class using an URN format."""
         urn_match = CRS_URN_REGEX.match(urn)
         if not urn_match:
-            raise ExternalValueError(
-                f"Unknown CRS URN [{urn}] specified: {CRS_URN_REGEX.pattern}"
-            )
+            raise ExternalValueError(f"Unknown CRS URN [{urn}] specified: {CRS_URN_REGEX.pattern}")
 
         domain = urn_match.group("domain")
         authority = urn_match.group("authority").upper()
 
         if domain not in ("ogc", "opengis"):
-            raise ExternalValueError(
-                f"CRS URI [{urn}] contains unknown domain [{domain}]"
-            )
+            raise ExternalValueError(f"CRS URI [{urn}] contains unknown domain [{domain}]")
 
         if authority == "EPSG":
             crsid = urn_match.group("id")
@@ -169,14 +164,10 @@ class CRS:
         elif authority == "OGC":
             crsid = urn_match.group("id").upper()
             if crsid != "CRS84":
-                raise ExternalValueError(
-                    f"OGC CRS URI from [{urn}] contains unknown id [{id}]"
-                )
+                raise ExternalValueError(f"OGC CRS URI from [{urn}] contains unknown id [{id}]")
             srid = 4326
         else:
-            raise ExternalValueError(
-                f"CRS URI [{urn}] contains unknown authority [{authority}]"
-            )
+            raise ExternalValueError(f"CRS URI [{urn}] contains unknown authority [{authority}]")
 
         crs = cls(
             domain=domain,
@@ -253,9 +244,7 @@ class CRS:
             if self.origin:
                 self.__dict__["backend"] = _get_spatial_reference(self.origin)
             else:
-                self.__dict__["backend"] = _get_spatial_reference(
-                    self.srid, srs_type="epsg"
-                )
+                self.__dict__["backend"] = _get_spatial_reference(self.srid, srs_type="epsg")
         return self.backend
 
     def apply_to(self, geometry: GEOSGeometry, clone=False) -> GEOSGeometry | None:
@@ -271,7 +260,7 @@ class CRS:
             if clone:
                 return geometry.clone()
             else:
-                return
+                return None
         else:
             # Convert using GDAL / proj
             transform = _get_coord_transform(geometry.srid, self._as_gdal())
@@ -300,8 +289,7 @@ class BoundingBox:
         bbox = bbox.split(",")
         if not (4 <= len(bbox) <= 5):
             raise ExternalParsingError(
-                f"Input does not contain bounding box, "
-                f"expected 4 or 5 values, not {bbox}."
+                f"Input does not contain bounding box, expected 4 or 5 values, not {bbox}."
             )
         return cls(
             Decimal(bbox[0]),
@@ -332,9 +320,7 @@ class BoundingBox:
     def __repr__(self):
         return f"BoundingBox({self.south}, {self.west}, {self.north}, {self.east})"
 
-    def extend_to(
-        self, lower_lon: float, lower_lat: float, upper_lon: float, upper_lat: float
-    ):
+    def extend_to(self, lower_lon: float, lower_lat: float, upper_lon: float, upper_lat: float):
         """Expand the bounding box in-place"""
         self.south = min(self.south, lower_lon)
         self.west = min(self.west, lower_lat)

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/gisserver/operations/base.py

@@ -4,12 +4,14 @@ All operations extend from an WFSMethod class.
 This defines the parameters and output formats of the method.
 This introspection data is also parsed by the GetCapabilities call.
 """
+
 from __future__ import annotations
 
 import math
 import re
+from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import Any, Callable
+from typing import Any
 
 from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
 from django.http import HttpResponse
@@ -108,21 +110,15 @@ class Parameter:
         This method can be overwritten by a subclass if needed.
         """
         if self.allowed_values is not None and value not in self.allowed_values:
-            msg = self.error_messages.get(
-                "invalid", "Invalid value for {name}: {value}"
-            )
-            raise InvalidParameterValue(
-                self.name, msg.format(name=self.name, value=value)
-            )
+            msg = self.error_messages.get("invalid", "Invalid value for {name}: {value}")
+            raise InvalidParameterValue(self.name, msg.format(name=self.name, value=value))
 
 
 class UnsupportedParameter(Parameter):
     def value_from_query(self, KVP: dict):
         kvp_name = self.name.upper()
         if kvp_name in KVP:
-            raise InvalidParameterValue(
-                self.name, f"Support for {self.name} is not implemented!"
-            )
+            raise InvalidParameterValue(self.name, f"Support for {self.name} is not implemented!")
         return None
 
 
@@ -262,9 +258,10 @@ class WFSMethod:
 
     def _parse_output_format(self, value) -> OutputFormat:
         """Select the proper OutputFormat object based on the input value"""
-        # The str.replace is here to "allow application/gml+xml on the KVP",
-        # but I'm not sure what that comment was supposed to mean.
-        for v in [value, value.replace(" ", "+")]:
+        # When using ?OUTPUTFORMAT=application/gml+xml", it is actually an URL-encoded space
+        # character. Hence spaces are replaced back to a '+' character to allow such notation
+        # instead of forcing it to to be ?OUTPUTFORMAT=application/gml%2bxml".
+        for v in {value, value.replace(" ", "+")}:
             for o in self.output_formats:
                 if o.matches(v):
                     return o
@@ -290,9 +287,7 @@ class WFSMethod:
         tokens = iter(tokens)
         for prefix in tokens:
             if not prefix.startswith("xmlns("):
-                raise InvalidParameterValue(
-                    "namespaces", f"Expected xmlns(...) format: {value}"
-                )
+                raise InvalidParameterValue("namespaces", f"Expected xmlns(...) format: {value}")
             if prefix.endswith(")"):
                 # xmlns(http://...)
                 prefix = ""
@@ -313,9 +308,7 @@ class WFSMethod:
     def parse_request(self, KVP: dict) -> dict[str, Any]:
         """Parse the parameters of the request"""
         self.namespaces.update(self._parse_namespaces(KVP.get("NAMESPACES")))
-        param_values = {
-            param.name: param.value_from_query(KVP) for param in self.get_parameters()
-        }
+        param_values = {param.name: param.value_from_query(KVP) for param in self.get_parameters()}
         param_values["NAMESPACES"] = self.namespaces
 
         for param in self.get_parameters():
@@ -331,7 +324,6 @@ class WFSMethod:
 
     def validate(self, **params):
         """Perform final request parameter validation before the method is called"""
-        pass
 
     def __call__(self, **params):
         """Default call implementation: render an XML template."""
@@ -371,18 +363,12 @@ class WFSMethod:
     def _get_xml_template_name(self):
         """Generate the XML template name for this operation, and check it's file pattern"""
         service = self.view.KVP["SERVICE"].lower()
-        template_name = (
-            f"gisserver/{service}/{self.view.version}/{self.xml_template_name}"
-        )
+        template_name = f"gisserver/{service}/{self.view.version}/{self.xml_template_name}"
 
         # Since 'service' and 'version' are based on external input,
         # these values are double checked again to avoid remove file inclusion.
-        if not RE_SAFE_FILENAME.match(service) or not RE_SAFE_FILENAME.match(
-            self.view.version
-        ):
-            raise SuspiciousOperation(
-                f"Refusing to render template name {template_name}"
-            )
+        if not RE_SAFE_FILENAME.match(service) or not RE_SAFE_FILENAME.match(self.view.version):
+            raise SuspiciousOperation(f"Refusing to render template name {template_name}")
 
         return template_name
 
@@ -397,9 +383,7 @@ class WFSTypeNamesMethod(WFSMethod):
         # This is not delayed until _parse_type_names() as that wraps any TypeError
         # from view.get_feature_types() as an InvalidParameterValue exception.
         self.all_feature_types = self.view.get_feature_types()
-        self.all_feature_types_by_name = _get_feature_types_by_name(
-            self.all_feature_types
-        )
+        self.all_feature_types_by_name = _get_feature_types_by_name(self.all_feature_types)
 
     def get_parameters(self):
         return super().get_parameters() + [
@@ -423,18 +407,13 @@ class WFSTypeNamesMethod(WFSMethod):
                 "Parameter lists to perform multiple queries are not supported yet.",
             )
 
-        return [
-            self._parse_type_name(name, locator="typenames")
-            for name in type_names.split(",")
-        ]
+        return [self._parse_type_name(name, locator="typenames") for name in type_names.split(",")]
 
     def _parse_type_name(self, name, locator="typename") -> FeatureType:
         """Find the requested feature type for a type name"""
         app_prefix = self.namespaces[self.view.xml_namespace]
-        if name.startswith(f"{app_prefix}:"):
-            local_name = name[len(app_prefix) + 1 :]  # strip our XML prefix
-        else:
-            local_name = name
+        # strip our XML prefix
+        local_name = name[len(app_prefix) + 1 :] if name.startswith(f"{app_prefix}:") else name
 
         try:
             return self.all_feature_types_by_name[local_name]

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/gisserver/operations/wfs20.py

@@ -7,6 +7,7 @@ Useful docs:
 * https://mapserver.org/development/rfc/ms-rfc-105.html
 * https://enonline.supermap.com/iExpress9D/API/WFS/WFS200/WFS_2.0.0_introduction.htm
 """
+
 import logging
 import math
 import re
@@ -46,12 +47,7 @@ class GetCapabilities(WFSMethod):
     """ "This operation returns map features, and available operations this WFS server supports."""
 
     output_formats = [
-        OutputFormat(
-            "application/gml+xml",
-            version="3.2",
-            renderer_class=output.gml32_value_renderer,
-            title="GML",
-        ),
+        OutputFormat("application/gml+xml", version="3.2", title="GML"),  # for FME
         OutputFormat("text/xml"),
     ]
     xml_template_name = "get_capabilities.xml"
@@ -94,9 +90,7 @@ class GetCapabilities(WFSMethod):
                 "AcceptVersions", "Can't provide both ACCEPTVERSIONS and VERSION"
             )
 
-        matched_versions = set(accept_versions.split(",")).intersection(
-            self.view.accept_versions
-        )
+        matched_versions = set(accept_versions.split(",")).intersection(self.view.accept_versions)
         if not matched_versions:
             allowed = ", ".join(self.view.accept_versions)
             raise VersionNegotiationFailed(
@@ -156,7 +150,7 @@ class DescribeFeatureType(WFSTypeNamesMethod):
             "application/gml+xml",
             version="3.2",
             renderer_class=output.XMLSchemaRenderer,
-        )
+        ),
         # OutputFormat("text/xml", subtype="gml/3.1.1"),
     ]
 
@@ -279,9 +273,7 @@ class BaseWFSGetDataMethod(WFSTypeNamesMethod):
                 raise
             logger.exception("WFS request failed: %s\nParams: %r", str(e), params)
             msg = str(e)
-            locator = (
-                "srsName" if "Cannot find SRID" in msg else self._get_locator(**params)
-            )
+            locator = "srsName" if "Cannot find SRID" in msg else self._get_locator(**params)
             raise InvalidParameterValue(locator, f"Invalid request: {msg}") from e
         except (TypeError, ValueError) as e:
             # TypeError/ValueError could reference a datatype mismatch in an
@@ -352,9 +344,7 @@ class BaseWFSGetDataMethod(WFSTypeNamesMethod):
             if not output_crs and collection.results:
                 output_crs = collection.results[0].feature_type.crs
 
-            outputFormat.renderer_class.decorate_collection(
-                collection, output_crs, **params
-            )
+            outputFormat.renderer_class.decorate_collection(collection, output_crs, **params)
 
         if stop != math.inf:
             if start > 0:
@@ -362,7 +352,7 @@ class BaseWFSGetDataMethod(WFSTypeNamesMethod):
                     STARTINDEX=max(0, start - page_size),
                     COUNT=page_size,
                 )
-            if stop < collection.number_matched:
+            if collection.has_next:
                 # TODO: fix this when returning multiple typeNames:
                 collection.next = self._replace_url_params(
                     STARTINDEX=start + page_size,
@@ -479,9 +469,7 @@ class GetPropertyValue(BaseWFSGetDataMethod):
             renderer_class=output.gml32_value_renderer,
             title="GML",
         ),
-        OutputFormat(
-            "text/xml", subtype="gml/3.2", renderer_class=output.gml32_value_renderer
-        ),
+        OutputFormat("text/xml", subtype="gml/3.2", renderer_class=output.gml32_value_renderer),
     ]
 
     parameters = BaseWFSGetDataMethod.parameters + [

{django-gisserver-1.2.7 → django-gisserver-1.4.0}/gisserver/output/__init__.py

@@ -1,4 +1,7 @@
 """All supported output formats"""
+
+from django.utils.functional import classproperty
+
 from gisserver import conf
 
 from .base import OutputRenderer
@@ -13,8 +16,6 @@ from .gml32 import (
 from .results import FeatureCollection, SimpleFeatureCollection
 from .xmlschema import XMLSchemaRenderer
 
-from django.utils.functional import classproperty
-
 __all__ = [
     "OutputRenderer",
     "FeatureCollection",
@@ -40,6 +41,10 @@ def select_renderer(native_renderer_class, db_renderer_class):
     """
 
     class SelectRenderer:
+        """A proxy to the actual rendering class.
+        Its structure still allows accessing class-properties of the actual class.
+        """
+
         @classproperty
         def real_class(self):
             if conf.GISSERVER_USE_DB_RENDERING: