Skip to content

Commit

Permalink
Merge pull request #6023 from jahow/improve-opendatasoft-harvesting
Browse files Browse the repository at this point in the history 
JSON Harvester / Improve ESRI and OpenDataSoft harvesting
  • Loading branch information
@jahow
jahow authored Nov 5, 2021
2 parents 130cf0a + 7b2cd9c commit 30f8b35
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 43 deletions.
52 changes: 36 additions & 16 deletions schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/convert/fromJsonLdEsri.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,21 +308,37 @@
"Aide Sociale",
"Aide famille"
],....-->
<mri:descriptiveKeywords>
<mri:MD_Keywords>
<xsl:for-each select="keyword|theme">
<mri:keyword>
<gco:CharacterString>
<xsl:value-of select="name"/>
</gco:CharacterString>
</mri:keyword>
</xsl:for-each>
<mri:type>
<mri:MD_KeywordTypeCode codeListValue="theme"
codeList="./resources/codeList.xml#MD_KeywordTypeCode"/>
</mri:type>
</mri:MD_Keywords>
</mri:descriptiveKeywords>
<xsl:if test="keyword">
<mri:descriptiveKeywords>
<mri:MD_Keywords>
<xsl:for-each select="keyword">
<mri:keyword>
<gco:CharacterString>
<xsl:value-of select="."/>
</gco:CharacterString>
</mri:keyword>
</xsl:for-each>
</mri:MD_Keywords>
</mri:descriptiveKeywords>
</xsl:if>

<xsl:if test="theme">
<mri:descriptiveKeywords>
<mri:MD_Keywords>
<xsl:for-each select="theme">
<mri:keyword>
<gco:CharacterString>
<xsl:value-of select="."/>
</gco:CharacterString>
</mri:keyword>
</xsl:for-each>
<mri:type>
<mri:MD_KeywordTypeCode codeListValue="theme"
codeList="./resources/codeList.xml#MD_KeywordTypeCode"/>
</mri:type>
</mri:MD_Keywords>
</mri:descriptiveKeywords>
</xsl:if>

<!--
license_url: "http://opendatacommons.org/licenses/odbl/",
Expand Down Expand Up @@ -407,7 +423,11 @@
</cit:linkage>
<cit:protocol>
<gco:CharacterString>
<xsl:value-of select="mediaType"/>
<xsl:choose>
<xsl:when test="format = 'Web Page'">WWW:LINK-1.0-http--link</xsl:when>
<xsl:when test="format = 'ArcGIS GeoServices REST API'">ESRI:REST</xsl:when>
<xsl:otherwise>WWW:DOWNLOAD</xsl:otherwise>
</xsl:choose>
</gco:CharacterString>
</cit:protocol>
<cit:name>
Expand Down
118 changes: 91 additions & 27 deletions schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/convert/fromJsonOpenDataSoft.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,30 +299,39 @@
</mmi:MD_MaintenanceInformation>
</mri:resourceMaintenance>-->

<!--
keyword: [
"CASVP",
"Famille",
"handicap",
"Enfant handicapé",
"Aide Sociale",
"Aide famille"
],....-->
<mri:descriptiveKeywords>
<mri:MD_Keywords>
<xsl:for-each select="metas/keyword|metas/theme">
<mri:keyword>
<gco:CharacterString>
<xsl:value-of select="name"/>
</gco:CharacterString>
</mri:keyword>
</xsl:for-each>
<mri:type>
<mri:MD_KeywordTypeCode codeListValue="theme"
codeList="./resources/codeList.xml#MD_KeywordTypeCode"/>
</mri:type>
</mri:MD_Keywords>
</mri:descriptiveKeywords>
<!-- ODS keywords copied without type -->
<xsl:if test="metas/keyword">
<mri:descriptiveKeywords>
<mri:MD_Keywords>
<xsl:for-each select="metas/keyword">
<mri:keyword>
<gco:CharacterString>
<xsl:value-of select="."/>
</gco:CharacterString>
</mri:keyword>
</xsl:for-each>
</mri:MD_Keywords>
</mri:descriptiveKeywords>
</xsl:if>

<!-- ODS themes copied as keywords with type 'theme' -->
<xsl:if test="metas/theme">
<mri:descriptiveKeywords>
<mri:MD_Keywords>
<xsl:for-each select="metas/theme">
<mri:keyword>
<gco:CharacterString>
<xsl:value-of select="."/>
</gco:CharacterString>
</mri:keyword>
</xsl:for-each>
<mri:type>
<mri:MD_KeywordTypeCode codeListValue="theme"
codeList="./resources/codeList.xml#MD_KeywordTypeCode"/>
</mri:type>
</mri:MD_Keywords>
</mri:descriptiveKeywords>
</xsl:if>

<!--
license_url: "http://opendatacommons.org/licenses/odbl/",
Expand Down Expand Up @@ -408,11 +417,13 @@
</gfc:memberName>
<gfc:definition>
<gco:CharacterString>
<xsl:value-of select="label"/>:
<xsl:value-of select="description"/>
<xsl:value-of select="label"/>
<xsl:if test="description">
- <xsl:value-of select="description"/>
</xsl:if>
</gco:CharacterString>
</gfc:definition>
<gfc:cardinality></gfc:cardinality>
<gfc:cardinality>1</gfc:cardinality>
<gfc:valueType>
<gco:TypeName>
<gco:aName>
Expand Down Expand Up @@ -488,6 +499,27 @@
</cit:CI_OnlineResource>
</mrd:onLine>
</xsl:for-each>

<!-- Data download links are inferred from the record metadata -->
<xsl:if test="metas/records_count > 0">
<xsl:call-template name="dataLink">
<xsl:with-param name="format">csv</xsl:with-param>
</xsl:call-template>
<xsl:call-template name="dataLink">
<xsl:with-param name="format">json</xsl:with-param>
</xsl:call-template>
<xsl:if test="count(features[. = 'geo']) > 0">
<xsl:call-template name="dataLink">
<xsl:with-param name="format">geojson</xsl:with-param>
</xsl:call-template>
<xsl:if test="metas/records_count &lt; 5000">
<xsl:call-template name="dataLink">
<xsl:with-param name="format">shapefile</xsl:with-param>
</xsl:call-template>
</xsl:if>
</xsl:if>
</xsl:if>

</mrd:MD_DigitalTransferOptions>
</mrd:transferOptions>
</mrd:MD_Distribution>
Expand All @@ -511,4 +543,36 @@
</mdb:resourceLineage>
</mdb:MD_Metadata>
</xsl:template>

<xsl:template name="dataLink">
<xsl:param name="format" />

<mrd:onLine>
<cit:CI_OnlineResource>
<cit:linkage>
<gco:CharacterString>
<xsl:value-of select="concat(nodeUrl, '/explore/dataset/', datasetid, '/download?format=', $format, '&amp;timezone=Europe/Berlin&amp;use_labels_for_header=false')" />
</gco:CharacterString>
</cit:linkage>
<cit:protocol>
<gco:CharacterString>WWW:DOWNLOAD-1.0-http--download</gco:CharacterString>
</cit:protocol>
<cit:name>
<gco:CharacterString>
<xsl:value-of select="concat('Download as ', upper-case($format))"/>
</gco:CharacterString>
</cit:name>
<cit:description>
<gco:CharacterString>
<xsl:value-of select="concat('Download this dataset in the ', upper-case($format), ' format.')"/>
</gco:CharacterString>
</cit:description>
<cit:function>
<cit:CI_OnLineFunctionCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_OnLineFunctionCode"
codeListValue="fileAccess"/>
</cit:function>
</cit:CI_OnlineResource>
</mrd:onLine>
</xsl:template>

</xsl:stylesheet>

0 comments on commit 30f8b35

Please sign in to comment.