django-gisserver 2.1.4__py3-none-any.whl → 2.2.1__py3-none-any.whl

{django_gisserver-2.1.4.dist-info → django_gisserver-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.1.4
+Version: 2.2.1
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor
@@ -12,26 +12,23 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
-Classifier: Framework :: Django :: 4.0
 Classifier: Framework :: Django :: 4.2
-Classifier: Framework :: Django :: 5.0
 Classifier: Framework :: Django :: 5.1
+Classifier: Framework :: Django :: 5.2
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires: Django (>=3.2)
-Requires-Python: >=3.9
+Requires: Django (>=4.2, >=5.1)
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Django>=3.2
+Requires-Dist: Django>=4.2
 Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: lru_dict>=1.1.7
 Requires-Dist: orjson>=3.9.15
@@ -44,7 +41,7 @@ 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"
 Provides-Extra: docs
-Requires-Dist: Django~=5.0; extra == "docs"
+Requires-Dist: Django~=5.1; 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"

{django_gisserver-2.1.4.dist-info → django_gisserver-2.2.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-django_gisserver-2.1.4.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-gisserver/__init__.py,sha256=4xPIvBHDsQLZ9QZUAMK7Z46GbopCPnl4GBHVOuZ-c9k,40
+django_gisserver-2.2.1.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+gisserver/__init__.py,sha256=huHQHmYDs0MMjz7xCO1V-2aYyzxtru98ekXW4AkHzRU,40
 gisserver/compat.py,sha256=qmLeT7wGRIyA2ujUtVEuUX7qgr98snak9b5OTvnkhas,451
 gisserver/conf.py,sha256=Bb2hbLx1SM4la6-e8PrBQ7dg2z3Z1sopOlaTrfa6gbg,3666
 gisserver/crs.py,sha256=ChqLNZCHBCZmXphjJTT22jvhyMIwAAFtFSjwbH4Bigk,18330
@@ -18,7 +18,7 @@ gisserver/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 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/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
@@ -31,7 +31,7 @@ gisserver/output/utils.py,sha256=dA4Y-6ZUBjjCC8ueO5AcYaVebB5M6ynXUtrw7yyOcoQ,300
 gisserver/output/xmlschema.py,sha256=fHj8h9-vG508uRmM-kD5r2omde2wa_myJWWwcWe2lus,6445
 gisserver/parsers/__init__.py,sha256=eGORBeT0F8fR3AadV1uq8dbCeZtIeK0-__CcXwSvXgs,402
 gisserver/parsers/ast.py,sha256=zFb64uaIgAT9THV07l0pnuzWfXkzJ2CwT1z6lVGwrag,15688
-gisserver/parsers/query.py,sha256=IbsWBSAlOKDgz8BS-JirxVCqzQxSpYqIxGEhv0-sOVc,6695
+gisserver/parsers/query.py,sha256=Lt2Q5PxTzmGNsjo0dK9_2A6vE_Ovj1oG40Ujf9z06_Q,6648
 gisserver/parsers/values.py,sha256=QCnHBlMAGDefoC51ujOrQc1YEb3RYYP7aq5UIDweJO0,4166
 gisserver/parsers/xml.py,sha256=uys1ddpx4BEDFg1WmknfATl4vJpgpKbb0yV2QT2kJqs,9753
 gisserver/parsers/fes20/__init__.py,sha256=P24auC3LN_DEnF6bK0er52F8I2_oLS26gBCJOMcpNT4,2423
@@ -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.1.4.dist-info/METADATA,sha256=oXLyyZrk_b5GswUoKTgiQo8s9k6tZcXRTAKgXn4RE1Q,6851
-django_gisserver-2.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_gisserver-2.1.4.dist-info/top_level.txt,sha256=8zFCEMmkpixE4TPiOAlxSq3PD2EXvAeFKwG4yZoIIOQ,10
-django_gisserver-2.1.4.dist-info/RECORD,,
+django_gisserver-2.2.1.dist-info/METADATA,sha256=jVQtfcUOBphc8vJ-apR1O3dWUtP1J4jl267y-MUxWxs,6731
+django_gisserver-2.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_gisserver-2.2.1.dist-info/top_level.txt,sha256=8zFCEMmkpixE4TPiOAlxSq3PD2EXvAeFKwG4yZoIIOQ,10
+django_gisserver-2.2.1.dist-info/RECORD,,

gisserver/__init__.py

@@ -1 +1 @@
-__version__ = "2.1.4"  # follows PEP440
+__version__ = "2.2.1"  # follows PEP440

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.

gisserver/parsers/query.py

@@ -7,7 +7,6 @@ import operator
 from datetime import date, datetime
 from decimal import Decimal as D
 from functools import reduce
-from typing import Union
 
 from django.contrib.gis.geos import GEOSGeometry
 from django.core.exceptions import FieldError
@@ -17,8 +16,8 @@ from django.db.models.expressions import Combinable, Func
 from gisserver.features import FeatureType
 
 logger = logging.getLogger(__name__)
-ScalarTypes = (bool, int, str, D, date, datetime)  # Not Union for Python 3.9
-RhsTypes = Union[Combinable, Func, Q, GEOSGeometry, bool, int, D, str, date, datetime, tuple]
+ScalarTypes = bool | int | str | D | date | datetime
+RhsTypes = Combinable | Func | Q | GEOSGeometry | bool | int | D | str | date | datetime | tuple
 
 
 class CompiledQuery: