diff --git a/src/formater-catalogue.vue b/src/formater-catalogue.vue index 8a4ad90..0707362 100644 --- a/src/formater-catalogue.vue +++ b/src/formater-catalogue.vue @@ -157,6 +157,7 @@ export default { var metadata = this.metadatas[this.metadatas.length -1] this.currentUuid = metadata['geonet:info'].uuid var parameters = metadata.osParameters + var mapping = metadata.mapping var min = null var max = null if (metadata.tempExtentBegin) { @@ -173,9 +174,10 @@ export default { } else { this.currentUuid = null var parameters = [] + var mapping = [] this.$store.commit('temporalChange', this.temporalExtent) } - this.$store.commit('parametersChange', parameters) + this.$store.commit('parametersChange', {parameters: parameters, mapping: mapping}) var event = new CustomEvent('fmt:closeMetadataEvent', {detail: {depth: this.metadatas.length }}) document.dispatchEvent(event) }, diff --git a/src/formater-metadata.vue b/src/formater-metadata.vue index 6db4fda..7efbf4c 100644 --- a/src/formater-metadata.vue +++ b/src/formater-metadata.vue @@ -43,26 +43,26 @@
- +
-
- - -
-
-

{{$t('temporal_extent')}}

-
- {{date2str(meta.tempExtentBegin)}} - - {{date2str(meta.tempExtentEnd)}} -
-
-
- -
- +
+ + +
+
+

{{$t('temporal_extent')}}

+
+ {{date2str(meta.tempExtentBegin)}} + + {{date2str(meta.tempExtentEnd)}} +
+
+
+ +
+
@@ -143,25 +143,9 @@ export default { metaLang2: {}, popstateListener: null, keydownListener: null, - searchEventListener: null, - // srv: process.env.GEONETWORK + 'srv/' + (this.lang === 'fr'? 'fre' : 'eng') + '/', - // api: process.env.GEONETWORK + '/srv/api/', - headers: { - 'Accept': 'application/json, text/plain, */*', - 'Accept-Language': this.$i18n.locale === 'fr' ? 'fre': 'eng' - }, + describe: null, - // parameters: {}, - // recordByLine: 4, nbRecord: 12, - // use for opensearch api -// api: null, -// geographic: ['geometry', 'box', 'lat', 'lon', 'radius'], -// paging: ['maxRecords', 'index', 'page'], -// removedFields: ['lang', 'name', 'q', 'organisationName', 'parentIdentifier'], -// osParameters: [], -// geoParameters: [], -// pagingParameters: [], type: 'geonetwork' } }, @@ -244,8 +228,9 @@ export default { this.setHasChild(false) } }, - setParameters(value) { - this.metadata.osParameters = value + setParameters(osParameters) { + this.metadata.osParameters = osParameters.parameters + this.metadata.mapping = osParameters.mapping this.setHasChild(true) }, setHasChild(value) { @@ -255,42 +240,39 @@ export default { this.currentTab = 'search' this.getRecords() } else { - this.$store.commit('parametersChange', []) + this.$store.commit('parametersChange', {parameters: [], mapping:[]}) } }, - fillMetadata () { - //get meta from other language if meta._locale != meta.docLocale - if (this.meta['geonet:info']) { - this.uuid = this.meta['geonet:info'].uuid; - } else { - this.uuid = this.meta.id - } + fillMetadata () { + //get meta from other language if meta._locale != meta.docLocale + if (this.meta['geonet:info']) { + this.uuid = this.meta['geonet:info'].uuid; + } else { + this.uuid = this.meta.id + } - if (this.meta._locale === this.meta.docLocale) { - - return - } - - var url = this.$store.state.geonetwork + 'srv/'+this.meta.docLocale+'/q?_content_type=json&fast=index&uuid=' + this.uuid; - var _this = this - this.$http.get(url).then( + if (this.meta._locale === this.meta.docLocale) { + + return + } + + var url = this.$store.state.geonetwork + 'srv/'+this.meta.docLocale+'/q?_content_type=json&fast=index&uuid=' + this.uuid; + var _this = this + this.$http.get(url).then( response => { // _this.extract(response.body.metadata) _this.metaLang2 = response.body.metadata } - ) - if (this.meta.related && this.meta.related.children) { - this.hasChild = true - this.getRecords() - } - }, - - getRecords () { + ) + if (this.meta.related && this.meta.related.children) { + this.hasChild = true + this.getRecords() + } + }, + getRecords () { // useless, it's trigger when load formater-page-changed - // lance le requeteur -// console.log('search child from metadata') - var event = new CustomEvent('fmt:metadataWithChildEvent', {detail: {uuid: this.uuid, depth: this.depth}}) - document.dispatchEvent(event) + var event = new CustomEvent('fmt:metadataWithChildEvent', {detail: {uuid: this.uuid, depth: this.depth}}) + document.dispatchEvent(event) }, } @@ -332,8 +314,8 @@ export default { .mtdt-metadata h2, .mtdt-metadata h3, .mtdt-metadata h4{ - max-width: 100%; - color:#754a15; + max-width: 100%; + color:#754a15; } .mtdt-metadata h2 { @@ -363,13 +345,13 @@ export default { line-height:1.5; } .mtdt-metadata .mtdt-group-logo{ - float:right; - margin-top:-5px; - margin-right: 15px; + float:right; + margin-top:-5px; + margin-right: 15px; } .mtdt-metadata .mtdt-group-logo img{ - max-width:100px; - height:40px; + max-width:100px; + height:40px; } .mtdt-metadata .mtdt-contacts h3{ margin-bottom:0; diff --git a/src/formater-opensearch.vue b/src/formater-opensearch.vue index b6e5253..39fb9f2 100644 --- a/src/formater-opensearch.vue +++ b/src/formater-opensearch.vue @@ -8,7 +8,9 @@