django-gisserver 1.4.1__tar.gz → 1.5.0__tar.gz

{django-gisserver-1.4.1 → django_gisserver-1.5.0}/CHANGES.md

@@ -1,3 +1,13 @@
+# 2024-11-25 (1.5.0)
+
+* Added `PROPERTYNAME` support
+* Added rendering of `<wfs:truncatedResponse>` when errors happen during output streaming.
+* Make sure Django 4.1+ won't do double prefetches on relations that we prefetch.
+* Hide the erroneous output formats in `GetCapabilities` that are supported for FME.
+* Bump requirements to non-vulnerable versions (of lxml and orjson).
+* Cleaned up code, removing some internal methods.
+* Cleaned up leftover Python 3.7 compat code.
+
 # 2024-08-29 (1.4.1)
 
 * Fix 500 error when `model_attribute` points to a dotted-path.
@@ -197,7 +207,7 @@ for their work on this release.
 # 2020-06-29 (0.8.1)
 
 * Added unpaginated GeoJSON support (performance is good enough).
-* Added basic support for non-namespaced `FILTER` queries, and `PropertyName` tags (though being WFS2 attributes, clients still use them).
+* Added basic support for non-namespaced `FILTER` queries, and `PropertyName` tags (though being WFS1 attributes, clients still use them).
 * Added extra strict check that `ValueReference`/`Literal`/`ResourceId` nodes don't have child nodes.
 * Fixed allowing filtering on unknown or undefined fields (XPaths are now resolved to known elements).
 * Optimized results streaming by automatically using a queryset-iterator if possible.

{django-gisserver-1.4.1/django_gisserver.egg-info → django_gisserver-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-gisserver
-Version: 1.4.1
+Version: 1.5.0
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor
@@ -29,8 +29,18 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires: Django (>=3.2)
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: tests
 License-File: LICENSE
+Requires-Dist: Django>=3.2
+Requires-Dist: defusedxml>=0.6.0
+Requires-Dist: lru_dict>=1.1.7
+Requires-Dist: orjson>=3.9.15
+Provides-Extra: tests
+Requires-Dist: django-environ>=0.4.5; extra == "tests"
+Requires-Dist: psycopg2-binary>=2.8.4; extra == "tests"
+Requires-Dist: lxml>=4.9.1; extra == "tests"
+Requires-Dist: pytest>=6.2.3; extra == "tests"
+Requires-Dist: pytest-django>=4.1.0; extra == "tests"
+Requires-Dist: pytest-cov>=2.11.1; extra == "tests"
 
 [![Documentation](https://readthedocs.org/projects/django-gisserver/badge/?version=latest)](https://django-gisserver.readthedocs.io/en/latest/?badge=latest)
 [![Actions](https://github.com/Amsterdam/django-gisserver/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/Amsterdam/django-gisserver/actions/workflows/tests.yaml)

{django-gisserver-1.4.1 → django_gisserver-1.5.0/django_gisserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-gisserver
-Version: 1.4.1
+Version: 1.5.0
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor
@@ -29,8 +29,18 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires: Django (>=3.2)
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: tests
 License-File: LICENSE
+Requires-Dist: Django>=3.2
+Requires-Dist: defusedxml>=0.6.0
+Requires-Dist: lru_dict>=1.1.7
+Requires-Dist: orjson>=3.9.15
+Provides-Extra: tests
+Requires-Dist: django-environ>=0.4.5; extra == "tests"
+Requires-Dist: psycopg2-binary>=2.8.4; extra == "tests"
+Requires-Dist: lxml>=4.9.1; extra == "tests"
+Requires-Dist: pytest>=6.2.3; extra == "tests"
+Requires-Dist: pytest-django>=4.1.0; extra == "tests"
+Requires-Dist: pytest-cov>=2.11.1; extra == "tests"
 
 [![Documentation](https://readthedocs.org/projects/django-gisserver/badge/?version=latest)](https://django-gisserver.readthedocs.io/en/latest/?badge=latest)
 [![Actions](https://github.com/Amsterdam/django-gisserver/actions/workflows/tests.yaml/badge.svg?branch=main)](https://github.com/Amsterdam/django-gisserver/actions/workflows/tests.yaml)

{django-gisserver-1.4.1 → django_gisserver-1.5.0}/django_gisserver.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ gisserver/parsers/gml/geometries.py
 gisserver/queries/__init__.py
 gisserver/queries/adhoc.py
 gisserver/queries/base.py
+gisserver/queries/projection.py
 gisserver/queries/stored.py
 gisserver/static/gisserver/index.css
 gisserver/templates/gisserver/index.html

{django-gisserver-1.4.1 → django_gisserver-1.5.0}/django_gisserver.egg-info/requires.txt

@@ -1,12 +1,12 @@
 Django>=3.2
 defusedxml>=0.6.0
 lru_dict>=1.1.7
-orjson>=2.4.0
+orjson>=3.9.15
 
 [tests]
 django-environ>=0.4.5
 psycopg2-binary>=2.8.4
-lxml>=4.5.0
+lxml>=4.9.1
 pytest>=6.2.3
 pytest-django>=4.1.0
 pytest-cov>=2.11.1

django_gisserver-1.5.0/gisserver/__init__.py

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

{django-gisserver-1.4.1 → django_gisserver-1.5.0}/gisserver/db.py

@@ -3,14 +3,13 @@
 from __future__ import annotations
 
 from functools import lru_cache, reduce
-from typing import cast
 
-from django.contrib.gis.db.models import GeometryField, functions
+from django.contrib.gis.db.models import functions
 from django.db import connection, connections, models
 
 from gisserver import conf
 from gisserver.geometries import CRS
-from gisserver.types import XPathMatch, XsdElement
+from gisserver.types import GmlElement
 
 
 class AsEWKT(functions.GeoFunc):
@@ -54,9 +53,9 @@ class ST_Union(functions.Union):
     arity = None
 
     def as_postgresql(self, compiler, connection, **extra_context):
-        # PostgreSQL can handle ST_Union(ARRAY(field names)), other databases don't.
+        # PostgreSQL can handle ST_Union(ARRAY[field names]), other databases don't.
         if len(self.source_expressions) > 2:
-            extra_context["template"] = "%(function)s(ARRAY(%(expressions)s))"
+            extra_context["template"] = "%(function)s(ARRAY[%(expressions)s])"
         return self.as_sql(compiler, connection, **extra_context)
 
 
@@ -65,7 +64,7 @@ def get_geometries_union(
 ) -> str | functions.Union:
     """Generate a union of multiple geometry fields."""
     if not expressions:
-        raise ValueError("Missing geometery fields for get_geometries_union()")
+        raise ValueError("Missing geometry fields for get_geometries_union()")
 
     if len(expressions) == 1:
         return next(iter(expressions))  # fastest in set data type
@@ -73,7 +72,7 @@ def get_geometries_union(
         return functions.Union(*expressions)
     elif connections[using].vendor == "postgresql":
         # postgres can handle multiple field names
-        return ST_Union(expressions)
+        return ST_Union(*expressions)
     else:
         # other databases do Union(Union(1, 2), 3)
         return reduce(functions.Union, expressions)
@@ -122,25 +121,20 @@ def escape_xml_name(name: str, template="{name}") -> str:
 
 
 def get_db_geometry_selects(
-    gml_elements: list[XsdElement], output_crs: CRS
+    gml_elements: list[GmlElement], output_crs: CRS
 ) -> dict[str, str | functions.Transform]:
     """Utility to generate select clauses for the geometry fields of a type.
     Key is the xsd element name, value is the database select expression.
     """
     return {
-        xsd_element.name: _get_db_geometry_target(xsd_element, output_crs)
-        for xsd_element in gml_elements
-        if xsd_element.source is not None
+        gml_element.name: get_db_geometry_target(gml_element, output_crs)
+        for gml_element in gml_elements
+        if gml_element.source is not None
     }
 
 
-def _get_db_geometry_target(xsd_element: XsdElement, output_crs: CRS) -> str | functions.Transform:
+def get_db_geometry_target(gml_element: GmlElement, 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)
-
-
-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(
+        gml_element.orm_path, gml_element.source.srid, output_srid=output_crs.srid
+    )

{django-gisserver-1.4.1 → django_gisserver-1.5.0}/gisserver/exceptions.py

@@ -9,13 +9,14 @@ https://docs.opengeospatial.org/is/09-025r2/09-025r2.html#411
 """
 
 from django.conf import settings
+from django.http import HttpResponse
 from django.utils.html import format_html
 
 
 class ExternalValueError(ValueError):
     """Raise a ValueError for external input.
     This helps to distinguish between internal bugs
-    (e.g. unpacking values) and misformed external input.
+    (e.g. unpacking values) and malformed external input.
     """
 
 
@@ -32,18 +33,29 @@ class OWSException(Exception):
     version = "2.0.0"
     code = None
     text_template = None
+    debug_hint = True
 
-    def __init__(self, locator, text=None, code=None, status_code=None):
+    def __init__(self, text=None, code=None, locator=None, status_code=None):
         text = text or self.text_template.format(code=self.code, locator=locator)
+        if (code and len(text) < len(code)) or (locator and len(text) < len(locator)):
+            raise ValueError("text/locator arguments are switched")
+
         super().__init__(text)
         self.locator = locator
         self.text = text
-        self.code = code or self.code
+        self.code = code or self.code or self.__class__.__name__
         self.status_code = status_code or self.status_code
 
+    def as_response(self):
+        return HttpResponse(
+            b'<?xml version="1.0" encoding="UTF-8"?>\n%b' % self.as_xml().encode("utf-8"),
+            content_type="text/xml; charset=utf-8",
+            status=self.status_code,
+            reason=self.reason,
+        )
+
     def as_xml(self):
         return format_html(
-            '<?xml version="1.0" encoding="UTF-8"?>\n'
             "<ows:ExceptionReport"
             ' xmlns:ows="http://www.opengis.net/ows/1.1"'
             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'
@@ -51,16 +63,18 @@ class OWSException(Exception):
             ' http://schemas.opengis.net/ows/1.1.0/owsExceptionReport.xsd"'
             ' xml:lang="en-US"'
             ' version="2.0.0">\n'
-            '  <ows:Exception exceptionCode="{code}" locator="{locator}">\n'
-            "    <ows:ExceptionText>{text}{debug}</ows:ExceptionText>\n"
+            '  <ows:Exception exceptionCode="{code}"{locator_attr}>\n\n'
+            "    <ows:ExceptionText>{text}{debug}</ows:ExceptionText>\n\n"
             "  </ows:Exception>\n"
-            "</ows:ExceptionReport>",
+            "</ows:ExceptionReport>\n",
             code=self.code,
-            locator=self.locator,
+            locator_attr=(
+                format_html(' locator="{locator}"', locator=self.locator) if self.locator else ""
+            ),
             text=self.text,
             debug=(
                 ".\n\n(set GISSERVER_WRAP_FILTER_DB_ERRORS=False to see the Django error page)"
-                if settings.DEBUG and self.status_code >= 500
+                if settings.DEBUG and self.status_code >= 500 and self.debug_hint
                 else ""
             ),
         )

{django-gisserver-1.4.1 → django_gisserver-1.5.0}/gisserver/features.py

@@ -18,10 +18,9 @@ from __future__ import annotations
 
 import html
 import operator
-from collections import defaultdict
 from dataclasses import dataclass
 from functools import cached_property, lru_cache, reduce
-from typing import Union
+from typing import TYPE_CHECKING, Literal, Union
 
 from django.conf import settings
 from django.contrib.gis.db import models as gis_models
@@ -35,6 +34,7 @@ from gisserver.exceptions import ExternalValueError
 from gisserver.geometries import CRS, WGS84, BoundingBox
 from gisserver.types import (
     GmlBoundedByElement,
+    GmlElement,
     GmlIdAttribute,
     GmlNameElement,
     XPathMatch,
@@ -49,13 +49,10 @@ if "django.contrib.postgres" in settings.INSTALLED_APPS:
 else:
     ArrayField = None
 
-try:
-    from typing import Literal  # Python 3.8
-
-    _all_ = Literal["__all__"]
-except ImportError:
-    _all_ = str
+if TYPE_CHECKING:
+    from gisserver.queries import FeatureRelation
 
+_all_ = Literal["__all__"]
 
 __all__ = [
     "FeatureType",
@@ -125,7 +122,12 @@ def get_basic_field_type(
         return DEFAULT_XSD_TYPE
 
 
-def _get_model_fields(model, fields, parent=None):
+def _get_model_fields(
+    model: type[models.Model],
+    fields: _all_ | list[str],
+    parent: ComplexFeatureField | None = None,
+    feature_type: FeatureType | None = None,
+):
     if fields == "__all__":
         # All regular fields
         # Relationships will not be expanded since it can expose so many other fields.
@@ -136,6 +138,7 @@ def _get_model_fields(model, fields, parent=None):
                 # .bind() is called directly by providing these arguments via init:
                 model=model,
                 parent=parent,
+                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
@@ -144,7 +147,7 @@ def _get_model_fields(model, fields, parent=None):
         # Only defined fields
         fields = [f if isinstance(f, FeatureField) else FeatureField(f) for f in fields]
         for field in fields:
-            field.bind(model, parent=parent)
+            field.bind(model, parent=parent, feature_type=feature_type)
         return fields
 
 
@@ -180,15 +183,30 @@ class FeatureField:
         model_attribute=None,
         model=None,
         parent: ComplexFeatureField | None = None,
+        feature_type: FeatureType | None = None,
         abstract=None,
         xsd_class: type[XsdElement] | None = None,
     ):
+        """
+        Initialize a single field of the feature.
+
+        :param name: Name of the model field.
+        :param model_attribute: Which model attribute to access. This can be a dotted field path.
+        :param model: Which model is accessed. Usually this is passed via :meth:`bind`.
+        :param parent: The parent field of this element. Usually this is passed via :meth:`bind`.
+        :param feature_type: The feature this field is a part of. Usually this is passed via :meth:`bind`.
+        :param abstract: The "help text" or short abstract/description for this field.
+        :param xsd_class: Override which class is used to construct the internal XsdElement.
+                          This controls the schema rendering, value retrieval and rendering of the element.
+        """
         self.name = name
         self.model_attribute = model_attribute
         self.model = None
         self.model_field = None
         self.parent = parent
+        self.feature_type = feature_type
         self.abstract = abstract
+
         # Allow to override the class attribute on 'self',
         # which avoids having to subclass this field class as well.
         if xsd_class is not None:
@@ -196,7 +214,7 @@ class FeatureField:
 
         self._nillable_relation = False
         if model is not None:
-            self.bind(model)
+            self.bind(model, parent=parent, feature_type=feature_type)
 
     def __repr__(self):
         return f"<{self.__class__.__name__}: {self.name}>"
@@ -208,6 +226,7 @@ class FeatureField:
         self,
         model: type[models.Model],
         parent: ComplexFeatureField | None = None,
+        feature_type: FeatureType | None = None,
     ):
         """Late-binding for the model.
 
@@ -220,11 +239,13 @@ class FeatureField:
         :param model: The model is field is linked to.
         :param parent: When this element is part of a complex feature,
                        this links to the parent field.
+        :param feature_type: The original feature type that his element was mentioned in.
         """
         if self.model is not None:
             raise RuntimeError(f"Feature field '{self.name}' cannot be reused")
         self.model = model
         self.parent = parent
+        self.feature_type = feature_type
 
         if self.model_attribute:
             # Support dot based field traversal.
@@ -284,6 +305,7 @@ class FeatureField:
             max_occurs=max_occurs,
             model_attribute=self.model_attribute,
             source=self.model_field,
+            feature_type=self.feature_type,
         )
 
 
@@ -311,9 +333,14 @@ class ComplexFeatureField(FeatureField):
     ):
         """
         :param name: Name of the model field.
-        :param fields: List of fields to expose for the target model. This can
-            be a list of :class:`FeatureField` objects, or plain field names.
+        :param fields: If the field exposes a foreign key, provide its child element names.
+            This can be a list of :func:`field` elements, or plain field names.
             Using ``__all__`` also works but is not recommended outside testing.
+        :param model_attribute: Which model attribute to access. This can be a dotted field path.
+        :param abstract: The "help text" or short abstract/description for this field.
+        :param xsd_class: Override which class is used to construct the internal XsdElement.
+                          This controls the schema rendering, value retrieval and rendering of the element.
+        :param xsd_base_type: Override which class is the base class for the element.
         """
         super().__init__(
             name,
@@ -343,6 +370,7 @@ class ComplexFeatureField(FeatureField):
                     type_name=self.name,
                     source=pk_field,
                     model_attribute=pk_field.name,
+                    feature_type=self.feature_type,
                 )
             ],
             base=self.xsd_base_type,
@@ -377,9 +405,13 @@ def field(
     so little knowledge is needed about the internal working.
 
     :param name: Name of the model field.
-    :param fields: If the field exposes a foreign key, provide it's child element names.
+    :param model_attribute: Which model attribute to access. This can be a dotted field path.
+    :param abstract: The "help text" or short abstract/description for this field.
+    :param fields: If the field exposes a foreign key, provide its child element names.
         This can be a list of :func:`field` elements, or plain field names.
         Using ``__all__`` also works but is not recommended outside testing.
+    :param xsd_class: Override which class is used to construct the internal XsdElement.
+                      This controls the schema rendering, value retrieval and rendering of the element.
     """
     if fields is not None:
         return ComplexFeatureField(
@@ -398,42 +430,6 @@ def field(
         )
 
 
-@dataclass
-class FeatureRelation:
-    """Tell which related fields are queried by the feature.
-    Each dict holds an ORM-path, with the relevant sub-elements.
-    """
-
-    #: The ORM path that is queried for this particular relation
-    orm_path: str
-    #: The fields that will be retrieved for that path
-    orm_fields: set[str]
-    #: The model that is accessed for this relation (if set)
-    related_model: type[models.Model] | None
-    #: The source elements that access this relation.
-    xsd_elements: list[XsdElement]
-
-    @cached_property
-    def _local_model_field_names(self) -> list[str]:
-        """Tell which local fields of the model will be accessed by this feature."""
-
-        meta = self.related_model._meta
-        result = []
-        for name in self.orm_fields:
-            model_field = meta.get_field(name)
-            if not model_field.many_to_many and not model_field.one_to_many:
-                result.append(name)
-
-        # When this relation is retrieved through a ManyToOneRel (reverse FK),
-        # the prefetch_related() also needs to have the original foreign key
-        # in order to link all prefetches to the proper parent instance.
-        for xsd_element in self.xsd_elements:
-            if xsd_element.source is not None and xsd_element.source.one_to_many:
-                result.append(xsd_element.source.field.name)
-
-        return result
-
-
 class FeatureType:
     """Declare a feature that is exposed on the map.
 
@@ -471,7 +467,7 @@ class FeatureType:
         :param fields: Define which fields to show in the WFS data.
             This can be a list of field names, or :class:`FeatureField` objects.
         :param display_field_name: Name of the field that's used as general string representation.
-        :param geometry_field: Name of the geometry field to expose (default = auto detect).
+        :param geometry_field_name: Name of the geometry field to expose (default = auto-detect).
         :param name: Name, also used as XML tag name.
         :param title: Used in WFS metadata.
         :param abstract: Used in WFS metadata.
@@ -529,6 +525,11 @@ class FeatureType:
         """Return all spatial reference system ID's that this feature supports."""
         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.
@@ -540,52 +541,6 @@ class FeatureType:
             if ff.xsd_element.is_geometry
         ]
 
-    @cached_property
-    def orm_relations(self) -> list[FeatureRelation]:
-        """Tell which fields will be retrieved from related fields.
-
-        This gives an object layout based on the XSD elements,
-        that can be used for prefetching data.
-        """
-        models = {}
-        fields = defaultdict(set)
-        elements = defaultdict(list)
-
-        # Check all elements that render as "dotted" flattened relation
-        for xsd_element in self.xsd_type.flattened_elements:
-            if xsd_element.source is not None:
-                # Split "relation.field" notation into path, and take the field as child attribute.
-                obj_path, field = xsd_element.orm_relation
-                elements[obj_path].append(xsd_element)
-                fields[obj_path].add(field)
-                # field is already on relation:
-                models[obj_path] = xsd_element.source.model
-
-        # Check all elements that render as "nested" complex type:
-        for xsd_element in self.xsd_type.complex_elements:
-            # The complex element itself points to the root of the path,
-            # all sub elements become the child attributes.
-            obj_path = xsd_element.orm_path
-            elements[obj_path].append(xsd_element)
-            fields[obj_path] = {
-                f.orm_path
-                for f in xsd_element.type.elements
-                if not f.is_many or f.is_array  # exclude M2M, but include ArrayField
-            }
-            if xsd_element.source:
-                # field references a related object:
-                models[obj_path] = xsd_element.source.related_model
-
-        return [
-            FeatureRelation(
-                orm_path=obj_path,
-                orm_fields=sub_fields,
-                related_model=models.get(obj_path),
-                xsd_elements=elements[obj_path],
-            )
-            for obj_path, sub_fields in fields.items()
-        ]
-
     @cached_property
     def _local_model_field_names(self) -> list[str]:
         """Tell which local fields of the model will be accessed by this feature."""
@@ -610,9 +565,9 @@ class FeatureType:
                     if isinstance(f, gis_models.GeometryField)
                 )
 
-            return [FeatureField(self._geometry_field_name, model=self.model)]
+            return [FeatureField(self._geometry_field_name, model=self.model, feature_type=self)]
         else:
-            return _get_model_fields(self.model, self._fields)
+            return _get_model_fields(self.model, self._fields, feature_type=self)
 
     @cached_property
     def display_field(self) -> models.Field | None:
@@ -653,6 +608,13 @@ class FeatureType:
             # 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."""
@@ -772,6 +734,7 @@ class FeatureType:
                     type_name=self.name,
                     source=pk_field,
                     model_attribute=pk_field.name,
+                    feature_type=self,
                 )
             ],
             base=XsdTypes.gmlAbstractGMLType,

{django-gisserver-1.4.1 → django_gisserver-1.5.0}/gisserver/geometries.py

@@ -123,7 +123,7 @@ class CRS:
 
     @classmethod
     def from_srid(cls, srid: int, backend=None):
-        """Instantiate this class using an numeric spatial reference ID
+        """Instantiate this class using a numeric spatial reference ID
 
         This is logically identical to calling::
 
@@ -142,7 +142,7 @@ class CRS:
 
     @classmethod
     def _from_urn(cls, urn, backend=None):  # noqa: C901
-        """Instantiate this class using an URN format."""
+        """Instantiate this class using a 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}")