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

gisserver/parsers/ast.py

@@ -6,7 +6,7 @@ For example, the FES filter syntax can be processed into objects that build an O
 Python classes can inherit :class:`AstNode` and register themselves as the parser/handler
 for a given tag. Both normal Python classes and dataclass work,
 as long as it has an :meth:`AstNode.from_xml` class method.
-The custom `from_xml()` method should copy the XML data into local attributes.
+The custom ``from_xml()`` method should copy the XML data into local attributes.
 
 Next, when :meth:`TagRegistry.node_from_xml` is called,
 it will detect which class the XML Element refers to and initialize it using the ``from_xml()`` call.
@@ -58,7 +58,7 @@ class TagNameEnum(Enum):
         """Cast the element tag name into the enum member.
 
         This translates the element name
-        such as``{http://www.opengis.net/fes/2.0}PropertyIsEqualTo``
+        such as ``{http://www.opengis.net/fes/2.0}PropertyIsEqualTo``
         into a ``PropertyIsEqualTo`` member.
         """
         tag_name = element.tag
@@ -90,6 +90,7 @@ class AstNode:
     an XML tag into a Python (data) class.
     """
 
+    #: Default namespace of the element and subclasses, if not given by ``@tag_registry.register()``.
     xml_ns: xmlns | str | None = None
 
     _xml_tags = []
@@ -99,6 +100,8 @@ class AstNode:
         """Tell the default tag by which this class is registered"""
         return cls._xml_tags[0]
 
+    xml_name.__doc__ = "Tell the default tag by which this class is registered"
+
     def __init_subclass__(cls):
         # Each class level has a fresh list of supported child tags.
         cls._xml_tags = []
@@ -124,7 +127,7 @@ class AstNode:
 
     @classmethod
     def get_tag_names(cls) -> list[str]:
-        """Provide all known XMl tags that this code can parse."""
+        """Provide all known XML tags that this code can parse."""
         try:
             # Because a cached class property is hard to build
             return _KNOWN_TAG_NAMES[cls]
@@ -233,14 +236,14 @@ class TagRegistry:
     def node_from_xml(self, element: NSElement, allowed_types: tuple[type[A]] | None = None) -> A:
         """Find the ``AstNode`` subclass that corresponds to the given XML element,
         and initialize it with the element. This is a convenience shortcut.
-        ``"""
+        """
         node_class = self.resolve_class(element, allowed_types)
         return node_class.from_xml(element)
 
     def resolve_class(
         self, element: NSElement, allowed_types: tuple[type[A]] | None = None
     ) -> type[A]:
-        """Find the ``AstNode`` subclass that corresponds to the given XML element."""
+        """Find the :class:`AstNode` subclass that corresponds to the given XML element."""
         try:
             node_class = self.parsers[element.tag]
         except KeyError:

gisserver/parsers/fes20/operators.py

@@ -227,7 +227,7 @@ class Operator(AstNode):
 
 @dataclass
 class IdOperator(Operator):
-    """List of :class:`~gisserver.parsers.fes20.identifers.ResourceId`` objects.
+    """List of :class:`~gisserver.parsers.fes20.identifers.ResourceId` objects.
 
     A ``<fes:Filter>`` only has a single predicate.
     Hence, this operator is used to wrap the ``<fes:ResourceId>`` elements in the syntax::

gisserver/parsers/gml/geometries.py

@@ -89,7 +89,13 @@ class GEOSGMLGeometry(AbstractGeometry):
         # This avoids having to support the whole GEOS logic.
         geos_data = GEOSGeometry.from_gml(tostring(element))
         geos_data.srid = srs.srid
-        CRS.tag_geometry(geos_data, axis_order=AxisOrder.AUTHORITY)
+
+        # Using the WFS 2 format (urn:ogc:def:crs:EPSG::4326"), coordinates should be latitude/longitude.
+        # However, when providing legacy formats like srsName="EPSG:4326",
+        # input is assumed to be in legacy longitude/latitude axis ordering too.
+        # This reflects what GeoServer does: https://docs.geoserver.org/main/en/user/services/wfs/axis_order.html
+        if not srs.force_xy:
+            CRS.tag_geometry(geos_data, axis_order=AxisOrder.AUTHORITY)
         return cls(srs=srs, geos_data=geos_data)
 
     def __repr__(self):

gisserver/parsers/wfs20/adhoc.py

@@ -48,7 +48,9 @@ class AdhocQuery(QueryExpression):
             <fes:SortBy>...</fes:SortBy>
         </wfs:Query>
 
-    And supports the KVP syntax::
+    And supports the KVP syntax:
+
+    .. code-block:: urlencoded
 
         ?SERVICE=WFS&...&TYPENAMES=ns:myType&FILTER=...&SORTBY=...&SRSNAME=...&PROPERTYNAME=...
         ?SERVICE=WFS&...&TYPENAMES=ns:myType&BBOX=...&SORTBY=...&SRSNAME=...&PROPERTYNAME=...