geonetwork-ui 2.3.0-dev.2c3530dc → 2.3.0-dev.3d65a13b

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (163) hide show
  1. package/esm2022/libs/api/metadata-converter/src/index.mjs +5 -5
  2. package/esm2022/libs/api/metadata-converter/src/lib/base.converter.mjs +14 -0
  3. package/esm2022/libs/api/metadata-converter/src/lib/find-converter.mjs +15 -0
  4. package/esm2022/libs/api/metadata-converter/src/lib/gn4/atomic-operations.mjs +3 -3
  5. package/esm2022/libs/api/metadata-converter/src/lib/gn4/gn4.converter.mjs +52 -0
  6. package/esm2022/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.mjs +3 -3
  7. package/esm2022/libs/api/metadata-converter/src/lib/gn4/index.mjs +4 -0
  8. package/esm2022/libs/api/metadata-converter/src/lib/iso19115-3/index.mjs +2 -0
  9. package/esm2022/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.mjs +123 -0
  10. package/esm2022/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.mjs +116 -0
  11. package/esm2022/libs/api/metadata-converter/src/lib/iso19115-3/write-parts.mjs +138 -0
  12. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/index.mjs +2 -0
  13. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.mjs +242 -0
  14. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/read-parts.mjs +58 -62
  15. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/utils/individual-name.mjs +18 -0
  16. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/utils/keyword.mapper.mjs +14 -0
  17. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/utils/role.mapper.mjs +48 -0
  18. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/utils/status.mapper.mjs +18 -0
  19. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/utils/update-frequency.mapper.mjs +64 -0
  20. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/write-parts.mjs +75 -58
  21. package/esm2022/libs/api/metadata-converter/src/lib/xml-utils.mjs +76 -14
  22. package/esm2022/libs/api/repository/src/lib/gn4/gn4-repository.mjs +4 -4
  23. package/esm2022/libs/common/domain/src/lib/model/record/metadata.model.mjs +1 -1
  24. package/esm2022/libs/feature/dataviz/src/lib/service/data.service.mjs +2 -2
  25. package/esm2022/libs/feature/editor/src/lib/services/editor.service.mjs +8 -8
  26. package/esm2022/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.mjs +6 -2
  27. package/esm2022/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.mjs +72 -0
  28. package/esm2022/libs/feature/map/src/lib/feature-map.module.mjs +7 -3
  29. package/esm2022/libs/feature/map/src/lib/layers-panel/layers-panel.component.mjs +12 -7
  30. package/esm2022/libs/feature/map/src/lib/map-context/map-context.model.mjs +2 -1
  31. package/esm2022/libs/feature/map/src/lib/map-context/map-context.service.mjs +52 -25
  32. package/esm2022/libs/feature/map/src/lib/utils/map-utils.service.mjs +12 -49
  33. package/esm2022/libs/feature/record/src/lib/map-view/map-view.component.mjs +6 -2
  34. package/esm2022/translations/de.json +2 -0
  35. package/esm2022/translations/en.json +2 -0
  36. package/esm2022/translations/es.json +2 -0
  37. package/esm2022/translations/fr.json +2 -0
  38. package/esm2022/translations/it.json +2 -0
  39. package/esm2022/translations/nl.json +2 -0
  40. package/esm2022/translations/pt.json +2 -0
  41. package/fesm2022/geonetwork-ui.mjs +3426 -2766
  42. package/fesm2022/geonetwork-ui.mjs.map +1 -1
  43. package/libs/api/metadata-converter/src/index.d.ts +4 -4
  44. package/libs/api/metadata-converter/src/index.d.ts.map +1 -1
  45. package/libs/api/metadata-converter/src/lib/{metadata-base.mapper.d.ts → base.converter.d.ts} +3 -3
  46. package/libs/api/metadata-converter/src/lib/base.converter.d.ts.map +1 -0
  47. package/libs/api/metadata-converter/src/lib/find-converter.d.ts +3 -0
  48. package/libs/api/metadata-converter/src/lib/find-converter.d.ts.map +1 -0
  49. package/libs/api/metadata-converter/src/lib/gn4/{gn4.metadata.mapper.d.ts → gn4.converter.d.ts} +5 -5
  50. package/libs/api/metadata-converter/src/lib/gn4/gn4.converter.d.ts.map +1 -0
  51. package/libs/api/metadata-converter/src/lib/gn4/index.d.ts +4 -0
  52. package/libs/api/metadata-converter/src/lib/gn4/index.d.ts.map +1 -0
  53. package/libs/api/metadata-converter/src/lib/iso19115-3/index.d.ts +2 -0
  54. package/libs/api/metadata-converter/src/lib/iso19115-3/index.d.ts.map +1 -0
  55. package/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.d.ts +9 -0
  56. package/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.d.ts.map +1 -0
  57. package/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.d.ts +20 -0
  58. package/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.d.ts.map +1 -0
  59. package/libs/api/metadata-converter/src/lib/iso19115-3/write-parts.d.ts +21 -0
  60. package/libs/api/metadata-converter/src/lib/iso19115-3/write-parts.d.ts.map +1 -0
  61. package/libs/api/metadata-converter/src/lib/iso19139/index.d.ts +2 -0
  62. package/libs/api/metadata-converter/src/lib/iso19139/index.d.ts.map +1 -0
  63. package/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.d.ts +11 -0
  64. package/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.d.ts.map +1 -0
  65. package/libs/api/metadata-converter/src/lib/iso19139/read-parts.d.ts +34 -6
  66. package/libs/api/metadata-converter/src/lib/iso19139/read-parts.d.ts.map +1 -1
  67. package/libs/api/metadata-converter/src/lib/iso19139/utils/individual-name.d.ts +8 -0
  68. package/libs/api/metadata-converter/src/lib/iso19139/utils/individual-name.d.ts.map +1 -0
  69. package/libs/api/metadata-converter/src/lib/iso19139/utils/keyword.mapper.d.ts.map +1 -0
  70. package/libs/api/metadata-converter/src/lib/iso19139/utils/role.mapper.d.ts.map +1 -0
  71. package/libs/api/metadata-converter/src/lib/iso19139/utils/status.mapper.d.ts.map +1 -0
  72. package/libs/api/metadata-converter/src/lib/iso19139/utils/update-frequency.mapper.d.ts.map +1 -0
  73. package/libs/api/metadata-converter/src/lib/iso19139/write-parts.d.ts +39 -3
  74. package/libs/api/metadata-converter/src/lib/iso19139/write-parts.d.ts.map +1 -1
  75. package/libs/api/metadata-converter/src/lib/xml-utils.d.ts +14 -1
  76. package/libs/api/metadata-converter/src/lib/xml-utils.d.ts.map +1 -1
  77. package/libs/api/repository/src/lib/gn4/gn4-repository.d.ts +2 -2
  78. package/libs/api/repository/src/lib/gn4/gn4-repository.d.ts.map +1 -1
  79. package/libs/common/domain/src/lib/model/record/metadata.model.d.ts +6 -4
  80. package/libs/common/domain/src/lib/model/record/metadata.model.d.ts.map +1 -1
  81. package/libs/feature/editor/src/lib/services/editor.service.d.ts.map +1 -1
  82. package/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.d.ts.map +1 -1
  83. package/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.d.ts +23 -0
  84. package/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.d.ts.map +1 -0
  85. package/libs/feature/map/src/lib/feature-map.module.d.ts +2 -1
  86. package/libs/feature/map/src/lib/feature-map.module.d.ts.map +1 -1
  87. package/libs/feature/map/src/lib/layers-panel/layers-panel.component.d.ts +2 -0
  88. package/libs/feature/map/src/lib/layers-panel/layers-panel.component.d.ts.map +1 -1
  89. package/libs/feature/map/src/lib/map-context/map-context.model.d.ts +10 -5
  90. package/libs/feature/map/src/lib/map-context/map-context.model.d.ts.map +1 -1
  91. package/libs/feature/map/src/lib/map-context/map-context.service.d.ts.map +1 -1
  92. package/libs/feature/map/src/lib/utils/map-utils.service.d.ts +2 -3
  93. package/libs/feature/map/src/lib/utils/map-utils.service.d.ts.map +1 -1
  94. package/libs/feature/record/src/lib/map-view/map-view.component.d.ts.map +1 -1
  95. package/package.json +2 -2
  96. package/src/libs/api/metadata-converter/src/index.ts +4 -4
  97. package/src/libs/api/metadata-converter/src/lib/{metadata-base.mapper.ts → base.converter.ts} +2 -2
  98. package/src/libs/api/metadata-converter/src/lib/find-converter.ts +16 -0
  99. package/src/libs/api/metadata-converter/src/lib/fixtures/generic.records.ts +32 -5
  100. package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.ts +11 -4
  101. package/src/libs/api/metadata-converter/src/lib/fixtures/geocat-ch.records.ts +33 -7
  102. package/src/libs/api/metadata-converter/src/lib/fixtures/metawal.records.ts +580 -0
  103. package/src/libs/api/metadata-converter/src/lib/gn4/atomic-operations.ts +2 -2
  104. package/src/libs/api/metadata-converter/src/lib/gn4/{gn4.metadata.mapper.ts → gn4.converter.ts} +2 -2
  105. package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts +2 -2
  106. package/src/libs/api/metadata-converter/src/lib/gn4/index.ts +3 -0
  107. package/src/libs/api/metadata-converter/src/lib/iso19115-3/index.ts +1 -0
  108. package/src/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.ts +176 -0
  109. package/src/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.ts +329 -0
  110. package/src/libs/api/metadata-converter/src/lib/iso19115-3/write-parts.ts +513 -0
  111. package/src/libs/api/metadata-converter/src/lib/iso19139/index.ts +1 -0
  112. package/src/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.ts +327 -0
  113. package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts +121 -82
  114. package/src/libs/api/metadata-converter/src/lib/iso19139/utils/individual-name.ts +20 -0
  115. package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts +175 -95
  116. package/src/libs/api/metadata-converter/src/lib/xml-utils.ts +84 -16
  117. package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts +2 -2
  118. package/src/libs/common/domain/src/lib/model/record/metadata.model.ts +9 -4
  119. package/src/libs/feature/dataviz/src/lib/service/data.service.ts +1 -1
  120. package/src/libs/feature/editor/src/lib/services/editor.service.ts +27 -16
  121. package/src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.ts +5 -1
  122. package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.css +0 -0
  123. package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.html +36 -0
  124. package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.ts +80 -0
  125. package/src/libs/feature/map/src/lib/feature-map.module.ts +2 -0
  126. package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.html +8 -0
  127. package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.ts +5 -0
  128. package/src/libs/feature/map/src/lib/map-context/map-context.model.ts +10 -3
  129. package/src/libs/feature/map/src/lib/map-context/map-context.service.ts +60 -32
  130. package/src/libs/feature/map/src/lib/utils/map-utils.service.ts +17 -61
  131. package/src/libs/feature/record/src/lib/map-view/map-view.component.ts +5 -1
  132. package/translations/de.json +2 -0
  133. package/translations/en.json +2 -0
  134. package/translations/es.json +2 -0
  135. package/translations/fr.json +2 -0
  136. package/translations/it.json +2 -0
  137. package/translations/nl.json +2 -0
  138. package/translations/pt.json +2 -0
  139. package/translations/sk.json +2 -0
  140. package/esm2022/libs/api/metadata-converter/src/lib/gn4/gn4.metadata.mapper.mjs +0 -52
  141. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/codelists/keyword.mapper.mjs +0 -14
  142. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/codelists/role.mapper.mjs +0 -48
  143. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/codelists/status.mapper.mjs +0 -18
  144. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/codelists/update-frequency.mapper.mjs +0 -64
  145. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/converter.mjs +0 -130
  146. package/esm2022/libs/api/metadata-converter/src/lib/metadata-base.mapper.mjs +0 -14
  147. package/libs/api/metadata-converter/src/lib/gn4/gn4.metadata.mapper.d.ts.map +0 -1
  148. package/libs/api/metadata-converter/src/lib/iso19139/codelists/keyword.mapper.d.ts.map +0 -1
  149. package/libs/api/metadata-converter/src/lib/iso19139/codelists/role.mapper.d.ts.map +0 -1
  150. package/libs/api/metadata-converter/src/lib/iso19139/codelists/status.mapper.d.ts.map +0 -1
  151. package/libs/api/metadata-converter/src/lib/iso19139/codelists/update-frequency.mapper.d.ts.map +0 -1
  152. package/libs/api/metadata-converter/src/lib/iso19139/converter.d.ts +0 -4
  153. package/libs/api/metadata-converter/src/lib/iso19139/converter.d.ts.map +0 -1
  154. package/libs/api/metadata-converter/src/lib/metadata-base.mapper.d.ts.map +0 -1
  155. package/src/libs/api/metadata-converter/src/lib/iso19139/converter.ts +0 -196
  156. /package/libs/api/metadata-converter/src/lib/iso19139/{codelists → utils}/keyword.mapper.d.ts +0 -0
  157. /package/libs/api/metadata-converter/src/lib/iso19139/{codelists → utils}/role.mapper.d.ts +0 -0
  158. /package/libs/api/metadata-converter/src/lib/iso19139/{codelists → utils}/status.mapper.d.ts +0 -0
  159. /package/libs/api/metadata-converter/src/lib/iso19139/{codelists → utils}/update-frequency.mapper.d.ts +0 -0
  160. /package/src/libs/api/metadata-converter/src/lib/iso19139/{codelists → utils}/keyword.mapper.ts +0 -0
  161. /package/src/libs/api/metadata-converter/src/lib/iso19139/{codelists → utils}/role.mapper.ts +0 -0
  162. /package/src/libs/api/metadata-converter/src/lib/iso19139/{codelists → utils}/status.mapper.ts +0 -0
  163. /package/src/libs/api/metadata-converter/src/lib/iso19139/{codelists → utils}/update-frequency.mapper.ts +0 -0
@@ -14,7 +14,7 @@ import {
14
14
  } from '../../../../../../libs/common/domain/src/lib/model/search'
15
15
  import { map } from 'rxjs/operators'
16
16
  import {
17
- Gn4MetadataMapper,
17
+ Gn4Converter,
18
18
  Gn4SearchResults,
19
19
  } from '../../../../../../libs/api/metadata-converter/src'
20
20
  import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
@@ -24,7 +24,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
24
24
  constructor(
25
25
  private gn4SearchApi: SearchApiService,
26
26
  private gn4SearchHelper: ElasticsearchService,
27
- private gn4Mapper: Gn4MetadataMapper
27
+ private gn4Mapper: Gn4Converter
28
28
  ) {}
29
29
 
30
30
  search({
@@ -83,8 +83,8 @@ export interface BaseRecord {
83
83
  title: string
84
84
  abstract: string
85
85
  recordCreated?: Date
86
- recordUpdated: Date
87
86
  recordPublished?: Date
87
+ recordUpdated: Date
88
88
  languages: Array<LanguageCode>
89
89
  kind: RecordKind
90
90
  topics: Array<string> // TODO: handle codelists
@@ -98,6 +98,12 @@ export interface BaseRecord {
98
98
  landingPage?: URL
99
99
  updateFrequency?: UpdateFrequency
100
100
 
101
+ // information related to the resource (dataset, service)
102
+ contactsForResource: Array<Individual>
103
+ resourceCreated?: Date
104
+ resourcePublished?: Date
105
+ resourceUpdated?: Date
106
+
101
107
  // to add: canonical url
102
108
  // to add: source catalog (??)
103
109
  // to add: is open data ?
@@ -173,10 +179,7 @@ export interface DatasetTemporalExtent {
173
179
 
174
180
  export interface DatasetRecord extends BaseRecord {
175
181
  kind: 'dataset'
176
- contactsForResource: Array<Individual>
177
182
  status: RecordStatus
178
- datasetCreated?: Date
179
- datasetUpdated?: Date
180
183
  lineage: string // Explanation of the origin of this record (e.g: how, why)"
181
184
  distributions: Array<DatasetDistribution>
182
185
  spatialExtents: Array<DatasetSpatialExtent>
@@ -203,3 +206,5 @@ export interface ServiceRecord extends BaseRecord {
203
206
  }
204
207
 
205
208
  export type CatalogRecord = ServiceRecord | DatasetRecord
209
+
210
+ export type CatalogRecordKeys = keyof ServiceRecord | keyof DatasetRecord
@@ -94,7 +94,7 @@ export class DataService {
94
94
  ),
95
95
  geojson: endpoint.supportsJson(featureType.name)
96
96
  ? endpoint.getFeatureUrl(featureType.name, {
97
- outputFormat: 'application/json',
97
+ asJson: true,
98
98
  outputCrs: 'EPSG:4326',
99
99
  })
100
100
  : null,
@@ -1,8 +1,11 @@
1
1
  import { Inject, Injectable, Optional } from '@angular/core'
2
- import { toModel, toXml } from '../../../../../../libs/api/metadata-converter/src'
2
+ import {
3
+ findConverterForDocument,
4
+ Iso19139Converter,
5
+ } from '../../../../../../libs/api/metadata-converter/src'
3
6
  import { Configuration } from '../../../../../../libs/data-access/gn4/src'
4
- import { Observable } from 'rxjs'
5
- import { map } from 'rxjs/operators'
7
+ import { from, Observable } from 'rxjs'
8
+ import { map, switchMap } from 'rxjs/operators'
6
9
  import { HttpClient } from '@angular/common/http'
7
10
  import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
8
11
  import { EditorFieldsConfig } from '../models/fields.model'
@@ -30,7 +33,11 @@ export class EditorService {
30
33
  Accept: 'application/xml',
31
34
  },
32
35
  })
33
- .pipe(map((response) => toModel(response.toString())))
36
+ .pipe(
37
+ switchMap((response) =>
38
+ findConverterForDocument(response).readRecord(response.toString())
39
+ )
40
+ )
34
41
  }
35
42
 
36
43
  // returns the record as it was when saved
@@ -52,17 +59,21 @@ export class EditorService {
52
59
  }
53
60
 
54
61
  // TODO: use the catalog repository instead
55
- return this.http
56
- .put(
57
- `${this.apiUrl}/records?metadataType=METADATA&uuidProcessing=OVERWRITE&transformWith=_none_&publishToAll=on`,
58
- toXml(savedRecord),
59
- {
60
- headers: {
61
- 'Content-Type': 'application/xml',
62
- },
63
- withCredentials: true,
64
- }
65
- )
66
- .pipe(map(() => savedRecord))
62
+ // TODO: use converter based on the format of the record before change
63
+ return from(new Iso19139Converter().writeRecord(savedRecord)).pipe(
64
+ switchMap((recordXml) =>
65
+ this.http.put(
66
+ `${this.apiUrl}/records?metadataType=METADATA&uuidProcessing=OVERWRITE&transformWith=_none_&publishToAll=on`,
67
+ recordXml,
68
+ {
69
+ headers: {
70
+ 'Content-Type': 'application/xml',
71
+ },
72
+ withCredentials: true,
73
+ }
74
+ )
75
+ ),
76
+ map(() => savedRecord)
77
+ )
67
78
  }
68
79
  }
@@ -59,7 +59,11 @@ export class AddLayerRecordPreviewComponent extends RecordPreviewComponent {
59
59
  name: link.name,
60
60
  })
61
61
  } else if (link.accessServiceProtocol === 'wmts') {
62
- return this.mapUtils.getWmtsLayerFromCapabilities(link)
62
+ return of({
63
+ url: link.url.toString(),
64
+ type: MapContextLayerTypeEnum.WMTS,
65
+ name: link.name,
66
+ })
63
67
  }
64
68
  return throwError(() => 'protocol not supported')
65
69
  }
@@ -0,0 +1,36 @@
1
+ <div class="flex items-center mb-5">
2
+ <gn-ui-text-input
3
+ [(value)]="ogcUrl"
4
+ (valueChange)="urlChange.next($event)"
5
+ [hint]="'map.ogc.urlInput.hint' | translate"
6
+ class="w-96"
7
+ >
8
+ </gn-ui-text-input>
9
+ </div>
10
+
11
+ <div *ngIf="errorMessage" class="text-red-500 mt-2">
12
+ {{ errorMessage }}
13
+ </div>
14
+
15
+ <div *ngIf="loading">
16
+ <p class="loading-message" translate>map.loading.service</p>
17
+ </div>
18
+
19
+ <div *ngIf="!loading && layers.length > 0">
20
+ <h2 class="font-bold" translate>map.layers.available</h2>
21
+ <ng-container *ngFor="let layer of layers">
22
+ <div class="flex items-center justify-between my-2 layer-item-tree">
23
+ <p class="max-w-xs overflow-hidden overflow-ellipsis whitespace-nowrap">
24
+ {{ layer }}
25
+ </p>
26
+ <gn-ui-button
27
+ class="layer-add-btn"
28
+ type="primary"
29
+ (buttonClick)="addLayer(layer)"
30
+ extraClass="text-sm !px-2 !py-1"
31
+ translate
32
+ ><span translate> map.layer.add </span></gn-ui-button
33
+ >
34
+ </div>
35
+ </ng-container>
36
+ </div>
@@ -0,0 +1,80 @@
1
+ import {
2
+ Component,
3
+ OnInit,
4
+ Output,
5
+ EventEmitter,
6
+ ChangeDetectionStrategy,
7
+ Input,
8
+ ChangeDetectorRef,
9
+ } from '@angular/core'
10
+ import { OgcApiEndpoint } from '@camptocamp/ogc-client'
11
+ import { Subject, debounceTime } from 'rxjs'
12
+ import {
13
+ MapContextLayerModel,
14
+ MapContextLayerTypeEnum,
15
+ } from '../map-context/map-context.model'
16
+ import { TranslateModule } from '@ngx-translate/core'
17
+ import { UiInputsModule } from '../../../../../../libs/ui/inputs/src'
18
+ import { CommonModule } from '@angular/common'
19
+ import { MapLayer } from '../+state/map.models'
20
+
21
+ @Component({
22
+ selector: 'gn-ui-add-layer-from-ogc-api',
23
+ templateUrl: './add-layer-from-ogc-api.component.html',
24
+ styleUrls: ['./add-layer-from-ogc-api.component.css'],
25
+ standalone: true,
26
+ imports: [CommonModule, TranslateModule, UiInputsModule],
27
+ })
28
+ export class AddLayerFromOgcApiComponent implements OnInit {
29
+ @Input() ogcUrl: string
30
+ @Output() layerAdded = new EventEmitter<MapLayer>()
31
+
32
+ urlChange = new Subject<string>()
33
+ layerUrl = ''
34
+ loading = false
35
+ layers: string[] = []
36
+ ogcEndpoint: OgcApiEndpoint = null
37
+ errorMessage: string | null = null
38
+
39
+ constructor(private changeDetectorRef: ChangeDetectorRef) {}
40
+
41
+ ngOnInit() {
42
+ this.urlChange.pipe(debounceTime(700)).subscribe(() => {
43
+ this.loadLayers()
44
+ this.changeDetectorRef.detectChanges() // manually trigger change detection
45
+ })
46
+ }
47
+
48
+ async loadLayers() {
49
+ this.errorMessage = null
50
+ try {
51
+ this.loading = true
52
+ if (this.ogcUrl.trim() === '') {
53
+ this.layers = []
54
+ return
55
+ }
56
+ this.ogcEndpoint = await new OgcApiEndpoint(this.ogcUrl)
57
+
58
+ // Currently only supports feature collections
59
+ this.layers = await this.ogcEndpoint.featureCollections
60
+ } catch (error) {
61
+ const err = error as Error
62
+ this.layers = []
63
+ this.errorMessage = 'Error loading layers: ' + err.message
64
+ } finally {
65
+ this.loading = false
66
+ this.changeDetectorRef.markForCheck()
67
+ }
68
+ }
69
+
70
+ async addLayer(layer: string) {
71
+ this.layerUrl = await this.ogcEndpoint.getCollectionItemsUrl(layer)
72
+
73
+ const layerToAdd: MapContextLayerModel = {
74
+ name: layer,
75
+ url: this.layerUrl,
76
+ type: MapContextLayerTypeEnum.OGCAPI,
77
+ }
78
+ this.layerAdded.emit({ ...layerToAdd, title: layer })
79
+ }
80
+ }
@@ -25,6 +25,7 @@ import { AddLayerFromFileComponent } from './add-layer-from-file/add-layer-from-
25
25
  import { AddLayerFromWfsComponent } from './add-layer-from-wfs/add-layer-from-wfs.component'
26
26
  import { GeocodingComponent } from './geocoding/geocoding.component'
27
27
  import { GEOCODING_PROVIDER, GeocodingProvider } from './geocoding.service'
28
+ import { AddLayerFromOgcApiComponent } from './add-layer-from-ogc-api/add-layer-from-ogc-api.component'
28
29
 
29
30
  @NgModule({
30
31
  declarations: [
@@ -59,6 +60,7 @@ import { GEOCODING_PROVIDER, GeocodingProvider } from './geocoding.service'
59
60
  EffectsModule.forFeature([MapEffects]),
60
61
  UiElementsModule,
61
62
  UiInputsModule,
63
+ AddLayerFromOgcApiComponent,
62
64
  ],
63
65
  providers: [
64
66
  {
@@ -40,6 +40,14 @@
40
40
  <gn-ui-add-layer-from-wfs></gn-ui-add-layer-from-wfs>
41
41
  </div>
42
42
  </mat-tab>
43
+ <mat-tab [label]="'map.add.layer.ogc.api' | translate" bodyClass="h-full">
44
+ <div class="p-3">
45
+ <gn-ui-add-layer-from-ogc-api
46
+ [ogcUrl]="ogcUrl"
47
+ (layerAdded)="addLayer($event)"
48
+ ></gn-ui-add-layer-from-ogc-api>
49
+ </div>
50
+ </mat-tab>
43
51
  <mat-tab [label]="'map.add.layer.file' | translate" bodyClass="h-full">
44
52
  <div class="p-3">
45
53
  <gn-ui-add-layer-from-file></gn-ui-add-layer-from-file>
@@ -9,9 +9,14 @@ import { MapFacade } from '../+state/map.facade'
9
9
  })
10
10
  export class LayersPanelComponent {
11
11
  layers$ = this.mapFacade.layers$
12
+ ogcUrl = ''
12
13
  constructor(private mapFacade: MapFacade) {}
13
14
 
14
15
  deleteLayer(index: number) {
15
16
  this.mapFacade.removeLayer(index)
16
17
  }
18
+
19
+ addLayer(layer) {
20
+ this.mapFacade.addLayer(layer)
21
+ }
17
22
  }
@@ -1,7 +1,6 @@
1
1
  import type { FeatureCollection } from 'geojson'
2
2
  import { Coordinate } from 'ol/coordinate'
3
3
  import type { Extent } from 'ol/extent'
4
- import { Options } from 'ol/source/WMTS'
5
4
 
6
5
  export enum MapContextLayerTypeEnum {
7
6
  XYZ = 'xyz',
@@ -9,6 +8,7 @@ export enum MapContextLayerTypeEnum {
9
8
  WMTS = 'wmts',
10
9
  WFS = 'wfs',
11
10
  GEOJSON = 'geojson',
11
+ OGCAPI = 'ogcapi',
12
12
  }
13
13
 
14
14
  export interface MapContextModel {
@@ -24,8 +24,8 @@ export interface MapContextLayerWmsModel {
24
24
 
25
25
  export interface MapContextLayerWmtsModel {
26
26
  type: 'wmts'
27
- options: Options
28
- extent?: Extent
27
+ url: string
28
+ name: string
29
29
  }
30
30
 
31
31
  interface MapContextLayerWfsModel {
@@ -34,6 +34,12 @@ interface MapContextLayerWfsModel {
34
34
  name: string
35
35
  }
36
36
 
37
+ export interface MapContextLayerOgcapiModel {
38
+ type: 'ogcapi'
39
+ url: string
40
+ name: string
41
+ }
42
+
37
43
  interface LayerXyzModel {
38
44
  type: 'xyz'
39
45
  name?: string
@@ -71,6 +77,7 @@ export type MapContextLayerModel =
71
77
  | MapContextLayerWfsModel
72
78
  | MapContextLayerXyzModel
73
79
  | MapContextLayerGeojsonModel
80
+ | MapContextLayerOgcapiModel
74
81
 
75
82
  export interface MapContextViewModel {
76
83
  center?: Coordinate // expressed in long/lat (EPSG:4326)
@@ -22,9 +22,9 @@ import { LayerConfig, MapConfig } from '../../../../../../libs/util/app-config/s
22
22
  import { FeatureCollection } from 'geojson'
23
23
  import { fromLonLat } from 'ol/proj'
24
24
  import WMTS from 'ol/source/WMTS'
25
- import { removeSearchParams } from '../../../../../../libs/util/shared/src'
26
25
  import { Geometry } from 'ol/geom'
27
26
  import Feature from 'ol/Feature'
27
+ import { WfsEndpoint, WmtsEndpoint } from '@camptocamp/ogc-client'
28
28
 
29
29
  export const DEFAULT_BASELAYER_CONTEXT: MapContextLayerXyzModel = {
30
30
  type: MapContextLayerTypeEnum.XYZ,
@@ -77,6 +77,15 @@ export class MapContextService {
77
77
  const { type } = layerModel
78
78
  const style = this.styleService.styles.default
79
79
  switch (type) {
80
+ case MapContextLayerTypeEnum.OGCAPI:
81
+ return new VectorLayer({
82
+ source: new VectorSource({
83
+ format: new GeoJSON(),
84
+ url: layerModel.url,
85
+ }),
86
+ style,
87
+ })
88
+
80
89
  case MapContextLayerTypeEnum.XYZ:
81
90
  return new TileLayer({
82
91
  source: new XYZ({
@@ -87,44 +96,63 @@ export class MapContextService {
87
96
  case MapContextLayerTypeEnum.WMS:
88
97
  return new TileLayer({
89
98
  source: new TileWMS({
90
- url: removeSearchParams(layerModel.url, ['request', 'service']),
99
+ url: layerModel.url,
91
100
  params: { LAYERS: layerModel.name },
92
101
  gutter: 20,
93
102
  }),
94
103
  })
95
- case MapContextLayerTypeEnum.WMTS:
96
- return new TileLayer({
97
- source: new WMTS(layerModel.options),
104
+ case MapContextLayerTypeEnum.WMTS: {
105
+ // TODO: isolate this in utils service
106
+ const olLayer = new TileLayer({})
107
+ const endpoint = new WmtsEndpoint(layerModel.url)
108
+ endpoint.isReady().then(async (endpoint) => {
109
+ const layerName = endpoint.getSingleLayerName() ?? layerModel.name
110
+ const layer = endpoint.getLayerByName(layerName)
111
+ const matrixSet = layer.matrixSets[0]
112
+ const tileGrid = await endpoint.getOpenLayersTileGrid(layer.name)
113
+ const resourceUrl = layer.resourceLinks[0]
114
+ const dimensions = endpoint.getDefaultDimensions(layer.name)
115
+ olLayer.setSource(
116
+ new WMTS({
117
+ layer: layer.name,
118
+ style: layer.defaultStyle,
119
+ matrixSet: matrixSet.identifier,
120
+ format: resourceUrl.format,
121
+ url: resourceUrl.url,
122
+ requestEncoding: resourceUrl.encoding,
123
+ tileGrid,
124
+ projection: matrixSet.crs,
125
+ dimensions,
126
+ })
127
+ )
98
128
  })
99
- case MapContextLayerTypeEnum.WFS:
100
- return new VectorLayer({
101
- source: new VectorSource({
102
- format: new GeoJSON(),
103
- url: function (extent) {
104
- const urlObj = new URL(
105
- removeSearchParams(layerModel.url, [
106
- 'service',
107
- 'version',
108
- 'request',
109
- ])
110
- )
111
- urlObj.searchParams.set('service', 'WFS')
112
- urlObj.searchParams.set('version', '1.1.0')
113
- urlObj.searchParams.set('request', 'GetFeature')
114
- urlObj.searchParams.set('outputFormat', 'application/json')
115
- urlObj.searchParams.set('typename', layerModel.name)
116
- urlObj.searchParams.set('srsname', 'EPSG:3857')
117
- urlObj.searchParams.set('bbox', `${extent.join(',')},EPSG:3857`)
118
- urlObj.searchParams.set(
119
- 'maxFeatures',
120
- WFS_MAX_FEATURES.toString()
121
- )
122
- return urlObj.toString()
123
- },
124
- strategy: bboxStrategy,
125
- }),
129
+ return olLayer
130
+ }
131
+ case MapContextLayerTypeEnum.WFS: {
132
+ const olLayer = new VectorLayer({
126
133
  style,
127
134
  })
135
+ new WfsEndpoint(layerModel.url).isReady().then((endpoint) => {
136
+ const featureType =
137
+ endpoint.getSingleFeatureTypeName() ?? layerModel.name
138
+ olLayer.setSource(
139
+ new VectorSource({
140
+ format: new GeoJSON(),
141
+ url: function (extent: [number, number, number, number]) {
142
+ return endpoint.getFeatureUrl(featureType, {
143
+ maxFeatures: WFS_MAX_FEATURES,
144
+ asJson: true,
145
+ outputCrs: 'EPSG:3857',
146
+ extent,
147
+ extentCrs: 'EPSG:3857',
148
+ })
149
+ },
150
+ strategy: bboxStrategy,
151
+ })
152
+ )
153
+ })
154
+ return olLayer
155
+ }
128
156
  case MapContextLayerTypeEnum.GEOJSON: {
129
157
  if ('url' in layerModel) {
130
158
  return new VectorLayer({
@@ -12,7 +12,6 @@ import Source from 'ol/source/Source'
12
12
  import ImageWMS from 'ol/source/ImageWMS'
13
13
  import TileWMS from 'ol/source/TileWMS'
14
14
  import VectorSource from 'ol/source/Vector'
15
- import { optionsFromCapabilities } from 'ol/source/WMTS'
16
15
  import { defaults, DragPan, Interaction, MouseWheelZoom } from 'ol/interaction'
17
16
  import {
18
17
  mouseOnly,
@@ -20,23 +19,17 @@ import {
20
19
  platformModifierKeyOnly,
21
20
  primaryAction,
22
21
  } from 'ol/events/condition'
23
- import WMTSCapabilities from 'ol/format/WMTSCapabilities'
24
- import { from, Observable } from 'rxjs'
22
+ import { Observable } from 'rxjs'
25
23
  import { map } from 'rxjs/operators'
26
24
  import {
27
25
  MapContextLayerModel,
28
- MapContextLayerTypeEnum,
29
26
  MapContextLayerWmsModel,
30
- MapContextLayerWmtsModel,
31
27
  } from '../map-context/map-context.model'
32
28
  import Collection from 'ol/Collection'
33
29
  import MapBrowserEvent from 'ol/MapBrowserEvent'
34
- import {
35
- CatalogRecord,
36
- DatasetDistribution,
37
- } from '../../../../../../libs/common/domain/src/lib/model/record'
30
+ import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
38
31
  import { ProxyService } from '../../../../../../libs/util/shared/src'
39
- import { WmsEndpoint } from '@camptocamp/ogc-client'
32
+ import { WmsEndpoint, WmtsEndpoint } from '@camptocamp/ogc-client'
40
33
  import { LONLAT_CRS_CODES } from '../constant/projections'
41
34
  import { fromEPSGCode, register } from 'ol/proj/proj4'
42
35
  import proj4 from 'proj4/dist/proj4'
@@ -152,11 +145,14 @@ export class MapUtilsService {
152
145
  } else if (layer && layer.type === 'wms') {
153
146
  latLonExtent = await this.getWmsLayerExtent(layer)
154
147
  } else if (layer && layer.type === 'wmts') {
155
- if (layer.extent) {
156
- latLonExtent = layer.extent
157
- } else {
158
- return layer.options.tileGrid.getExtent()
159
- }
148
+ // TODO: isolate this in utils service
149
+ latLonExtent = await new WmtsEndpoint(layer.url)
150
+ .isReady()
151
+ .then((endpoint) => {
152
+ const layerName = endpoint.getSingleLayerName() ?? layer.name
153
+ const wmtsLayer = endpoint.getLayerByName(layerName)
154
+ return wmtsLayer.latLonBoundingBox
155
+ })
160
156
  } else {
161
157
  return null
162
158
  }
@@ -180,59 +176,19 @@ export class MapUtilsService {
180
176
  LONLAT_CRS_CODES.includes(crs)
181
177
  )
182
178
  if (lonLatCRS) {
183
- return boundingBoxes[lonLatCRS].map(parseFloat)
179
+ return boundingBoxes[lonLatCRS]
184
180
  } else {
185
181
  const availableEPSGCode = Object.keys(boundingBoxes)[0]
186
182
  register(proj4)
187
183
  const proj = await fromEPSGCode(availableEPSGCode)
188
- const bboxWithFiniteNumbers =
189
- boundingBoxes[availableEPSGCode].map(parseFloat)
190
- return transformExtent(bboxWithFiniteNumbers, proj, 'EPSG:4326')
184
+ return transformExtent(
185
+ boundingBoxes[availableEPSGCode],
186
+ proj,
187
+ 'EPSG:4326'
188
+ )
191
189
  }
192
190
  }
193
191
 
194
- getWmtsLayerFromCapabilities(
195
- link: DatasetDistribution
196
- ): Observable<MapContextLayerWmtsModel> {
197
- const getCapabilitiesUrl = new URL(link.url, window.location.toString())
198
- getCapabilitiesUrl.searchParams.set('SERVICE', 'WMTS')
199
- getCapabilitiesUrl.searchParams.set('REQUEST', 'GetCapabilities')
200
- return from(
201
- fetch(getCapabilitiesUrl.toString())
202
- .then(async function (response) {
203
- if (!response.ok) {
204
- throw new Error(`WMTS GetCapabilities HTTP request failed with code ${
205
- response.status
206
- } and body:
207
- ${await response.text()}`)
208
- }
209
- return response.text()
210
- })
211
- .then(function (text) {
212
- try {
213
- const result = new WMTSCapabilities().read(text)
214
- const options = optionsFromCapabilities(result, {
215
- layer: link.name,
216
- matrixSet: 'EPSG:3857',
217
- })
218
- const layerCap = result?.Contents?.Layer.find(
219
- (layer) => layer.Identifier === link.name
220
- )
221
- return {
222
- options,
223
- type: MapContextLayerTypeEnum.WMTS as 'wmts',
224
- ...(layerCap?.WGS84BoundingBox
225
- ? { extent: layerCap.WGS84BoundingBox }
226
- : {}),
227
- }
228
- } catch (e: any) {
229
- throw new Error(`WMTS GetCapabilities parsing failed:
230
- ${e.stack || e.message || e}`)
231
- }
232
- })
233
- )
234
- }
235
-
236
192
  prioritizePageScroll(interactions: Collection<Interaction>) {
237
193
  interactions.clear()
238
194
  interactions.extend(
@@ -188,7 +188,11 @@ export class MapViewComponent implements OnInit, OnDestroy {
188
188
  link.type === 'service' &&
189
189
  link.accessServiceProtocol === 'wmts'
190
190
  ) {
191
- return this.mapUtils.getWmtsLayerFromCapabilities(link)
191
+ return of({
192
+ url: link.url.toString(),
193
+ type: MapContextLayerTypeEnum.WMTS,
194
+ name: link.name,
195
+ })
192
196
  } else if (
193
197
  (link.type === 'service' &&
194
198
  (link.accessServiceProtocol === 'wfs' ||
@@ -177,6 +177,7 @@
177
177
  "map.add.layer": "Eine Ebene hinzufügen",
178
178
  "map.add.layer.catalog": "Aus dem Katalog",
179
179
  "map.add.layer.file": "Aus einer Datei",
180
+ "map.add.layer.ogc.api": "",
180
181
  "map.add.layer.wfs": "Aus WFS",
181
182
  "map.add.layer.wms": "Aus WMS",
182
183
  "map.addFromFile.placeholder": "Klicke hier oder ziehe eine Datei herein",
@@ -188,6 +189,7 @@
188
189
  "map.loading.data": "Kartendaten werden geladen...",
189
190
  "map.loading.service": "Dienst wird geladen...",
190
191
  "map.navigation.message": "Bitte verwenden Sie STRG + Maus (oder zwei Finger auf einem Mobilgerät), um die Karte zu navigieren",
192
+ "map.ogc.urlInput.hint": "",
191
193
  "map.select.layer": "Datenquelle",
192
194
  "map.wfs.urlInput.hint": "Geben Sie die WFS URL ein",
193
195
  "map.wms.urlInput.hint": "Geben Sie die WMS URL ein",
@@ -177,6 +177,7 @@
177
177
  "map.add.layer": "Add a layer",
178
178
  "map.add.layer.catalog": "From the catalog",
179
179
  "map.add.layer.file": "From a file",
180
+ "map.add.layer.ogc.api": "From OGC API",
180
181
  "map.add.layer.wfs": "From WFS",
181
182
  "map.add.layer.wms": "From WMS",
182
183
  "map.addFromFile.placeholder": "Click or drop a file here",
@@ -188,6 +189,7 @@
188
189
  "map.loading.data": "Loading map data...",
189
190
  "map.loading.service": "Loading service...",
190
191
  "map.navigation.message": "Please use CTRL + mouse (or two fingers on mobile) to navigate the map",
192
+ "map.ogc.urlInput.hint": "Enter OGC API service URL",
191
193
  "map.select.layer": "Data source",
192
194
  "map.wfs.urlInput.hint": "Enter WFS service URL",
193
195
  "map.wms.urlInput.hint": "Enter WMS service URL",
@@ -177,6 +177,7 @@
177
177
  "map.add.layer": "",
178
178
  "map.add.layer.catalog": "",
179
179
  "map.add.layer.file": "",
180
+ "map.add.layer.ogc.api": "",
180
181
  "map.add.layer.wfs": "",
181
182
  "map.add.layer.wms": "",
182
183
  "map.addFromFile.placeholder": "",
@@ -188,6 +189,7 @@
188
189
  "map.loading.data": "",
189
190
  "map.loading.service": "",
190
191
  "map.navigation.message": "",
192
+ "map.ogc.urlInput.hint": "",
191
193
  "map.select.layer": "",
192
194
  "map.wfs.urlInput.hint": "",
193
195
  "map.wms.urlInput.hint": "",