django-gisserver 2.2.0__py3-none-any.whl → 2.2.2__py3-none-any.whl

{django_gisserver-2.2.0.dist-info → django_gisserver-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.2.0
+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.0.dist-info → django_gisserver-2.2.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-django_gisserver-2.2.0.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-gisserver/__init__.py,sha256=N7STxpDjd2Gy8Zv7HsUf5L8bEDZQl1TW0x2ebcVtO4Q,40
+django_gisserver-2.2.2.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+gisserver/__init__.py,sha256=FiIUkBAQzSsfZ3bs8XQLYkfb2mLfi49gQVU4FmNlSMs,40
 gisserver/compat.py,sha256=qmLeT7wGRIyA2ujUtVEuUX7qgr98snak9b5OTvnkhas,451
 gisserver/conf.py,sha256=Bb2hbLx1SM4la6-e8PrBQ7dg2z3Z1sopOlaTrfa6gbg,3666
 gisserver/crs.py,sha256=ChqLNZCHBCZmXphjJTT22jvhyMIwAAFtFSjwbH4Bigk,18330
@@ -17,8 +17,8 @@ gisserver/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 gisserver/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gisserver/management/commands/loadgeojson.py,sha256=lmvxXFEVGOWRELLB3u7M3hiJg2TQEICJOatdHLw8toI,12130
 gisserver/operations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gisserver/operations/base.py,sha256=SP3PV78bIFCeCQxEFMqIhj0YBjn1g6UqhyoK_Ub4ZxU,10113
-gisserver/operations/wfs20.py,sha256=r_2dcqzN5xw2LIOVE7Ofe93t9GvNx7ESFWKRnnW10Y4,20964
+gisserver/operations/base.py,sha256=Ecb4ZqqT0Tb2rY-qDDqv293xQWvuhiHR6x1QrAUX3yU,10743
+gisserver/operations/wfs20.py,sha256=4NduwMgJVT37CGMRGpW5cKWQkv-s-L_P52xEatC_8HU,21257
 gisserver/output/__init__.py,sha256=1-bzgNq1yGuWGse2zLXUwTnR7-FpfosGCzDm97diKRM,1133
 gisserver/output/base.py,sha256=igcOhjJkziPlpPJjwfyyC0S1LHfRI8Em-UMNnX5Lk-E,11247
 gisserver/output/csv.py,sha256=1Bz3o3-dvdEFWWLrDj-cxCp7My6IMMakmwAZIfPsjc4,6906
@@ -63,7 +63,7 @@ gisserver/templates/gisserver/wfs/feature_type.html,sha256=Kl_0c7nnlc7Z1bzJOq8v7
 gisserver/templates/gisserver/wfs/2.0.0/get_capabilities.xml,sha256=SGZSn7cDU_Oai6d45xrkqhax5CPyI1oIc8BZLOEw1X4,8695
 gisserver/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gisserver/templatetags/gisserver_tags.py,sha256=L2YG-PxiKR0QWBMRLLrL_VR94p6wCb5HzgnrPMg4hug,995
-django_gisserver-2.2.0.dist-info/METADATA,sha256=_G1iWkU3srwwY0h0zdXHEKbFK_ytWs9ZBq3uneOkd4Y,6731
-django_gisserver-2.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_gisserver-2.2.0.dist-info/top_level.txt,sha256=8zFCEMmkpixE4TPiOAlxSq3PD2EXvAeFKwG4yZoIIOQ,10
-django_gisserver-2.2.0.dist-info/RECORD,,
+django_gisserver-2.2.2.dist-info/METADATA,sha256=tgpm8eLr6tvT0CEcE235oBOYqV5BKZf-Q51G5KapNzQ,6731
+django_gisserver-2.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_gisserver-2.2.2.dist-info/top_level.txt,sha256=8zFCEMmkpixE4TPiOAlxSq3PD2EXvAeFKwG4yZoIIOQ,10
+django_gisserver-2.2.2.dist-info/RECORD,,

gisserver/__init__.py

@@ -1 +1 @@
-__version__ = "2.2.0"  # follows PEP440
+__version__ = "2.2.2"  # follows PEP440

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):

gisserver/operations/wfs20.py

@@ -473,6 +473,14 @@ class GetFeature(BaseWFSGetDataOperation):
 
         return result
 
+    def get_parameters(self) -> list[Parameter]:
+        """Extend Parameters with outputFormat to support ArcGISOnline."""
+        parameters = super().get_parameters()
+
+        return parameters + [
+            Parameter("outputFormat", allowed_values=self.get_output_formats()),
+        ]
+
 
 class GetPropertyValue(BaseWFSGetDataOperation):
     """This returns a limited set of properties of the feature.