From 592a1b48115370af4042aaad63e64849fbc85c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Garc=C3=ADa?= <josegar74@gmail.com>
Date: Mon, 9 Dec 2024 15:03:49 +0100
Subject: [PATCH] ISO19110 / Fix indexing of multiple feature type aliases

---
 .../src/main/plugin/iso19110/index-fields/index.xsl         | 6 +++++-
 .../default/templates/recordView/featurecatalogue.html      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/schemas/iso19110/src/main/plugin/iso19110/index-fields/index.xsl b/schemas/iso19110/src/main/plugin/iso19110/index-fields/index.xsl
index c2d2e3913d3..2cf9e6796cc 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/index-fields/index.xsl
+++ b/schemas/iso19110/src/main/plugin/iso19110/index-fields/index.xsl
@@ -101,7 +101,11 @@
           "definition" :"<xsl:value-of select="util:escapeForJson(gfc:FC_FeatureType/gfc:definition/*/text())"/>",
           "code" :"<xsl:value-of select="util:escapeForJson(gfc:FC_FeatureType/gfc:code/*/text())"/>",
           "isAbstract" :"<xsl:value-of select="gfc:FC_FeatureType/gfc:isAbstract/*/text()"/>",
-          "aliases" : "<xsl:value-of select="util:escapeForJson(gfc:FC_FeatureType/gfc:aliases/*/text())"/>"
+          "aliases" : [
+          <xsl:for-each select="gfc:FC_FeatureType/gfc:aliases[string(*/text())]">
+            "<xsl:value-of select="util:escapeForJson(*/text())"/>"<xsl:if test="position() != last()">,</xsl:if>
+          </xsl:for-each>
+          ]
           <!--"inheritsFrom" : "<xsl:value-of select="gfc:FC_FeatureType/gfc:inheritsFrom/*/text()"/>",
           "inheritsTo" : "<xsl:value-of select="gfc:FC_FeatureType/gfc:inheritsTo/*/text()"/>",
           "constrainedBy" : "<xsl:value-of select="gfc:FC_FeatureType/gfc:constrainedBy/*/text()"/>",
diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/featurecatalogue.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/featurecatalogue.html
index 73cf1f7aa28..c9cdc743f88 100644
--- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/featurecatalogue.html
+++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/featurecatalogue.html
@@ -49,7 +49,7 @@ <h3>
       </tr>
       <tr data-ng-if="featureType.aliases">
         <th data-translate="">featureAliases</th>
-        <td>{{featureType.aliases}}</td>
+        <td>{{featureType.aliases.join(", ")}}</td>
       </tr>
       <tr data-ng-if="featureType.attributeTable">
         <td