ISO19115-3 / Updates following geonetwork#4701

fxprunayre · Aug 11, 2020 · a5b1b95 · a5b1b95
1 parent 96c3a00
commit a5b1b95
Show file tree

Hide file tree

Showing 43 changed files with 2,158 additions and 7,491 deletions.
diff --git a/schemas/iso19115-3.2018/pom.xml b/schemas/iso19115-3.2018/pom.xml
@@ -4,19 +4,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
  <parent>
-    <artifactId>schemas</artifactId>
-    <groupId>org.geonetwork-opensource.schemas</groupId>
-    <version>3.11.0-SNAPSHOT</version>
+   <artifactId>gn-schemas</artifactId>
+   <groupId>org.geonetwork-opensource.schemas</groupId>
+   <version>4.0.0-alpha.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>schema-iso19115-3.2018</artifactId>
+  <artifactId>gn-schema-iso19115-3.2018</artifactId>
   <name>GeoNetwork schema plugin for ISO19115-3:2018 standard</name>
 
   <dependencies>
     <dependency>
       <groupId>org.geonetwork-opensource.schemas</groupId>
-      <artifactId>schema-core</artifactId>
+      <artifactId>gn-schema-core</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/extract-thumbnails.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/extract-thumbnails.xsl
diff --git a/...115-3.2018/src/main/plugin/iso19115-3.2018/formatter/jsonld/iso19115-3.2018-to-jsonld.xsl b/...115-3.2018/src/main/plugin/iso19115-3.2018/formatter/jsonld/iso19115-3.2018-to-jsonld.xsl
@@ -87,10 +87,25 @@
       <entry key="nonGeographicDataset" value="Dataset"/>
       <entry key="dimensionGroup" value="TechArticle"/>
       <entry key="featureType" value="Dataset"/>
+      <entry key="attribute" value="CreativeWork"/>
+      <entry key="attributeType" value="Thing"/>
+      <entry key="feature" value="Thing"/>
+      <entry key="propertyType" value="Thing"/>
+      <entry key="fieldSession" value="Project"/>
+      <entry key="software" value="SoftwareApplication"/>
       <entry key="model" value="TechArticle"/>
       <entry key="tile" value="Dataset"/>
-      <entry key="fieldSession" value="Project"/>
+      <entry key="metadata" value="ArchiveComponent"/>
+      <entry key="initiative" value="Thing"/>
+      <entry key="sample" value="ArchiveComponent"/>
+      <entry key="document" value="DigitalDocument"/>
+      <entry key="repository" value="ArchiveComponent"/>
+      <entry key="aggregate" value="ArchiveComponent"/>
+      <entry key="product" value="Product"/>
+      <entry key="collection" value="ArchiveComponent"/>
+      <entry key="coverage" value="CreativeWork"/>
       <entry key="collectionSession" value="Project"/>
+
     </xsl:variable>
 
     <xsl:variable name="match"
@@ -153,15 +168,15 @@
     "@context": "http://schema.org/",
     <xsl:choose>
       <xsl:when test="mdb:metadataScope/*/mdb:resourceScope/*/@codeListValue != ''">
-        "@type": "<xsl:value-of select="schema-org-fn:getType(mdb:metadataScope/*/mdb:resourceScope/*/@codeListValue, 'schema:')"/>",
+        "@type": "<xsl:value-of select="schema-org-fn:getType(mdb:metadataScope/*/mdb:resourceScope/*/@codeListValue,'')"/>",
       </xsl:when>
       <xsl:otherwise>
-        "@type": "schema:Dataset",
+        "@type": "Dataset",
       </xsl:otherwise>
     </xsl:choose>
     <!-- TODO: Use the identifier property to attach any relevant Digital Object identifiers (DOIs). -->
     "@id": "<xsl:value-of select="concat($baseUrl, 'api/records/', mdb:metadataIdentifier[1]/*/mcc:code/*/text())"/>",
-    "includedInDataCatalog":[{"url":"<xsl:value-of select="concat($baseUrl, 'search#', $catalogueName)"/>","name":"<xsl:value-of select="$catalogueName"/>"}],
+    "includedInDataCatalog":[{"@type":"DataCatalog","url":"<xsl:value-of select="concat($baseUrl, 'search#', $catalogueName)"/>","name":"<xsl:value-of select="$catalogueName"/>"}],
     <!-- TODO: is the dataset language or the metadata language ? -->
     "inLanguage":"<xsl:value-of select="if ($requestedLanguage  != '') then $requestedLanguage else $defaultLanguage"/>",
     <!-- TODO: availableLanguage -->
@@ -242,10 +257,12 @@
           ,"name": <xsl:apply-templates mode="toJsonLDLocalized"
                                        select="."/>
         </xsl:for-each>
-        <xsl:for-each select=".//cit:electronicMailAddress">
-          ,"email": <xsl:apply-templates mode="toJsonLDLocalized"
-                                       select="."/>
-        </xsl:for-each>
+        <xsl:if test=".//cit:electronicMailAddress">
+            ,"email":  [<xsl:for-each select=".//cit:electronicMailAddress">
+            <xsl:apply-templates mode="toJsonLDLocalized" select="."/>
+            <xsl:if test="position() != last()">,</xsl:if>
+        </xsl:for-each>]
+        </xsl:if>
 
         <!-- TODO: only if children available -->
         ,"contactPoint": {
@@ -352,11 +369,13 @@
       -->
     </xsl:for-each>
 
-    <xsl:for-each select="mdb:identificationInfo/*/mri:resourceConstraints/mco:MD_LegalConstraints/mco:otherConstraints">
-      ,"license": <xsl:apply-templates mode="toJsonLDLocalized"
-                                      select="."/>
-    </xsl:for-each>
 
+    <xsl:if test="mdb:identificationInfo/*/mri:resourceConstraints/mco:MD_LegalConstraints/mco:otherConstraints">    
+      ,"license": [<xsl:for-each select="mdb:identificationInfo/*/mri:resourceConstraints/mco:MD_LegalConstraints/mco:otherConstraints"> 
+          <xsl:apply-templates mode="toJsonLDLocalized" select="."/>
+          <xsl:if test="position() != last()">,</xsl:if>
+      </xsl:for-each>]
+    </xsl:if>
     <!-- TODO: When a dataset derives from or aggregates several originals, use the isBasedOn property. -->
     <!-- TODO: hasPart -->
   }