django-gisserver 2.1__tar.gz → 2.1.2__tar.gz

{django_gisserver-2.1 → django_gisserver-2.1.2}/CHANGES.md

@@ -1,3 +1,17 @@
+# 2025-09-10 (2.1.2)
+
+* Stop using CDN for bootstrap stylesheet, instead use a static local file.
+  This in order for the server to work in an airgapped environment (PR#72).
+
+# 2025-06-06 (2.1.1)
+
+* Fixed using legacy longitude/latitude rendering for `EPSG:4326` and `:http://www.opengis.net/gml/srs/epsg.xml#xxxx` SRS names.
+* Improved styling for the default HTML page.
+
+This increases interoperability with web-based clients and legacy libraries. GeoServer applies the same heuristic.
+Clients that use the official OGC notations such as `urn:ogc:def:crs:EPSG::4326` and `http://www.opengis.net/def/crs/epsg/0/4326`
+are not affected. If needed, this behavior can be disabled using `GISSERVER_FORCE_XY_EPSG_4326=False` and `GISSERVER_FORCE_XY_OLD_CRS=False`.
+
 # 2025-05-29 (2.1)
 
 * Added support for `ArrayField` field in CSV exports.
@@ -16,7 +30,6 @@
 * Fixed crash when receiving WFS 1.0 POST requests.
 * Fixed building readthedocs.
 
-
 # 2025-04-28 (2.0)
 
 * Added support for XML POST requests.
@@ -86,7 +99,6 @@ the notable API changes are:
   * `XsdElement.is_geometry` was unneeded, use `XsdElement.type.is_geometry` now.
   * `XsdElement.orm_path` points to the absolute path, and `XsdElement.local_orm_path` to the relative path.
 
-
 # 2024-11-25 (1.5.0)
 
 * Added `PROPERTYNAME` support
@@ -120,10 +132,11 @@ the notable API changes are:
 * Django 5 support added.
 
 ## Contributors
+
 We would like to thank the following contributors
 for their work on this release.
 
-   - [tomdtp](https://github.com/tomdtp)
+* [tomdtp](https://github.com/tomdtp)
 
 # 2023-06-08 (1.2.7)
 
@@ -143,25 +156,21 @@ for their work on this release.
 
 * Fixed type assertion when `django.contrib.postgres` was not installed.
 
-
 # 2022-09-07 (1.2.3)
 
 * Added "geojson" as output format alias in `GetCapabilities` for ESRI ArcGIS online.
 
-
 # 2022-07-28 (1.2.2)
 
 * Optimized response writing, buffering provement gave ~12-15% speedup.
 * Optimized GML response, reduced response size by ~9% by removing whitespace.
 
-
 # 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.
 * Simplify `FeatureType.geometry_field` logic.
 
-
 # 2022-04-11 (1.2)
 
 * Added support for `maxOccurs=unbounded` elements (M2M, reverse foreign key, array fields).
@@ -182,7 +191,6 @@ for their work on this release.
 * Various code cleanups.
 * Dropped Python 3.6 support.
 
-
 # 2021-05-17 (1.1.3)
 
 * Included Django 3.2 in test matrix.
@@ -191,21 +199,18 @@ for their work on this release.
 * Updated pre-commit hooks.
 * Drop universal wheel declaration (Python 2 is no longer supported)
 
-
 # 2020-12-22 (1.1.2)
 
 * Fixed double ``>`` sign in ``<Filter xml..>>`` code when namespaces were auto-corrected.
 * Fixed basic ``<Beyond>`` support for distance queries.
 * Fixed parameter name for ``round()`` function.
 
-
 # 2020-08-19 (1.1.1)
 
 * Improve HTML page with "Using This WFS" section.
 * Fixed Django 3.1 compatibility.
 * Improved error message for `<fes:PropertyIsLike>` operator when comparing against a `<fes:ValueReference>` instead of `<fes:Literal>`.
 
-
 # 2020-08-13 (1.1)
 
 * Added browsable HTML views for WFS views, which can be extended/overwritten.
@@ -213,7 +218,6 @@ for their work on this release.
 * Added "abstract" property to field classes to provide a description.
 * Consider `?SERVICE=WFS` as default for `WFSView` views.
 
-
 # 2020-07-21 (1.0)
 
 * Added `FeatureType.show_name_field` to show/hide `<gml:name>` and GeoJSON `geometry_name`.
@@ -235,12 +239,10 @@ for their work on this release.
   * Fixed exception message for bad SRID's.
 * Internal code reorganizations.
 
-
 # 2020-07-09 (0.9.1)
 
 * Fixed `GetPropertyValue` calls for non-db optimized rendering.
 
-
 # 2020-07-09 (0.9)
 
 * Added support for nested, flattened fields.
@@ -260,7 +262,6 @@ for their work on this release.
 * Optimize feature retrieval, only fetch the actual fields being displayed.
 * Compactified XML output headers.
 
-
 # 2020-07-06 (0.8.4)
 
 * Added field renaming support with `field(..., model_attribute=...)`.
@@ -280,7 +281,6 @@ for their work on this release.
   * Fix exposed WFS capabilities to pass cite WFS Simple conformance
 * Fixed SORTBY parameter to handle renamed fields.
 
-
 # 2020-06-30 (0.8.3)
 
 * Added `GISSERVER_CAPABILITIES_BOUNDING_BOX` setting.
@@ -288,13 +288,11 @@ for their work on this release.
 * Fixed `DescribeFeatureType` to return all types when TYPENAMES is not provided.
 * Advertise `ImplementsMinimumXPath` in `GetCapabilities` for cite testing (other servers also do this while being incomplete).
 
-
 # 2020-06-30 (0.8.2)
 
 * Improve XPath matching support, allow "app:" prefix and root elements.
 * Refactored `FeatureType.resolve_element()` to return an `XPathMatch` object
 
-
 # 2020-06-29 (0.8.1)
 
 * Added unpaginated GeoJSON support (performance is good enough).
@@ -305,7 +303,6 @@ for their work on this release.
 * Optimized GeoJSON output by no longer selecting the other geometry fields.
 * Added shortcut properties to `XsdComplexType`: `gml_elements` and `complex_elements`.
 
-
 # 2020-06-25 (0.8)
 
 * Added preliminary support to render complex field types (e.g. relations).
@@ -328,7 +325,6 @@ for their work on this release.
 * Enforce using keyword-arguments on `FeatureType(...)`
 * Internal code reorganizations/cleanups.
 
-
 # 2020-06-08 (0.7)
 
 * Added database-based rendering for GML/GeoJSON (disable with `GISSERVER_USE_DB_RENDERING=False`).
@@ -400,6 +396,6 @@ for their work on this release.
 * First basic release that works in QGis.
 * Features:
 
- * WFS `GetCapabilities`
- * WFS `DescribeFeatureType`
- * WFS `GetFeature` with bbox and pagination support.
+* WFS `GetCapabilities`
+* WFS `DescribeFeatureType`
+* WFS `GetFeature` with bbox and pagination support.

{django_gisserver-2.1/django_gisserver.egg-info → django_gisserver-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.1
+Version: 2.1.2
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor
@@ -46,6 +46,7 @@ Requires-Dist: pytest-cov>=2.11.1; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: Django~=5.0; extra == "docs"
 Requires-Dist: sphinxcontrib-django>=2.5; extra == "docs"
+Requires-Dist: myst-parser>=3.0.1; extra == "docs"
 Requires-Dist: psycopg2-binary>=2.8.4; extra == "docs"
 Dynamic: author
 Dynamic: author-email

{django_gisserver-2.1 → django_gisserver-2.1.2/django_gisserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.1
+Version: 2.1.2
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor
@@ -46,6 +46,7 @@ Requires-Dist: pytest-cov>=2.11.1; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: Django~=5.0; extra == "docs"
 Requires-Dist: sphinxcontrib-django>=2.5; extra == "docs"
+Requires-Dist: myst-parser>=3.0.1; extra == "docs"
 Requires-Dist: psycopg2-binary>=2.8.4; extra == "docs"
 Dynamic: author
 Dynamic: author-email

{django_gisserver-2.1 → django_gisserver-2.1.2}/django_gisserver.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ gisserver/parsers/wfs20/base.py
 gisserver/parsers/wfs20/projection.py
 gisserver/parsers/wfs20/requests.py
 gisserver/parsers/wfs20/stored.py
+gisserver/static/gisserver/bootstrap-5.3.6.min.css
 gisserver/static/gisserver/index.css
 gisserver/templates/gisserver/base.html
 gisserver/templates/gisserver/index.html

{django_gisserver-2.1 → django_gisserver-2.1.2}/django_gisserver.egg-info/requires.txt

@@ -7,6 +7,7 @@ pyproj>=3.6.1
 [docs]
 Django~=5.0
 sphinxcontrib-django>=2.5
+myst-parser>=3.0.1
 psycopg2-binary>=2.8.4
 
 [tests]

django_gisserver-2.1.2/gisserver/__init__.py

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

{django_gisserver-2.1 → django_gisserver-2.1.2}/gisserver/conf.py

@@ -4,6 +4,8 @@ from django.conf import settings
 from django.core.signals import setting_changed
 from django.dispatch import receiver
 
+_originals = {}
+
 # -- feature flags
 
 # Configure whether the <ows:WGS84BoundingBox> should be included in GetCapabilities.
@@ -30,6 +32,17 @@ GISSERVER_COUNT_NUMBER_MATCHED = getattr(settings, "GISSERVER_COUNT_NUMBER_MATCH
 
 # -- output rendering
 
+# Following https://docs.geoserver.org/stable/en/user/services/wfs/axis_order.html here:
+# Whether the older EPSG:4326 notation (instead of the OGC recommended styles)
+# should render in legacy longitude/latitude (x/y) ordering.
+# This increases interoperability with legacy web clients,
+# as others use urn:ogc:def:crs:EPSG::4326 or http://www.opengis.net/def/crs/epsg/0/4326.
+GISSERVER_FORCE_XY_EPSG_4326 = getattr(settings, "GISSERVER_FORCE_XY_EPSG_4326", True)
+
+# Whether the legacy CRS notation http://www.opengis.net/gml/srs/epsg.xml# should render in X/Y
+GISSERVER_FORCE_XY_OLD_CRS = getattr(settings, "GISSERVER_FORCE_XY_OLD_CRS", True)
+
+# Extra output formats for GetFeature (see documentation for details)
 GISSERVER_EXTRA_OUTPUT_FORMATS = getattr(settings, "GISSERVER_EXTRA_OUTPUT_FORMATS", {})
 GISSERVER_GET_FEATURE_OUTPUT_FORMATS = getattr(
     settings, "GISSERVER_GET_FEATURE_OUTPUT_FORMATS", {}
@@ -59,4 +72,13 @@ def _on_settings_change(setting, value, enter, **kwargs):
     if not setting.startswith("GISSERVER_"):
         return
 
-    globals()[setting] = value
+    conf_module = globals()
+    if value is None and not enter:
+        # override_settings().disable() returns what the django settings module had.
+        # Revert to our defaults here instead.
+        value = _originals.get(setting)
+    else:
+        # Track defaults of this file for reverting to them
+        _originals.setdefault(setting, conf_module[setting])
+
+    conf_module[setting] = value

{django_gisserver-2.1 → django_gisserver-2.1.2}/gisserver/crs.py

@@ -15,6 +15,7 @@ import pyproj
 from django.contrib.gis.gdal import AxisOrder, CoordTransform, OGRGeometry, SpatialReference
 from django.contrib.gis.geos import GEOSGeometry
 
+from gisserver import conf
 from gisserver.exceptions import ExternalValueError
 
 CRS_URN_REGEX = re.compile(
@@ -36,7 +37,7 @@ __all__ = [
 ]
 
 # Caches to avoid reinitializing WGS84 each time.
-_COMMON_CRS_BY_URN = {}
+_COMMON_CRS_BY_STR = {}
 _COMMON_CRS_BY_SRID = {}
 
 
@@ -74,7 +75,7 @@ _get_proj_crs_from_string = lru_cache(maxsize=10)(pyproj.CRS.from_string)
 _get_proj_crs_from_authority = lru_cache(maxsize=10)(pyproj.CRS.from_authority)
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, eq=False)
 class CRS:
     """
     Represents a CRS (Coordinate Reference System), which preferably follows the URN format
@@ -110,6 +111,9 @@ class CRS:
     #: Original input
     origin: str = field(init=False, default=None)
 
+    #: Tell whether the input format used the legacy notation.
+    force_xy: bool = False
+
     @classmethod
     def from_string(cls, uri: str | int) -> CRS:
         """
@@ -123,12 +127,15 @@ class CRS:
         * A legacy CRS URI ("epsg:<SRID>", or "http://www.opengis.net/...").
         * A numeric SRID (which calls :meth:`from_srid()`)
         """
+        if known_crs := _COMMON_CRS_BY_STR.get(uri):
+            return known_crs  # Avoid object re-creation
+
         if isinstance(uri, int) or uri.isdigit():
             return cls.from_srid(int(uri))
         elif uri.startswith("urn:"):
             return cls._from_urn(uri)
         else:
-            return cls._from_legacy(uri)
+            return cls._from_prefix(uri)
 
     @classmethod
     def from_srid(cls, srid: int):
@@ -141,22 +148,19 @@ class CRS:
         if common_crs := _COMMON_CRS_BY_SRID.get(srid):
             return common_crs  # Avoid object re-creation
 
-        crs = cls(
+        return cls(
             domain="ogc",
             authority="EPSG",
             version="",
             crsid=str(srid),
             srid=int(srid),
         )
-        crs.__dict__["origin"] = srid
-        return crs
 
     @classmethod
     def _from_urn(cls, urn):  # noqa: C901
-        """Instantiate this class using a URN format."""
-        if known_crs := _COMMON_CRS_BY_URN.get(urn):
-            return known_crs  # Avoid object re-creation
-
+        """Instantiate this class using a URN format.
+        This format is defined in https://portal.ogc.org/files/?artifact_id=30575.
+        """
         urn_match = CRS_URN_REGEX.match(urn)
         if not urn_match:
             raise ExternalValueError(f"Unknown CRS URN [{urn}] specified: {CRS_URN_REGEX.pattern}")
@@ -187,7 +191,7 @@ class CRS:
         crs = cls(
             domain=domain,
             authority=authority,
-            version=urn_match.group(3),
+            version=urn_match.group(3) or "",
             crsid=crsid,
             srid=srid,
         )
@@ -195,16 +199,30 @@ class CRS:
         return crs
 
     @classmethod
-    def _from_legacy(cls, uri):
-        """Instantiate this class from a legacy URL"""
-        luri = uri.lower()
-        for head in (
-            "epsg:",
-            "http://www.opengis.net/def/crs/epsg/0/",
-            "http://www.opengis.net/gml/srs/epsg.xml#",
+    def _from_prefix(cls, uri):
+        """Instantiate this class from a non-URI notation.
+
+        The modern URL format (:samp:`http://www.opengis.net/def/crs/epsg/0/{xxxx}`)
+        is defined in https://portal.ogc.org/files/?artifact_id=46361.
+
+        Older notations like :samp:`EPSG:{xxxx}` or legacy XML URLs like
+        and :samp`:http://www.opengis.net/gml/srs/epsg.xml#{xxxx}` are also supported.
+        """
+        # Make sure origin uses the expected upper/lowercasing.
+        origin = uri.lower() if "://" in uri else uri.upper()
+        for prefix, force_xy in (
+            (
+                "EPSG:",
+                (conf.GISSERVER_FORCE_XY_EPSG_4326 and origin == "EPSG:4326"),
+            ),
+            (
+                "http://www.opengis.net/gml/srs/epsg.xml#",
+                conf.GISSERVER_FORCE_XY_OLD_CRS,
+            ),
+            ("http://www.opengis.net/def/crs/epsg/0/", False),
         ):
-            if luri.startswith(head):
-                crsid = luri[len(head) :]
+            if origin.startswith(prefix):
+                crsid = origin[len(prefix) :]
                 try:
                     srid = int(crsid)
                 except ValueError:
@@ -218,16 +236,19 @@ class CRS:
                     version="",
                     crsid=crsid,
                     srid=srid,
+                    force_xy=force_xy,
                 )
-                crs.__dict__["origin"] = uri
+                crs.__dict__["origin"] = origin
                 return crs
 
         raise ExternalValueError(f"Unknown CRS URI [{uri}] specified")
 
     @property
     def legacy(self):
-        """Return a legacy string in the format :samp:`EPSG:{srid}`."""
-        return f"EPSG:{self.srid:d}"
+        """Return a legacy string in the format :samp:`http://www.opengis.net/gml/srs/epsg.xml#{srid}`."""
+        # This mirrors what GeoSever does, as this notation always has an axis ordering defined.
+        # Notations like EPSG:xxxx notation don't have such consistent usage.
+        return f"http://www.opengis.net/gml/srs/epsg.xml#{self.srid:d}"
 
     @cached_property
     def urn(self):
@@ -254,16 +275,29 @@ class CRS:
         return [axis.direction for axis in proj_crs.axis_info]
 
     def __str__(self):
-        return self.urn
+        return self.legacy if self.force_xy else self.urn
 
     def __eq__(self, other):
         if isinstance(other, CRS):
-            # CRS84 is NOT equivalent to EPSG:4326.
-            # EPSG:4326 specifies coordinates in lat/long order and CRS84 in long/lat order.
-            return self.authority == other.authority and self.srid == other.srid
+            return self.matches(other, compare_legacy=True)
         else:
             return NotImplemented
 
+    def matches(self, other, compare_legacy=True) -> bool:
+        """Tell whether this CRS is identical to another one."""
+        return (
+            # "urn:ogc:def:crs:EPSG::4326" != "urn:ogc:def:crs:OGC::CRS84"
+            # even through they both share the same srid.
+            self.srid == other.srid
+            and self.authority == other.authority
+            and (
+                # Also, legacy notations like EPSG:4326 are treated differently,
+                # unless this is configured to not make a difference.
+                not compare_legacy
+                or self.force_xy == other.force_xy
+            )
+        )
+
     def __hash__(self):
         """Used to match objects in a set."""
         return hash((self.authority, self.srid))
@@ -272,7 +306,8 @@ class CRS:
         """Generate the GDAL Spatial Reference object."""
         if self.backends[axis_order] is None:
             backends = list(self.backends)
-            if self.origin:
+            if self.origin and "://" not in self.origin:  # avoid downloads and OGR errors
+                # Passing the origin helps to detect CRS84 strings
                 backends[axis_order] = _get_spatial_reference(self.origin, "user", axis_order)
             else:
                 backends[axis_order] = _get_spatial_reference(self.srid, "epsg", axis_order)
@@ -284,7 +319,12 @@ class CRS:
 
     def _as_proj(self) -> pyproj.CRS:
         """Generate the PROJ CRS object"""
-        if isinstance(self.origin, str) and not self.origin.isdigit():
+        if (
+            isinstance(self.origin, str)
+            and not self.origin.isdigit()
+            and "epsg.xml#" not in self.origin  # not supported
+        ):
+            # Passing the origin helps to detect CRS84 strings
             return _get_proj_crs_from_string(self.origin)
         else:
             return _get_proj_crs_from_authority(self.authority, self.srid)
@@ -293,7 +333,7 @@ class CRS:
         self,
         geometry: AnyGeometry,
         clone=False,
-        axis_order: AxisOrder = AxisOrder.AUTHORITY,
+        axis_order: AxisOrder | None = None,
     ) -> AnyGeometry | None:
         """Transform the geometry using this coordinate reference.
 
@@ -322,6 +362,12 @@ class CRS:
         * PostGIS stores the data in x/y.
         * WFS 1.0 used x/y, WFS 1.3 used y/x except for ``EPSG:4326``.
 
+        When receiving legacy notations (e.g. ``EPSG:4326`` instead of ``urn:ogc:def:crs:EPSG::4326``),
+        the data is still projected in legacy ordering, unless ``GISSERVER_FORCE_XY_...`` is disabled.
+        This reflects the design of `GeoServer Axis Ordering
+        <https://docs.geoserver.org/stable/en/user/services/wfs/axis_order.html>`_
+        to have maximum interoperability with legacy/JavaScript clients.
+
         After GDAL/OGR changed the axis orientation, that information is
         lost when the return value is loaded back into GEOS.
         To address this, :meth:`tag_geometry` is called on the result.
@@ -331,6 +377,11 @@ class CRS:
                       For GEOS->GDAL->GEOS conversions, this makes no difference in efficiency.
         :param axis_order: Which axis ordering to convert the geometry into (depends on the use-case).
         """
+        if axis_order is None:
+            # This transforms by default to WFS 2 axis ordering (e.g. latitude/longitude),
+            # unless a legacy notation is used (e.g. EPSG:4326).
+            axis_order = AxisOrder.TRADITIONAL if self.force_xy else AxisOrder.AUTHORITY
+
         if isinstance(geometry, OGRGeometry):
             transform = _get_coord_transform(geometry.srs, self._as_gdal(axis_order=axis_order))
             return geometry.transform(transform, clone=clone)
@@ -377,12 +428,12 @@ class CRS:
         This also makes sure that requests which use the same URN will get our CRS object
         version, instead of a fresh new one.
         """
-        if self.authority == "EPSG":
+        if self.authority == "EPSG" and self.srid != 4326:
             # Only register for EPSG to avoid conflicting axis ordering issues.
-            # (WGS84 and CRS84 both use srid 4326)
+            # (WGS84 and CRS84 both use srid 4326, and the 'EPSG:4326' notation is treated as legacy)
             _COMMON_CRS_BY_SRID[self.srid] = self
 
-        _COMMON_CRS_BY_URN[self.urn] = self
+        _COMMON_CRS_BY_STR[str(self)] = self
 
 
 #: Worldwide GPS, latitude/longitude (y/x). https://epsg.io/4326

{django_gisserver-2.1 → django_gisserver-2.1.2}/gisserver/db.py

@@ -42,16 +42,22 @@ class AsGML(functions.AsGML):
         precision=conf.GISSERVER_DB_PRECISION,
         envelope=False,
         is_latlon=False,
+        long_urn=False,
         **extra,
     ):
         # Note that Django's AsGml the defaults are: version=2, precision=8
         super().__init__(expression, version, precision, **extra)
         self.envelope = envelope
         self.is_latlon = is_latlon
+        self.long_urn = long_urn
 
     def as_postgresql(self, compiler, connection, **extra_context):
         # Fill options parameter (https://postgis.net/docs/ST_AsGML.html)
-        options = 33 if self.envelope else 1  # 32 = bbox, 1 = long CRS urn
+        options = 0
+        if self.long_urn:
+            options |= 1  # long CRS urn
+        if self.envelope:
+            options |= 32  # bbox
         if self.is_latlon:
             # PostGIS provides the data in longitude/latitude format (east/north to look like x/y).
             # However, WFS 2.0 fixed their axis by following the authority. The ST_AsGML() doesn't

{django_gisserver-2.1 → django_gisserver-2.1.2}/gisserver/features.py

@@ -846,19 +846,24 @@ class FeatureType:
 
     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
+        for candidate in self.supported_crs:
+            # Not using self.supported_crs.index(crs), as that depends on CRS.__eq__():
+            if candidate.matches(crs, compare_legacy=False):
+                if candidate.force_xy != crs.force_xy:
+                    # user provided legacy CRS, allow output in legacy CRS
+                    return crs
+                else:
+                    # Replace the parsed CRS with the declared one.
+                    return candidate
+
+        # No match found
+        if conf.GISSERVER_SUPPORTED_CRS_ONLY:
+            raise InvalidParameterValue(
+                f"Feature '{self.name}' does not support CRS '{crs}'.",
+                locator=locator,
+            ) from None
+        else:
+            return crs
 
 
 class HDict(dict):

{django_gisserver-2.1 → django_gisserver-2.1.2}/gisserver/geometries.py

@@ -27,7 +27,7 @@ class BoundingBox:
     Due to the overlap between 2 types, this element is used for 2 cases:
 
     * The ``<ows:WGS84BoundingBox>`` element for ``GetCapabilities``.
-    * The ``<gml:Envelope>`` inside an``<gml:boundedBy>``  single feature.
+    * The ``<gml:Envelope>`` inside an ``<gml:boundedBy>``  single feature.
 
     While both classes have no common base class (and exist in different schema's),
     their properties are identical.