diff --git a/conf/OHMCV/inputs/OHMCV.ADV.CLA.13-14.1.csv b/conf/OHMCV/inputs/OHMCV.ADV.CLA.13-14.1.csv index 9d4673d159ac8db50b7abd4af35642c980103d14..33e40e96892f4ac6b93b3894d4a7f82ba27659a1 100644 --- a/conf/OHMCV/inputs/OHMCV.ADV.CLA.13-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.ADV.CLA.13-14.1.csv @@ -14,5 +14,5 @@ The Claduègne hydro-sedimentary station (http://mistrals.sedoo.fr/?editDatsId=9 format;CSV;;;; format;"ESRI Grid";;;; geoLocationPlace;Claduègne hydro-sedimentary station -geoLocationBox;4.478 44.562 4.478 44.562 +geoLocationPoint;44.562 4.478 # END; diff --git a/conf/OHMCV/inputs/OHMCV.DSD.MRE.12-14.1.csv b/conf/OHMCV/inputs/OHMCV.DSD.MRE.12-14.1.csv index 44936a69d7df77f72b6d592cd62924c63ab04d2a..e683250f4a56f08e67d1f96458137d5cddda246f 100644 --- a/conf/OHMCV/inputs/OHMCV.DSD.MRE.12-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.DSD.MRE.12-14.1.csv @@ -15,7 +15,7 @@ subject:main;Fixed Observation Stations contributorName:WorkPackageLeader;Brice Boudevillain;affiliation;IGE date:Collected;2011-09-10/2014-12-31 geoLocationPlace;Mont Redon -geoLocationBox;4.5148 44.6141 4.5148 44.6141 +geoLocationPoint;44.6141 4.5148 relatedIdentifier:IsSupplementedBy:DOI;10.5072/OHMCV.DSD.MRE.12-16.1 description:Other;"This dataset has been extended and updated by the following dataset: 10.17178/OHMCV.DSD.MRE.12-16.1" # END; diff --git a/conf/OHMCV/inputs/OHMCV.DSD.PVI.11-14.1.csv b/conf/OHMCV/inputs/OHMCV.DSD.PVI.11-14.1.csv index 089055761940c21828dc9f25af08406cc660a27e..dac6a747eafb82c5b73e19d021c07f3b542aa042 100644 --- a/conf/OHMCV/inputs/OHMCV.DSD.PVI.11-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.DSD.PVI.11-14.1.csv @@ -14,7 +14,7 @@ subject:main;Fixed Observation Stations contributorName:WorkPackageLeader;Brice Boudevillain;affiliation;IGE date:Collected;2011-01-11/2014-12-31 geoLocationPlace;Pradel-Vignes -geoLocationBox;4.495 44.5801 4.495 44.5801 +geoLocationPoint;44.5801 4.495 relatedIdentifier:IsSupplementedBy:DOI;10.5072/OHMCV.DSD.PVI.12-16.1 description:Other;"This dataset has been extended and updated by the following dataset: 10.17178/OHMCV.DSD.PVI.12-16.1" # END; diff --git a/conf/OHMCV/inputs/OHMCV.DSD.SEF.12-14.1.csv b/conf/OHMCV/inputs/OHMCV.DSD.SEF.12-14.1.csv index 8fead8b55944529feeee298558429de9da5614c7..00fb0bbc44e92fb7acaae9839e27e9468df7c90b 100644 --- a/conf/OHMCV/inputs/OHMCV.DSD.SEF.12-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.DSD.SEF.12-14.1.csv @@ -14,7 +14,7 @@ subject:main;Fixed Observation Stations contributorName:WorkPackageLeader;Brice Boudevillain;affiliation;IGE date:Collected;2012-09-05/2014-12-31 geoLocationPlace;Saint-Etienne-de-Fontbellon -geoLocationBox;4.3826 44.6 4.3826 44.6 +geoLocationPoint;44.6 4.3826 relatedIdentifier:IsSupplementedBy:DOI;10.5072/OHMCV.DSD.SEF.12-16.1 description:Other;"This dataset has been extended and updated by the following dataset: 10.17178/OHMCV.DSD.SEF.12-16.1" # END; diff --git a/conf/OHMCV/inputs/OHMCV.DSD.SOU.12-16.1.csv b/conf/OHMCV/inputs/OHMCV.DSD.SOU.12-16.1.csv index 0238658d7c999cf646039c43244ba6a8146ac5da..77533069f700f9b72e66fa69df7b6616b131e75d 100644 --- a/conf/OHMCV/inputs/OHMCV.DSD.SOU.12-16.1.csv +++ b/conf/OHMCV/inputs/OHMCV.DSD.SOU.12-16.1.csv @@ -15,5 +15,5 @@ subject:main;Fixed Observation Stations contributorName:WorkPackageLeader;Brice Boudevillain;affiliation;IGE date:Collected;2012-07-27/2016-12-31 geoLocationPlace;La Souche -geoLocationBox;4.1235 44.6285 4.1235 44.6285 +geoLocationPoint;44.6285 4.1235 # END; diff --git a/conf/OHMCV/inputs/OHMCV.DSD.TOU.12-16.1.csv b/conf/OHMCV/inputs/OHMCV.DSD.TOU.12-16.1.csv index 9f7b0fb20991e36829ac6cc3d02fdda9d4e50101..92edaa60a430070464e6a9e0a21d56bc8b89041d 100644 --- a/conf/OHMCV/inputs/OHMCV.DSD.TOU.12-16.1.csv +++ b/conf/OHMCV/inputs/OHMCV.DSD.TOU.12-16.1.csv @@ -14,5 +14,5 @@ subject:main;Fixed Observation Stations contributorName:WorkPackageLeader;Brice Boudevillain;affiliation;IGE date:Collected;2012-11-08/2016-09-12 geoLocationPlace;Tourgueille -geoLocationBox;3.6622 44.1288 3.6622 44.1288 +geoLocationPoint;44.1288 3.6622 # END; diff --git a/conf/OHMCV/inputs/OHMCV.DSD.VAL.12-16.1.csv b/conf/OHMCV/inputs/OHMCV.DSD.VAL.12-16.1.csv index e8189c9f8c239c8272b21bdbbdf1965ceb402bd5..84dccae1e46763c0a74e1525c0f9a61c809b3c50 100644 --- a/conf/OHMCV/inputs/OHMCV.DSD.VAL.12-16.1.csv +++ b/conf/OHMCV/inputs/OHMCV.DSD.VAL.12-16.1.csv @@ -14,5 +14,5 @@ subject:main;Fixed Observation Stations contributorName:WorkPackageLeader;Brice Boudevillain;affiliation;IGE date:Collected;2012-11-07/2016-12-31 geoLocationPlace;Valescure -geoLocationBox;3.8353 44.0939 3.8353 44.0939 +geoLocationPoint;44.0939 3.8353 # END; diff --git a/conf/OHMCV/inputs/OHMCV.DSD.VB1.12-14.1.csv b/conf/OHMCV/inputs/OHMCV.DSD.VB1.12-14.1.csv index 111b02308cf2949c893d2aac06f3b20555e4090f..03e60fa739d31a488b0fdcf5fe382a2c0d66bc72 100644 --- a/conf/OHMCV/inputs/OHMCV.DSD.VB1.12-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.DSD.VB1.12-14.1.csv @@ -14,7 +14,7 @@ subject:main;Fixed Observation Stations contributorName:WorkPackageLeader;Brice Boudevillain;affiliation;IGE date:Collected;2012-01-06/2014-12-31 geoLocationPlace;Collège Laboissière -geoLocationBox;4.4953 44.5548 4.4953 44.5548 +geoLocationPoint;44.5548 4.4953 relatedIdentifier:IsSupplementedBy:DOI;10.5072/OHMCV.DSD.VB1.12-16.1 description:Other;"This dataset has been extended and updated by the following dataset: 10.17178/OHMCV.DSD.VB1.12-16.1" # END; diff --git a/conf/OHMCV/inputs/OHMCV.DSD.VB2.11-14.1.csv b/conf/OHMCV/inputs/OHMCV.DSD.VB2.11-14.1.csv index cda74f29bad55725279a1ed7b1cffee943fc57ec..1c41b8d1a5df8c19def92b9b884e607dd15cceb4 100644 --- a/conf/OHMCV/inputs/OHMCV.DSD.VB2.11-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.DSD.VB2.11-14.1.csv @@ -15,7 +15,7 @@ subject:main;Fixed Observation Stations contributorName:WorkPackageLeader;Brice Boudevillain;affiliation;IGE date:Collected;2011-11-04/2014-12-31 geoLocationPlace;Villeneuve-de-Berg -geoLocationBox;4.4954 44.5547 4.4954 44.5547 +geoLocationPoint;44.5547 4.4954 relatedIdentifier:IsSupplementedBy:DOI;10.5072/OHMCV.DSD.VB2.12-16.1 description:Other;"This dataset has been extended and updated by the following dataset: 10.17178/OHMCV.DSD.VB2.12-16.1" # END; diff --git a/conf/OHMCV/inputs/OHMCV.DSD.VB3.12-14.1.csv b/conf/OHMCV/inputs/OHMCV.DSD.VB3.12-14.1.csv index ebd292a1a38a8bda03ca5b6e3481c1969dec3573..8132336b5ca2e518c8c9b6d3c44db6cb20752999 100644 --- a/conf/OHMCV/inputs/OHMCV.DSD.VB3.12-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.DSD.VB3.12-14.1.csv @@ -15,7 +15,7 @@ subject:main;Fixed Observation Stations contributorName:WorkPackageLeader;Brice Boudevillain;affiliation;IGE date:Collected;2012-01-06/2014-12-31 geoLocationPlace;Villeneuve-de-Berg -geoLocationBox;4.4955 44.5548 4.4955 44.5548 +geoLocationPoint;44.5548 4.4955 relatedIdentifier:IsSupplementedBy:DOI;10.5072/OHMCV.DSD.VB3.12-16.1 description:Other;"This dataset has been extended and updated by the following dataset: 10.17178/OHMCV.DSD.VB3.12-16.1" # END; diff --git a/conf/OHMCV/inputs/OHMCV.ERO.PRA.10-13.1.csv b/conf/OHMCV/inputs/OHMCV.ERO.PRA.10-13.1.csv index 54811891b67e91548af2b9cbb978493bca49a92e..74178f86bb8e6c5235aa4c75002a7e11dbcc27ef 100644 --- a/conf/OHMCV/inputs/OHMCV.ERO.PRA.10-13.1.csv +++ b/conf/OHMCV/inputs/OHMCV.ERO.PRA.10-13.1.csv @@ -18,5 +18,5 @@ The measurement site is part of the OHMCV observatory. It is located at Le Prade format;CSV;;;; format;"ESRI Grid";;;; geoLocationPlace;Pradel-Vignes -geoLocationBox;4.495 44.5801 4.495 44.5801 +geoLocationPoint;44.5801 4.495 # END; diff --git a/conf/OHMCV/inputs/OHMCV.HSS.CLA.11-14.1.csv b/conf/OHMCV/inputs/OHMCV.HSS.CLA.11-14.1.csv index 7130cbbbe57739e6c23dd8ea3c218d276c9f82ab..0d250e10d285fe543215b89a911d9937f8c0d130 100644 --- a/conf/OHMCV/inputs/OHMCV.HSS.CLA.11-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.HSS.CLA.11-14.1.csv @@ -21,5 +21,5 @@ The data provided are continuous series of water temperature, water level, disch format;CSV;;;; format;"ESRI Grid";;;; geoLocationPlace;Gazel and Claduègne hydro-sedimentary stations -geoLocationBox;4.478 44.562 4.4943 44.5793 +geoLocationBox;44.562 4.478 44.5793 4.4943 # END; diff --git a/conf/OHMCV/inputs/OHMCV.LIM.CLA.12-14.1.csv b/conf/OHMCV/inputs/OHMCV.LIM.CLA.12-14.1.csv index 0d180d51dfa54bd14a02ec5e4de0147071ce4fc3..c632c488a9dd2928e82a5b8f01e782ca7f037be8 100644 --- a/conf/OHMCV/inputs/OHMCV.LIM.CLA.12-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.LIM.CLA.12-14.1.csv @@ -24,5 +24,5 @@ The data provided are continuous series of water temperature, total pressure, wa format;CSV;;;; format;"ESRI Grid";;;; geoLocationPlace;Claduègne catchment -geoLocationBox;4.4789 44.562 4.547 44.6671 +geoLocationBox;44.562 4.4789 44.6671 4.547 # END; diff --git a/conf/OHMCV/inputs/OHMCV.RTS.AUZ.10-14.1.csv b/conf/OHMCV/inputs/OHMCV.RTS.AUZ.10-14.1.csv index 93d86a6145daf6a327ee4faf9c1f1c9f4670ffb5..ea7740c5e85fd36689f247be76c49835f05a8ebb 100644 --- a/conf/OHMCV/inputs/OHMCV.RTS.AUZ.10-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.RTS.AUZ.10-14.1.csv @@ -16,5 +16,5 @@ A interactive software based on R allows to interactively plot and extract the d description:SeriesInformation;The data provided are 5-min rainfall amounts at 19 raingauges situated in an area of about 7x5km^2. Rainfall data are provided only for rainfall events which are defined as a succession of rainy days during which at least 2 raingauges have recorded 10mm or more. format;CSV;;;; format;"ESRI Grid";;;; -geoLocationBox;4.44838 44.54993 4.5148 44.6141 +geoLocationBox;44.54993 4.44838 44.6141 4.5148 # END; diff --git a/conf/OHMCV/inputs/OHMCV.SMO.CLA.13-14.1.csv b/conf/OHMCV/inputs/OHMCV.SMO.CLA.13-14.1.csv index 7669e9c071a3edc9abc2a6cd0e9d25b0bf5b56eb..9c24c7198bf39968b9af1061f8d998144f310677 100644 --- a/conf/OHMCV/inputs/OHMCV.SMO.CLA.13-14.1.csv +++ b/conf/OHMCV/inputs/OHMCV.SMO.CLA.13-14.1.csv @@ -15,5 +15,5 @@ Nine sites with different land uses (two vineyards, four pastures, one piece of format;CSV;;;; format;"ESRI Grid";;;; geoLocationPlace;Claduègne catchment -geoLocationBox;4.49379283 44.57625496 4.54757162 44.66844587 +geoLocationBox;44.57625496 4.49379283 44.66844587 4.54757162 # END; diff --git a/resources/xsl/csw2txt_ohmcv.xsl b/resources/xsl/csw2txt_ohmcv.xsl index 28740008a01944418ed751fa77b2db17ec98c379..271261bb17671e98ad302135f7ea36ef29acb5bf 100644 --- a/resources/xsl/csw2txt_ohmcv.xsl +++ b/resources/xsl/csw2txt_ohmcv.xsl @@ -316,18 +316,37 @@ <xsl:variable name="box" select="gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox"/> <xsl:if test="$box"> - <xsl:call-template name="row"> - <xsl:with-param name="key">geoLocationBox</xsl:with-param> - <xsl:with-param name="value"> - <xsl:value-of select="$box/gmd:westBoundLongitude/gco:Decimal/text()"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$box/gmd:southBoundLatitude/gco:Decimal/text()"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$box/gmd:eastBoundLongitude/gco:Decimal/text()"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$box/gmd:northBoundLatitude/gco:Decimal/text()"/> - </xsl:with-param> - </xsl:call-template> + <xsl:variable name="west" select="$box/gmd:westBoundLongitude/gco:Decimal/text()"/> + <xsl:variable name="east" select="$box/gmd:eastBoundLongitude/gco:Decimal/text()"/> + <xsl:variable name="north" select="$box/gmd:northBoundLatitude/gco:Decimal/text()"/> + <xsl:variable name="south" select="$box/gmd:southBoundLatitude/gco:Decimal/text()"/> + + <xsl:choose> + <xsl:when test="$west = $east and $north = $south"> + <xsl:call-template name="row"> + <xsl:with-param name="key">geoLocationPoint</xsl:with-param> + <xsl:with-param name="value"> + <xsl:value-of select="$north"/> + <xsl:text> </xsl:text> + <xsl:value-of select="$west"/> + </xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="row"> + <xsl:with-param name="key">geoLocationBox</xsl:with-param> + <xsl:with-param name="value"> + <xsl:value-of select="$south"/> + <xsl:text> </xsl:text> + <xsl:value-of select="$west"/> + <xsl:text> </xsl:text> + <xsl:value-of select="$north"/> + <xsl:text> </xsl:text> + <xsl:value-of select="$east"/> + </xsl:with-param> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> </xsl:if> </xsl:template>