geonetwork-ui 2.7.5-dev.e8dc58a92 → 2.7.5-dev.efd24f2bd
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.
- package/esm2022/libs/feature/dataviz/src/lib/service/data.service.mjs +11 -7
- package/esm2022/libs/feature/record/src/lib/state/mdview.facade.mjs +2 -2
- package/esm2022/libs/util/shared/src/lib/gn-ui-version.mjs +2 -2
- package/fesm2022/geonetwork-ui.mjs +13 -9
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/libs/feature/dataviz/src/lib/service/data.service.d.ts +1 -1
- package/libs/feature/dataviz/src/lib/service/data.service.d.ts.map +1 -1
- package/libs/util/shared/src/lib/gn-ui-version.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/libs/feature/dataviz/src/lib/service/data.service.ts +21 -6
- package/src/libs/feature/record/src/lib/state/mdview.facade.ts +1 -1
- package/src/libs/util/shared/src/lib/gn-ui-version.ts +5 -4
|
@@ -27,7 +27,7 @@ export declare class DataService {
|
|
|
27
27
|
getDownloadLinksFromWfs(wfsLink: DatasetServiceDistribution): Observable<DatasetOnlineResource[]>;
|
|
28
28
|
getDownloadLinksFromOgcApiFeatures(ogcApiLink: DatasetServiceDistribution): Promise<DatasetOnlineResource[]>;
|
|
29
29
|
getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo>;
|
|
30
|
-
getItemsFromOgcApi(url: string): Promise<OgcApiRecord[]>;
|
|
30
|
+
getItemsFromOgcApi(url: string, limit?: number): Promise<OgcApiRecord[]>;
|
|
31
31
|
getGeodataLinksFromTms(tmsLink: DatasetServiceDistribution, keepOriginalLink?: boolean): Promise<DatasetServiceDistribution[]>;
|
|
32
32
|
getDownloadLinksFromEsriRest(esriRestLink: DatasetServiceDistribution): DatasetOnlineResource[];
|
|
33
33
|
readAsGeoJson(link: DatasetOnlineResource, cacheActive: boolean): Observable<FeatureCollection>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/dataviz/src/lib/service/data.service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,EAEpB,YAAY,EACZ,WAAW,EACX,UAAU,EAEX,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACL,UAAU,EAKX,MAAM,8CAA8C,CAAA;AACrD,OAAO,EAIL,YAAY,EACb,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EAAQ,UAAU,EAAc,MAAM,MAAM,CAAA;AAEnD,OAAO,EACL,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,2DAA2D,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wFAAwF,CAAA;;AAgB3H,UAAU,eAAe;IACvB,GAAG,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,UAAU,CAAA;KAAE,CAAA;CACvE;AAED,qBAGa,WAAW;IACV,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAEvC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC;IA2BvD,sBAAsB,CACpB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,eAAe,CAAC;IAkD9B,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,MAAM,CAAC;IAerB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAMlE,uBAAuB,CACrB,OAAO,EAAE,0BAA0B,GAClC,UAAU,CAAC,qBAAqB,EAAE,CAAC;IA6BhC,kCAAkC,CACtC,UAAU,EAAE,0BAA0B,GACrC,OAAO,CAAC,qBAAqB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/dataviz/src/lib/service/data.service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,EAEpB,YAAY,EACZ,WAAW,EACX,UAAU,EAEX,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACL,UAAU,EAKX,MAAM,8CAA8C,CAAA;AACrD,OAAO,EAIL,YAAY,EACb,MAAM,wCAAwC,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EAAQ,UAAU,EAAc,MAAM,MAAM,CAAA;AAEnD,OAAO,EACL,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,2DAA2D,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wFAAwF,CAAA;;AAgB3H,UAAU,eAAe;IACvB,GAAG,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,UAAU,CAAA;KAAE,CAAA;CACvE;AAED,qBAGa,WAAW;IACV,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAEvC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC;IA2BvD,sBAAsB,CACpB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,eAAe,CAAC;IAkD9B,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,MAAM,CAAC;IAerB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAMlE,uBAAuB,CACrB,OAAO,EAAE,0BAA0B,GAClC,UAAU,CAAC,qBAAqB,EAAE,CAAC;IA6BhC,kCAAkC,CACtC,UAAU,EAAE,0BAA0B,GACrC,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAsB7B,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAWrE,kBAAkB,CACtB,GAAG,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,EAAE,CAAC;IAapB,sBAAsB,CAC1B,OAAO,EAAE,0BAA0B,EACnC,gBAAgB,UAAQ,GACvB,OAAO,CAAC,0BAA0B,EAAE,CAAC;IAqCxC,4BAA4B,CAC1B,YAAY,EAAE,0BAA0B,GACvC,qBAAqB,EAAE;IAU1B,aAAa,CACX,IAAI,EAAE,qBAAqB,EAC3B,WAAW,EAAE,OAAO,GACnB,UAAU,CAAC,iBAAiB,CAAC;IAUhC,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAQnD,UAAU,CACR,IAAI,EAAE,qBAAqB,EAC3B,WAAW,EAAE,OAAO,GACnB,UAAU,CAAC,UAAU,CAAC;yCAzQd,WAAW;6CAAX,WAAW;CAwUvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gn-ui-version.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/shared/src/lib/gn-ui-version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB,QAAsB,CAAA;AAExD,eAAO,MAAM,sBAAsB,
|
|
1
|
+
{"version":3,"file":"gn-ui-version.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/shared/src/lib/gn-ui-version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB,QAAsB,CAAA;AAExD,eAAO,MAAM,sBAAsB,QAIN,CAAA"}
|
package/package.json
CHANGED
|
@@ -197,14 +197,19 @@ export class DataService {
|
|
|
197
197
|
const collectionInfo = await this.getDownloadUrlsFromOgcApi(
|
|
198
198
|
ogcApiLink.url.href
|
|
199
199
|
)
|
|
200
|
-
|
|
200
|
+
|
|
201
|
+
return Object.keys(collectionInfo.bulkDownloadLinks).map((mimeType) => {
|
|
202
|
+
const urlWithoutLimit = new URL(
|
|
203
|
+
collectionInfo.bulkDownloadLinks[mimeType]
|
|
204
|
+
)
|
|
205
|
+
urlWithoutLimit.searchParams.delete('limit')
|
|
201
206
|
return {
|
|
202
207
|
...ogcApiLink,
|
|
203
208
|
name: collectionInfo.id,
|
|
204
209
|
type: 'download',
|
|
205
|
-
url:
|
|
210
|
+
url: urlWithoutLimit,
|
|
206
211
|
mimeType: getMimeTypeForFormat(
|
|
207
|
-
getFileFormatFromServiceOutput(
|
|
212
|
+
getFileFormatFromServiceOutput(mimeType)
|
|
208
213
|
),
|
|
209
214
|
}
|
|
210
215
|
})
|
|
@@ -221,12 +226,15 @@ export class DataService {
|
|
|
221
226
|
})
|
|
222
227
|
}
|
|
223
228
|
|
|
224
|
-
async getItemsFromOgcApi(
|
|
229
|
+
async getItemsFromOgcApi(
|
|
230
|
+
url: string,
|
|
231
|
+
limit?: number
|
|
232
|
+
): Promise<OgcApiRecord[]> {
|
|
225
233
|
const endpoint = new OgcApiEndpoint(url)
|
|
226
234
|
return await endpoint.featureCollections
|
|
227
235
|
.then((collections) => {
|
|
228
236
|
return collections.length
|
|
229
|
-
? endpoint.getCollectionItems(collections[0])
|
|
237
|
+
? endpoint.getCollectionItems(collections[0], limit)
|
|
230
238
|
: null
|
|
231
239
|
})
|
|
232
240
|
.catch(() => {
|
|
@@ -360,7 +368,14 @@ export class DataService {
|
|
|
360
368
|
if (!geojsonUrl) {
|
|
361
369
|
return throwError(() => 'ogc.geojson.notsupported')
|
|
362
370
|
}
|
|
363
|
-
|
|
371
|
+
const urlWithoutLimit = new URL(geojsonUrl)
|
|
372
|
+
urlWithoutLimit.searchParams.delete('limit')
|
|
373
|
+
return openDataset(
|
|
374
|
+
urlWithoutLimit.toString(),
|
|
375
|
+
'geojson',
|
|
376
|
+
undefined,
|
|
377
|
+
cacheActive
|
|
378
|
+
)
|
|
364
379
|
})
|
|
365
380
|
)
|
|
366
381
|
}
|
|
@@ -137,7 +137,7 @@ export class MdViewFacade {
|
|
|
137
137
|
link.accessServiceProtocol === 'ogcFeatures'
|
|
138
138
|
) {
|
|
139
139
|
return from(
|
|
140
|
-
this.dataService.getItemsFromOgcApi(link.url.href)
|
|
140
|
+
this.dataService.getItemsFromOgcApi(link.url.href, 1)
|
|
141
141
|
).pipe(
|
|
142
142
|
map((collectionRecords: OgcApiRecord[]) => {
|
|
143
143
|
return collectionRecords &&
|
|
@@ -2,7 +2,8 @@ import packageJson from '../../../../../package.json'
|
|
|
2
2
|
|
|
3
3
|
export const GEONETWORK_UI_VERSION = packageJson.version
|
|
4
4
|
|
|
5
|
-
export const GEONETWORK_UI_TAG_NAME =
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
export const GEONETWORK_UI_TAG_NAME = GEONETWORK_UI_VERSION.split(
|
|
6
|
+
'-'
|
|
7
|
+
)[1]?.startsWith('dev')
|
|
8
|
+
? '2.7.x'
|
|
9
|
+
: `v${packageJson.version}`
|