geonetwork-ui 2.6.0-dev.01d2b5fc0 → 2.6.0-dev.01f702fed

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

@@ -1,112 +1,119 @@
-import { DatasetOnlineResource, ServiceProtocol } from '../../../../../../libs/common/domain/src/lib/model/record';
+import { DatasetOnlineResource, ServiceOnlineResource, ServiceProtocol } from '../../../../../../libs/common/domain/src/lib/model/record';
 export declare const FORMATS: {
     readonly csv: {
         readonly extensions: readonly ["csv"];
         readonly priority: 1;
-        readonly color: "#a6d6c0";
+        readonly color: "#F6A924";
         readonly mimeTypes: readonly ["text/csv", "application/csv"];
     };
     readonly excel: {
         readonly extensions: readonly ["excel", "xls", "xlsx", "ms-excel", "openxmlformats-officedocument"];
         readonly priority: 2;
-        readonly color: "#acc5e4";
+        readonly color: "#FFDE10";
         readonly mimeTypes: readonly ["application/vnd.ms-excel", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"];
     };
     readonly geojson: {
         readonly extensions: readonly ["geojson"];
         readonly priority: 3;
-        readonly color: "#b3cde8";
+        readonly color: "#293C6F";
         readonly mimeTypes: readonly ["application/geo+json", "application/vnd.geo+json"];
     };
     readonly json: {
         readonly extensions: readonly ["json"];
         readonly priority: 3;
-        readonly color: "#b3cde8";
+        readonly color: "#84D0F0";
         readonly mimeTypes: readonly ["application/json"];
     };
     readonly shp: {
         readonly extensions: readonly ["shp", "shape", "zipped-shapefile"];
         readonly priority: 4;
-        readonly color: "#b2d8ba";
+        readonly color: "#009036";
         readonly mimeTypes: readonly ["x-gis/x-shapefile"];
     };
     readonly gml: {
         readonly extensions: readonly ["gml"];
         readonly priority: 5;
-        readonly color: "#e3b3e5";
+        readonly color: "#E75113";
         readonly mimeTypes: readonly ["application/gml+xml", "text/xml; subtype=gml"];
     };
     readonly kml: {
         readonly extensions: readonly ["kml", "kmz"];
         readonly priority: 6;
-        readonly color: "#c1e6a0";
+        readonly color: "#F4B5D0";
         readonly mimeTypes: readonly ["application/vnd.google-earth.kml+xml", "application/vnd.google-earth.kmz"];
     };
     readonly gpkg: {
         readonly extensions: readonly ["gpkg", "geopackage"];
         readonly priority: 7;
-        readonly color: "#f7cce6";
+        readonly color: "#7D5D9F";
         readonly mimeTypes: readonly ["application/geopackage+sqlite3"];
     };
     readonly zip: {
         readonly extensions: readonly ["zip", "tar.gz"];
         readonly priority: 8;
-        readonly color: "#ffe7a3";
+        readonly color: "#B0CB52";
         readonly mimeTypes: readonly ["application/zip", "application/x-zip"];
     };
     readonly pdf: {
         readonly extensions: readonly ["pdf"];
         readonly priority: 9;
-        readonly color: "#f5b2a3";
+        readonly color: "#49579E";
         readonly mimeTypes: readonly ["application/pdf"];
     };
     readonly jpg: {
         readonly extensions: readonly ["jpg", "jpeg", "jfif", "pjpeg", "pjp"];
         readonly priority: 9;
-        readonly color: "#d1c1e9";
+        readonly color: "#C4A98F";
         readonly mimeTypes: readonly ["image/jpg"];
     };
     readonly svg: {
         readonly extensions: readonly ["svg"];
         readonly priority: 10;
-        readonly color: "#f3c1c9";
+        readonly color: "#EB6D82";
         readonly mimeTypes: readonly ["image/svg+xml"];
     };
     readonly dxf: {
         readonly extensions: readonly ["dxf"];
         readonly priority: 11;
-        readonly color: "#f6ceac";
+        readonly color: "#DCCD00";
         readonly mimeTypes: readonly ["application/x-dxf", "image/x-dxf"];
     };
     readonly html: {
         readonly extensions: readonly ["html", "htm"];
         readonly priority: 12;
-        readonly color: "#FFF2CC";
+        readonly color: "#C0C9B6";
         readonly mimeTypes: readonly ["text/html"];
     };
     readonly fgb: {
         readonly extensions: readonly ["fgb", "flatgeobuf"];
         readonly priority: 13;
-        readonly color: "#ffe7a3";
+        readonly color: "#A8111C";
         readonly mimeTypes: readonly ["application/flatgeobuf"];
     };
     readonly jsonfg: {
         readonly extensions: readonly ["jsonfg", "jsonfgc"];
         readonly priority: 14;
-        readonly color: "#ffe7a3";
+        readonly color: "#009EE0";
         readonly mimeTypes: readonly ["application/vnd.ogc.fg+json", "application/vnd.ogc.fg+json;compatibility=geojson"];
     };
 };
 export type FileFormat = keyof typeof FORMATS;
 export declare function getFormatPriority(linkFormat: FileFormat): number;
-export declare function getLinkPriority(link: DatasetOnlineResource): number;
+export declare function getLinkPriority(link: DatasetOnlineResource | ServiceOnlineResource): number;
 export declare function getFileFormatFromServiceOutput(serviceOutput: string): FileFormat | null;
-export declare function getFileFormat(link: DatasetOnlineResource): FileFormat;
-export declare function isFormatInQueryParam(link: DatasetOnlineResource, alias: string): boolean;
+export declare function getFileFormat(link: DatasetOnlineResource | ServiceOnlineResource): FileFormat;
+export declare function isFormatInQueryParam(link: DatasetOnlineResource | ServiceOnlineResource, alias: string): boolean;
 export declare function mimeTypeToFormat(mimeType: string): FileFormat;
-export declare function checkFileFormat(link: DatasetOnlineResource, format: FileFormat): boolean;
+export declare function checkFileFormat(link: DatasetOnlineResource | ServiceOnlineResource, format: FileFormat): boolean;
 export declare function getBadgeColor(linkFormat: FileFormat): string;
-export declare function getLinkLabel(link: DatasetOnlineResource): string;
-export declare function getLayers(url: string, serviceProtocol: ServiceProtocol): Promise<any[]>;
+export declare function getLinkLabel(link: DatasetOnlineResource | ServiceOnlineResource): string;
+export declare function getLayers(url: string, serviceProtocol: ServiceProtocol): Promise<{
+    name: string;
+    hasRecords?: boolean;
+    hasFeatures?: boolean;
+    hasVectorTiles?: boolean;
+    hasMapTiles?: boolean;
+}[] | import("@camptocamp/ogc-client").WfsFeatureTypeFull[] | import("@camptocamp/ogc-client").WmsLayerFull[] | import("@camptocamp/ogc-client").WmtsLayer[]>;
+export declare function wmsLayerFlatten(layerFull: any): any[];
 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,EACL,qBAAqB,EACrB,eAAe,EAChB,MAAM,2DAA2D,CAAA;AAUlE,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,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,kBAwB5E;AAcD,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,EACL,qBAAqB,EACrB,qBAAqB,EACrB,eAAe,EAChB,MAAM,2DAA2D,CAAA;AAUlE,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,CAC7B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,MAAM,CAER;AAED,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,GACpB,UAAU,GAAG,IAAI,CAgBnB;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,UAAU,CAcZ;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,KAAK,EAAE,MAAM,GACZ,OAAO,CAQT;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAO7D;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,MAAM,EAAE,UAAU,GACjB,OAAO,CAQT;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAQ5D;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,MAAM,CA0BR;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe;;;;;;8JAmC5E;AAED,wBAAgB,eAAe,CAAC,SAAS,KAAA,SAUxC;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEtE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.6.0-dev.01d2b5fc0",
+  "version": "2.6.0-dev.01f702fed",
   "engines": {
     "node": ">=20"
   },

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

@@ -5,3 +5,4 @@ export * from './lib/gn4'
 export * from './lib/dcat-ap'
 export * from './lib/xml-utils'
 export * from './lib/base.converter'
+export * from './lib/common/resource-types'

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

@@ -1,7 +1,4 @@
-import {
-  CatalogRecord,
-  DatasetRecord,
-} from '../../../../../libs/common/domain/src/lib/model/record'
+import { CatalogRecord } from '../../../../../libs/common/domain/src/lib/model/record'
 
 export class MetadataMapperContext {
   readonly location?

package/src/libs/api/metadata-converter/src/lib/common/resource-types.ts

@@ -4,23 +4,37 @@ import {
   ReuseType,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
-export function getResourceType(type: string): RecordKind {
-  const possibleResourceTypes = {
-    application: 'reuse',
-    dataset: 'dataset',
-    map: 'reuse',
-    'map/static': 'reuse', // old index field
-    'map/interactive': 'reuse', // old index field
-    'map-interactive': 'reuse', // new index field since Oct 10, 2024
-    'map-static': 'reuse', // new index field
-    mapDigital: 'reuse',
-    interactiveMap: 'reuse',
-    staticMap: 'reuse',
-    service: 'service',
-  } as const
+export const PossibleResourceTypes = {
+  application: 'reuse',
+  dataset: 'dataset',
+  interactiveMap: 'reuse',
+  map: 'reuse',
+  'map/static': 'reuse', // old index field
+  'map/interactive': 'reuse', // old index field
+  'map-interactive': 'reuse', // new index field since Oct 10, 2024
+  'map-static': 'reuse', // new index field
+  mapDigital: 'reuse',
+  series: 'dataset',
+  service: 'service',
+  staticMap: 'reuse',
+} as const
+
+type KindType = keyof typeof PossibleResourceTypes
+type ResourceType = 'reuse' | 'dataset' | 'service'
+type PossibleResourceTypesGrouped = {
+  [K in ResourceType]: KindType[]
+}
+
+export const PossibleResourceTypesDefinition = Object.entries(
+  PossibleResourceTypes
+).reduce(
+  (acc, [key, val]) => ((acc[val] ??= []).push(key), acc),
+  {}
+) as PossibleResourceTypesGrouped
 
+export function getResourceType(type: string): RecordKind {
   return (
-    possibleResourceTypes[type as keyof typeof possibleResourceTypes] ||
+    PossibleResourceTypes[type as keyof typeof PossibleResourceTypes] ||
     'dataset'
   )
 }

package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.service+eaux-usees.ts

@@ -174,10 +174,10 @@ export const GEO2FRANCE_SERVICE_EAUXUSEES_RECORD: ServiceRecord = {
   onlineResources: [
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://services.sandre.eaufrance.fr/geo/odp?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetCapabilities'
       ),
-      protocol: 'wfs',
+      accessServiceProtocol: 'wfs',
       description:
         'Ouvrages de dépollution - Système de traitement des eaux usées - France entière',
       translations: {},

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

@@ -772,10 +772,10 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
     },
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS'
       ),
-      protocol: 'wms',
+      accessServiceProtocol: 'wms',
       description:
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS',
       translations: {

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

@@ -629,10 +629,10 @@ export const METAWAL_SERVICE_RECORD: ServiceRecord = {
     {
       description:
         'Ce service ESRI-REST permet de visualiser la couche de données "Plan parcellaire cadastral - situation 01/01/2016" (uniquement les données du bâti et le parcellaire)',
-      endpointUrl: new URL(
+      url: new URL(
         'https://geoservices.wallonie.be/arcgis/rest/services/PLAN_REGLEMENT/CADMAP_2016_PARCELLES/MapServer'
       ),
-      protocol: 'esriRest',
+      accessServiceProtocol: 'esriRest',
       type: 'endpoint',
       translations: {},
     },

package/src/libs/api/metadata-converter/src/lib/fixtures/wallonie.records.service+napitswallonia.ts

@@ -274,10 +274,10 @@ export const WALLONIE_SERVICE_NAPITSWALLONIA_RECORD: ServiceRecord = {
   onlineResources: [
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://metawal.wallonie.be/geonetwork/api/collections/napits'
       ),
-      protocol: 'other',
+      accessServiceProtocol: 'other',
       description: "Point d'accès OGC API Records pour NAP-ITS-Wallonia.",
       translations: {},
     },

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

@@ -460,6 +460,11 @@ export class Gn4FieldMapper {
       ),
       selectField<string>(sourceLink, 'description')
     )
+    const descriptionLink = selectField<object>(sourceLink, 'descriptionObject')
+    const accessRestricted =
+      descriptionLink &&
+      'link' in descriptionLink &&
+      descriptionLink.link.toString().includes('#MD_RestrictionCode_restricted')
     // no url: fail early
     if (url === null) {
       // TODO: collect errors at the record level?
@@ -485,6 +490,7 @@ export class Gn4FieldMapper {
           type,
           url: url,
           accessServiceProtocol,
+          accessRestricted: accessRestricted,
         }
       case 'link':
         return {
@@ -503,8 +509,8 @@ export class Gn4FieldMapper {
         return {
           ...distribution,
           type,
-          endpointUrl: url,
-          protocol: accessServiceProtocol,
+          url: url,
+          accessServiceProtocol: accessServiceProtocol,
         }
     }
   }

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

@@ -965,8 +965,8 @@ export function extractServiceOnlineResources(): ChainableFunction<
         } else {
           return {
             type: 'endpoint',
-            endpointUrl: url,
-            protocol,
+            url: url,
+            accessServiceProtocol: protocol,
             ...(description && { description }),
             translations,
           }

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

@@ -1227,7 +1227,7 @@ export function writeLineage(record: DatasetRecord, rootEl: XmlElement) {
 }
 
 export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
-  switch (endpoint.protocol.toLowerCase()) {
+  switch (endpoint.accessServiceProtocol.toLowerCase()) {
     case 'wfs':
       return 'OGC:WFS'
     case 'wms':
@@ -1235,14 +1235,14 @@ export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
     case 'wps':
       return 'OGC:WPS'
     default:
-      return endpoint.protocol
+      return endpoint.accessServiceProtocol
   }
 }
 
 export function createOnlineResource(onlineResource: ServiceOnlineResource) {
   let linkageUrl, functionCode, protocol
   if (onlineResource.type === 'endpoint') {
-    linkageUrl = onlineResource.endpointUrl.toString()
+    linkageUrl = onlineResource.url.toString()
     protocol = getServiceEndpointProtocol(onlineResource)
     functionCode = 'download'
   } else {

package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts

@@ -299,14 +299,6 @@ export class ElasticsearchService {
 
   private mustNotFilters(): Record<string, unknown>[] {
     return [
-      {
-        ...this.queryFilterOnValues('resourceType', [
-          'service',
-          'map',
-          'map/static',
-          'mapDigital',
-        ]),
-      },
       {
         query_string: {
           query:
@@ -429,7 +421,7 @@ export class ElasticsearchService {
           must_not: this.mustNotFilters(),
         },
       },
-      _source: ['resourceTitleObject', 'uuid'],
+      _source: ['resourceTitleObject', 'uuid', 'resourceType'],
       from: 0,
       size: 20,
     }

package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts

@@ -14,6 +14,7 @@ import {
 import { PublicationVersionError } from '../../../../../../libs/common/domain/src/lib/model/error'
 import {
   CatalogRecord,
+  DatasetFeatureType,
   DatasetFeatureCatalog,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
@@ -141,24 +142,31 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
+  private mapEmbeddedFeatureCatalog(
+    featureTypes: Array<DatasetFeatureType>
+  ): DatasetFeatureCatalog {
+    return {
+      featureTypes: featureTypes.map((featureType) => ({
+        name: featureType.typeName || '',
+        definition: featureType.definition || '',
+        attributes: Array.isArray(featureType.attributeTable)
+          ? featureType.attributeTable.map((attr) => ({
+              name: attr.name,
+              title: attr.definition,
+            }))
+          : [],
+      })),
+    }
+  }
   getFeatureCatalog(
     record: CatalogRecord,
     visited: Set<string> = new Set() // prevent looping
   ): Observable<DatasetFeatureCatalog | null> {
     if (
-      record.extras &&
-      record.extras['featureTypes'] &&
-      record.extras['featureTypes'][0]?.attributeTable &&
-      Array.isArray(record.extras['featureTypes'][0].attributeTable)
+      record.extras?.['featureTypes'] &&
+      Array.isArray(record.extras['featureTypes'])
     ) {
-      return of({
-        attributes: record.extras['featureTypes'][0]?.attributeTable?.map(
-          (attr) => ({
-            name: attr.name,
-            title: attr.definition,
-          })
-        ),
-      } as DatasetFeatureCatalog)
+      return of(this.mapEmbeddedFeatureCatalog(record.extras['featureTypes']))
     }
 
     const featureCatalogIdentifier = record.extras[

package/src/libs/api/repository/src/lib/gn4/gn4.provider.ts

@@ -2,6 +2,8 @@ import { Provider } from '@angular/core'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { Gn4PlatformService } from './platform/gn4-platform.service'
 import { Gn4PlatformMapper } from './platform/gn4-platform.mapper'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { Gn4Repository } from './gn4-repository'
 
 export function provideGn4(): Provider[] {
   return [
@@ -9,6 +11,10 @@ export function provideGn4(): Provider[] {
       provide: PlatformServiceInterface,
       useClass: Gn4PlatformService,
     },
+    {
+      provide: RecordsRepositoryInterface,
+      useClass: Gn4Repository,
+    },
     Gn4PlatformMapper,
   ]
 }

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -164,6 +164,7 @@ export interface DatasetServiceDistribution {
   name?: string
   description?: string
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface DatasetDownloadDistribution {
@@ -178,6 +179,7 @@ export interface DatasetDownloadDistribution {
   description?: string
   accessServiceProtocol?: ServiceProtocol
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface OnlineLinkResource {
@@ -186,6 +188,8 @@ export interface OnlineLinkResource {
   name?: string
   description?: string
   translations?: OnlineResourceTranslations
+  mimeType?: string
+  accessRestricted?: boolean
 }
 
 export type DatasetOnlineResource = (
@@ -226,12 +230,18 @@ export interface DatasetRecord extends BaseRecord {
   temporalExtents: Array<DatasetTemporalExtent>
   spatialRepresentation?: SpatialRepresentationType
 }
+
 export type DatasetFeatureCatalog = {
-  attributes: Array<{ name: string; title: string }>
+  featureTypes: Array<{
+    name: string
+    definition: string
+    attributes: Array<{ name: string; title: string }>
+  }>
 }
+
 export interface ServiceEndpoint {
-  endpointUrl: URL
-  protocol: string
+  url: URL
+  accessServiceProtocol: ServiceProtocol
   type: 'endpoint'
   description?: string
   translations?: OnlineResourceTranslations
@@ -256,6 +266,15 @@ export interface ReuseRecord extends BaseRecord {
   temporalExtents: Array<DatasetTemporalExtent>
 }
 
+export interface DatasetFeatureType {
+  aliases: string
+  code: string
+  isAbstract: string
+  typeName: string
+  definition: string
+  attributeTable: Array<{ name: string; definition: string }>
+}
+
 export type ReuseType = 'application' | 'map' | 'other'
 
 export type OnlineResource = DatasetOnlineResource | ServiceOnlineResource