django-gisserver 2.2.1__tar.gz → 2.2.2__tar.gz

{django_gisserver-2.2.1 → django_gisserver-2.2.2}/CHANGES.md

@@ -1,3 +1,7 @@
+# 2025-12-04 (2.2.2)
+
+* Fix output format matching to allow `application/json; subtype=geojson; charset=utf-8`
+
 # 2025-10-14 (2.2.1)
 
 * Add outputFormat to GetFeature operation to support ArcGISOnline

{django_gisserver-2.2.1/django_gisserver.egg-info → django_gisserver-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.2.1
+Version: 2.2.2
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor

{django_gisserver-2.2.1 → django_gisserver-2.2.2/django_gisserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.2.1
+Version: 2.2.2
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor

django_gisserver-2.2.2/gisserver/__init__.py

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

{django_gisserver-2.2.1 → django_gisserver-2.2.2}/gisserver/operations/base.py

@@ -96,12 +96,32 @@ class OutputFormat(typing.Generic[R]):
         self._max_page_size = max_page_size
 
     def matches(self, value):
-        """Test whether the 'value' is matched by this object."""
-        if self.content_type == "application/gml+xml":
-            # Allow "application/gml+xml; version=3.2" as sent by FME.
-            # TODO rewrite this matching code in a clean way.
-            value = value.split("; ", 1)[0]
-        return self.content_type == value or self.subtype == value
+        """
+        Test whether the 'value' is matched by this object.
+
+        The regex used captures the content-type (ct), subtype (st), charset (cs) and version (v)
+        from the supplied value.
+
+        Some possible input values are:
+        - application/gml+xml
+        - application/gml+xml; version=3.2
+        - csv
+        - text/csv
+        - application/json; subtype=geojson; charset=utf-8
+        - geojson
+        """
+
+        regex = (
+            r"^(?P<ct>[^;]+);?\s?(?:(?:subtype=)(?P<st>[^;]*))?;?\s?"
+            r"(?:(?:charset=)(?P<cs>.*))?(;\s)?(?:(?:version=)(?P<v>.*))?"
+        )
+        if match := re.match(regex, value):
+            # If we capture a subtype, match on both
+            if match.group("st") is not None:
+                return self.content_type == match.group("ct") and self.subtype == match.group("st")
+            else:
+                return self.content_type == match.group("ct") or self.subtype == match.group("ct")
+        return False
 
     @property
     def identifier(self):

django_gisserver-2.2.1/gisserver/__init__.py

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