diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields-keywords.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields-keywords.xsl index ab2df3dbd77..4e3c88822b7 100644 --- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields-keywords.xsl +++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields-keywords.xsl @@ -245,8 +245,14 @@ + - {"replace": true} + {"replace": "true"} + + + + + {"replace": "true", "boundingAll": "true"} diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/strings.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/strings.xml index eb8bdc0ba9f..1a47320c0ad 100644 --- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/strings.xml +++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/strings.xml @@ -71,8 +71,8 @@ the metadata identifier (eg. http://www.organization.org/catalogue/5391bf69-44bc-4ea0-8cc0-6cf6c3bc81ae). - Compute extent from keyword - + Add extent for each keywords + Add one extent from all keywords Analyze each keyword of type place and add matching extent. diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/strings.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/strings.xml index 315c19c5d8d..249d77e159a 100644 --- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/strings.xml +++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/strings.xml @@ -61,8 +61,8 @@ et l'identifiant de la fiche (eg. http://www.organization.org/catalogue/5391bf69-44bc-4ea0-8cc0-6cf6c3bc81ae). - Calculer les emprises à partir des mots clés - + Ajouter les emprises correspondantes + Ajouter une emprise globale Analyse les mots clés de type géographique et ajoute les emprises correspondantes. diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/process/add-extent-from-geokeywords.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/process/add-extent-from-geokeywords.xsl index fa542ef09d3..8048d536d1e 100644 --- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/process/add-extent-from-geokeywords.xsl +++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/process/add-extent-from-geokeywords.xsl @@ -3,7 +3,7 @@ xmlns:geonet="http://www.fao.org/geonetwork" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" - xmlns:gmx="http://www.isotc211.org/2005/gmx" + xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.1" xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0" @@ -30,10 +30,14 @@ + + + @@ -54,19 +58,22 @@ select="string-join($root//gex:EX_Extent/gex:description/gco:CharacterString, ' ')"/> + or not(contains($extentDescription, gcx:Anchor))) + and ../mri:type/*/@codeListValue='place']"/> - + true {"gurl":{"type":"string", "defaultValue":""}, "lang":{"type":"string", "defaultValue":""}, - "replace":{"type":"boolean", "defaultValue":""}} + "addExtentFor":{"type":"string", "defaultValue":""}, + "boundingAll":{"type":"boolean", "defaultValue":""}, + "replace":{"type":"boolean", "defaultValue":""}} + @@ -168,15 +175,37 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -191,7 +220,7 @@ - + diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-keywords.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-keywords.xsl index 9b24bbc17f8..71e2d3a320a 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-keywords.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-keywords.xsl @@ -184,7 +184,7 @@ - + @@ -281,8 +281,14 @@ select="count(gmd:type/gmd:MD_KeywordTypeCode[@codeListValue='place']) > 0"/> + + + {"replace": "true"} + + + - {"replace": true} + {"replace": "true", "boundingAll": "true"} diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/eng/strings.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/eng/strings.xml index b6ae84e09e5..49b6dad700a 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/loc/eng/strings.xml +++ b/schemas/iso19139/src/main/plugin/iso19139/loc/eng/strings.xml @@ -123,7 +123,8 @@ Compose the resource identifier using the catalog URL and the metadata identifier (eg. http://www.organization.org/catalogue/5391bf69-44bc-4ea0-8cc0-6cf6c3bc81ae). - Compute extent from keyword + Add extent for each keywords + Add one extent from all keywords Analyze each keyword of type place and add matching extent. Classification of data and services diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/fre/strings.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/fre/strings.xml index 589c20e36df..ad8f28c2c25 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/loc/fre/strings.xml +++ b/schemas/iso19139/src/main/plugin/iso19139/loc/fre/strings.xml @@ -120,8 +120,8 @@ du catalogue ou l'URL du catalogue et l'identifiant de la fiche (eg. http://www.organization.org/catalogue/5391bf69-44bc-4ea0-8cc0-6cf6c3bc81ae). - Calculer les emprises à partir des mots clés - + Ajouter les emprises correspondantes + Ajouter une emprise globale Analyse les mots clés de type géographique et ajoute les emprises correspondantes. diff --git a/schemas/iso19139/src/main/plugin/iso19139/process/add-extent-from-geokeywords.xsl b/schemas/iso19139/src/main/plugin/iso19139/process/add-extent-from-geokeywords.xsl index ef69680f69a..43c9bf46371 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/process/add-extent-from-geokeywords.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/process/add-extent-from-geokeywords.xsl @@ -54,10 +54,14 @@ + + + @@ -86,12 +90,14 @@ target="extent"> + select="string-join($geoKeywords/(gco:CharacterString|gmx:Anchor), ', ')"/> true {"gurl":{"type":"string", "defaultValue":""}, "lang":{"type":"string", "defaultValue":""}, + "addExtentFor":{"type":"string", "defaultValue":""}, + "boundingAll":{"type":"boolean", "defaultValue":""}, "replace":{"type":"boolean", "defaultValue":""}} @@ -170,8 +176,9 @@ + test="gmd:EX_Extent/gmd:temporalElement + or gmd:EX_Extent/gmd:verticalElement + or gmd:EX_Extent/gmd:geographicElement[gmd:EX_BoundingPolygon]"> @@ -216,16 +223,39 @@ - - - - - - + + + + + + + + + + + + + + + + + + + @@ -236,25 +266,16 @@ - + - - - - - - - - - - - - - + + + + diff --git a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl index 48d77bb96c8..fc67338d9ab 100644 --- a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl +++ b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl @@ -1591,6 +1591,7 @@ + @@ -1600,7 +1601,7 @@ diff --git a/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl b/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl index e49bf518482..47007b50bf2 100644 --- a/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl +++ b/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl @@ -134,6 +134,7 @@ +