geonetwork-ui 2.7.0-dev.dadaab772 → 2.7.0-dev.e3a54608e

package/src/libs/ui/elements/src/lib/api-card/api-card.component.html

@@ -67,7 +67,10 @@
         [ngClass]="{
           '!bg-primary': currentlyActive,
         }"
-        >{{ link.accessServiceProtocol }}</span
+        translate
+        >record.metadata.api.accessServiceProtocol.{{
+          link.accessServiceProtocol
+        }}</span
       >
       <span
         *ngIf="link.accessServiceProtocol === 'GPFDL'"

package/src/libs/ui/elements/src/lib/downloads-list/downloads-list.component.html

@@ -13,8 +13,7 @@
       <span class="px-3">({{ linksCount }})</span>
     </div>
     <gn-ui-previous-next-buttons
-      class="md:block hidden"
-      *ngIf="_list?.pagesCount > 1"
+      *ngIf="(isMobile$ | async) === false && _list?.pagesCount > 1"
       [listComponent]="_list"
     ></gn-ui-previous-next-buttons>
   </div>
@@ -40,7 +39,7 @@
 
 <ng-container>
   <gn-ui-block-list
-    class="md:block hidden"
+    *ngIf="(isMobile$ | async) === false"
     #blockList
     (listChanges)="updateList($event)"
     containerClass="gap-4 pt-5 pb-7"
@@ -57,12 +56,14 @@
   </gn-ui-block-list>
 </ng-container>
 
-<div class="mb-5 md:hidden block" *ngFor="let link of filteredLinks">
-  <gn-ui-download-item
-    size="M"
-    [link]="link"
-    [color]="getLinkColor(link)"
-    [format]="getLinkFormat(link)"
-    [isFromApi]="isFromApi(link)"
-  ></gn-ui-download-item>
+<div class="mb-5" *ngFor="let link of filteredLinks">
+  <ng-container *ngIf="(isMobile$ | async) === true">
+    <gn-ui-download-item
+      size="M"
+      [link]="link"
+      [color]="getLinkColor(link)"
+      [format]="getLinkFormat(link)"
+      [isFromApi]="isFromApi(link)"
+    ></gn-ui-download-item>
+  </ng-container>
 </div>

package/src/libs/ui/elements/src/lib/downloads-list/downloads-list.component.ts

@@ -6,7 +6,11 @@ import {
 } from '@angular/core'
 import { TranslateDirective, TranslateService } from '@ngx-translate/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { getBadgeColor, getFileFormat } from '../../../../../../libs/util/shared/src'
+import {
+  getBadgeColor,
+  getFileFormat,
+  getIsMobile,
+} from '../../../../../../libs/util/shared/src'
 import { DatasetDownloadDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { CommonModule } from '@angular/common'
 import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
@@ -50,6 +54,8 @@ export class DownloadsListComponent {
     return this.filteredLinks?.length || 0
   }
 
+  isMobile$ = getIsMobile()
+
   activeFilterFormats: FilterFormat[] = ['all']
 
   updateList($event: BlockListComponent) {

package/src/libs/ui/elements/src/lib/geo-data-badge/geo-data-badge.component.html

@@ -7,7 +7,10 @@
     class="shrink-0 text-[0.75em]"
     name="matLocationSearchingOutline"
   ></ng-icon>
-  <span class="ml-1 hidden sm:inline-block shrink-0" *ngIf="showLabel" translate
+  <span
+    class="ml-1 inline-block shrink-0"
+    *ngIf="(isMobile$ | async) === false && showLabel"
+    translate
     >record.metadata.isGeographical</span
   >
 </div>

package/src/libs/ui/elements/src/lib/geo-data-badge/geo-data-badge.component.ts

@@ -4,7 +4,11 @@ import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/mode
 import { CommonModule } from '@angular/common'
 import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { NgIcon, provideIcons } from '@ng-icons/core'
-import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
+import {
+  getIsMobile,
+  LinkClassifierService,
+  LinkUsage,
+} from '../../../../../../libs/util/shared/src'
 
 @Component({
   selector: 'gn-ui-geo-data-badge',
@@ -24,6 +28,8 @@ export class GeoDataBadgeComponent {
   @Input() styling = 'default'
   @Input() record: CatalogRecord
 
+  isMobile$ = getIsMobile()
+
   isGeodata() {
     const links =
       'onlineResources' in this.record ? this.record.onlineResources : []

package/src/libs/ui/elements/src/lib/metadata-quality/metadata-quality.component.ts

@@ -74,10 +74,6 @@ export class MetadataQualityComponent implements OnChanges {
     )
   }
 
-  hasGetCapabilities(url: string): boolean {
-    return url.toLowerCase().includes('capabilities')
-  }
-
   initialize() {
     if (!this.propsToValidate) {
       this.propsToValidate = getAllKeysValidator()

package/src/libs/ui/inputs/src/lib/search-feature-catalog/search-feature-catalog.component.html

@@ -1,5 +1,8 @@
 <div
   class="flex items-center justify-between p-3 mt-8 bg-white rounded-lg border-b solid border-gray-300"
+  *ngIf="
+    (isMobile$ | async) === false || featureCatalog?.featureTypes?.length > 1
+  "
 >
   <div
     class="relative shrink-0"
@@ -17,7 +20,10 @@
       name="iconoirSearch"
     ></ng-icon>
   </div>
-  <div class="text-sm px-1 ml-auto hidden sm:inline">
+  <div
+    *ngIf="(isMobile$ | async) === false"
+    class="text-sm px-1 ml-auto inline"
+  >
     <ng-container *ngIf="featureCatalog?.featureTypes?.length > 1">
       <span
         class="text-sm font-medium text-gray-900"

package/src/libs/ui/inputs/src/lib/search-feature-catalog/search-feature-catalog.component.ts

@@ -6,7 +6,7 @@ import { DatasetFeatureCatalog } from '../../../../../../libs/common/domain/src/
 import { FormsModule } from '@angular/forms'
 import { of } from 'rxjs'
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators'
-import { createFuzzyFilter } from '../../../../../../libs/util/shared/src'
+import { createFuzzyFilter, getIsMobile } from '../../../../../../libs/util/shared/src'
 import { iconoirSearch } from '@ng-icons/iconoir'
 
 @Component({
@@ -39,6 +39,8 @@ export class SearchFeatureCatalogComponent {
     return this._featureCatalog
   }
 
+  isMobile$ = getIsMobile()
+
   @Output() filteredFeatureCatalogChange =
     new EventEmitter<DatasetFeatureCatalog>()
   filteredFeatureCatalog: DatasetFeatureCatalog

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -231,6 +231,7 @@ export function loadAppConfig() {
           'filter_geometry_url',
           'search_preset',
           'advanced_filters',
+          'limit',
         ],
         warnings,
         errors
@@ -257,6 +258,7 @@ export function loadAppConfig() {
                 filters: param.filters,
               })),
               ADVANCED_FILTERS: parsedSearchSection.advanced_filters,
+              LIMIT: parsedSearchSection.limit,
             } as SearchConfig)
 
       const parsedMetadataQualitySection = parseConfigSection(

package/src/libs/util/app-config/src/lib/model.ts

@@ -60,6 +60,7 @@ export interface SearchConfig {
   FILTER_GEOMETRY_DATA?: string
   SEARCH_PRESET?: SearchPreset[]
   ADVANCED_FILTERS?: []
+  LIMIT?: number
 }
 
 export interface MetadataQualityConfig {

package/src/libs/util/shared/src/lib/record/quality-score.util.ts

@@ -12,14 +12,13 @@ const ValidatorMapper: TValidatorMapper = {
   abstract: (record) => !!record?.abstract,
   keywords: (record) => (record?.keywords?.length ?? 0) > 0,
   legalConstraints: (record) => (record?.legalConstraints?.length ?? 0) > 0,
-  contacts: (record) => !!record?.contacts?.[0]?.email,
-  updateFrequency: (record) => !!record?.updateFrequency,
+  contacts: (record) =>
+    !!record?.contacts?.[0]?.email &&
+    record.contacts[0].email !== 'missing@missing.com',
+  updateFrequency: (record) =>
+    !!record?.updateFrequency && record.updateFrequency !== 'unknown',
   topics: (record) => (record?.topics?.length ?? 0) > 0,
   organisation: (record) => !!record?.contacts?.[0]?.organization?.name,
-  capabilities: (record) =>
-    record?.onlineResources?.some((resource) =>
-      resource?.url?.href.toLowerCase().includes('capabilities')
-    ),
   source: (record) => !!record?.extras?.sourcesIdentifiers,
 } as const
 
@@ -40,12 +39,12 @@ function getMappersFromKind(kind: RecordKind) {
   ]
 
   switch (kind) {
-    case 'service':
-      kindKeys = ['capabilities']
-      break
     case 'reuse':
       kindKeys = ['topics', 'organisation', 'source']
       break
+    case 'service':
+      kindKeys = []
+      break
     case 'dataset':
     default:
       kindKeys = ['updateFrequency', 'topics', 'organisation']

package/src/libs/util/shared/src/lib/utils/geojson.ts

@@ -1,8 +1,11 @@
-import { Feature, FeatureCollection, Geometry } from 'geojson'
+import type { Feature, FeatureCollection, Geometry, Position } from 'geojson'
 
+/**
+ * @returns The geometry if available, otherwise null.
+ */
 export function getGeometryFromGeoJSON(
   data: FeatureCollection | Feature | Geometry
-): Geometry {
+): Geometry | null {
   if (data.type === 'FeatureCollection') {
     return data?.features?.[0]?.geometry || null
   }
@@ -24,3 +27,70 @@ export function getGeometryFromGeoJSON(
   }
   return null
 }
+
+// FIXME: this type should be more generic across the project
+export type BoundingBox = [number, number, number, number]
+
+export function getGeometryBoundingBox(geometry: Geometry): BoundingBox {
+  // use the bounding box if specified in the GeoJSON object
+  if (geometry.bbox) {
+    return geometry.bbox.length > 4
+      ? [geometry.bbox[0], geometry.bbox[1], geometry.bbox[3], geometry.bbox[4]]
+      : (geometry.bbox as BoundingBox)
+  }
+
+  const coordinatesReducer = (prev: BoundingBox, coords: Position) =>
+    [
+      Math.min(prev[0], coords[0]),
+      Math.min(prev[1], coords[1]),
+      Math.max(prev[2], coords[0]),
+      Math.max(prev[3], coords[1]),
+    ] as BoundingBox
+  const coordinatesArrayReducer = (
+    prev: BoundingBox,
+    coordsArray: Position[]
+  ) => {
+    const bbox = coordsArray.reduce(coordinatesReducer, emptyExtent)
+    return [
+      Math.min(prev[0], bbox[0]),
+      Math.min(prev[1], bbox[1]),
+      Math.max(prev[2], bbox[2]),
+      Math.max(prev[3], bbox[3]),
+    ] as BoundingBox
+  }
+  const emptyExtent = [Infinity, Infinity, -Infinity, -Infinity] as BoundingBox
+
+  switch (geometry.type) {
+    case 'MultiPolygon':
+      return geometry.coordinates.reduce((prev, polygonCoords) => {
+        const bbox = polygonCoords.reduce(coordinatesArrayReducer, emptyExtent)
+        return [
+          Math.min(prev[0], bbox[0]),
+          Math.min(prev[1], bbox[1]),
+          Math.max(prev[2], bbox[2]),
+          Math.max(prev[3], bbox[3]),
+        ] as BoundingBox
+      }, emptyExtent)
+    case 'GeometryCollection':
+      return geometry.geometries.reduce((prev, geom) => {
+        const bbox = getGeometryBoundingBox(geom)
+        return [
+          Math.min(prev[0], bbox[0]),
+          Math.min(prev[1], bbox[1]),
+          Math.max(prev[2], bbox[2]),
+          Math.max(prev[3], bbox[3]),
+        ] as BoundingBox
+      }, emptyExtent)
+    case 'Polygon':
+    case 'MultiLineString':
+      return geometry.coordinates.reduce(coordinatesArrayReducer, emptyExtent)
+    case 'LineString':
+    case 'MultiPoint':
+      return geometry.coordinates.reduce<BoundingBox>(
+        coordinatesReducer,
+        emptyExtent
+      )
+    case 'Point':
+      return coordinatesReducer(emptyExtent, geometry.coordinates)
+  }
+}

package/src/libs/util/shared/src/lib/utils/index.ts

@@ -4,6 +4,7 @@ export * from './format-fields'
 export * from './fuzzy-filter'
 export * from './geojson'
 export * from './image-resize'
+export * from './mobile-screen'
 export * from './no-duplicate-file-name'
 export * from './parse'
 export * from './remove-whitespace'

package/src/libs/util/shared/src/lib/utils/mobile-screen.ts

@@ -0,0 +1,14 @@
+import { fromEvent, startWith, map, shareReplay } from 'rxjs'
+
+/**
+ * This returns true when the screen size is under 768px, which is the mobile threshold.
+ */
+const MOBILE_MAX_WIDTH = 768
+
+export function getIsMobile() {
+  return fromEvent(window, 'resize').pipe(
+    startWith(window.innerWidth),
+    map(() => window.innerWidth < MOBILE_MAX_WIDTH),
+    shareReplay({ bufferSize: 1, refCount: true })
+  )
+}

package/translations/de.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "Beschreibung",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "Schließen",
   "record.metadata.api.form.closeForm": "Formular schließen",
   "record.metadata.api.form.create": "Ihre Anfrage erstellen",

package/translations/en.json

@@ -390,6 +390,16 @@
   "record.kind.service": "Service",
   "record.metadata.about": "Description",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "GPFDL",
+  "record.metadata.api.accessServiceProtocol.esriRest": "esriRest",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "maplibre-style",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "ogcFeatures",
+  "record.metadata.api.accessServiceProtocol.other": "other",
+  "record.metadata.api.accessServiceProtocol.tms": "tms",
+  "record.metadata.api.accessServiceProtocol.wfs": "wfs",
+  "record.metadata.api.accessServiceProtocol.wms": "wms",
+  "record.metadata.api.accessServiceProtocol.wmts": "wmts",
+  "record.metadata.api.accessServiceProtocol.wps": "wps",
   "record.metadata.api.form.closeButton": "Close",
   "record.metadata.api.form.closeForm": "Close the form",
   "record.metadata.api.form.create": "Create your request",

package/translations/es.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "",
   "record.metadata.api": "",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "",
   "record.metadata.api.form.closeForm": "",
   "record.metadata.api.form.create": "",

package/translations/fr.json

@@ -390,6 +390,16 @@
   "record.kind.service": "Service",
   "record.metadata.about": "A propos",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "autre",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "Fermer",
   "record.metadata.api.form.closeForm": "Fermer le panneau de personnalisation",
   "record.metadata.api.form.create": "Paramétrer votre requête",

package/translations/it.json

@@ -390,6 +390,16 @@
   "record.kind.service": "Servizio",
   "record.metadata.about": "Descrizione",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "Chiude",
   "record.metadata.api.form.closeForm": "Chiude il pannello di personalizzazione",
   "record.metadata.api.form.create": "Configura la sua richiesta",

package/translations/nl.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "",
   "record.metadata.api": "",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "",
   "record.metadata.api.form.closeForm": "",
   "record.metadata.api.form.create": "",

package/translations/pt.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "",
   "record.metadata.api": "",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "",
   "record.metadata.api.form.closeForm": "",
   "record.metadata.api.form.create": "",

package/translations/sk.json

@@ -390,6 +390,16 @@
   "record.kind.service": "",
   "record.metadata.about": "O",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "Zavrieť",
   "record.metadata.api.form.closeForm": "Zavrieť formulár",
   "record.metadata.api.form.create": "Vytvoriť požiadavku",