django-gisserver 1.4.1__py3-none-any.whl → 2.0__py3-none-any.whl

gisserver/templates/gisserver/wfs/2.0.0/get_capabilities.xml

@@ -11,8 +11,8 @@
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:fes="http://www.opengis.net/fes/2.0"
-    xmlns:app="{{ app_xml_namespace }}"
+    xmlns:fes="http://www.opengis.net/fes/2.0"{% for xml_namespace, prefix in xml_namespaces.items %}
+    xmlns:{{ prefix }}="{{ xml_namespace }}"{% endfor %}
     xsi:schemaLocation="http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd">
 
   <ows:ServiceIdentification>
@@ -59,22 +59,22 @@
   </ows:ServiceProvider>
 
   <ows:OperationsMetadata>
-    {% for name, operation in accept_operations.items %}
+    {% for name, parameters in accept_operations.items %}
     <ows:Operation name="{{ name }}">
       <ows:DCP>
         <ows:HTTP>
           <ows:Get xlink:type="simple" xlink:href="{{ server_url }}"/>
-          {# <ows:Post xlink:type="simple" xlink:href="{{ server_url }}"/> #}
+          <ows:Post xlink:type="simple" xlink:href="{{ server_url }}"/>
         </ows:HTTP>
       </ows:DCP>
-      {% for parameter in operation.get_parameters %}{% if parameter.in_capabilities and parameter.allowed_values %}
+      {% for parameter in parameters %}
       <ows:Parameter name="{{ parameter.name }}">
         <ows:AllowedValues>
           {% for output in parameter.allowed_values %}
             <ows:Value>{{ output }}</ows:Value>
           {% endfor %}
         </ows:AllowedValues>
-      </ows:Parameter>{% endif %}{% endfor %}
+      </ows:Parameter>{% endfor %}
     </ows:Operation>
     {% endfor %}
     {% for name, value in service_constraints.items %}
@@ -89,7 +89,7 @@
   <FeatureTypeList>
     {% for feature_type in feature_types %}
     <FeatureType>
-      <Name>{{ feature_type.xml_name }}</Name>
+      <Name>{% feature_qname feature_type %}</Name>
       <Title>{{ feature_type.title }}</Title>{% if feature_type.abstract %}
       <Abstract>{{ feature_type.abstract }}</Abstract>{% endif %}
       {% if feature_type.keywords %}<ows:Keywords>{% for keyword in feature_type.keywords %}
@@ -97,8 +97,8 @@
       </ows:Keywords>{% endif %}
       <DefaultCRS>{{ feature_type.crs }}</DefaultCRS>{% for crs in feature_type.other_crs %}
       <OtherCRS>{{ crs }}</OtherCRS>{% endfor %}
-      <OutputFormats>{% for output in feature_output_formats %}
-        <Format>{{ output }}</Format>{% endfor %}
+      <OutputFormats>{% for output in feature_output_formats %}{% if output.in_capabilities %}
+        <Format>{{ output }}</Format>{% endif %}{% endfor %}
       </OutputFormats>
       {% if BOUNDING_BOX %}{% with bbox=feature_type.get_bounding_box %}{% if bbox %}<ows:WGS84BoundingBox dimensions="2">
         <ows:LowerCorner>{{ bbox.lower_corner|join:" " }}</ows:LowerCorner>
@@ -177,10 +177,10 @@
     {% endcomment %}{% if function_registry %}
     <fes:Functions>{% for function in function_registry %}
       <fes:Function name="{{ function.name }}">
-        <fes:Returns>{{ function.returns.with_prefix }}</fes:Returns>{% if function.arguments %}
+        <fes:Returns>{{ function.returns|to_qname }}</fes:Returns>{% if function.arguments %}
         <fes:Arguments>{% for name, xs_type in function.arguments.items %}
           <fes:Argument name="{{ name }}">
-            <fes:Type>{{ xs_type.with_prefix }}</fes:Type>
+            <fes:Type>{{ xs_type|to_qname }}</fes:Type>
           </fes:Argument>{% endfor %}
         </fes:Arguments>{% endif %}
       </fes:Function>{% endfor %}

gisserver/templates/gisserver/wfs/feature_field.html

@@ -1,6 +1,6 @@
-<tr{% if level %} class="complex-field-member complex-level-{{ level }}"{% endif %}>
+{% load gisserver_tags %}<tr{% if level %} class="complex-field-member complex-level-{{ level }}"{% endif %}>
   <th><code>{{ field.name }}</code></th>
-  <td>{{ field.xsd_element.type }}{% if field.xsd_element.is_many %} <em>(maxOccurs={{ field.xsd_element.max_occurs }})</em>{% endif %}</td>
+  <td>{{ field.xsd_element.type|to_qname:xml_namespaces }}{% if field.xsd_element.is_many %} <em>(maxOccurs={{ field.xsd_element.max_occurs }})</em>{% endif %}</td>
   <td>{{ field.abstract|default:'' }}</td>
 </tr>
 {% if field.xsd_element.type.is_complex_type and field.fields %}

gisserver/templatetags/gisserver_tags.py

@@ -1,10 +1,30 @@
+from __future__ import annotations
+
 from urllib.parse import urljoin
 
 from django.template import Library
 
+from gisserver.features import FeatureType
+from gisserver.output import to_qname
+from gisserver.types import XsdAnyType, XsdNode
+
 register = Library()
 
 
 @register.filter(name="urljoin")
 def urljoin_(fragment, server_url):
     return urljoin(server_url, fragment)
+
+
+@register.filter(name="to_qname")
+def _to_qname(xsd_type: XsdNode | XsdAnyType, xml_namespaces=None):
+    """Translate a full XML name to a shortened name, using common prefixes.."""
+    return to_qname(xsd_type.namespace, xsd_type.name, xml_namespaces or {})
+
+
+@register.simple_tag(name="feature_qname", takes_context=True)
+def feature_qname(context, feature_type: FeatureType, xml_namespaces=None):
+    """Translate a full XML name to a shortened name."""
+    if xml_namespaces is None:
+        xml_namespaces = context["xml_namespaces"]
+    return to_qname(feature_type.xml_namespace, feature_type.name, xml_namespaces)