geonetwork-ui 2.4.0-dev.3c297076 → 2.4.0-dev.49921490

package/libs/util/shared/src/lib/links/link-classifier.service.d.ts

@@ -1,4 +1,4 @@
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record';
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record';
 import * as i0 from "@angular/core";
 export declare enum LinkUsage {
     API = "api",
@@ -10,8 +10,8 @@ export declare enum LinkUsage {
     UNKNOWN = "unknown"
 }
 export declare class LinkClassifierService {
-    getUsagesForLink(link: DatasetDistribution): LinkUsage[];
-    hasUsage(link: DatasetDistribution, usage: LinkUsage): boolean;
+    getUsagesForLink(link: DatasetOnlineResource): LinkUsage[];
+    hasUsage(link: DatasetOnlineResource, usage: LinkUsage): boolean;
     static ɵfac: i0.ɵɵFactoryDeclaration<LinkClassifierService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<LinkClassifierService>;
 }

package/libs/util/shared/src/lib/links/link-classifier.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link-classifier.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-classifier.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAA;;AAE/F,oBAAY,SAAS;IACnB,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,YAAY,gBAAgB;IAC5B,OAAO,YAAY;CACpB;AAED,qBAGa,qBAAqB;IAChC,gBAAgB,CAAC,IAAI,EAAE,mBAAmB,GAAG,SAAS,EAAE;IAoCxD,QAAQ,CAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,SAAS;yCArCzC,qBAAqB;6CAArB,qBAAqB;CAwCjC"}
+{"version":3,"file":"link-classifier.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-classifier.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2DAA2D,CAAA;;AAGjG,oBAAY,SAAS;IACnB,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,YAAY,gBAAgB;IAC5B,OAAO,YAAY;CACpB;AAED,qBAGa,qBAAqB;IAChC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,SAAS,EAAE;IAoC1D,QAAQ,CAAC,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,SAAS;yCArC3C,qBAAqB;6CAArB,qBAAqB;CAwCjC"}

package/libs/util/shared/src/lib/links/link-utils.d.ts

@@ -1,4 +1,4 @@
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record';
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record';
 export declare const FORMATS: {
     readonly csv: {
         readonly extensions: readonly ["csv"];
@@ -99,13 +99,13 @@ export declare const FORMATS: {
 };
 export type FileFormat = keyof typeof FORMATS;
 export declare function getFormatPriority(linkFormat: FileFormat): number;
-export declare function getLinkPriority(link: DatasetDistribution): number;
+export declare function getLinkPriority(link: DatasetOnlineResource): number;
 export declare function getFileFormatFromServiceOutput(serviceOutput: string): FileFormat | null;
-export declare function getFileFormat(link: DatasetDistribution): FileFormat;
-export declare function isFormatInQueryParam(link: DatasetDistribution, alias: string): boolean;
+export declare function getFileFormat(link: DatasetOnlineResource): FileFormat;
+export declare function isFormatInQueryParam(link: DatasetOnlineResource, alias: string): boolean;
 export declare function mimeTypeToFormat(mimeType: string): FileFormat;
-export declare function checkFileFormat(link: DatasetDistribution, format: FileFormat): boolean;
+export declare function checkFileFormat(link: DatasetOnlineResource, format: FileFormat): boolean;
 export declare function getBadgeColor(linkFormat: FileFormat): string;
-export declare function getLinkLabel(link: DatasetDistribution): string;
+export declare function getLinkLabel(link: DatasetOnlineResource): string;
 export declare function getMimeTypeForFormat(format: FileFormat): string | null;
 //# sourceMappingURL=link-utils.d.ts.map

package/libs/util/shared/src/lib/links/link-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAA;AAI/F,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgHV,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,OAAO,CAAA;AAE7C,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAUhE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAEjE;AAED,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,GACpB,UAAU,GAAG,IAAI,CAgBnB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,mBAAmB,GAAG,UAAU,CAcnE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,MAAM,GACZ,OAAO,CAQT;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAO7D;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,mBAAmB,EACzB,MAAM,EAAE,UAAU,GACjB,OAAO,CAMT;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAQ5D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CA0B9D;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEtE"}
+{"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2DAA2D,CAAA;AAIjG,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgHV,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,OAAO,CAAA;AAE7C,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAUhE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CAEnE;AAED,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,GACpB,UAAU,GAAG,IAAI,CAgBnB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,qBAAqB,GAAG,UAAU,CAcrE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,EAC3B,KAAK,EAAE,MAAM,GACZ,OAAO,CAQT;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAO7D;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,qBAAqB,EAC3B,MAAM,EAAE,UAAU,GACjB,OAAO,CAMT;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAQ5D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CA0BhE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEtE"}

package/libs/util/shared/src/lib/services/theme.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/services/theme.service.ts"],"names":[],"mappings":";AAGA,qBAGa,YAAY;IAEvB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM;IAI5B,MAAM,CAAC,wBAAwB,CAC7B,SAAS,KAAA,EACT,UAAU,KAAA,EACV,SAAS,WAAsB;IAiBjC,MAAM,CAAC,iBAAiB,CACtB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,MAAM;IA4F7B,MAAM,CAAC,kBAAkB,CACvB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,MAAM;IAQT,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;yCAzIjC,YAAY;6CAAZ,YAAY;CAiJxB"}
+{"version":3,"file":"theme.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/services/theme.service.ts"],"names":[],"mappings":";AAGA,qBAGa,YAAY;IAEvB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM;IAI5B,MAAM,CAAC,wBAAwB,CAC7B,SAAS,KAAA,EACT,UAAU,KAAA,EACV,SAAS,WAAsB;IAiBjC,MAAM,CAAC,iBAAiB,CACtB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,MAAM;IA6F7B,MAAM,CAAC,kBAAkB,CACvB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,MAAM;IAQT,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;yCA1IjC,YAAY;6CAAZ,YAAY;CAkJxB"}

package/libs/util/shared/src/lib/utils/bytes-convert.d.ts

@@ -1,2 +1,3 @@
-export declare function megabytesToBytes(megabytes: any): number;
+export declare function megabytesToBytes(megabytes: number): number;
+export declare function bytesToMegabytes(bytes: number): number;
 //# sourceMappingURL=bytes-convert.d.ts.map

package/libs/util/shared/src/lib/utils/bytes-convert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bytes-convert.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/bytes-convert.ts"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,SAAS,KAAA,UAEzC"}
+{"version":3,"file":"bytes-convert.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/bytes-convert.ts"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,UAEjD;AACD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,UAE7C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.4.0-dev.3c297076",
+  "version": "2.4.0-dev.49921490",
   "engines": {
     "node": ">=14.17.0"
   },
@@ -47,8 +47,10 @@
   },
   "dependencies": {
     "@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
-    "@camptocamp/ogc-client": "1.1.1-dev.ad6d9ab",
-    "@geospatial-sdk/geocoding": "^0.0.5-alpha.2",
+    "@camptocamp/ogc-client": "1.1.1-dev.c75dcba",
+    "@geospatial-sdk/core": "^0.0.5-dev.20",
+    "@geospatial-sdk/geocoding": "^0.0.5-dev.20",
+    "@geospatial-sdk/openlayers": "^0.0.5-dev.20",
     "@ltd/j-toml": "~1.35.2",
     "@messageformat/core": "^3.0.1",
     "@nx/angular": "16.6.0",

package/src/libs/api/metadata-converter/src/index.ts

@@ -2,3 +2,4 @@ export * from './lib/iso19139'
 export * from './lib/iso19115-3'
 export * from './lib/find-converter'
 export * from './lib/gn4'
+export * from './lib/xml-utils'

package/src/libs/api/metadata-converter/src/lib/fixtures/generic.records.ts

@@ -141,7 +141,7 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
   ],
   topics: ['agriculture'],
   spatialRepresentation: 'grid',
-  distributions: [
+  onlineResources: [
     {
       type: 'download',
       url: new URL('http://my-org.net/download/1.zip'),
@@ -194,7 +194,12 @@ As such, **it is not very interesting at all.**`,
       text: 'Contains sensitive information related to national defense',
     },
   ],
-  spatialExtents: [],
+  spatialExtents: [
+    {
+      bbox: [-11.5, 35.3, 43.2, 81.4],
+      description: 'http://www.naturalearthdata.com/ne_admin#Continent/Europe',
+    },
+  ],
   temporalExtents: [
     {
       start: new Date('2024-05-24'),

package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.ts

@@ -98,7 +98,7 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
   ],
   topics: ['planningCadastre'],
   spatialRepresentation: 'vector',
-  distributions: [
+  onlineResources: [
     {
       type: 'download',
       url: new URL(

package/src/libs/api/metadata-converter/src/lib/fixtures/geocat-ch.records.ts

@@ -222,7 +222,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
     },
   ],
   spatialRepresentation: 'vector',
-  distributions: [
+  onlineResources: [
     {
       type: 'link',
       url: new URL('https://map.geo.admin.ch/?layers=ch.are.alpenkonvention'),

package/src/libs/api/metadata-converter/src/lib/fixtures/metawal.records.ts

@@ -68,7 +68,7 @@ Toutes ces données sont reprises dans BDR.`,
   resourceCreated: new Date('2002-01-01'),
   resourceUpdated: new Date('2022-06-16'),
   resourcePublished: new Date('2022-06-16'),
-  distributions: [
+  onlineResources: [
     {
       description:
         "Application de consultation des routes et autoroutes de Wallonie. Cette application est sécurisée et n'est accessible que pour les agents de la DGO1 du SPW.",

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts

@@ -20,12 +20,9 @@ import { getUpdateFrequencyFromFrequencyCode } from '../iso19139/utils/update-fr
 import {
   CatalogRecord,
   Constraint,
-  DatasetDistribution,
-  DatasetDistributionType,
-  DatasetDownloadDistribution,
-  DatasetServiceDistribution,
   DatasetSpatialExtent,
-  OnlineLinkResource,
+  OnlineResource,
+  OnlineResourceType,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchProtocol } from '../common/distribution.mapper'
 import { Thesaurus } from './types'
@@ -158,13 +155,13 @@ export class Gn4FieldMapper {
       const rawLinks = getAsArray(
         selectField<SourceWithUnknownProps[]>(source, 'link')
       )
-      const distributions = rawLinks
+      const onlineResources = rawLinks
         .map((link) => this.mapLink(link))
         .filter((v) => v !== null)
       return {
         ...output,
-        distributions,
-      }
+        onlineResources,
+      } as CatalogRecord
     },
     contact: (output, source) => ({
       ...output,
@@ -287,7 +284,7 @@ export class Gn4FieldMapper {
       return {
         ...output,
         kind,
-      }
+      } as CatalogRecord
     },
     geom: (output, source) => {
       const geoms = getAsArray(selectField(source, 'geom'))
@@ -387,7 +384,7 @@ export class Gn4FieldMapper {
     return fieldName in this.fields ? this.fields[fieldName] : this.genericField
   }
 
-  getLinkType(url: string, protocol?: string): DatasetDistributionType {
+  getLinkType(url: string, protocol?: string): OnlineResourceType {
     if (!protocol) {
       return 'link'
     }
@@ -406,9 +403,7 @@ export class Gn4FieldMapper {
     return 'link'
   }
 
-  mapLink = (
-    sourceLink: SourceWithUnknownProps
-  ): DatasetDistribution | null => {
+  mapLink = (sourceLink: SourceWithUnknownProps): OnlineResource | null => {
     const url = getAsUrl(
       selectFallback(
         selectTranslatedField<string>(sourceLink, 'urlObject', this.lang3),
@@ -452,20 +447,27 @@ export class Gn4FieldMapper {
           type,
           url: url,
           accessServiceProtocol,
-        } as DatasetServiceDistribution
+        }
       case 'link':
         return {
           ...distribution,
           type,
           url: url,
-        } as OnlineLinkResource
+        }
       case 'download':
         return {
           ...distribution,
           type,
           url: url,
           ...(mimeType && { mimeType }),
-        } as DatasetDownloadDistribution
+        }
+      case 'endpoint':
+        return {
+          ...distribution,
+          type,
+          endpointUrl: url,
+          protocol: accessServiceProtocol,
+        }
     }
   }
 

package/src/libs/api/metadata-converter/src/lib/gn4/types/keywords.model.ts

@@ -1,10 +1,6 @@
 export interface KeywordApiResponse {
-  values?: {
-    eng: string
-  }
-  definitions?: {
-    eng: string
-  }
+  values?: Record<string, string>
+  definitions?: Record<string, string>
   coordEast?: string
   coordWest?: string
   coordSouth?: string

package/src/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.ts

@@ -4,10 +4,10 @@ import { Iso19139Converter } from '../iso19139'
 import { renameElements } from '../xml-utils'
 import {
   readContacts,
-  readDistributions,
   readKind,
   readLandingPage,
   readLineage,
+  readOnlineResources,
   readOwnerOrganization,
   readRecordCreated,
   readRecordPublished,
@@ -18,10 +18,10 @@ import {
 import {
   writeContacts,
   writeContactsForResource,
-  writeDistributions,
   writeKind,
   writeLandingPage,
   writeLineage,
+  writeOnlineResources,
   writeOwnerOrganization,
   writeRecordCreated,
   writeRecordPublished,
@@ -48,7 +48,7 @@ export class Iso191153Converter extends Iso19139Converter {
     this.readers['ownerOrganization'] = readOwnerOrganization
     this.readers['landingPage'] = readLandingPage
     this.readers['lineage'] = readLineage
-    this.readers['distributions'] = readDistributions
+    this.readers['onlineResources'] = readOnlineResources
 
     this.writers['uniqueIdentifier'] = writeUniqueIdentifier
     this.writers['kind'] = writeKind
@@ -63,7 +63,7 @@ export class Iso191153Converter extends Iso19139Converter {
     this.writers['ownerOrganization'] = writeOwnerOrganization
     this.writers['landingPage'] = writeLandingPage
     this.writers['lineage'] = writeLineage
-    this.writers['distributions'] = writeDistributions
+    this.writers['onlineResources'] = writeOnlineResources
     this.writers['status'] = writeStatus
     this.writers['spatialRepresentation'] = writeSpatialRepresentation
   }

package/src/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.ts

@@ -19,15 +19,16 @@ import {
 } from '../function-utils'
 import {
   extractCharacterString,
-  extractDatasetDistributions,
+  extractDatasetOnlineResources,
   extractDateTime,
   extractRole,
+  extractServiceOnlineResources,
   extractUrl,
   findIdentification,
 } from '../iso19139/read-parts'
 import {
-  DatasetDistribution,
   Individual,
+  OnlineResource,
   Organization,
   RecordKind,
   Role,
@@ -320,10 +321,17 @@ const getMimeType = pipe(
   map(matchMimeType)
 )
 
-export function readDistributions(rootEl: XmlElement): DatasetDistribution[] {
+export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
+  if (readKind(rootEl) === 'dataset') {
+    return pipe(
+      findNestedElements('mrd:distributionInfo', 'mrd:MD_Distribution'),
+      mapArray(extractDatasetOnlineResources(getMimeType)),
+      flattenArray()
+    )(rootEl)
+  }
   return pipe(
     findNestedElements('mrd:distributionInfo', 'mrd:MD_Distribution'),
-    mapArray(extractDatasetDistributions(getMimeType)),
+    mapArray(extractServiceOnlineResources()),
     flattenArray()
   )(rootEl)
 }

package/src/libs/api/metadata-converter/src/lib/iso19115-3/write-parts.ts

@@ -2,7 +2,6 @@ import {
   CatalogRecord,
   DatasetRecord,
   Individual,
-  ServiceOnlineResource,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   addAttribute,
@@ -34,14 +33,14 @@ import {
   pipe,
 } from '../function-utils'
 import {
-  appendDistribution,
   appendKeywords,
+  appendOnlineResource,
+  appendServiceOnlineResources,
   createDistributionInfo,
   findOrCreateDistribution,
   findOrCreateIdentification,
   getProgressCode,
   getRoleCode,
-  getServiceEndpointProtocol,
   removeKeywords,
   writeCharacterString,
   writeDateTime,
@@ -481,7 +480,7 @@ function removeTransferOptions(rootEl: XmlElement) {
   )(rootEl)
 }
 
-function appendDistributionFormat(mimeType: string) {
+function appendOnlineResourceFormat(mimeType: string) {
   return appendChildren(
     pipe(
       createElement('mrd:distributionFormat'),
@@ -494,11 +493,18 @@ function appendDistributionFormat(mimeType: string) {
   )
 }
 
-export function writeDistributions(record: DatasetRecord, rootEl: XmlElement) {
+export function writeOnlineResources(
+  record: CatalogRecord,
+  rootEl: XmlElement
+) {
   removeTransferOptions(rootEl)
 
-  // for each distribution, either find an existing distribution info or create a new one
-  record.distributions.forEach((distribution, index) => {
+  if (record.kind === 'service') {
+    appendServiceOnlineResources(record, rootEl)
+  }
+
+  // for each online resource, either find an existing distribution info or create a new one
+  record.onlineResources.forEach((onlineResource, index) => {
     pipe(
       fallback(
         pipe(
@@ -507,7 +513,7 @@ export function writeDistributions(record: DatasetRecord, rootEl: XmlElement) {
         ),
         appendChildTree(createDistributionInfo())
       ),
-      appendDistribution(distribution, appendDistributionFormat)
+      appendOnlineResource(onlineResource, appendOnlineResourceFormat)
     )(rootEl)
   })
 }

package/src/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.ts

@@ -18,7 +18,6 @@ import {
   readAbstract,
   readContacts,
   readContactsForResource,
-  readDistributions,
   readIsoTopics,
   readKeywords,
   readKind,
@@ -46,7 +45,6 @@ import {
   writeAbstract,
   writeContacts,
   writeContactsForResource,
-  writeDistributions,
   writeGraphicOverviews,
   writeKeywords,
   writeKind,
@@ -55,7 +53,6 @@ import {
   writeLineage,
   writeOnlineResources,
   writeOtherConstraints,
-  writeOwnerOrganization,
   writeRecordUpdated,
   writeResourceCreated,
   writeResourcePublished,
@@ -100,7 +97,6 @@ export class Iso19139Converter extends BaseConverter<string> {
     spatialRepresentation: readSpatialRepresentation,
     overviews: readOverviews,
     lineage: readLineage,
-    distributions: readDistributions,
     onlineResources: readOnlineResources,
     temporalExtents: readTemporalExtents,
     spatialExtents: readSpatialExtents,
@@ -116,7 +112,7 @@ export class Iso19139Converter extends BaseConverter<string> {
   > = {
     uniqueIdentifier: writeUniqueIdentifier,
     kind: writeKind,
-    ownerOrganization: writeOwnerOrganization,
+    ownerOrganization: () => undefined, // fixme: find a way to store this value properly
     recordUpdated: writeRecordUpdated,
     recordCreated: () => undefined, // not supported in ISO19139
     recordPublished: () => undefined, // not supported in ISO19139
@@ -138,10 +134,9 @@ export class Iso19139Converter extends BaseConverter<string> {
     spatialRepresentation: writeSpatialRepresentation,
     overviews: writeGraphicOverviews,
     lineage: writeLineage,
-    distributions: writeDistributions,
     onlineResources: writeOnlineResources,
     temporalExtents: writeTemporalExtents,
-    spatialExtents: () => writeSpatialExtents,
+    spatialExtents: writeSpatialExtents,
     // TODO
     extras: () => undefined,
     landingPage: () => undefined,
@@ -177,6 +172,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     const licenses = this.readers['licenses'](rootEl)
     const overviews = this.readers['overviews'](rootEl)
     const landingPage = this.readers['landingPage'](rootEl)
+    const onlineResources = this.readers['onlineResources'](rootEl)
 
     if (kind === 'dataset') {
       const status = this.readers['status'](rootEl)
@@ -185,7 +181,6 @@ export class Iso19139Converter extends BaseConverter<string> {
       const spatialExtents = this.readers['spatialExtents'](rootEl)
       const temporalExtents = this.readers['temporalExtents'](rootEl)
       const lineage = this.readers['lineage'](rootEl)
-      const distributions = this.readers['distributions'](rootEl)
       const updateFrequency = this.readers['updateFrequency'](rootEl)
 
       return {
@@ -215,12 +210,11 @@ export class Iso19139Converter extends BaseConverter<string> {
         overviews,
         spatialExtents,
         temporalExtents,
-        distributions,
+        onlineResources,
         updateFrequency,
         ...(landingPage && { landingPage }),
       } as DatasetRecord
     } else {
-      const onlineResources = this.readers['onlineResources'](rootEl)
       return {
         uniqueIdentifier,
         kind,
@@ -307,6 +301,8 @@ export class Iso19139Converter extends BaseConverter<string> {
     fieldChanged('licenses') && this.writers['licenses'](record, rootEl)
     fieldChanged('otherConstraints') &&
       this.writers['otherConstraints'](record, rootEl)
+    fieldChanged('onlineResources') &&
+      this.writers['onlineResources'](record, rootEl)
 
     if (record.kind === 'dataset') {
       fieldChanged('status') && this.writers['status'](record, rootEl)
@@ -317,12 +313,9 @@ export class Iso19139Converter extends BaseConverter<string> {
       fieldChanged('overviews') && this.writers['overviews'](record, rootEl)
       fieldChanged('temporalExtents') &&
         this.writers['temporalExtents'](record, rootEl)
-      fieldChanged('distributions') &&
-        this.writers['distributions'](record, rootEl)
+      fieldChanged('spatialExtents') &&
+        this.writers['spatialExtents'](record, rootEl)
       fieldChanged('lineage') && this.writers['lineage'](record, rootEl)
-    } else {
-      fieldChanged('onlineResources') &&
-        this.writers['onlineResources'](record, rootEl)
     }
 
     this.beforeDocumentCreation(rootEl)

package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -1,9 +1,10 @@
 import {
   Constraint,
-  DatasetDistribution,
+  DatasetOnlineResource,
   GraphicOverview,
   Individual,
   Keyword,
+  OnlineResource,
   Organization,
   RecordKind,
   RecordStatus,
@@ -326,12 +327,12 @@ const getMimeType = pipe(
 )
 
 /**
- * Extract distributions from a MD_Distribution element
+ * Extract online resources from an MD_Distribution element
  * @param getMimeTypeFn This function starts from a gmd:transferOptions element
  */
-export function extractDatasetDistributions(
+export function extractDatasetOnlineResources(
   getMimeTypeFn: ChainableFunction<XmlElement, string>
-): ChainableFunction<XmlElement, DatasetDistribution[]> {
+): ChainableFunction<XmlElement, DatasetOnlineResource[]> {
   const getUrl = pipe(findChildElement('gmd:linkage'), extractMandatoryUrl())
   const getProtocolStr = pipe(
     findChildElement('gmd:protocol'),
@@ -774,14 +775,6 @@ export function readLineage(rootEl: XmlElement): string {
   )(rootEl)
 }
 
-export function readDistributions(rootEl: XmlElement): DatasetDistribution[] {
-  return pipe(
-    findNestedElements('gmd:distributionInfo', 'gmd:MD_Distribution'),
-    mapArray(extractDatasetDistributions(getMimeType)),
-    flattenArray()
-  )(rootEl)
-}
-
 export function readUpdateFrequency(rootEl: XmlElement): UpdateFrequency {
   return pipe(
     findIdentification(),
@@ -845,9 +838,14 @@ export function extractServiceOnlineResources(): ChainableFunction<
   )
 }
 
-export function readOnlineResources(
-  rootEl: XmlElement
-): ServiceOnlineResource[] {
+export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
+  if (readKind(rootEl) === 'dataset') {
+    return pipe(
+      findNestedElements('gmd:distributionInfo', 'gmd:MD_Distribution'),
+      mapArray(extractDatasetOnlineResources(getMimeType)),
+      flattenArray()
+    )(rootEl)
+  }
   return pipe(
     findNestedElements('gmd:distributionInfo', 'gmd:MD_Distribution'),
     mapArray(extractServiceOnlineResources()),