Read attribute aliases and store them in ogcConfig and featureInfoConfig resources

Author: manisandro

src/config_generator/capabilities_reader.py

@@ -348,13 +348,13 @@ def collect_wms_layers(self, layer, layer_names, internal_print_layers, ns, np,
                 return None
 
             # collect attributes
-            attributes = []
+            attributes = {}
             attrs = layer.find('%sAttributes' % np, ns)
             if attrs is not None:
                 for attr in attrs.findall('%sAttribute' % np, ns):
-                    attributes.append(attr.get('alias', attr.get('name')))
-                attributes.append('geometry')
-                attributes.append('maptip')
+                    attributes[attr.get('name')] = attr.get('alias', attr.get('name'))
+                attributes['geometry'] = 'geometry'
+                attributes['maptip'] = 'maptip'
 
             if attributes:
                 wms_layer['attributes'] = attributes

src/config_generator/feature_info_service_config.py

@@ -161,10 +161,11 @@ def collect_wms_layers(self, layer):
             # collect attributes
             if 'attributes' in layer:
                 attributes = []
-                for attr in layer['attributes']:
+                for attr, alias in layer['attributes'].items():
                     # NOTE: use ordered keys
                     attribute = OrderedDict()
                     attribute['name'] = attr
+                    attribute['alias'] = alias
 
                     attributes.append(attribute)