geonetwork-ui 2.7.4-dev.a83fc214d → 2.7.4-dev.edb6871ab
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/chart-view/chart-view.component.mjs +2 -2
- package/esm2022/libs/feature/dataviz/src/lib/service/data.service.mjs +7 -7
- package/esm2022/libs/feature/record/src/lib/state/mdview.facade.mjs +6 -6
- package/fesm2022/geonetwork-ui.mjs +186 -186
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/libs/feature/dataviz/src/lib/service/data.service.d.ts +4 -4
- package/libs/feature/dataviz/src/lib/service/data.service.d.ts.map +1 -1
- package/libs/feature/record/src/lib/state/mdview.facade.d.ts +27 -26
- package/libs/feature/record/src/lib/state/mdview.facade.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/libs/feature/dataviz/src/lib/chart-view/chart-view.component.ts +1 -1
- package/src/libs/feature/dataviz/src/lib/service/data.service.ts +12 -15
- package/src/libs/feature/record/src/lib/state/mdview.facade.ts +12 -11
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { OgcApiCollectionInfo,
|
|
2
|
-
import { DatavizConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model';
|
|
3
|
-
import { DatasetOnlineResource, DatasetServiceDistribution } from '../../../../../../libs/common/domain/src/lib/model/record';
|
|
1
|
+
import { OgcApiCollectionInfo, OgcApiRecord, WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client';
|
|
4
2
|
import { BaseReader } from '../../../../../../libs/util/data-fetcher/src';
|
|
5
3
|
import { ProxyService } from '../../../../../../libs/util/shared/src';
|
|
6
4
|
import type { FeatureCollection } from 'geojson';
|
|
7
5
|
import { Observable } from 'rxjs';
|
|
6
|
+
import { DatasetOnlineResource, DatasetServiceDistribution } from '../../../../../../libs/common/domain/src/lib/model/record';
|
|
7
|
+
import { DatavizConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model';
|
|
8
8
|
import * as i0 from "@angular/core";
|
|
9
9
|
interface WfsDownloadUrls {
|
|
10
10
|
all: {
|
|
@@ -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
|
|
30
|
+
getItemsFromOgcApi(url: string): 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,
|
|
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;;AAe3H,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;IAiB7B,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAWrE,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAaxD,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;yCAjQd,WAAW;6CAAX,WAAW;CAmTvB"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Store } from '@ngrx/store';
|
|
2
|
+
import { LinkClassifierService } from '../../../../../../libs/util/shared/src';
|
|
2
3
|
import { DatavizChartConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model';
|
|
3
4
|
import { CatalogRecord, UserFeedback } from '../../../../../../libs/common/domain/src/lib/model/record';
|
|
5
|
+
import { AvatarServiceInterface } from '../../../../../../libs/api/repository/src';
|
|
6
|
+
import { Observable } from 'rxjs';
|
|
4
7
|
import { DataService } from '../../../../../../libs/feature/dataviz/src';
|
|
5
|
-
import { LinkClassifierService } from '../../../../../../libs/util/shared/src';
|
|
6
|
-
import { Store } from '@ngrx/store';
|
|
7
8
|
import * as i0 from "@angular/core";
|
|
8
9
|
export declare class MdViewFacade {
|
|
9
10
|
private store;
|
|
@@ -11,32 +12,32 @@ export declare class MdViewFacade {
|
|
|
11
12
|
private avatarService;
|
|
12
13
|
dataService: DataService;
|
|
13
14
|
constructor(store: Store, linkClassifier: LinkClassifierService, avatarService: AvatarServiceInterface, dataService: DataService);
|
|
14
|
-
isPresent$:
|
|
15
|
-
isMetadataLoading$:
|
|
16
|
-
metadata$:
|
|
17
|
-
featureCatalog$:
|
|
18
|
-
isIncomplete$:
|
|
19
|
-
isHighUpdateFrequency$:
|
|
20
|
-
error$:
|
|
15
|
+
isPresent$: Observable<boolean>;
|
|
16
|
+
isMetadataLoading$: Observable<boolean>;
|
|
17
|
+
metadata$: Observable<Partial<CatalogRecord>>;
|
|
18
|
+
featureCatalog$: Observable<import("../../../../../common/domain/src/lib/model/record/metadata.model").DatasetFeatureCatalog>;
|
|
19
|
+
isIncomplete$: Observable<boolean>;
|
|
20
|
+
isHighUpdateFrequency$: Observable<boolean>;
|
|
21
|
+
error$: Observable<{
|
|
21
22
|
notFound?: boolean;
|
|
22
23
|
otherError?: string;
|
|
23
24
|
}>;
|
|
24
|
-
related$:
|
|
25
|
-
sources$:
|
|
26
|
-
sourceOf$:
|
|
27
|
-
chartConfig$:
|
|
28
|
-
allLinks$:
|
|
29
|
-
apiLinks$:
|
|
30
|
-
mapApiLinks$:
|
|
31
|
-
downloadLinks$:
|
|
32
|
-
dataLinks$:
|
|
33
|
-
geoDataLinks$:
|
|
34
|
-
geoDataLinksWithGeometry$:
|
|
35
|
-
landingPageLinks$:
|
|
36
|
-
otherLinks$:
|
|
37
|
-
userFeedbacks$:
|
|
38
|
-
isAllUserFeedbackLoading$:
|
|
39
|
-
isAddUserFeedbackLoading$:
|
|
25
|
+
related$: Observable<CatalogRecord[]>;
|
|
26
|
+
sources$: Observable<CatalogRecord[]>;
|
|
27
|
+
sourceOf$: Observable<CatalogRecord[]>;
|
|
28
|
+
chartConfig$: Observable<DatavizChartConfigModel>;
|
|
29
|
+
allLinks$: Observable<import("../../../../../common/domain/src/lib/model/record/metadata.model").DatasetOnlineResource[] | import("../../../../../common/domain/src/lib/model/record/metadata.model").ServiceOnlineResource[]>;
|
|
30
|
+
apiLinks$: Observable<(import("../../../../../common/domain/src/lib/model/record/metadata.model").DatasetOnlineResource | import("../../../../../common/domain/src/lib/model/record/metadata.model").ServiceOnlineResource)[]>;
|
|
31
|
+
mapApiLinks$: Observable<(import("../../../../../common/domain/src/lib/model/record/metadata.model").DatasetOnlineResource | import("../../../../../common/domain/src/lib/model/record/metadata.model").ServiceOnlineResource)[]>;
|
|
32
|
+
downloadLinks$: Observable<(import("../../../../../common/domain/src/lib/model/record/metadata.model").DatasetOnlineResource | import("../../../../../common/domain/src/lib/model/record/metadata.model").ServiceOnlineResource)[]>;
|
|
33
|
+
dataLinks$: Observable<(import("../../../../../common/domain/src/lib/model/record/metadata.model").DatasetOnlineResource | import("../../../../../common/domain/src/lib/model/record/metadata.model").ServiceOnlineResource)[]>;
|
|
34
|
+
geoDataLinks$: Observable<(import("../../../../../common/domain/src/lib/model/record/metadata.model").DatasetOnlineResource | import("../../../../../common/domain/src/lib/model/record/metadata.model").ServiceOnlineResource)[]>;
|
|
35
|
+
geoDataLinksWithGeometry$: Observable<any[]>;
|
|
36
|
+
landingPageLinks$: Observable<URL[]>;
|
|
37
|
+
otherLinks$: Observable<(import("../../../../../common/domain/src/lib/model/record/metadata.model").DatasetOnlineResource | import("../../../../../common/domain/src/lib/model/record/metadata.model").ServiceOnlineResource)[]>;
|
|
38
|
+
userFeedbacks$: Observable<UserFeedback[]>;
|
|
39
|
+
isAllUserFeedbackLoading$: Observable<boolean>;
|
|
40
|
+
isAddUserFeedbackLoading$: Observable<boolean>;
|
|
40
41
|
/**
|
|
41
42
|
* This will show an incomplete record (e.g. from a search result) as a preview
|
|
42
43
|
* Note: the full record will not be loaded automatically; use the `loadFull` method for that
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mdview.facade.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/record/src/lib/state/mdview.facade.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mdview.facade.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/record/src/lib/state/mdview.facade.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAE,MAAM,aAAa,CAAA;AAa3C,OAAO,EAAE,qBAAqB,EAAa,MAAM,wCAAwC,CAAA;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,wFAAwF,CAAA;AAChI,OAAO,EACL,aAAa,EACb,YAAY,EACb,MAAM,2DAA2D,CAAA;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAA;AAElF,OAAO,EAAY,UAAU,EAAE,MAAM,MAAM,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;;AAExE,qBAOa,YAAY;IAErB,OAAO,CAAC,KAAK;IACN,cAAc,EAAE,qBAAqB;IAC5C,OAAO,CAAC,aAAa;IACd,WAAW,EAAE,WAAW;gBAHvB,KAAK,EAAE,KAAK,EACb,cAAc,EAAE,qBAAqB,EACpC,aAAa,EAAE,sBAAsB,EACtC,WAAW,EAAE,WAAW;IAGjC,UAAU,sBAGT;IAED,kBAAkB,sBAEjB;IAED,SAAS,qCAGR;IAED,eAAe,+GAA6D;IAE5E,aAAa,sBAGZ;IAED,sBAAsB,sBAWrB;IAED,MAAM;;;OAA4D;IAElE,QAAQ,8BAAsD;IAE9D,QAAQ,8BAAsD;IAE9D,SAAS,8BAAuD;IAEhE,YAAY,sCAA0D;IAEtE,SAAS,sNAKR;IAED,SAAS,sNAKR;IAED,YAAY,sNAOX;IAED,cAAc,sNAMb;IAED,UAAU,sNAIT;IAED,aAAa,sNAMZ;IAED,yBAAyB,oBAoCxB;IAED,iBAAiB,oBAEhB;IAED,WAAW,sNAMV;IAED,cAAc,6BAA4D;IAC1E,yBAAyB,sBAExB;IACD,yBAAyB,sBAExB;IAED;;;OAGG;IACH,qBAAqB,CAAC,UAAU,EAAE,aAAa;IAI/C;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM;IAIrB,aAAa;IAIb,cAAc,CAAC,WAAW,EAAE,uBAAuB;IAInD;;OAEG;IACH,eAAe,CAAC,YAAY,EAAE,YAAY;IAI1C,iBAAiB,CAAC,WAAW,EAAE,MAAM;IAIrC;;OAEG;IACH,kBAAkB,CAAC,QAAQ,EAAE,aAAa;yCAhM/B,YAAY;6CAAZ,YAAY;CAmMxB"}
|
package/package.json
CHANGED
|
@@ -2,17 +2,12 @@ import { Injectable } from '@angular/core'
|
|
|
2
2
|
import { marker } from '@biesbjerg/ngx-translate-extract-marker'
|
|
3
3
|
import {
|
|
4
4
|
OgcApiCollectionInfo,
|
|
5
|
-
OgcApiCollectionItem,
|
|
6
5
|
OgcApiEndpoint,
|
|
7
|
-
|
|
6
|
+
OgcApiRecord,
|
|
8
7
|
WfsEndpoint,
|
|
9
8
|
WfsVersion,
|
|
9
|
+
TmsEndpoint,
|
|
10
10
|
} from '@camptocamp/ogc-client'
|
|
11
|
-
import { DatavizConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
|
|
12
|
-
import {
|
|
13
|
-
DatasetOnlineResource,
|
|
14
|
-
DatasetServiceDistribution,
|
|
15
|
-
} from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
16
11
|
import {
|
|
17
12
|
BaseReader,
|
|
18
13
|
FetchError,
|
|
@@ -29,6 +24,11 @@ import {
|
|
|
29
24
|
import type { FeatureCollection } from 'geojson'
|
|
30
25
|
import { from, Observable, throwError } from 'rxjs'
|
|
31
26
|
import { catchError, map, switchMap, tap } from 'rxjs/operators'
|
|
27
|
+
import {
|
|
28
|
+
DatasetOnlineResource,
|
|
29
|
+
DatasetServiceDistribution,
|
|
30
|
+
} from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
31
|
+
import { DatavizConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
|
|
32
32
|
|
|
33
33
|
marker('wfs.unreachable.cors')
|
|
34
34
|
marker('wfs.unreachable.http')
|
|
@@ -211,24 +211,21 @@ export class DataService {
|
|
|
211
211
|
|
|
212
212
|
async getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo> {
|
|
213
213
|
const endpoint = new OgcApiEndpoint(url)
|
|
214
|
-
return await endpoint.
|
|
214
|
+
return await endpoint.featureCollections
|
|
215
215
|
.then((collections) => {
|
|
216
|
-
return endpoint.getCollectionInfo(collections[0]
|
|
216
|
+
return endpoint.getCollectionInfo(collections[0])
|
|
217
217
|
})
|
|
218
218
|
.catch((error) => {
|
|
219
219
|
throw new Error(`ogc.unreachable.unknown`)
|
|
220
220
|
})
|
|
221
221
|
}
|
|
222
222
|
|
|
223
|
-
async getItemsFromOgcApi(
|
|
224
|
-
url: string,
|
|
225
|
-
limit?: number
|
|
226
|
-
): Promise<OgcApiCollectionItem[]> {
|
|
223
|
+
async getItemsFromOgcApi(url: string): Promise<OgcApiRecord[]> {
|
|
227
224
|
const endpoint = new OgcApiEndpoint(url)
|
|
228
|
-
return await endpoint.
|
|
225
|
+
return await endpoint.featureCollections
|
|
229
226
|
.then((collections) => {
|
|
230
227
|
return collections.length
|
|
231
|
-
? endpoint.getCollectionItems(collections[0]
|
|
228
|
+
? endpoint.getCollectionItems(collections[0])
|
|
232
229
|
: null
|
|
233
230
|
})
|
|
234
231
|
.catch(() => {
|
|
@@ -1,14 +1,5 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core'
|
|
2
|
-
import { AvatarServiceInterface } from '../../../../../../libs/api/repository/src'
|
|
3
|
-
import { DatavizChartConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
|
|
4
|
-
import {
|
|
5
|
-
CatalogRecord,
|
|
6
|
-
UserFeedback,
|
|
7
|
-
} from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
8
|
-
import { DataService } from '../../../../../../libs/feature/dataviz/src'
|
|
9
|
-
import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
|
|
10
2
|
import { select, Store } from '@ngrx/store'
|
|
11
|
-
import { from, of } from 'rxjs'
|
|
12
3
|
import {
|
|
13
4
|
catchError,
|
|
14
5
|
defaultIfEmpty,
|
|
@@ -21,6 +12,16 @@ import {
|
|
|
21
12
|
} from 'rxjs/operators'
|
|
22
13
|
import * as MdViewActions from './mdview.actions'
|
|
23
14
|
import * as MdViewSelectors from './mdview.selectors'
|
|
15
|
+
import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
|
|
16
|
+
import { DatavizChartConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
|
|
17
|
+
import {
|
|
18
|
+
CatalogRecord,
|
|
19
|
+
UserFeedback,
|
|
20
|
+
} from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
21
|
+
import { AvatarServiceInterface } from '../../../../../../libs/api/repository/src'
|
|
22
|
+
import { OgcApiRecord } from '@camptocamp/ogc-client'
|
|
23
|
+
import { from, of, Observable } from 'rxjs'
|
|
24
|
+
import { DataService } from '../../../../../../libs/feature/dataviz/src'
|
|
24
25
|
|
|
25
26
|
@Injectable()
|
|
26
27
|
/**
|
|
@@ -136,9 +137,9 @@ export class MdViewFacade {
|
|
|
136
137
|
link.accessServiceProtocol === 'ogcFeatures'
|
|
137
138
|
) {
|
|
138
139
|
return from(
|
|
139
|
-
this.dataService.getItemsFromOgcApi(link.url.href
|
|
140
|
+
this.dataService.getItemsFromOgcApi(link.url.href)
|
|
140
141
|
).pipe(
|
|
141
|
-
map((collectionRecords) => {
|
|
142
|
+
map((collectionRecords: OgcApiRecord[]) => {
|
|
142
143
|
return collectionRecords &&
|
|
143
144
|
collectionRecords[0] &&
|
|
144
145
|
collectionRecords[0].geometry
|