Commit 9d6d759f authored by Kim Mortimer's avatar Kim Mortimer
Browse files

That didn't change anything, so problem is elsewhere

parent ff1b06b6
......@@ -630,8 +630,8 @@
</xsl:when>
<xsl:otherwise>
<geojson>
<xsl:text>{&quot;type&quot;: &quot;polygon&quot;,</xsl:text>
<xsl:text>&quot;coordinates&quot;: [[</xsl:text>
<xsl:text>{"type": "polygon",</xsl:text>
<xsl:text>"coordinates": [[</xsl:text>
<xsl:value-of select="concat('[', $w, ',', $s, ']')"/>
<xsl:text>,</xsl:text>
<xsl:value-of select="concat('[', $e, ',', $s, ']')"/>
......@@ -750,8 +750,8 @@
<xsl:for-each select=".//gmd:EX_BoundingPolygon/gmd:polygon/gml:Point">
<xsl:if test="ends-with(@srsName, '84') or ends-with(@srsName, '4326') or not(@srsName)">
<geojson>
<xsl:text>{&quot;type&quot;: &quot;Point&quot;,</xsl:text>
<xsl:text>&quot;coordinates&quot;: </xsl:text>
<xsl:text>{"type": "Point",</xsl:text>
<xsl:text>"coordinates": </xsl:text>
<xsl:value-of select="concat('[', substring-before(./gml:pos,'&#32;'), ', ', substring-after(./gml:pos, '&#32;'), ']')"/>
<!-- simplifying this to ensure i'm getting something
<xsl:value-of select="concat('[', ./gml:pos, ']')"/>-->
......@@ -931,54 +931,54 @@
<xsl:for-each select=".//gmi:MI_Operation">
<operationDetails>{
&quot;status&quot;:&quot;<xsl:value-of select="./gmi:status/gmd:MD_ProgressCode[@codeListValue]"/>&quot;,
&quot;identifier&quot;:&quot;<xsl:value-of select="./gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"/>&quot;,
&quot;citation&quot;:{&quot;title&quot;:&quot;<xsl:value-of select="./gmi:citation/gmd:CI_Citation/gmd:title/gco:CharacterString"/>&quot;,
&quot;dates&quot;:{
"status":"<xsl:value-of select="./gmi:status/gmd:MD_ProgressCode[@codeListValue]"/>",
"identifier":"<xsl:value-of select="./gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"/>",
"citation":{"title":"<xsl:value-of select="./gmi:citation/gmd:CI_Citation/gmd:title/gco:CharacterString"/>",
"dates":{
<xsl:for-each select="./gmi:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date[gmd:date/*/text() != '' and
matches(gmd:date/*/text(), '[0-9]{4}.*')]">
[&quot;dateType&quot;:&quot;<xsl:value-of select="gmd:dateType[1]/gmd:CI_DateTypeCode/@codeListValue"/>&quot;,
&quot;date&quot;:&quot;<xsl:value-of select="string(gmd:date[1]/gco:Date|gmd:date[1]/gco:DateTime)"/>&quot;,]
["dateType":"<xsl:value-of select="gmd:dateType[1]/gmd:CI_DateTypeCode/@codeListValue"/>",
"date":"<xsl:value-of select="string(gmd:date[1]/gco:Date|gmd:date[1]/gco:DateTime)"/>",]
</xsl:for-each>
},
&quot;respParties&quot;: [
"respParties": [
<xsl:for-each select="./gmi:citation/gmd:CI_Citation/gmd:citedResponsibleParty">
<xsl:if test="./gmd:CI_ResponsibleParty/gmd:individualName">
&quot;person&quot;:&quot;<xsl:value-of select="./gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString"/>&quot;,
"person":"<xsl:value-of select="./gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString"/>",
</xsl:if>
<xsl:if test="./gmd:CI_ResponsibleParty/gmd:organisationName">
&quot;organisation&quot;:&quot;<xsl:value-of select="./gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString"/>&quot;,
"organisation":"<xsl:value-of select="./gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString"/>",
</xsl:if>
<xsl:if test="./gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress">
&quot;email&quot;:&quot;<xsl:value-of select="./gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress[1]/gco:CharacterString"/>&quot;,
"email":"<xsl:value-of select="./gmd:CI_ResponsibleParty/gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress[1]/gco:CharacterString"/>",
</xsl:if>
&quot;role&quot;:&quot;<xsl:value-of select="./gmd:CI_ResponsibleParty/gmd:role/gmd:CI_RoleCode[@codeListValue]"/>&quot;
"role":"<xsl:value-of select="./gmd:CI_ResponsibleParty/gmd:role/gmd:CI_RoleCode[@codeListValue]"/>"
</xsl:for-each>
],
},
<xsl:for-each select="./*[name() != 'gmi:platform' and name() != 'gmi:status' and name() != 'gmi:identifier' and name() != 'gmi:citation']">
&quot;<xsl:value-of select="name()"/>&quot;:&quot;<xsl:value-of select="."/>&quot;,
"<xsl:value-of select="name()"/>":"<xsl:value-of select="."/>",
</xsl:for-each>
}</operationDetails>
</xsl:for-each>
<xsl:for-each select=".//gmi:MI_Platform">
<platformDetails>{
&quot;identifier&quot;:&quot;<xsl:value-of select="./gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"/>&quot;,
&quot;description&quot;:&quot;<xsl:value-of select="./gmi:description/gco:CharacterString"/>",
"identifier":"<xsl:value-of select="./gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"/>",
"description":"<xsl:value-of select="./gmi:description/gco:CharacterString"/>",
<xsl:for-each select="./*[name() != 'gmi:instrument' and name() != 'gmi:identifier' and name() != 'gmi:description']">
&quot;<xsl:value-of select="name()"/>&quot;:&quot;<xsl:value-of select="."/>&quot;,
"<xsl:value-of select="name()"/>":"<xsl:value-of select="."/>",
</xsl:for-each>
}</platformDetails>
</xsl:for-each>
<xsl:for-each select=".//gmi:MI_Instrument|.//MER:MI_Instrument">
<instrumentDetails>{
&quot;identifier&quot;:&quot;<xsl:value-of select="./gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"/>&quot;,
&quot;type&quot;:&quot;<xsl:value-of select="./gmi:type/gco:CharacterString"/>&quot;,
"identifier":"<xsl:value-of select="./gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"/>",
"type":"<xsl:value-of select="./gmi:type/gco:CharacterString"/>",
<xsl:for-each select="./*[name() != 'gmi:type' and name() != 'gmi:identifier']">
&quot;<xsl:value-of select="name()"/>&quot;:&quot;<xsl:value-of select="."/>&quot;,
"<xsl:value-of select="name()"/>":"<xsl:value-of select="."/>",
</xsl:for-each>
}</instrumentDetails>
</xsl:for-each>
......@@ -1066,43 +1066,43 @@
<xsl:choose>
<xsl:when test="normalize-space($organisationName) != '' and normalize-space($individualName) != '' and normalize-space($emailAddress) != ''">
<xsl:element name="contact{$fieldSuffix}">{
&quot;person&quot;:&quot;<xsl:value-of select="replace($individualName, '&quot;', '\\&quot;')"/>&quot;,
&quot;org&quot;:&quot;<xsl:value-of select="replace($organisationName, '&quot;', '\\&quot;')"/>&quot;,
&quot;role&quot;:&quot;<xsl:value-of select="$role"/>&quot;,
&quot;email&quot;:&quot;<xsl:value-of select="$emailAddress"/>&quot;
"person":"<xsl:value-of select="replace($individualName, '&quot;', '\\&quot;')"/>",
"org":"<xsl:value-of select="replace($organisationName, '&quot;', '\\&quot;')"/>",
"role":"<xsl:value-of select="$role"/>",
"email":"<xsl:value-of select="$emailAddress"/>"
}</xsl:element>
</xsl:when>
<xsl:when test="normalize-space($organisationName) != '' and normalize-space($individualName) = '' and normalize-space($emailAddress) != ''">
<xsl:element name="contact{$fieldSuffix}">{
&quot;org&quot;:&quot;<xsl:value-of select="replace($organisationName, '&quot;', '\\&quot;')"/>&quot;,
&quot;role&quot;:&quot;<xsl:value-of select="$role"/>&quot;,
&quot;email&quot;:&quot;<xsl:value-of select="$emailAddress"/>&quot;
"org":"<xsl:value-of select="replace($organisationName, '&quot;', '\\&quot;')"/>",
"role":"<xsl:value-of select="$role"/>",
"email":"<xsl:value-of select="$emailAddress"/>"
}</xsl:element>
</xsl:when>
<xsl:when test="normalize-space($organisationName) != '' and normalize-space($individualName) = '' and normalize-space($emailAddress) = ''">
<xsl:element name="contact{$fieldSuffix}">{
&quot;org:"<xsl:value-of select="replace($organisationName, '&quot;', '\\&quot;')"/>",
&quot;role:"<xsl:value-of select="$role"/>"
"org":"<xsl:value-of select="replace($organisationName, '&quot;', '\\&quot;')"/>",
"role":"<xsl:value-of select="$role"/>"
}</xsl:element>
</xsl:when>
<xsl:when test="normalize-space($organisationName) != '' and normalize-space($individualName) != '' and normalize-space($emailAddress) = ''">
<xsl:element name="contact{$fieldSuffix}">{
&quot;person&quot;:&quot;<xsl:value-of select="replace($individualName, '&quot;', '\\&quot;')"/>&quot;,
&quot;org&quot;:&quot;<xsl:value-of select="replace($organisationName, '&quot;', '\\&quot;')"/>&quot;,
&quot;role&quot;:&quot;<xsl:value-of select="$role"/>&quot;
"person":"<xsl:value-of select="replace($individualName, '&quot;', '\\&quot;')"/>",
"org":"<xsl:value-of select="replace($organisationName, '&quot;', '\\&quot;')"/>",
"role":"<xsl:value-of select="$role"/>"
}</xsl:element>
</xsl:when>
<xsl:when test="normalize-space($organisationName) = '' and normalize-space($individualName) != '' and normalize-space($emailAddress) != ''">
<xsl:element name="contact{$fieldSuffix}">{
&quot;person&quot;:&quot;<xsl:value-of select="replace($individualName, '&quot;', '\\&quot;')"/>&quot;,
&quot;role&quot;:&quot;<xsl:value-of select="$role"/>&quot;,
&quot;email&quot;:&quot;<xsl:value-of select="$emailAddress"/>&quot;
"person":"<xsl:value-of select="replace($individualName, '&quot;', '\\&quot;')"/>",
"role":"<xsl:value-of select="$role"/>",
"email":"<xsl:value-of select="$emailAddress"/>"
}</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:element name="contact{$fieldSuffix}">{
&quot;person&quot;:&quot;<xsl:value-of select="replace($individualName, '&quot;', '\\&quot;')"/>&quot;,
&quot;role&quot;:&quot;<xsl:value-of select="$role"/>&quot;
"person":"<xsl:value-of select="replace($individualName, '&quot;', '\\&quot;')"/>",
"role":"<xsl:value-of select="$role"/>"
}</xsl:element>
</xsl:otherwise>
</xsl:choose>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment