geonetwork-ui 2.7.0-dev.0d8b7bca9 → 2.7.0-dev.1296cd46b

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

@@ -41,7 +41,7 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchMimeType } from '../common/distribution.mapper'
 import { fullNameToParts } from '../iso19139/utils/individual-name'
-import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { toLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { getResourceType, getReuseType } from '../common/resource-types'
 
 export function readKind(rootEl: XmlElement): RecordKind {
@@ -370,7 +370,7 @@ export function readLocaleElement(): ChainableFunction<
   return pipe(
     findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
+    map((lang) => toLang2(lang?.toLowerCase()) ?? lang)
   )
 }
 

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

@@ -49,7 +49,7 @@ import {
 } from '../iso19139/write-parts'
 import { findIdentification } from '../iso19139/read-parts'
 import { namePartsToFull } from '../iso19139/utils/individual-name'
-import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { toLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { kindToCodeListValue } from '../common/resource-types'
 
 export function writeUniqueIdentifier(
@@ -529,7 +529,7 @@ export function writeOnlineResources(
 }
 
 function writeLocaleElement(language: LanguageCode) {
-  const lang3 = getLang3FromLang2(language.toLowerCase()) ?? language
+  const lang3 = toLang3(language.toLowerCase()) ?? language
   return pipe(
     findChildOrCreate('lan:PT_Locale'),
     writeAttribute('id', language.toUpperCase()),

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

@@ -55,7 +55,7 @@ import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
 import { getRoleFromRoleCode } from './utils/role.mapper'
 import { getStatusFromStatusCode } from './utils/status.mapper'
 import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
-import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { toLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { getResourceType, getReuseType } from '../common/resource-types'
 
 export function extractCharacterString(): ChainableFunction<
@@ -1164,7 +1164,7 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
       pipe(
         findChildElement('lan:LanguageCode'),
         readAttribute('codeListValue'),
-        map((lang) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
+        map((lang) => toLang2(lang?.toLowerCase()) ?? lang)
       )
     ),
     map((languages) =>
@@ -1179,7 +1179,7 @@ export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
     findChildElement('gmd:language', false),
     findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => (lang ? getLang2FromLang3(lang.toLowerCase()) : null))
+    map((lang) => (lang ? toLang2(lang.toLowerCase()) : null))
   )(rootEl)
 }
 

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

@@ -11,8 +11,11 @@ export function getStatusFromStatusCode(statusCode: string): RecordStatus {
     case 'onGoing':
       return 'ongoing'
     case 'planned':
+      return 'planned'
     case 'required':
+      return 'required'
     case 'underDevelopment':
+      return 'under_development'
     default:
       return 'under_development'
   }

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

@@ -53,7 +53,7 @@ import {
 import { readKind } from './read-parts'
 import { writeGeometry } from './utils/geometry'
 import { namePartsToFull } from './utils/individual-name'
-import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { toLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { kindToCodeListValue } from '../common/resource-types'
 
 function writeLocalizedElement(
@@ -183,6 +183,10 @@ export function getProgressCode(status: RecordStatus): string {
       return 'removed'
     case 'under_development':
       return 'underDevelopment'
+    case 'planned':
+      return 'planned'
+    case 'required':
+      return 'required'
     default:
       throw new Error(
         `Could not determine progress code from status: ${status}`
@@ -1296,7 +1300,7 @@ export function createOnlineResource(onlineResource: ServiceOnlineResource) {
 }
 
 export function appendDatasetOnlineResources(
-  record: DatasetRecord,
+  record: DatasetRecord | ReuseRecord,
   rootEl: XmlElement
 ) {
   appendChildren(
@@ -1315,7 +1319,7 @@ export function appendDatasetOnlineResources(
 }
 
 export function appendServiceOnlineResources(
-  record: ServiceRecord | ReuseRecord,
+  record: ServiceRecord,
   rootEl: XmlElement
 ) {
   appendChildren(...record.onlineResources.map(createOnlineResource))(rootEl)
@@ -1327,7 +1331,7 @@ export function writeOnlineResources(
 ) {
   removeOnlineResources()(rootEl)
 
-  if (record.kind === 'dataset') {
+  if (record.kind === 'dataset' || record.kind === 'reuse') {
     appendDatasetOnlineResources(record, rootEl)
     return
   }
@@ -1472,7 +1476,7 @@ export function writeLanguages(record: DatasetRecord, rootEl: XmlElement) {
       writeAttribute('id', lang.toUpperCase()),
       createNestedChild('gmd:languageCode', 'gmd:LanguageCode'),
       writeAttribute('codeList', 'http://www.loc.gov/standards/iso639-2/'),
-      writeAttribute('codeListValue', getLang3FromLang2(lang) ?? lang)
+      writeAttribute('codeListValue', toLang3(lang) ?? lang)
     )
 
   // add new languages (only if other than default one)
@@ -1486,7 +1490,7 @@ export function writeDefaultLanguage(
   record: DatasetRecord,
   rootEl: XmlElement
 ) {
-  const lang3 = getLang3FromLang2(record.defaultLanguage.toLowerCase())
+  const lang3 = toLang3(record.defaultLanguage.toLowerCase())
   return pipe(
     findNestedChildOrCreate('gmd:language', 'gmd:LanguageCode'),
     writeAttribute('codeList', 'http://www.loc.gov/standards/iso639-2/'),

package/src/libs/api/repository/src/index.ts

@@ -1,3 +1,3 @@
-export * from './lib/metadata-language'
+export * from './lib/metadata-language.token'
 export * from './lib/repository-url'
 export * from './lib/gn4'

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

@@ -1,5 +1,5 @@
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang2, toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { TranslateService } from '@ngx-translate/core'
 import { Location } from '@angular/common'
 
@@ -35,8 +35,8 @@ export class AuthService {
         '${current_url}',
         new URL(this.location.path(), window.location.href).toString()
       )
-      .replace('${lang2}', this.translateService.currentLang)
-      .replace('${lang3}', getLang3FromLang2(this.translateService.currentLang))
+      .replace('${lang2}', toLang2(this.translateService.currentLang))
+      .replace('${lang3}', toLang3(this.translateService.currentLang))
   }
 
   get logoutUrl() {
@@ -46,7 +46,7 @@ export class AuthService {
   get settingsUrl() {
     return this.baseSettingsUrl.replace(
       '${lang3}',
-      getLang3FromLang2(this.translateService.currentLang)
+      toLang3(this.translateService.currentLang)
     )
   }
 

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

@@ -10,14 +10,12 @@ export const ES_SOURCE_SUMMARY = [
   'codelist_status_text',
   'link',
   'linkProtocol',
-  'contactForResource.organisation',
-  'contact.organisation',
-  'contact.email',
+  'contactForResource*.organisation*',
+  'contact*.organisation*',
+  'contact*.email',
   'userSavedCount',
-  'updateFrequency',
   'cl_topic',
   'cl_maintenanceAndUpdateFrequency',
-  'tag',
   'MD_LegalConstraints*Object',
   'qualityScore',
   'allKeywords',

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

@@ -1,5 +1,5 @@
 import { Injectable, Injector } from '@angular/core'
-import { Geometry } from 'geojson'
+import type { Geometry } from 'geojson'
 import {
   ES_QUERY_FIELDS_PRIORITY,
   ES_SOURCE_SUMMARY,
@@ -15,7 +15,7 @@ import {
   FiltersAggregationParams,
   SortByField,
 } from '../../../../../../../libs/common/domain/src/lib/model/search'
-import { METADATA_LANGUAGE } from '../../metadata-language'
+import { METADATA_LANGUAGE } from '../../metadata-language.token'
 import {
   AggregationResult,
   EsSearchParams,
@@ -26,10 +26,16 @@ import {
   SortParams,
   TermsAggregationResult,
 } from '../../../../../../../libs/api/metadata-converter/src'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { formatDate, isDateRange } from './date-range.utils'
-import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  CatalogRecord,
+  LanguageCode,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateService } from '@ngx-translate/core'
+import { getGeometryBoundingBox } from '../../../../../../../libs/util/shared/src'
+import { getLength as getGeodesicLength } from 'ol/sphere'
+import { LineString } from 'ol/geom'
 
 export type DateRange = { start?: Date; end?: Date }
 
@@ -42,11 +48,9 @@ export class ElasticsearchService {
   private runtimeFields: Record<string, string> = {}
 
   // we're using getters in case the defined languages change over time
-  private get lang3() {
-    return getLang3FromLang2(this.translateService.currentLang)
-  }
-  private get metadataLang() {
-    return this.injector.get(METADATA_LANGUAGE, null)
+  private get metadataLang(): LanguageCode {
+    const mdLangValue = this.injector.get(METADATA_LANGUAGE, null)
+    return typeof mdLangValue === 'function' ? mdLangValue() : mdLangValue
   }
 
   constructor(
@@ -230,9 +234,12 @@ export class ElasticsearchService {
 
   private getQueryLang(): string {
     if (this.metadataLang) {
-      return this.isCurrentSearchLang()
-        ? `lang${this.lang3}`
-        : `lang${this.metadataLang}`
+      const lang3 = toLang3(
+        this.isCurrentSearchLang()
+          ? this.translateService.currentLang
+          : this.metadataLang
+      )
+      return `lang${lang3}`
     } else return '*'
   }
   private isCurrentSearchLang() {
@@ -351,6 +358,11 @@ export class ElasticsearchService {
       })
     }
     if (geometry) {
+      // boosts applied using the filter geometry:
+      // * records completely within the geometry receive a boost of 5
+      // * records intersecting the geometry receive a boost of 2
+      // * records close to the geometry center receive a boost of 5 (based on the `location` field)
+      // * records on the outskirt of the geometry receive a boost of 2.5
       should.push(
         {
           geo_shape: {
@@ -358,7 +370,7 @@ export class ElasticsearchService {
               shape: geometry,
               relation: 'within',
             },
-            boost: 10.0,
+            boost: 5.0,
           },
         },
         {
@@ -367,10 +379,49 @@ export class ElasticsearchService {
               shape: geometry,
               relation: 'intersects',
             },
-            boost: 7.0,
+            boost: 2.0,
           },
         }
       )
+
+      // this will boost the results variably depending on their distance from the given geometry
+      // note: this takes into account the `location` field of a record; this is generally the center of all spatial extents
+      // combined, and thus the actual size/coverage of the record spatial extent isn't relevant here
+      const bbox = getGeometryBoundingBox(geometry)
+      const center = [(bbox[0] + bbox[2]) / 2, (bbox[1] + bbox[3]) / 2]
+      const northToCenter = new LineString([
+        [center[0], bbox[3]],
+        center,
+      ]).transform('EPSG:4326', 'EPSG:3857')
+      const southToCenter = new LineString([
+        [center[0], bbox[1]],
+        center,
+      ]).transform('EPSG:4326', 'EPSG:3857')
+      const westToCenter = new LineString([
+        [bbox[0], center[1]],
+        center,
+      ]).transform('EPSG:4326', 'EPSG:3857')
+      const eastToCenter = new LineString([
+        [bbox[2], center[1]],
+        center,
+      ]).transform('EPSG:4326', 'EPSG:3857')
+      // cutoff distance is the distance from where the boost will only be half of the max value
+      // it is an average of the "size" of the bounding box in every direction, in meters
+      const cutoffDistance =
+        (getGeodesicLength(northToCenter) +
+          getGeodesicLength(southToCenter) +
+          getGeodesicLength(westToCenter) +
+          getGeodesicLength(eastToCenter)) /
+        4
+
+      should.push({
+        distance_feature: {
+          field: 'location',
+          pivot: `${Math.round(cutoffDistance).toFixed(0)}m`,
+          origin: center,
+          boost: 5.0,
+        },
+      })
     }
 
     return {

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

@@ -48,7 +48,7 @@ import {
 import { catchError, map, tap } from 'rxjs/operators'
 import { lt } from 'semver'
 import { ElasticsearchService } from './elasticsearch'
-import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src'
+import { toLang2 } from '../../../../../../libs/util/i18n/src'
 import { Gn4SettingsService } from './settings/gn4-settings.service'
 
 const minPublicationApiVersion = '4.2.5'
@@ -562,7 +562,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       .pipe(
         map((languages) =>
           languages
-            .map((lang) => getLang2FromLang3(lang.id))
+            .map((lang) => toLang2(lang.id))
             .filter((code): code is string => !!code)
         )
       )

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

@@ -1,12 +1,35 @@
 import { Provider } from '@angular/core'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
-import { Gn4PlatformService } from './platform/gn4-platform.service'
+import {
+  DISABLE_AUTH,
+  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'
+import { AvatarServiceInterface, GravatarService } from './auth'
+import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
+import {
+  ORGANIZATIONS_STRATEGY,
+  organizationsServiceFactory,
+} from './organizations'
+import { ElasticsearchService } from './elasticsearch'
+import {
+  GroupsApiService,
+  SearchApiService,
+} from '../../../../../../libs/data-access/gn4/src'
+import { TranslateService } from '@ngx-translate/core'
 
-export function provideGn4(): Provider[] {
+interface Gn4ProvideOptions {
+  disableAuth?: boolean
+}
+
+export function provideGn4(provideOptions?: Gn4ProvideOptions): Provider[] {
   return [
+    {
+      provide: DISABLE_AUTH,
+      useValue: provideOptions?.disableAuth,
+    },
     {
       provide: PlatformServiceInterface,
       useClass: Gn4PlatformService,
@@ -16,5 +39,18 @@ export function provideGn4(): Provider[] {
       useClass: Gn4Repository,
     },
     Gn4PlatformMapper,
+    { provide: AvatarServiceInterface, useClass: GravatarService },
+    {
+      provide: OrganizationsServiceInterface,
+      useFactory: organizationsServiceFactory,
+      deps: [
+        ORGANIZATIONS_STRATEGY,
+        ElasticsearchService,
+        SearchApiService,
+        GroupsApiService,
+        TranslateService,
+        PlatformServiceInterface,
+      ],
+    },
   ]
 }

package/src/libs/api/repository/src/lib/gn4/organizations/index.ts

@@ -1,13 +1,4 @@
 export * from './organizations-from-metadata.service'
 export * from './organizations-from-groups.service'
-
-import { InjectionToken } from '@angular/core'
-
-export type OrganizationsStrategy = 'metadata' | 'groups'
-
-export const ORGANIZATIONS_STRATEGY = new InjectionToken<OrganizationsStrategy>(
-  'organizations-strategy',
-  {
-    factory: () => 'metadata',
-  }
-)
+export * from './organization-strategy.token'
+export * from './organizations-service.factory'

package/src/libs/api/repository/src/lib/gn4/organizations/organization-strategy.token.ts

@@ -0,0 +1,10 @@
+import { InjectionToken } from '@angular/core'
+
+export type OrganizationsStrategy = 'metadata' | 'groups'
+
+export const ORGANIZATIONS_STRATEGY = new InjectionToken<OrganizationsStrategy>(
+  'organizations-strategy',
+  {
+    factory: () => 'metadata',
+  }
+)

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts

@@ -7,7 +7,7 @@ import {
 import { forkJoin, Observable, of } from 'rxjs'
 import { map, shareReplay } from 'rxjs/operators'
 import { TranslateService } from '@ngx-translate/core'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import {
   CatalogRecord,
@@ -52,7 +52,7 @@ export class OrganizationsFromGroupsService
   organisationsCount$ = this.organisations$.pipe(map((orgs) => orgs.length))
 
   private get lang3() {
-    return getLang3FromLang2(this.translateService.currentLang)
+    return toLang3(this.translateService.currentLang)
   }
 
   constructor(

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts

@@ -33,7 +33,7 @@ import {
   tap,
   withLatestFrom,
 } from 'rxjs/operators'
-import { getLocalizedIndexKey } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { coerce, satisfies, valid } from 'semver'
 import { TranslateService } from '@ngx-translate/core'
@@ -126,7 +126,7 @@ export class OrganizationsFromMetadataService
   ) {}
 
   private get langIndex() {
-    return getLocalizedIndexKey(this.translateService.currentLang)
+    return `lang${toLang3(this.translateService.currentLang)}`
   }
 
   equalsNormalizedStrings(

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

@@ -0,0 +1,33 @@
+import {
+  GroupsApiService,
+  SearchApiService,
+} from '../../../../../../../libs/data-access/gn4/src'
+import { TranslateService } from '@ngx-translate/core'
+import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { ElasticsearchService } from '../elasticsearch'
+import { OrganizationsStrategy } from './organization-strategy.token'
+import { OrganizationsFromGroupsService } from './organizations-from-groups.service'
+import { OrganizationsFromMetadataService } from './organizations-from-metadata.service'
+
+export const organizationsServiceFactory = (
+  strategy: OrganizationsStrategy,
+  esService: ElasticsearchService,
+  searchApiService: SearchApiService,
+  groupsApiService: GroupsApiService,
+  translateService: TranslateService,
+  platformService: PlatformServiceInterface
+) =>
+  strategy === 'groups'
+    ? new OrganizationsFromGroupsService(
+        esService,
+        searchApiService,
+        groupsApiService,
+        translateService
+      )
+    : new OrganizationsFromMetadataService(
+        esService,
+        searchApiService,
+        groupsApiService,
+        platformService,
+        translateService
+      )