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

{django_gisserver-1.5.0 → django_gisserver-2.1}/CHANGES.md

@@ -1,10 +1,101 @@
+# 2025-05-29 (2.1)
+
+* Added support for `ArrayField` field in CSV exports.
+* Added support for `models.DurationField` for features.
+* Added proper axis ordering handling.
+* Changed built-in fes functions to match current GeoServer signatures.
+* Improved error handling for invalid filter input (also fixes 500 errors).
+* Improved error handling for database query errors during rendering.
+* Improved error messages for unexpected tags in the XML body.
+* Improved error handling for fes 1.0 arithmetic operators (e.g. typing: `date > 2020-01-01` in QGis).
+* Improved HTML index page, make it easier to override and restyle.
+* Improved documentation, added API documentation.
+* Fixed axis ordering handling for `EPSG:4326` and other longitude/latitude CRS definitions.
+* Fixed comparing to `NULL` when date/time input is invalid.
+* Fixed filter comparisons for `<`, `<=`, `>`, `>=` when using a reversed "value < property" ordering.
+* Fixed crash when receiving WFS 1.0 POST requests.
+* Fixed building readthedocs.
+
+
+# 2025-04-28 (2.0)
+
+* Added support for XML POST requests.
+* Added support for geometry elements on child nodes.
+* Added support for Django 5 `GeneratedField` fields as geometry field.
+* Added `WFSView.check_permissions()` API to simplify permission checking.
+* Added `WFSView.xml_namespace_aliases` attribute to configure custom namespace prefixes.
+* Added example app and docker-compose setup for testing.
+* Added `GISSERVER_EXTRA_OUTPUT_FORMATS` setting to define additional output formats.
+* Added `GISSERVER_GET_FEATURE_OUTPUT_FORMATS` setting to override the default output formats.
+* Added `CRS84` and `WEB_MERCATOR` constants in `gisserver.geometries`.
+* Improved debugging by adding debug-level logging and better error messages.
+* Improved font styling somewhat for browsable HTML pages.
+* Fixed XML namespace support (e.g. handling `<ValueReference>ns0:tagname</ValueReference>`).
+* Fixed bugs found by CITE compliance testing:
+  * Support `<fes:PropertyIsLike>` for array elements.
+  * Support `<fes:PropertyIsNil>` for geometry elements.
+  * Support `resulttype=hits` with `count` arguments.
+* Fixed `ArrayField` detection when `django.contrib.postgres` is not in `INSTALLED_APPS`.
+* Fixed `main_geometry_element` detection.
+* Fixed swapped X/Y coordinates for systems that use a different axis-ordering (e.g. EPSG:3879 for Finland).
+* Fixed GeoJSON CRS value to be `CRS84` (urn:ogc:def:crs:OGC::CRS84) instead of WGS84 (urn:ogc:def:crs:EPSG::4326).
+* Fixed applying the `CRS.backend` when the client requests a custom coordinate system using `srsName`.
+* Fixed rendering JSON exceptions during streaming errors.
+* Fixed internal XML Schema; use proper model CamelCasing for class names (doesn't affect requests).
+* Fixed internal XML schema; remove unneeded inheritance from `gml:AbstractFeatureType` for nested elements.
+* Fixed CI testing.
+* Confirmed support for Python 3.13.
+
+This release has a lot of API changes, renamed and moved classes,
+which was needed to implement POST support and XML namespace handling.
+
+This won't affect most projects as they use the basic `FeatureType` functionality.
+For implementations that have taken full advantage of our architecture,
+the notable API changes are:
+
+* Configuration:
+  * `WFSOperation.output_formats` still works, but `get_output_formats()` is preferred.
+  * `WFSOperation.parameters` is replaced by ``get_parameters()`` and only lists parameters that need to be mentioned in `GetCapabilities`.
+  * The `Parameter` class only exposes choices, parsing happens in `gisserver.parsers.wfs20` now.
+  * `FeatureType.xml_namespace` now defines which namespace the feature exists in (defaults to `WFSView.xml_namespace`).
+* Overiding and extending queries:
+  * `FeatureType.get_extent()` was replaced with ``GmlBoundedByElement.get_value()``.
+  * `gisserver.operations`: renamed `WFSMethod` -> `WFSOperation`.
+  * `gisserver.extensions.functions` now tracks filter function registration.
+  * `gisserver.extensions.queries` now tracks stored query registration.
+  * The `StoredQuery` base class is now `StoredQueryImplementation` providing a `build_query()` method.
+  * The internal `CompiledQuery` moved to `gisserver.parsers.query` and receives a `feature_types` array now with a single element.
+   (This change reflects the WFS spec and allowing to potentially implement JOIN queries later).
+* Request parsing:
+  * `WFSView.ows_request` and `request.ows_request` both provide access to the parsed WFS request.
+  * `WFSOperation.parser_class` allows to define a custom parser for a additional WFS operations.
+  * The WFS request parsing moved to `gisserver.parsers.wfs20`, which builds an Abstract Syntax Tree (AST) of the XML request.
+  * The GET request (KVP format) parsing is now a special-case of the XML-based parsing classes.
+* Output formats:
+  * `gisserver.output` no longer exposes the auto-switching DB/non-DB rendering aliases, as `get_output_formats()` can do that easier.
+  * `OutputRenderer` only provides the basic XML aliasing, a new `CollectionOutputRenderer` base class provides the collection logic.
+  * `OutputRenderer.xml_namespaces` allows defining XML namespace aliases that construct default `xmlns` attributes.
+  * All rendering parameters (e.g. output CRS) moved to the `FeatureProjection` logic.
+  * The `decorate_queryset()` logic is no longer a classmethod.
+* Internal XSD schema elements:
+  * XML tag parsing is reworked for simplicity and namespace handling.
+  * Namespace aliases/prefixes are removed entirely, and resolved during rendering.
+  * `FeatureType.xml_name` now returns the full XML name, not the QName.
+  * `XsdTypes` use fully qualified XML names, not the QName.
+  * `XsdElement.xml_name` now returns the full XML name, not the QName.
+  * `XsdElement.is_geometry` was unneeded, use `XsdElement.type.is_geometry` now.
+  * `XsdElement.orm_path` points to the absolute path, and `XsdElement.local_orm_path` to the relative path.
+
+
 # 2024-11-25 (1.5.0)
 
 * Added `PROPERTYNAME` support
 * Added rendering of `<wfs:truncatedResponse>` when errors happen during output streaming.
+* Fixed accessing a feature with 3 geometry fields (fixed our PostgreSQL `ST_Union` syntax).
 * 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).
+* Improved documentation.
 * Cleaned up code, removing some internal methods.
 * Cleaned up leftover Python 3.7 compat code.
 

{django_gisserver-1.5.0/django_gisserver.egg-info → django_gisserver-2.1}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-gisserver
-Version: 1.5.0
+Version: 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
 Author-email: opensource@edoburu.nl
 License: Mozilla Public License 2.0
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
@@ -16,6 +16,7 @@ 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
@@ -27,13 +28,14 @@ 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.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Django>=3.2
-Requires-Dist: defusedxml>=0.6.0
+Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: lru_dict>=1.1.7
 Requires-Dist: orjson>=3.9.15
+Requires-Dist: pyproj>=3.6.1
 Provides-Extra: tests
 Requires-Dist: django-environ>=0.4.5; extra == "tests"
 Requires-Dist: psycopg2-binary>=2.8.4; extra == "tests"
@@ -41,6 +43,23 @@ 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"
+Provides-Extra: docs
+Requires-Dist: Django~=5.0; extra == "docs"
+Requires-Dist: sphinxcontrib-django>=2.5; extra == "docs"
+Requires-Dist: psycopg2-binary>=2.8.4; extra == "docs"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![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)
@@ -66,6 +85,12 @@ Django speaking WFS 2.0 to expose geo data.
 
 For more details, see: <https://django-gisserver.readthedocs.io/>
 
+## Test drive
+
+* Run `docker compose up`.
+* Open http://localhost:8000/ to see this works.
+* Connect to http://localhost:8000/wfs/ in your GIS client (e.g. QGis) and zoom to Amsterdam.
+* Add more data on the map using the Django admin, username and password are both "admin".
 
 ## Quickstart
 
@@ -102,12 +127,13 @@ class Restaurant(models.Model):
 Write a view that exposes this model as a WFS feature:
 
 ```python
+from gisserver.crs import CRS, CRS84, WEB_MERCATOR
 from gisserver.features import FeatureType, ServiceDescription
-from gisserver.geometries import CRS, WGS84
 from gisserver.views import WFSView
 from .models import Restaurant
 
-RD_NEW = CRS.from_srid(28992)
+# As example, the local coordinate system for The Netherlands
+RD_NEW = CRS.from_string("urn:ogc:def:crs:EPSG::28992")
 
 
 class PlacesWFSView(WFSView):
@@ -130,7 +156,7 @@ class PlacesWFSView(WFSView):
         FeatureType(
             Restaurant.objects.all(),
             fields="__all__",
-            other_crs=[RD_NEW]
+            other_crs=[RD_NEW, CRS84, WEB_MERCATOR]
         ),
     ]
 ```

{django_gisserver-1.5.0 → django_gisserver-2.1}/README.md

@@ -22,6 +22,12 @@ Django speaking WFS 2.0 to expose geo data.
 
 For more details, see: <https://django-gisserver.readthedocs.io/>
 
+## Test drive
+
+* Run `docker compose up`.
+* Open http://localhost:8000/ to see this works.
+* Connect to http://localhost:8000/wfs/ in your GIS client (e.g. QGis) and zoom to Amsterdam.
+* Add more data on the map using the Django admin, username and password are both "admin".
 
 ## Quickstart
 
@@ -58,12 +64,13 @@ class Restaurant(models.Model):
 Write a view that exposes this model as a WFS feature:
 
 ```python
+from gisserver.crs import CRS, CRS84, WEB_MERCATOR
 from gisserver.features import FeatureType, ServiceDescription
-from gisserver.geometries import CRS, WGS84
 from gisserver.views import WFSView
 from .models import Restaurant
 
-RD_NEW = CRS.from_srid(28992)
+# As example, the local coordinate system for The Netherlands
+RD_NEW = CRS.from_string("urn:ogc:def:crs:EPSG::28992")
 
 
 class PlacesWFSView(WFSView):
@@ -86,7 +93,7 @@ class PlacesWFSView(WFSView):
         FeatureType(
             Restaurant.objects.all(),
             fields="__all__",
-            other_crs=[RD_NEW]
+            other_crs=[RD_NEW, CRS84, WEB_MERCATOR]
         ),
     ]
 ```

{django_gisserver-1.5.0 → django_gisserver-2.1/django_gisserver.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-gisserver
-Version: 1.5.0
+Version: 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
 Author-email: opensource@edoburu.nl
 License: Mozilla Public License 2.0
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
@@ -16,6 +16,7 @@ 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
@@ -27,13 +28,14 @@ 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.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Django>=3.2
-Requires-Dist: defusedxml>=0.6.0
+Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: lru_dict>=1.1.7
 Requires-Dist: orjson>=3.9.15
+Requires-Dist: pyproj>=3.6.1
 Provides-Extra: tests
 Requires-Dist: django-environ>=0.4.5; extra == "tests"
 Requires-Dist: psycopg2-binary>=2.8.4; extra == "tests"
@@ -41,6 +43,23 @@ 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"
+Provides-Extra: docs
+Requires-Dist: Django~=5.0; extra == "docs"
+Requires-Dist: sphinxcontrib-django>=2.5; extra == "docs"
+Requires-Dist: psycopg2-binary>=2.8.4; extra == "docs"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![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)
@@ -66,6 +85,12 @@ Django speaking WFS 2.0 to expose geo data.
 
 For more details, see: <https://django-gisserver.readthedocs.io/>
 
+## Test drive
+
+* Run `docker compose up`.
+* Open http://localhost:8000/ to see this works.
+* Connect to http://localhost:8000/wfs/ in your GIS client (e.g. QGis) and zoom to Amsterdam.
+* Add more data on the map using the Django admin, username and password are both "admin".
 
 ## Quickstart
 
@@ -102,12 +127,13 @@ class Restaurant(models.Model):
 Write a view that exposes this model as a WFS feature:
 
 ```python
+from gisserver.crs import CRS, CRS84, WEB_MERCATOR
 from gisserver.features import FeatureType, ServiceDescription
-from gisserver.geometries import CRS, WGS84
 from gisserver.views import WFSView
 from .models import Restaurant
 
-RD_NEW = CRS.from_srid(28992)
+# As example, the local coordinate system for The Netherlands
+RD_NEW = CRS.from_string("urn:ogc:def:crs:EPSG::28992")
 
 
 class PlacesWFSView(WFSView):
@@ -130,7 +156,7 @@ class PlacesWFSView(WFSView):
         FeatureType(
             Restaurant.objects.all(),
             fields="__all__",
-            other_crs=[RD_NEW]
+            other_crs=[RD_NEW, CRS84, WEB_MERCATOR]
         ),
     ]
 ```

{django_gisserver-1.5.0 → django_gisserver-2.1}/django_gisserver.egg-info/SOURCES.txt

@@ -11,13 +11,22 @@ django_gisserver.egg-info/not-zip-safe
 django_gisserver.egg-info/requires.txt
 django_gisserver.egg-info/top_level.txt
 gisserver/__init__.py
+gisserver/compat.py
 gisserver/conf.py
+gisserver/crs.py
 gisserver/db.py
 gisserver/exceptions.py
 gisserver/features.py
 gisserver/geometries.py
+gisserver/projection.py
 gisserver/types.py
 gisserver/views.py
+gisserver/extensions/__init__.py
+gisserver/extensions/functions.py
+gisserver/extensions/queries.py
+gisserver/management/__init__.py
+gisserver/management/commands/__init__.py
+gisserver/management/commands/loadgeojson.py
 gisserver/operations/__init__.py
 gisserver/operations/base.py
 gisserver/operations/wfs20.py
@@ -26,36 +35,41 @@ gisserver/output/base.py
 gisserver/output/csv.py
 gisserver/output/geojson.py
 gisserver/output/gml32.py
+gisserver/output/iters.py
 gisserver/output/results.py
+gisserver/output/stored.py
 gisserver/output/utils.py
 gisserver/output/xmlschema.py
 gisserver/parsers/__init__.py
-gisserver/parsers/base.py
-gisserver/parsers/tags.py
+gisserver/parsers/ast.py
+gisserver/parsers/query.py
 gisserver/parsers/values.py
+gisserver/parsers/xml.py
 gisserver/parsers/fes20/__init__.py
 gisserver/parsers/fes20/expressions.py
 gisserver/parsers/fes20/filters.py
-gisserver/parsers/fes20/functions.py
 gisserver/parsers/fes20/identifiers.py
+gisserver/parsers/fes20/lookups.py
 gisserver/parsers/fes20/operators.py
-gisserver/parsers/fes20/query.py
 gisserver/parsers/fes20/sorting.py
 gisserver/parsers/gml/__init__.py
 gisserver/parsers/gml/base.py
 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/parsers/ows/__init__.py
+gisserver/parsers/ows/kvp.py
+gisserver/parsers/ows/requests.py
+gisserver/parsers/wfs20/__init__.py
+gisserver/parsers/wfs20/adhoc.py
+gisserver/parsers/wfs20/base.py
+gisserver/parsers/wfs20/projection.py
+gisserver/parsers/wfs20/requests.py
+gisserver/parsers/wfs20/stored.py
 gisserver/static/gisserver/index.css
+gisserver/templates/gisserver/base.html
 gisserver/templates/gisserver/index.html
 gisserver/templates/gisserver/service_description.html
 gisserver/templates/gisserver/wfs/feature_field.html
 gisserver/templates/gisserver/wfs/feature_type.html
-gisserver/templates/gisserver/wfs/2.0.0/describe_stored_queries.xml
 gisserver/templates/gisserver/wfs/2.0.0/get_capabilities.xml
-gisserver/templates/gisserver/wfs/2.0.0/list_stored_queries.xml
 gisserver/templatetags/__init__.py
 gisserver/templatetags/gisserver_tags.py

{django_gisserver-1.5.0 → django_gisserver-2.1}/django_gisserver.egg-info/requires.txt

@@ -1,7 +1,13 @@
 Django>=3.2
-defusedxml>=0.6.0
+defusedxml>=0.7.1
 lru_dict>=1.1.7
 orjson>=3.9.15
+pyproj>=3.6.1
+
+[docs]
+Django~=5.0
+sphinxcontrib-django>=2.5
+psycopg2-binary>=2.8.4
 
 [tests]
 django-environ>=0.4.5

django_gisserver-2.1/gisserver/__init__.py

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

django_gisserver-2.1/gisserver/compat.py

@@ -0,0 +1,23 @@
+"""Compatability imports"""
+
+import sys
+
+import django
+from django.conf import settings
+from django.db import models
+
+if (
+    "django.contrib.postgres" in settings.INSTALLED_APPS
+    or "django.contrib.postgres" in sys.modules
+):
+    from django.contrib.postgres.fields import ArrayField
+else:
+    ArrayField = None
+
+GeneratedField = models.GeneratedField if django.VERSION >= (5, 0) else None
+
+
+__all__ = (
+    "ArrayField",
+    "GeneratedField",
+)

{django_gisserver-1.5.0 → django_gisserver-2.1}/gisserver/conf.py

@@ -28,6 +28,13 @@ GISSERVER_SUPPORTED_CRS_ONLY = getattr(settings, "GISSERVER_SUPPORTED_CRS_ONLY",
 # 0 = No counting, 1 = all pages, 2 = only for the first page.
 GISSERVER_COUNT_NUMBER_MATCHED = getattr(settings, "GISSERVER_COUNT_NUMBER_MATCHED", 1)
 
+# -- output rendering
+
+GISSERVER_EXTRA_OUTPUT_FORMATS = getattr(settings, "GISSERVER_EXTRA_OUTPUT_FORMATS", {})
+GISSERVER_GET_FEATURE_OUTPUT_FORMATS = getattr(
+    settings, "GISSERVER_GET_FEATURE_OUTPUT_FORMATS", {}
+)
+
 # -- max page size
 
 # Allow tuning the page size without having to override code.