django-gisserver 1.2.6__tar.gz → 1.3.0__tar.gz

{django-gisserver-1.2.6 → django-gisserver-1.3.0}/CHANGES.md

@@ -1,3 +1,18 @@
+# 2023-06-08 (1.3.0)
+
+## Updates
+* Django 5 support added.
+
+## Contributors
+We would like to thank the following contributors
+for their work on this release.
+
+   - [tomdtp](https://github.com/tomdtp)
+  
+# 2023-06-08 (1.2.7)
+
+* WFS endpoints now accept a GML version number in their OUTPUTFORMAT.
+
 # 2023-06-07 (1.2.6)
 
 * Workaround for FME doing a DescribeFeatureType with the wrong outputformat.

{django-gisserver-1.2.6/django_gisserver.egg-info → django-gisserver-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-gisserver
-Version: 1.2.6
+Version: 1.3.0
 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-1.2.6 → django-gisserver-1.3.0/django_gisserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-gisserver
-Version: 1.2.6
+Version: 1.3.0
 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-1.3.0/gisserver/__init__.py

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

{django-gisserver-1.2.6 → django-gisserver-1.3.0}/gisserver/operations/base.py

@@ -158,6 +158,10 @@ class OutputFormat:
 
     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
 
     @property

{django-gisserver-1.2.6 → django-gisserver-1.3.0}/gisserver/operations/wfs20.py

@@ -45,7 +45,15 @@ RE_SAFE_FILENAME = re.compile(r"\A[A-Za-z0-9]+[A-Za-z0-9.]*")  # no dot at the s
 class GetCapabilities(WFSMethod):
     """ "This operation returns map features, and available operations this WFS server supports."""
 
-    output_formats = [OutputFormat("text/xml")]
+    output_formats = [
+        OutputFormat(
+            "application/gml+xml",
+            version="3.2",
+            renderer_class=output.gml32_value_renderer,
+            title="GML",
+        ),
+        OutputFormat("text/xml"),
+    ]
     xml_template_name = "get_capabilities.xml"
 
     def get_parameters(self):
@@ -144,8 +152,11 @@ class DescribeFeatureType(WFSTypeNamesMethod):
         # At least one version of FME seems to sends a DescribeFeatureType
         # request with this output format. Do what mapserver does and just
         # send it XML Schema.
-        OutputFormat("application/gml+xml; version=3.2",
-                     renderer_class=output.XMLSchemaRenderer)
+        OutputFormat(
+            "application/gml+xml",
+            version="3.2",
+            renderer_class=output.XMLSchemaRenderer,
+        )
         # OutputFormat("text/xml", subtype="gml/3.1.1"),
     ]
 
@@ -441,7 +452,7 @@ class GetFeature(BaseWFSGetDataMethod):
         OutputFormat(
             # Alias needed to make ESRI ArcGIS online accept the WFS.
             # It does not recognize the "subtype" as an alias.
-            "GEOJSON",
+            "geojson",
             renderer_class=output.geojson_renderer,
         ),
         OutputFormat(
@@ -462,6 +473,12 @@ class GetPropertyValue(BaseWFSGetDataMethod):
     """
 
     output_formats = [
+        OutputFormat(
+            "application/gml+xml",
+            version="3.2",
+            renderer_class=output.gml32_value_renderer,
+            title="GML",
+        ),
         OutputFormat(
             "text/xml", subtype="gml/3.2", renderer_class=output.gml32_value_renderer
         ),

{django-gisserver-1.2.6 → django-gisserver-1.3.0}/gisserver/output/csv.py

@@ -2,11 +2,10 @@
 from __future__ import annotations
 
 import csv
-from datetime import datetime
+from datetime import datetime, timezone
 
 from django.conf import settings
 from django.db import models
-from django.utils.timezone import utc
 
 from gisserver import conf
 from gisserver.db import (
@@ -137,7 +136,7 @@ class CSVRenderer(OutputRenderer):
                 # Array field
                 append(",".join(map(str, value)))
             elif isinstance(value, datetime):
-                append(str(value.astimezone(utc)))
+                append(str(value.astimezone(timezone.utc)))
             else:
                 append(value)
         return values

{django-gisserver-1.2.6 → django-gisserver-1.3.0}/gisserver/output/geojson.py

@@ -1,5 +1,5 @@
 """Output rendering logic for GeoJSON."""
-from datetime import datetime
+from datetime import datetime, timezone
 from decimal import Decimal
 from typing import cast
 
@@ -8,7 +8,6 @@ from django.conf import settings
 from django.contrib.gis.db.models.functions import AsGeoJSON
 from django.db import models
 from django.utils.functional import Promise
-from django.utils.timezone import utc
 
 from gisserver import conf
 from gisserver.db import get_db_geometry_target
@@ -147,7 +146,7 @@ class GeoJsonRenderer(OutputRenderer):
 
     def _format_geojson_value(self, value):
         if isinstance(value, datetime):
-            return value.astimezone(utc)
+            return value.astimezone(timezone.utc)
         elif isinstance(value, models.Model):
             # ForeignKey, not defined as complex type.
             return str(value)

{django-gisserver-1.2.6 → django-gisserver-1.3.0}/gisserver/output/gml32.py

@@ -7,14 +7,13 @@ from __future__ import annotations
 
 import itertools
 import re
-from datetime import date, datetime, time
+from datetime import date, datetime, time, timezone
 from html import escape
 from typing import cast
 
 from django.contrib.gis import geos
 from django.db import models
 from django.http import HttpResponse
-from django.utils.timezone import utc
 
 from gisserver.db import (
     AsGML,
@@ -306,7 +305,7 @@ class GML32Renderer(OutputRenderer):
             # Expanded foreign relation / dictionary
             return self.render_xml_complex_type(feature_type, xsd_element, value)
         elif isinstance(value, datetime):
-            value = value.astimezone(utc).isoformat()
+            value = value.astimezone(timezone.utc).isoformat()
         elif isinstance(value, (date, time)):
             value = value.isoformat()
         elif isinstance(value, bool):

{django-gisserver-1.2.6 → django-gisserver-1.3.0}/gisserver/output/results.py

@@ -13,7 +13,9 @@ from typing import Iterable
 import django
 from django.db import models
 from django.utils.functional import cached_property
-from django.utils.timezone import now, utc
+from django.utils.timezone import now
+
+from datetime import timezone
 
 from gisserver.features import FeatureType
 from gisserver.geometries import BoundingBox
@@ -218,7 +220,7 @@ class FeatureCollection:
         self.next = next
         self.previous = previous
         self.date = now()
-        self.timestamp = self.date.astimezone(utc).isoformat()
+        self.timestamp = self.date.astimezone(timezone.utc).isoformat()
 
     def get_bounding_box(self) -> BoundingBox:
         """Determine bounding box of all items."""

django-gisserver-1.2.6/gisserver/__init__.py

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