geonetwork-ui 2.3.0-dev.431347d3 → 2.3.0-dev.549700bf
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 +3 -3
- package/esm2022/libs/feature/map/src/lib/map-context/map-context.model.mjs +1 -1
- package/esm2022/libs/feature/map/src/lib/map-context/map-context.service.mjs +1 -9
- package/esm2022/libs/feature/map/src/lib/utils/map-utils.service.mjs +2 -6
- package/esm2022/libs/ui/elements/src/lib/record-api-form/record-api-form.component.mjs +7 -6
- package/fesm2022/geonetwork-ui.mjs +11 -22
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/libs/feature/map/src/lib/map-context/map-context.model.d.ts +0 -6
- package/libs/feature/map/src/lib/map-context/map-context.model.d.ts.map +1 -1
- package/libs/feature/map/src/lib/map-context/map-context.service.d.ts.map +1 -1
- package/libs/feature/map/src/lib/utils/map-utils.service.d.ts.map +1 -1
- package/libs/ui/elements/src/lib/record-api-form/record-api-form.component.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/libs/feature/dataviz/src/lib/service/data.service.ts +2 -2
- package/src/libs/feature/map/src/lib/map-context/map-context.model.ts +0 -6
- package/src/libs/feature/map/src/lib/map-context/map-context.service.ts +0 -8
- package/src/libs/feature/map/src/lib/utils/map-utils.service.ts +1 -5
- package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts +8 -7
|
@@ -12,7 +12,7 @@ import { map as map$1, shareReplay, filter, tap as tap$1, startWith, withLatestF
|
|
|
12
12
|
import { marker } from '@biesbjerg/ngx-translate-extract-marker';
|
|
13
13
|
import * as i1$3 from '@angular/common';
|
|
14
14
|
import { CommonModule, NgOptimizedImage, NgForOf } from '@angular/common';
|
|
15
|
-
import { of, map as map$2, lastValueFrom, switchMap, combineLatest, takeLast, forkJoin, firstValueFrom, Subject, merge, throwError, BehaviorSubject, fromEvent, timer, Subscription, ReplaySubject, distinctUntilChanged as distinctUntilChanged$1, debounceTime as debounceTime$1,
|
|
15
|
+
import { of, map as map$2, lastValueFrom, switchMap, combineLatest, takeLast, forkJoin, firstValueFrom, Subject, merge, throwError, BehaviorSubject, fromEvent, timer, Subscription, ReplaySubject, distinctUntilChanged as distinctUntilChanged$1, debounceTime as debounceTime$1, animationFrameScheduler, from, tap as tap$2, Observable, buffer, combineLatestWith, catchError as catchError$1, takeUntil, exhaustMap, mergeMap as mergeMap$1, EMPTY, withLatestFrom as withLatestFrom$1, filter as filter$1, startWith as startWith$1, pairwise as pairwise$1 } from 'rxjs';
|
|
16
16
|
import { valid, coerce, satisfies, ltr } from 'semver';
|
|
17
17
|
import * as i1$2 from '@ngrx/store';
|
|
18
18
|
import { createAction, props, createReducer, on, createFeatureSelector, createSelector, select, StoreModule, Store } from '@ngrx/store';
|
|
@@ -28,9 +28,8 @@ import { transformExtent, fromLonLat } from 'ol/proj';
|
|
|
28
28
|
import ImageWMS from 'ol/source/ImageWMS';
|
|
29
29
|
import TileWMS from 'ol/source/TileWMS';
|
|
30
30
|
import VectorSource from 'ol/source/Vector';
|
|
31
|
-
import { defaults
|
|
31
|
+
import { defaults, DragPan, MouseWheelZoom } from 'ol/interaction';
|
|
32
32
|
import { mouseOnly, noModifierKeys, primaryAction, platformModifierKeyOnly } from 'ol/events/condition';
|
|
33
|
-
import { defaults } from 'ol/control.js';
|
|
34
33
|
import chroma from 'chroma-js';
|
|
35
34
|
import { WmtsEndpoint, WmsEndpoint, WfsEndpoint, OgcApiEndpoint, sharedFetch, useCache } from '@camptocamp/ogc-client';
|
|
36
35
|
import { register, fromEPSGCode } from 'ol/proj/proj4';
|
|
@@ -22562,10 +22561,7 @@ class MapUtilsService {
|
|
|
22562
22561
|
}
|
|
22563
22562
|
createEmptyMap() {
|
|
22564
22563
|
return new Map$1({
|
|
22565
|
-
controls:
|
|
22566
|
-
attribution: true,
|
|
22567
|
-
attributionOptions: { collapsible: false },
|
|
22568
|
-
}),
|
|
22564
|
+
controls: [],
|
|
22569
22565
|
pixelRatio: 1,
|
|
22570
22566
|
});
|
|
22571
22567
|
}
|
|
@@ -22664,7 +22660,7 @@ class MapUtilsService {
|
|
|
22664
22660
|
}
|
|
22665
22661
|
prioritizePageScroll(interactions) {
|
|
22666
22662
|
interactions.clear();
|
|
22667
|
-
interactions.extend(defaults
|
|
22663
|
+
interactions.extend(defaults({
|
|
22668
22664
|
// remove rotate interactions
|
|
22669
22665
|
altShiftDragRotate: false,
|
|
22670
22666
|
pinchRotate: false,
|
|
@@ -23781,7 +23777,6 @@ const DEFAULT_BASELAYER_CONTEXT = {
|
|
|
23781
23777
|
`https://b.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png`,
|
|
23782
23778
|
`https://c.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png`,
|
|
23783
23779
|
],
|
|
23784
|
-
attributions: `<span>© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, © <a href="https://carto.com/">Carto</a></span>`,
|
|
23785
23780
|
};
|
|
23786
23781
|
const DEFAULT_VIEW = {
|
|
23787
23782
|
center: [0, 15],
|
|
@@ -23819,7 +23814,6 @@ class MapContextService {
|
|
|
23819
23814
|
source: new OGCVectorTile({
|
|
23820
23815
|
url: layerModel.url,
|
|
23821
23816
|
format: new MVT(),
|
|
23822
|
-
attributions: layerModel.attributions,
|
|
23823
23817
|
}),
|
|
23824
23818
|
});
|
|
23825
23819
|
}
|
|
@@ -23827,7 +23821,6 @@ class MapContextService {
|
|
|
23827
23821
|
return new TileLayer({
|
|
23828
23822
|
source: new OGCMapTile({
|
|
23829
23823
|
url: layerModel.url,
|
|
23830
|
-
attributions: layerModel.attributions,
|
|
23831
23824
|
}),
|
|
23832
23825
|
});
|
|
23833
23826
|
}
|
|
@@ -23836,7 +23829,6 @@ class MapContextService {
|
|
|
23836
23829
|
source: new VectorSource({
|
|
23837
23830
|
format: new GeoJSON(),
|
|
23838
23831
|
url: layerModel.url,
|
|
23839
|
-
attributions: layerModel.attributions,
|
|
23840
23832
|
}),
|
|
23841
23833
|
style,
|
|
23842
23834
|
});
|
|
@@ -23846,7 +23838,6 @@ class MapContextService {
|
|
|
23846
23838
|
source: new XYZ({
|
|
23847
23839
|
url: 'url' in layerModel ? layerModel.url : undefined,
|
|
23848
23840
|
urls: 'urls' in layerModel ? layerModel.urls : undefined,
|
|
23849
|
-
attributions: layerModel.attributions,
|
|
23850
23841
|
}),
|
|
23851
23842
|
});
|
|
23852
23843
|
case MapContextLayerTypeEnum.WMS:
|
|
@@ -23855,7 +23846,6 @@ class MapContextService {
|
|
|
23855
23846
|
url: layerModel.url,
|
|
23856
23847
|
params: { LAYERS: layerModel.name },
|
|
23857
23848
|
gutter: 20,
|
|
23858
|
-
attributions: layerModel.attributions,
|
|
23859
23849
|
}),
|
|
23860
23850
|
});
|
|
23861
23851
|
case MapContextLayerTypeEnum.WMTS: {
|
|
@@ -23879,7 +23869,6 @@ class MapContextService {
|
|
|
23879
23869
|
tileGrid,
|
|
23880
23870
|
projection: matrixSet.crs,
|
|
23881
23871
|
dimensions,
|
|
23882
|
-
attributions: layerModel.attributions,
|
|
23883
23872
|
}));
|
|
23884
23873
|
});
|
|
23885
23874
|
return olLayer;
|
|
@@ -23902,7 +23891,6 @@ class MapContextService {
|
|
|
23902
23891
|
});
|
|
23903
23892
|
},
|
|
23904
23893
|
strategy: bbox,
|
|
23905
|
-
attributions: layerModel.attributions,
|
|
23906
23894
|
}));
|
|
23907
23895
|
});
|
|
23908
23896
|
return olLayer;
|
|
@@ -27242,8 +27230,7 @@ class RecordApiFormComponent {
|
|
|
27242
27230
|
this.offset$,
|
|
27243
27231
|
this.limit$,
|
|
27244
27232
|
this.format$,
|
|
27245
|
-
|
|
27246
|
-
this.endpoint$.pipe(filter$1((endpoint) => !!endpoint)),
|
|
27233
|
+
this.endpoint$,
|
|
27247
27234
|
]).pipe(switchMap(([offset, limit, format]) => this.generateApiQueryUrl(offset, limit, format)));
|
|
27248
27235
|
this.noLimitChecked$ = this.limit$.pipe(map$2((limit) => limit === '-1' || limit === ''));
|
|
27249
27236
|
this.displayLimit$ = this.limit$.pipe(map$2((limit) => (limit !== '-1' ? limit : '')));
|
|
@@ -27303,7 +27290,9 @@ class RecordApiFormComponent {
|
|
|
27303
27290
|
return this.endpoint.getServiceInfo();
|
|
27304
27291
|
}
|
|
27305
27292
|
else {
|
|
27306
|
-
|
|
27293
|
+
{
|
|
27294
|
+
return (await this.endpoint.getCollectionInfo(this.firstCollection));
|
|
27295
|
+
}
|
|
27307
27296
|
}
|
|
27308
27297
|
}
|
|
27309
27298
|
async createEndpoint() {
|
|
@@ -27315,7 +27304,7 @@ class RecordApiFormComponent {
|
|
|
27315
27304
|
}
|
|
27316
27305
|
else {
|
|
27317
27306
|
this.endpoint = new OgcApiEndpoint(this.apiBaseUrl);
|
|
27318
|
-
this.firstCollection = (await this.endpoint.
|
|
27307
|
+
this.firstCollection = (await this.endpoint.featureCollections)[0];
|
|
27319
27308
|
}
|
|
27320
27309
|
this.endpoint$.next(this.endpoint);
|
|
27321
27310
|
}
|
|
@@ -32326,9 +32315,9 @@ class DataService {
|
|
|
32326
32315
|
}
|
|
32327
32316
|
async getDownloadUrlsFromOgcApi(url) {
|
|
32328
32317
|
const endpoint = new OgcApiEndpoint(this.proxy.getProxiedUrl(url));
|
|
32329
|
-
return await endpoint.
|
|
32318
|
+
return await endpoint.featureCollections
|
|
32330
32319
|
.then((collections) => {
|
|
32331
|
-
return endpoint.getCollectionInfo(collections[0]
|
|
32320
|
+
return endpoint.getCollectionInfo(collections[0]);
|
|
32332
32321
|
})
|
|
32333
32322
|
.catch((error) => {
|
|
32334
32323
|
throw new Error(`ogc.unreachable.unknown`);
|