django-gisserver 2.0__tar.gz → 2.1.1__tar.gz

{django-gisserver-2.0 → django_gisserver-2.1.1}/CHANGES.md

@@ -1,4 +1,33 @@
-# 2024-04-28 (2.0)
+# 2025-06-06 (2.1.1)
+
+* Fixed using legacy longitude/latitude rendering for `EPSG:4326` and `:http://www.opengis.net/gml/srs/epsg.xml#xxxx` SRS names.
+* Improved styling for the default HTML page.
+
+This increases interoperability with web-based clients and legacy libraries. GeoServer applies the same heuristic.
+Clients that use the official OGC notations such as `urn:ogc:def:crs:EPSG::4326` and `http://www.opengis.net/def/crs/epsg/0/4326`
+are not affected. If needed, this behavior can be disabled using `GISSERVER_FORCE_XY_EPSG_4326=False` and `GISSERVER_FORCE_XY_OLD_CRS=False`.
+
+
+# 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.

{django-gisserver-2.0/django_gisserver.egg-info → django_gisserver-2.1.1}/PKG-INFO

@@ -1,12 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.0
+Version: 2.1.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
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -31,8 +30,37 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires: Django (>=3.2)
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Provides-Extra: tests
 License-File: LICENSE
+Requires-Dist: Django>=3.2
+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"
+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: myst-parser>=3.0.1; 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)
@@ -100,12 +128,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):
@@ -128,7 +157,7 @@ class PlacesWFSView(WFSView):
         FeatureType(
             Restaurant.objects.all(),
             fields="__all__",
-            other_crs=[RD_NEW]
+            other_crs=[RD_NEW, CRS84, WEB_MERCATOR]
         ),
     ]
 ```
@@ -166,5 +195,3 @@ software developed with public money is also publicly available.
 
 This package is initially developed by the City of Amsterdam, but the tools
 and concepts created in this project can be used in any city.
-
-

{django-gisserver-2.0 → django_gisserver-2.1.1}/README.md

@@ -64,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):
@@ -92,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-2.0 → django_gisserver-2.1.1/django_gisserver.egg-info}/PKG-INFO

@@ -1,12 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.0
+Version: 2.1.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
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -31,8 +30,37 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires: Django (>=3.2)
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Provides-Extra: tests
 License-File: LICENSE
+Requires-Dist: Django>=3.2
+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"
+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: myst-parser>=3.0.1; 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)
@@ -100,12 +128,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):
@@ -128,7 +157,7 @@ class PlacesWFSView(WFSView):
         FeatureType(
             Restaurant.objects.all(),
             fields="__all__",
-            other_crs=[RD_NEW]
+            other_crs=[RD_NEW, CRS84, WEB_MERCATOR]
         ),
     ]
 ```
@@ -166,5 +195,3 @@ software developed with public money is also publicly available.
 
 This package is initially developed by the City of Amsterdam, but the tools
 and concepts created in this project can be used in any city.
-
-

{django-gisserver-2.0 → django_gisserver-2.1.1}/django_gisserver.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ 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
@@ -64,6 +65,7 @@ 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

{django-gisserver-2.0 → django_gisserver-2.1.1}/django_gisserver.egg-info/requires.txt

@@ -1,7 +1,14 @@
 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
+myst-parser>=3.0.1
+psycopg2-binary>=2.8.4
 
 [tests]
 django-environ>=0.4.5

django_gisserver-2.1.1/gisserver/__init__.py

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

{django-gisserver-2.0 → django_gisserver-2.1.1}/gisserver/conf.py

@@ -4,6 +4,8 @@ from django.conf import settings
 from django.core.signals import setting_changed
 from django.dispatch import receiver
 
+_originals = {}
+
 # -- feature flags
 
 # Configure whether the <ows:WGS84BoundingBox> should be included in GetCapabilities.
@@ -30,6 +32,17 @@ GISSERVER_COUNT_NUMBER_MATCHED = getattr(settings, "GISSERVER_COUNT_NUMBER_MATCH
 
 # -- output rendering
 
+# Following https://docs.geoserver.org/stable/en/user/services/wfs/axis_order.html here:
+# Whether the older EPSG:4326 notation (instead of the OGC recommended styles)
+# should render in legacy longitude/latitude (x/y) ordering.
+# This increases interoperability with legacy web clients,
+# as others use urn:ogc:def:crs:EPSG::4326 or http://www.opengis.net/def/crs/epsg/0/4326.
+GISSERVER_FORCE_XY_EPSG_4326 = getattr(settings, "GISSERVER_FORCE_XY_EPSG_4326", True)
+
+# Whether the legacy CRS notation http://www.opengis.net/gml/srs/epsg.xml# should render in X/Y
+GISSERVER_FORCE_XY_OLD_CRS = getattr(settings, "GISSERVER_FORCE_XY_OLD_CRS", True)
+
+# Extra output formats for GetFeature (see documentation for details)
 GISSERVER_EXTRA_OUTPUT_FORMATS = getattr(settings, "GISSERVER_EXTRA_OUTPUT_FORMATS", {})
 GISSERVER_GET_FEATURE_OUTPUT_FORMATS = getattr(
     settings, "GISSERVER_GET_FEATURE_OUTPUT_FORMATS", {}
@@ -59,4 +72,13 @@ def _on_settings_change(setting, value, enter, **kwargs):
     if not setting.startswith("GISSERVER_"):
         return
 
-    globals()[setting] = value
+    conf_module = globals()
+    if value is None and not enter:
+        # override_settings().disable() returns what the django settings module had.
+        # Revert to our defaults here instead.
+        value = _originals.get(setting)
+    else:
+        # Track defaults of this file for reverting to them
+        _originals.setdefault(setting, conf_module[setting])
+
+    conf_module[setting] = value