Also store aliases for WFS attributes in resources, clean wfs layer/attribute names

Author: manisandro

src/config_generator/capabilities_reader.py

@@ -637,6 +637,9 @@ def read_wfs_service_capabilities(self, service_name, item):
                 wfs_layer = OrderedDict()
 
                 layer_name = layer.find('%sName' % np, ns).text
+                # NOTE: ensure special characters in layer names are consistently replaced (varies across QGIS WFS versions)
+                layer_name = layer_name.replace(' ', '_').replace(':', '-')
+
                 wfs_layer['name'] = layer_name
                 wfs_layer['title'] = layer.find('%sTitle' % np, ns).text
                 wfs_layer['attributes'] = wfs_layers_attributes.get(layer_name, [])
@@ -720,15 +723,19 @@ def collect_wfs_layers_attributes(self, full_url):
                 np = ''
 
             layers_attributes = {}
+            replace_unicode_pat = re.compile(r'[^\w.\-_]', flags=re.UNICODE)
 
             for complex_type in root.findall('%scomplexType' % np, ns):
                 # extract layer name from complexType by removing "Type" suffix
                 # e.g. "edit_pointsType" -> "edit_points"
                 layer_name = complex_type.get('name').removesuffix('Type')
 
-                attributes = []
+                attributes = {}
                 for element in complex_type.findall('%scomplexContent/%sextension/%ssequence/%selement' % (np, np, np, np), ns):
-                    attributes.append(element.get('name'))
+                    attribute_name = element.get('name')
+                    # NOTE: ensure special characters in attribute names are consistently replaced (varies across QGIS WFS versions)
+                    attribute_name = replace_unicode_pat.sub('', attribute_name.replace(' ', '_'))
+                    attributes[attribute_name] = element.get('alias', attribute_name)
 
                 layers_attributes[layer_name] = attributes
 

src/config_generator/ogc_service_config.py

@@ -1,4 +1,5 @@
 from collections import OrderedDict
+import re
 
 from .permissions_query import PermissionsQuery
 from .service_config import ServiceConfig
@@ -656,6 +657,24 @@ def wfs_permissions(self, role, session):
             'attributes': non_public_resources('attribute', session)
         }
 
+        # NOTE: replace special characters in layer/attribute names
+        # (WFS capabilities/etc report cleaned names)
+        replace_unicode_pat = re.compile(r'[^\w.\-_]', flags=re.UNICODE)
+        clean_layer_name = lambda layer_name: layer_name.replace(' ', '_').replace(':', '-')
+        clean_attr_name = lambda attr_name: replace_unicode_pat.sub('', attr_name.replace(' ', '_'))
+
+        for perm in (role_permissions, public_permissions, public_restrictions):
+            for service_name in perm['layers']:
+                perm['layers'][service_name] = dict([
+                    (clean_layer_name(layer_name), {}) for layer_name in perm['layers'][service_name]
+                ])
+            for service_name in perm['attributes']:
+                perm['attributes'][service_name] = dict([
+                    (clean_layer_name(layer_name_attrs[0]), dict([
+                        (clean_attr_name(attr_name), {}) for attr_name in layer_name_attrs[1]
+                    ])) for layer_name_attrs in perm['attributes'][service_name].items()
+                ])
+
         is_public_role = (role == self.permissions_query.public_role())
 
         for service_name in self.themes_reader.wfs_service_names():