geonetwork-ui 2.3.0-dev.2c3530dc → 2.3.0-dev.3222f975

package/src/libs/api/repository/src/lib/gn4/auth/avatar.service.interface.ts

@@ -3,4 +3,5 @@ import { Observable } from 'rxjs'
 export abstract class AvatarServiceInterface {
   public abstract getPlaceholder(): Observable<string>
   public abstract getProfileIcon(...args): Observable<string>
+  public abstract getProfileIconUrl(userId: string): Promise<string>
 }

package/src/libs/api/repository/src/lib/gn4/auth/gravatar.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'
 import { AvatarServiceInterface } from './avatar.service.interface'
 import { Gn4SettingsService } from '../settings/gn4-settings.service'
 import { map } from 'rxjs/operators'
-import { Observable } from 'rxjs'
+import { firstValueFrom, Observable } from 'rxjs'
 
 @Injectable({
   providedIn: 'root',
@@ -14,6 +14,7 @@ export class GravatarService implements AvatarServiceInterface {
   private readonly identicon$ = this.gn4SettingsService.identicon$.pipe(
     map((identicon) => identicon?.replace('gravatar:', ''))
   )
+
   constructor(private gn4SettingsService: Gn4SettingsService) {}
 
   getPlaceholder(): Observable<string> {
@@ -26,4 +27,14 @@ export class GravatarService implements AvatarServiceInterface {
       map((identicon) => `${this.GRAVATAR_URL}${hash}?d=${identicon}`)
     )
   }
+
+  async getProfileIconUrl(userId: string) {
+    let iconUrl = ''
+    try {
+      iconUrl = await firstValueFrom(this.getProfileIcon(userId))
+    } catch (error) {
+      return ''
+    }
+    return iconUrl
+  }
 }

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

@@ -14,7 +14,7 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/search'
 import { map } from 'rxjs/operators'
 import {
-  Gn4MetadataMapper,
+  Gn4Converter,
   Gn4SearchResults,
 } from '../../../../../../libs/api/metadata-converter/src'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
@@ -24,7 +24,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   constructor(
     private gn4SearchApi: SearchApiService,
     private gn4SearchHelper: ElasticsearchService,
-    private gn4Mapper: Gn4MetadataMapper
+    private gn4Mapper: Gn4Converter
   ) {}
 
   search({

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

@@ -1,17 +1,23 @@
 import {
   MeResponseApiModel,
   UserApiModel,
+  UserFeedbackDTOApiModel,
 } from '../../../../../../../libs/data-access/gn4/src'
 import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
 import { Injectable } from '@angular/core'
-import { AvatarServiceInterface } from '../auth/avatar.service.interface'
+import { AvatarServiceInterface } from '../auth'
 import { map } from 'rxjs/operators'
 import { Observable, of } from 'rxjs'
 import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
+import {
+  UserFeedback,
+  UserFeedbackViewModel,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 @Injectable()
 export class Gn4PlatformMapper {
   constructor(private avatarService: AvatarServiceInterface) {}
+
   userFromMeApi(apiUser: MeResponseApiModel): Observable<UserModel | null> {
     if (!apiUser) return of(null)
     const {
@@ -28,6 +34,7 @@ export class Gn4PlatformMapper {
       .getProfileIcon(hash)
       .pipe(map((profileIcon) => ({ ...user, profileIcon } as UserModel)))
   }
+
   userFromApi(apiUser: UserApiModel): UserModel {
     if (!apiUser) return null
     const {
@@ -65,4 +72,47 @@ export class Gn4PlatformMapper {
       }
     })
   }
+
+  userFeedbacksFromApi(userFeedback: any): UserFeedback {
+    return {
+      uuid: userFeedback.uuid,
+      metadataUUID: userFeedback.metadataUUID,
+      comment: userFeedback.comment,
+      authorUserId: userFeedback.authorUserId.toString(),
+      authorName: userFeedback.authorName,
+      authorEmail: userFeedback.authorEmail,
+      published: userFeedback.published,
+      parentUuid: userFeedback.parentUuid ?? undefined,
+      date: new Date(userFeedback.date),
+    }
+  }
+
+  userFeedbacksToApi(
+    userFeedback: UserFeedback
+  ): Partial<UserFeedbackDTOApiModel> {
+    return {
+      uuid: userFeedback.uuid,
+      metadataUUID: userFeedback.metadataUUID,
+      comment: userFeedback.comment,
+      authorUserId: Number.parseInt(userFeedback.authorUserId),
+      authorName: userFeedback.authorName,
+      authorEmail: userFeedback.authorEmail,
+      published: userFeedback.published,
+      parentUuid: userFeedback.parentUuid,
+      date: userFeedback.date.getTime().toString(),
+    }
+  }
+
+  async createUserFeedbackViewModel(
+    baseUserFeedback: UserFeedback
+  ): Promise<UserFeedbackViewModel> {
+    const userAvatarUrl = await this.avatarService.getProfileIconUrl(
+      baseUserFeedback.authorUserId?.toString()
+    )
+
+    return {
+      ...baseUserFeedback,
+      avatarUrl: userAvatarUrl,
+    }
+  }
 }

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

@@ -6,11 +6,15 @@ import {
   RegistriesApiService,
   SiteApiService,
   ToolsApiService,
+  UserfeedbackApiService,
   UsersApiService,
 } from '../../../../../../../libs/data-access/gn4/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
-import { Organization } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  Organization,
+  UserFeedback,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { Gn4PlatformMapper } from './gn4-platform.mapper'
 import { ltr } from 'semver'
 import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
@@ -21,9 +25,9 @@ const minApiVersion = '4.2.2'
 @Injectable()
 export class Gn4PlatformService implements PlatformServiceInterface {
   private readonly type = 'GeoNetwork'
-  private me$: Observable<UserModel>
-  private users$: Observable<UserModel[]>
-  private isAnonymous$: Observable<boolean>
+  private readonly me$: Observable<UserModel>
+  private readonly users$: Observable<UserModel[]>
+  private readonly isUserAnonymous$: Observable<boolean>
 
   private keyTranslations$ = this.toolsApiService
     .getTranslationsPackage1('gnui')
@@ -65,13 +69,18 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private mapper: Gn4PlatformMapper,
     private toolsApiService: ToolsApiService,
     private registriesApiService: RegistriesApiService,
-    private langService: LangService
+    private langService: LangService,
+    private userfeedbackApiService: UserfeedbackApiService
   ) {
     this.me$ = this.meApi.getMe().pipe(
       switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
       shareReplay({ bufferSize: 1, refCount: true })
     )
-    this.isAnonymous$ = this.me$.pipe(map((user) => !user || !('id' in user)))
+
+    this.isUserAnonymous$ = this.me$.pipe(
+      map((user) => !user || !('id' in user))
+    )
+
     this.users$ = this.usersApi.getUsers().pipe(
       map((users) => users.map((user) => this.mapper.userFromApi(user))),
       shareReplay()
@@ -91,7 +100,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   }
 
   isAnonymous(): Observable<boolean> {
-    return this.isAnonymous$
+    return this.isUserAnonymous$
   }
 
   getOrganizations(): Observable<Organization[]> {
@@ -148,6 +157,24 @@ export class Gn4PlatformService implements PlatformServiceInterface {
         ),
         shareReplay(1)
       )
+
     return this.thesauri[uri]
   }
+
+  getUserFeedbacks(uuid: string): Observable<UserFeedback[]> {
+    return this.userfeedbackApiService
+      .getUserComments(uuid)
+      .pipe(
+        map((userFeedbacks) =>
+          userFeedbacks.map(this.mapper.userFeedbacksFromApi)
+        )
+      )
+  }
+
+  postUserFeedbacks(userFeedback: UserFeedback): Observable<void> {
+    const mappedUserFeedBack = this.mapper.userFeedbacksToApi(userFeedback)
+    return this.userfeedbackApiService
+      .newUserFeedback(mappedUserFeedBack)
+      .pipe(map(() => undefined))
+  }
 }

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

@@ -1,3 +1,4 @@
 export * from './contact.model'
 export * from './organization.model'
 export * from './metadata.model'
+export * from './user-feedbacks.model'

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

@@ -83,8 +83,8 @@ export interface BaseRecord {
   title: string
   abstract: string
   recordCreated?: Date
-  recordUpdated: Date
   recordPublished?: Date
+  recordUpdated: Date
   languages: Array<LanguageCode>
   kind: RecordKind
   topics: Array<string> // TODO: handle codelists
@@ -98,6 +98,12 @@ export interface BaseRecord {
   landingPage?: URL
   updateFrequency?: UpdateFrequency
 
+  // information related to the resource (dataset, service)
+  contactsForResource: Array<Individual>
+  resourceCreated?: Date
+  resourcePublished?: Date
+  resourceUpdated?: Date
+
   // to add: canonical url
   // to add: source catalog (??)
   // to add: is open data ?
@@ -173,10 +179,7 @@ export interface DatasetTemporalExtent {
 
 export interface DatasetRecord extends BaseRecord {
   kind: 'dataset'
-  contactsForResource: Array<Individual>
   status: RecordStatus
-  datasetCreated?: Date
-  datasetUpdated?: Date
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
   distributions: Array<DatasetDistribution>
   spatialExtents: Array<DatasetSpatialExtent>
@@ -203,3 +206,5 @@ export interface ServiceRecord extends BaseRecord {
 }
 
 export type CatalogRecord = ServiceRecord | DatasetRecord
+
+export type CatalogRecordKeys = keyof ServiceRecord | keyof DatasetRecord

package/src/libs/common/domain/src/lib/model/record/user-feedbacks.model.ts

@@ -0,0 +1,15 @@
+export interface UserFeedback {
+  uuid: string
+  comment: string
+  metadataUUID: string
+  authorUserId: string
+  authorName: string
+  authorEmail: string
+  published: boolean
+  parentUuid?: string
+  date: Date
+}
+
+export interface UserFeedbackViewModel extends UserFeedback {
+  avatarUrl: string
+}

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -2,6 +2,7 @@ import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
 import type { Organization } from './model/record/organization.model'
 import type { ThesaurusModel } from './model/thesaurus/'
+import { UserFeedback } from './model/record'
 
 export abstract class PlatformServiceInterface {
   abstract getType(): string
@@ -16,4 +17,6 @@ export abstract class PlatformServiceInterface {
   abstract getOrganizations(): Observable<Organization[]>
   abstract translateKey(key: string): Observable<string>
   abstract getThesaurusByUri(uri: string): Observable<ThesaurusModel>
+  abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
+  abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>
 }

package/src/libs/common/fixtures/src/index.ts

@@ -1,11 +1,13 @@
+export * from './lib/elasticsearch'
+export * from './lib/gn4'
+export * from './lib/search'
+
 export * from './lib/geojson.fixtures'
+export * from './lib/link.fixtures'
 export * from './lib/ol-feature.fixture'
+export * from './lib/organisations.fixture'
 export * from './lib/record-link.fixtures'
-export * from './lib/link.fixtures'
 export * from './lib/records.fixtures'
-export * from './lib/organisations.fixture'
-export * from './lib/elasticsearch'
-export * from './lib/search'
-export * from './lib/user.fixtures'
 export * from './lib/repository.fixtures'
-export * from './lib/gn4'
+export * from './lib/user.fixtures'
+export * from './lib/user-feedbacks.fixtures'

package/src/libs/common/fixtures/src/lib/link.fixtures.ts

@@ -110,6 +110,14 @@ export const LINK_FIXTURES: Record<string, DatasetDistribution> = deepFreeze({
     url: new URL('https://my.ogc.server/wfs'),
     accessServiceProtocol: 'wfs',
   },
+  geodataWfsDownload: {
+    name: 'mylayer',
+    type: 'download',
+    url: new URL(
+      'https://my.ogc.server/wfs?GetFeature&FeatureType=surval_parametre_ligne&format=csv'
+    ),
+    accessServiceProtocol: 'wfs',
+  },
   geodataWms2: {
     name: 'myotherlayer',
     type: 'service',

package/src/libs/common/fixtures/src/lib/records.fixtures.ts

@@ -1,5 +1,5 @@
 import { DatasetRecord } from '../../../../../libs/common/domain/src/lib/model/record'
-import { deepFreeze } from './utils/freeze'
+import { deepFreeze } from './utils'
 
 export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([
   {
@@ -49,8 +49,8 @@ export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([
     status: 'ongoing',
     recordCreated: new Date('2022-02-01T15:12:00'),
     recordUpdated: new Date('2022-02-01T15:12:00'),
-    datasetCreated: new Date('2022-09-01T14:18:19'),
-    datasetUpdated: new Date('2022-12-04T15:12:00'),
+    resourceCreated: new Date('2022-09-01T14:18:19'),
+    resourceUpdated: new Date('2022-12-04T15:12:00'),
     title: 'A very interesting dataset (un jeu de données très intéressant)',
     abstract: `# Introduction
 This dataset has been established for testing purposes.

package/src/libs/common/fixtures/src/lib/user-feedbacks.fixtures.ts

@@ -0,0 +1,83 @@
+import { UserFeedback } from '../../../../../libs/common/domain/src/lib/model/record'
+import { deepFreeze } from './utils'
+
+export const SOME_USER_FEEDBACKS: UserFeedback[] = deepFreeze([
+  {
+    uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
+    comment: 'A nice comment.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: undefined,
+    date: new Date('2023-01-01T08:00:00Z'),
+  },
+  {
+    uuid: '52cbd0f1-9cb9-4409-8e85-bc608f049af4',
+    comment: 'A very nice comment that is a reply.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
+    date: new Date('2023-01-01T09:00:00Z'),
+  },
+  {
+    uuid: 'b48f62ec-b5e6-4d27-a396-2c2b44f6dcb5',
+    comment: 'Another nice comment.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: undefined,
+    date: new Date('2023-01-01T10:00:00Z'),
+  },
+  {
+    uuid: '1f12a3be-fc8a-4e83-968f-9b88ffbcab02',
+    comment: 'Another very nice reply.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
+    date: new Date('2023-01-01T11:00:00Z'),
+  },
+  {
+    uuid: 'f8dd778d-e93c-4b3c-ba9b-9574be070f46',
+    comment: 'Another nice comment.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: undefined,
+    date: new Date('2023-01-01T10:00:00Z'),
+  },
+  {
+    uuid: 'df3b8872-61d1-4ae9-8822-bb070b94d7d1',
+    comment: 'Another nice comment.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: undefined,
+    date: new Date('2023-01-01T11:00:00Z'),
+  },
+])
+
+export const A_USER_FEEDBACK: UserFeedback = deepFreeze({
+  uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
+  comment: 'A nice comment.',
+  metadataUUID: 'my-dataset-001',
+  authorUserId: '46798',
+  authorName: 'Arnaud De Maison',
+  authorEmail: 'a.demaison@geo2france.fr',
+  published: true,
+  parentUuid: undefined,
+  date: new Date('2023-01-01T08:00:00Z'),
+})

package/src/libs/data-access/gn4/src/openapi/api/records.api.service.ts

@@ -30,7 +30,6 @@ import {
 import { ExtentDtoApiModel } from '../model/models'
 import { FeatureResponseApiModel } from '../model/models'
 import { IProcessingReportApiModel } from '../model/models'
-import { InlineObject3ApiModel } from '../model/models'
 import { MetadataBatchApproveParameterApiModel } from '../model/models'
 import { MetadataBatchSubmitParameterApiModel } from '../model/models'
 import { MetadataCategoryApiModel } from '../model/models'
@@ -75,6 +74,20 @@ export class RecordsApiService {
     this.encoder = this.configuration.encoder || new CustomHttpParameterCodec()
   }
 
+  /**
+   * @param consumes string[] mime-types
+   * @return true: consumes contains 'multipart/form-data', false: otherwise
+   */
+  private canConsumeForm(consumes: string[]): boolean {
+    const form = 'multipart/form-data'
+    for (const consume of consumes) {
+      if (form === consume) {
+        return true
+      }
+    }
+    return false
+  }
+
   private addToHttpParams(
     httpParams: HttpParams,
     value: any,
@@ -8290,44 +8303,44 @@ export class RecordsApiService {
   /**
    * Create a new resource for a given metadata
    * @param metadataUuid The metadata UUID
+   * @param file The file to upload
    * @param visibility The sharing policy
    * @param approved Use approved version or not
-   * @param inlineObject3ApiModel
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
   public putResource(
     metadataUuid: string,
+    file: Blob,
     visibility?: 'public' | 'private',
     approved?: boolean,
-    inlineObject3ApiModel?: InlineObject3ApiModel,
     observe?: 'body',
     reportProgress?: boolean,
     options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<MetadataResourceApiModel>
   public putResource(
     metadataUuid: string,
+    file: Blob,
     visibility?: 'public' | 'private',
     approved?: boolean,
-    inlineObject3ApiModel?: InlineObject3ApiModel,
     observe?: 'response',
     reportProgress?: boolean,
     options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<HttpResponse<MetadataResourceApiModel>>
   public putResource(
     metadataUuid: string,
+    file: Blob,
     visibility?: 'public' | 'private',
     approved?: boolean,
-    inlineObject3ApiModel?: InlineObject3ApiModel,
     observe?: 'events',
     reportProgress?: boolean,
     options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<HttpEvent<MetadataResourceApiModel>>
   public putResource(
     metadataUuid: string,
+    file: Blob,
     visibility?: 'public' | 'private',
     approved?: boolean,
-    inlineObject3ApiModel?: InlineObject3ApiModel,
     observe: any = 'body',
     reportProgress: boolean = false,
     options?: { httpHeaderAccept?: 'application/json' }
@@ -8337,6 +8350,11 @@ export class RecordsApiService {
         'Required parameter metadataUuid was null or undefined when calling putResource.'
       )
     }
+    if (file === null || file === undefined) {
+      throw new Error(
+        'Required parameter file was null or undefined when calling putResource.'
+      )
+    }
 
     let queryParameters = new HttpParams({ encoder: this.encoder })
     if (visibility !== undefined && visibility !== null) {
@@ -8369,11 +8387,24 @@ export class RecordsApiService {
     }
 
     // to determine the Content-Type header
-    const consumes: string[] = ['application/json']
-    const httpContentTypeSelected: string | undefined =
-      this.configuration.selectHeaderContentType(consumes)
-    if (httpContentTypeSelected !== undefined) {
-      headers = headers.set('Content-Type', httpContentTypeSelected)
+    const consumes: string[] = ['multipart/form-data']
+
+    const canConsumeForm = this.canConsumeForm(consumes)
+
+    let formParams: { append(param: string, value: any): any }
+    let useForm = false
+    let convertFormParamsToString = false
+    // use FormData to transmit files using content-type "multipart/form-data"
+    // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data
+    useForm = canConsumeForm
+    if (useForm) {
+      formParams = new FormData()
+    } else {
+      formParams = new HttpParams({ encoder: this.encoder })
+    }
+
+    if (file !== undefined) {
+      formParams = (formParams.append('file', <any>file) as any) || formParams
     }
 
     let responseType_: 'text' | 'json' = 'json'
@@ -8388,7 +8419,7 @@ export class RecordsApiService {
       `${this.configuration.basePath}/records/${encodeURIComponent(
         String(metadataUuid)
       )}/attachments`,
-      inlineObject3ApiModel,
+      convertFormParamsToString ? formParams.toString() : formParams,
       {
         params: queryParameters,
         responseType: <any>responseType_,

package/src/libs/data-access/gn4/src/openapi/model/models.ts

@@ -33,7 +33,6 @@ export * from './iProcessingReport.api.model'
 export * from './iSODate.api.model'
 export * from './infoReport.api.model'
 export * from './inlineObject1.api.model'
-export * from './inlineObject3.api.model'
 export * from './inlineObject4.api.model'
 export * from './isoLanguage.api.model'
 export * from './jSONObject.api.model'

package/src/libs/data-access/gn4/src/spec.yaml

@@ -7390,7 +7390,7 @@ paths:
           example: true
       requestBody:
         content:
-          application/json:
+          multipart/form-data:
             schema:
               required:
                 - file

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -1,6 +1,11 @@
 import { Injectable } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
+import {
+  OgcApiCollectionInfo,
+  OgcApiEndpoint,
+  WfsEndpoint,
+  WfsVersion,
+} from '@camptocamp/ogc-client'
 import {
   BaseReader,
   FetchError,
@@ -27,6 +32,7 @@ marker('wfs.unreachable.http')
 marker('wfs.unreachable.unknown')
 marker('wfs.featuretype.notfound')
 marker('wfs.geojsongml.notsupported')
+marker('ogc.unreachable.unknown')
 marker('dataset.error.network')
 marker('dataset.error.http')
 marker('dataset.error.parse')
@@ -94,7 +100,7 @@ export class DataService {
           ),
           geojson: endpoint.supportsJson(featureType.name)
             ? endpoint.getFeatureUrl(featureType.name, {
-                outputFormat: 'application/json',
+                asJson: true,
                 outputCrs: 'EPSG:4326',
               })
             : null,
@@ -148,6 +154,35 @@ export class DataService {
     )
   }
 
+  async getDownloadLinksFromOgcApiFeatures(
+    ogcApiLink: DatasetServiceDistribution
+  ): Promise<DatasetDistribution[]> {
+    const collectionInfo = await this.getDownloadUrlsFromOgcApi(
+      ogcApiLink.url.href
+    )
+    return Object.keys(collectionInfo.bulkDownloadLinks).map((downloadLink) => {
+      return {
+        ...ogcApiLink,
+        type: 'download',
+        url: new URL(collectionInfo.bulkDownloadLinks[downloadLink]),
+        mimeType: getMimeTypeForFormat(
+          getFileFormatFromServiceOutput(downloadLink)
+        ),
+      }
+    })
+  }
+
+  async getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo> {
+    const endpoint = new OgcApiEndpoint(this.proxy.getProxiedUrl(url))
+    return await endpoint.featureCollections
+      .then((collections) => {
+        return endpoint.getCollectionInfo(collections[0])
+      })
+      .catch((error) => {
+        throw new Error(`ogc.unreachable.unknown`)
+      })
+  }
+
   getDownloadLinksFromEsriRest(
     esriRestLink: DatasetServiceDistribution
   ): DatasetDistribution[] {
@@ -205,6 +240,21 @@ export class DataService {
         'geojson'
       )
       return from(openDataset(url, 'geojson')).pipe()
+    } else if (
+      link.type === 'service' &&
+      link.accessServiceProtocol === 'ogcFeatures'
+    ) {
+      return from(this.getDownloadUrlsFromOgcApi(link.url.href)).pipe(
+        switchMap((collectionInfo) => {
+          const geojsonUrl = collectionInfo.jsonDownloadLink
+          return openDataset(geojsonUrl, 'geojson')
+        }),
+        tap((url) => {
+          if (url === null) {
+            throw new Error('wfs.geojsongml.notsupported')
+          }
+        })
+      )
     }
     return throwError(() => 'protocol not supported')
   }