geonetwork-ui 2.3.0-dev.376e0e90 → 2.3.0-dev.6e2b8bea
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/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.mjs +6 -2
- package/esm2022/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.mjs +72 -0
- package/esm2022/libs/feature/map/src/lib/feature-map.module.mjs +7 -3
- package/esm2022/libs/feature/map/src/lib/layers-panel/layers-panel.component.mjs +12 -7
- package/esm2022/libs/feature/map/src/lib/map-context/map-context.model.mjs +2 -1
- package/esm2022/libs/feature/map/src/lib/map-context/map-context.service.mjs +52 -25
- package/esm2022/libs/feature/map/src/lib/utils/map-utils.service.mjs +12 -49
- package/esm2022/libs/feature/record/src/lib/map-view/map-view.component.mjs +6 -2
- package/esm2022/translations/de.json +2 -0
- package/esm2022/translations/en.json +2 -0
- package/esm2022/translations/es.json +2 -0
- package/esm2022/translations/fr.json +2 -0
- package/esm2022/translations/it.json +2 -0
- package/esm2022/translations/nl.json +2 -0
- package/esm2022/translations/pt.json +2 -0
- package/fesm2022/geonetwork-ui.mjs +2574 -2491
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.d.ts.map +1 -1
- package/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.d.ts +23 -0
- package/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.d.ts.map +1 -0
- package/libs/feature/map/src/lib/feature-map.module.d.ts +2 -1
- package/libs/feature/map/src/lib/feature-map.module.d.ts.map +1 -1
- package/libs/feature/map/src/lib/layers-panel/layers-panel.component.d.ts +2 -0
- package/libs/feature/map/src/lib/layers-panel/layers-panel.component.d.ts.map +1 -1
- package/libs/feature/map/src/lib/map-context/map-context.model.d.ts +10 -5
- 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 +2 -3
- package/libs/feature/map/src/lib/utils/map-utils.service.d.ts.map +1 -1
- package/libs/feature/record/src/lib/map-view/map-view.component.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.ts +5 -1
- package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.css +0 -0
- package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.html +36 -0
- package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.ts +80 -0
- package/src/libs/feature/map/src/lib/feature-map.module.ts +2 -0
- package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.html +8 -0
- package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.ts +5 -0
- package/src/libs/feature/map/src/lib/map-context/map-context.model.ts +10 -3
- package/src/libs/feature/map/src/lib/map-context/map-context.service.ts +60 -32
- package/src/libs/feature/map/src/lib/utils/map-utils.service.ts +17 -61
- package/src/libs/feature/record/src/lib/map-view/map-view.component.ts +5 -1
- package/translations/de.json +2 -0
- package/translations/en.json +2 -0
- package/translations/es.json +2 -0
- package/translations/fr.json +2 -0
- package/translations/it.json +2 -0
- package/translations/nl.json +2 -0
- package/translations/pt.json +2 -0
- package/translations/sk.json +2 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-layer-record-preview.component.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,UAAU,EAAE,MAAM,eAAe,CAAA;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAA;AAChF,OAAO,EAEL,qBAAqB,EAEtB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAAE,UAAU,EAAkB,MAAM,MAAM,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EACL,oBAAoB,EAErB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EACL,mBAAmB,EAEpB,MAAM,8DAA8D,CAAA;;AAErE,qBAMa,8BAA+B,SAAQ,sBAAsB;IAQtE,SAAS,CAAC,UAAU,EAAE,UAAU;IAChC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ;IAVlB,IAAI,QAAQ,IAAI,mBAAmB,EAAE,CAIpC;gBAGW,UAAU,EAAE,UAAU,EACxB,cAAc,EAAE,qBAAqB,EACrC,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,eAAe;IAK7B,eAAe,CAAC,IAAI,EAAE,mBAAmB;IAK/C,gBAAgB,CACd,IAAI,EAAE,mBAAmB,GACxB,UAAU,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"add-layer-record-preview.component.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,UAAU,EAAE,MAAM,eAAe,CAAA;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAA;AAChF,OAAO,EAEL,qBAAqB,EAEtB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAAE,UAAU,EAAkB,MAAM,MAAM,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EACL,oBAAoB,EAErB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EACL,mBAAmB,EAEpB,MAAM,8DAA8D,CAAA;;AAErE,qBAMa,8BAA+B,SAAQ,sBAAsB;IAQtE,SAAS,CAAC,UAAU,EAAE,UAAU;IAChC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ;IAVlB,IAAI,QAAQ,IAAI,mBAAmB,EAAE,CAIpC;gBAGW,UAAU,EAAE,UAAU,EACxB,cAAc,EAAE,qBAAqB,EACrC,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,eAAe;IAK7B,eAAe,CAAC,IAAI,EAAE,mBAAmB;IAK/C,gBAAgB,CACd,IAAI,EAAE,mBAAmB,GACxB,UAAU,CAAC,oBAAoB,CAAC;IAqBnC,YAAY,CAAC,IAAI,EAAE,mBAAmB;yCA5C3B,8BAA8B;2CAA9B,8BAA8B;CA+C1C"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { OnInit, EventEmitter, ChangeDetectorRef } from '@angular/core';
|
|
2
|
+
import { OgcApiEndpoint } from '@camptocamp/ogc-client';
|
|
3
|
+
import { Subject } from 'rxjs';
|
|
4
|
+
import { MapLayer } from '../+state/map.models';
|
|
5
|
+
import * as i0 from "@angular/core";
|
|
6
|
+
export declare class AddLayerFromOgcApiComponent implements OnInit {
|
|
7
|
+
private changeDetectorRef;
|
|
8
|
+
ogcUrl: string;
|
|
9
|
+
layerAdded: EventEmitter<MapLayer>;
|
|
10
|
+
urlChange: Subject<string>;
|
|
11
|
+
layerUrl: string;
|
|
12
|
+
loading: boolean;
|
|
13
|
+
layers: string[];
|
|
14
|
+
ogcEndpoint: OgcApiEndpoint;
|
|
15
|
+
errorMessage: string | null;
|
|
16
|
+
constructor(changeDetectorRef: ChangeDetectorRef);
|
|
17
|
+
ngOnInit(): void;
|
|
18
|
+
loadLayers(): Promise<void>;
|
|
19
|
+
addLayer(layer: string): Promise<void>;
|
|
20
|
+
static ɵfac: i0.ɵɵFactoryDeclaration<AddLayerFromOgcApiComponent, never>;
|
|
21
|
+
static ɵcmp: i0.ɵɵComponentDeclaration<AddLayerFromOgcApiComponent, "gn-ui-add-layer-from-ogc-api", never, { "ogcUrl": { "alias": "ogcUrl"; "required": false; }; }, { "layerAdded": "layerAdded"; }, never, never, true, never>;
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=add-layer-from-ogc-api.component.d.ts.map
|
package/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.d.ts.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-layer-from-ogc-api.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EAEN,YAAY,EAGZ,iBAAiB,EAClB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,EAAE,OAAO,EAAgB,MAAM,MAAM,CAAA;AAQ5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;;AAE/C,qBAOa,2BAA4B,YAAW,MAAM;IAW5C,OAAO,CAAC,iBAAiB;IAV5B,MAAM,EAAE,MAAM,CAAA;IACb,UAAU,yBAA+B;IAEnD,SAAS,kBAAwB;IACjC,QAAQ,SAAK;IACb,OAAO,UAAQ;IACf,MAAM,EAAE,MAAM,EAAE,CAAK;IACrB,WAAW,EAAE,cAAc,CAAO;IAClC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;gBAEd,iBAAiB,EAAE,iBAAiB;IAExD,QAAQ;IAOF,UAAU;IAsBV,QAAQ,CAAC,KAAK,EAAE,MAAM;yCA1CjB,2BAA2B;2CAA3B,2BAA2B;CAoDvC"}
|
|
@@ -20,9 +20,10 @@ import * as i18 from "@ngrx/store";
|
|
|
20
20
|
import * as i19 from "@ngrx/effects";
|
|
21
21
|
import * as i20 from "../../../../ui/elements/src/lib/ui-elements.module";
|
|
22
22
|
import * as i21 from "../../../../ui/inputs/src/lib/ui-inputs.module";
|
|
23
|
+
import * as i22 from "./add-layer-from-ogc-api/add-layer-from-ogc-api.component";
|
|
23
24
|
export declare class FeatureMapModule {
|
|
24
25
|
static ɵfac: i0.ɵɵFactoryDeclaration<FeatureMapModule, never>;
|
|
25
|
-
static ɵmod: i0.ɵɵNgModuleDeclaration<FeatureMapModule, [typeof i1.MapContextComponent, typeof i2.MapInstanceDirective, typeof i3.LayersPanelComponent, typeof i4.AddLayerFromCatalogComponent, typeof i5.MapContainerComponent, typeof i6.AddLayerRecordPreviewComponent, typeof i7.AddLayerFromWmsComponent, typeof i8.AddLayerFromFileComponent, typeof i9.AddLayerFromWfsComponent, typeof i10.GeocodingComponent], [typeof i11.CommonModule, typeof i12.UiMapModule, typeof i13.UiLayoutModule, typeof i14.MatIconModule, typeof i15.MatTabsModule, typeof i16.TranslateModule, typeof i17.FeatureSearchModule, typeof i18.StoreFeatureModule, typeof i19.EffectsFeatureModule, typeof i20.UiElementsModule, typeof i21.UiInputsModule], [typeof i1.MapContextComponent, typeof i2.MapInstanceDirective, typeof i3.LayersPanelComponent, typeof i4.AddLayerFromCatalogComponent, typeof i5.MapContainerComponent, typeof i10.GeocodingComponent]>;
|
|
26
|
+
static ɵmod: i0.ɵɵNgModuleDeclaration<FeatureMapModule, [typeof i1.MapContextComponent, typeof i2.MapInstanceDirective, typeof i3.LayersPanelComponent, typeof i4.AddLayerFromCatalogComponent, typeof i5.MapContainerComponent, typeof i6.AddLayerRecordPreviewComponent, typeof i7.AddLayerFromWmsComponent, typeof i8.AddLayerFromFileComponent, typeof i9.AddLayerFromWfsComponent, typeof i10.GeocodingComponent], [typeof i11.CommonModule, typeof i12.UiMapModule, typeof i13.UiLayoutModule, typeof i14.MatIconModule, typeof i15.MatTabsModule, typeof i16.TranslateModule, typeof i17.FeatureSearchModule, typeof i18.StoreFeatureModule, typeof i19.EffectsFeatureModule, typeof i20.UiElementsModule, typeof i21.UiInputsModule, typeof i22.AddLayerFromOgcApiComponent], [typeof i1.MapContextComponent, typeof i2.MapInstanceDirective, typeof i3.LayersPanelComponent, typeof i4.AddLayerFromCatalogComponent, typeof i5.MapContainerComponent, typeof i10.GeocodingComponent]>;
|
|
26
27
|
static ɵinj: i0.ɵɵInjectorDeclaration<FeatureMapModule>;
|
|
27
28
|
}
|
|
28
29
|
//# sourceMappingURL=feature-map.module.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-map.module.d.ts","sourceRoot":"","sources":["../../../../../src/libs/feature/map/src/lib/feature-map.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"feature-map.module.d.ts","sourceRoot":"","sources":["../../../../../src/libs/feature/map/src/lib/feature-map.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AA6BA,qBA+Ca,gBAAgB;yCAAhB,gBAAgB;0CAAhB,gBAAgB;0CAAhB,gBAAgB;CAAG"}
|
|
@@ -3,8 +3,10 @@ import * as i0 from "@angular/core";
|
|
|
3
3
|
export declare class LayersPanelComponent {
|
|
4
4
|
private mapFacade;
|
|
5
5
|
layers$: import("rxjs").Observable<import("geonetwork-ui").MapLayerWithInfo[]>;
|
|
6
|
+
ogcUrl: string;
|
|
6
7
|
constructor(mapFacade: MapFacade);
|
|
7
8
|
deleteLayer(index: number): void;
|
|
9
|
+
addLayer(layer: any): void;
|
|
8
10
|
static ɵfac: i0.ɵɵFactoryDeclaration<LayersPanelComponent, never>;
|
|
9
11
|
static ɵcmp: i0.ɵɵComponentDeclaration<LayersPanelComponent, "gn-ui-layers-panel", never, {}, {}, never, never, false, never>;
|
|
10
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layers-panel.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/map/src/lib/layers-panel/layers-panel.component.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;;AAEhD,qBAMa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"layers-panel.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/map/src/lib/layers-panel/layers-panel.component.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;;AAEhD,qBAMa,oBAAoB;IAGnB,OAAO,CAAC,SAAS;IAF7B,OAAO,wEAAyB;IAChC,MAAM,SAAK;gBACS,SAAS,EAAE,SAAS;IAExC,WAAW,CAAC,KAAK,EAAE,MAAM;IAIzB,QAAQ,CAAC,KAAK,KAAA;yCATH,oBAAoB;2CAApB,oBAAoB;CAYhC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
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
|
export declare enum MapContextLayerTypeEnum {
|
|
6
5
|
XYZ = "xyz",
|
|
7
6
|
WMS = "wms",
|
|
8
7
|
WMTS = "wmts",
|
|
9
8
|
WFS = "wfs",
|
|
10
|
-
GEOJSON = "geojson"
|
|
9
|
+
GEOJSON = "geojson",
|
|
10
|
+
OGCAPI = "ogcapi"
|
|
11
11
|
}
|
|
12
12
|
export interface MapContextModel {
|
|
13
13
|
layers: MapContextLayerModel[];
|
|
@@ -20,14 +20,19 @@ export interface MapContextLayerWmsModel {
|
|
|
20
20
|
}
|
|
21
21
|
export interface MapContextLayerWmtsModel {
|
|
22
22
|
type: 'wmts';
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
url: string;
|
|
24
|
+
name: string;
|
|
25
25
|
}
|
|
26
26
|
interface MapContextLayerWfsModel {
|
|
27
27
|
type: 'wfs';
|
|
28
28
|
url: string;
|
|
29
29
|
name: string;
|
|
30
30
|
}
|
|
31
|
+
export interface MapContextLayerOgcapiModel {
|
|
32
|
+
type: 'ogcapi';
|
|
33
|
+
url: string;
|
|
34
|
+
name: string;
|
|
35
|
+
}
|
|
31
36
|
interface LayerXyzModel {
|
|
32
37
|
type: 'xyz';
|
|
33
38
|
name?: string;
|
|
@@ -53,7 +58,7 @@ interface LayerGeojsonWithData extends LayerGeojson {
|
|
|
53
58
|
url?: never;
|
|
54
59
|
}
|
|
55
60
|
export type MapContextLayerGeojsonModel = LayerGeojsonWithUrl | LayerGeojsonWithData;
|
|
56
|
-
export type MapContextLayerModel = MapContextLayerWmsModel | MapContextLayerWmtsModel | MapContextLayerWfsModel | MapContextLayerXyzModel | MapContextLayerGeojsonModel;
|
|
61
|
+
export type MapContextLayerModel = MapContextLayerWmsModel | MapContextLayerWmtsModel | MapContextLayerWfsModel | MapContextLayerXyzModel | MapContextLayerGeojsonModel | MapContextLayerOgcapiModel;
|
|
57
62
|
export interface MapContextViewModel {
|
|
58
63
|
center?: Coordinate;
|
|
59
64
|
zoom?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-context.model.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/map/src/lib/map-context/map-context.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"map-context.model.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/map/src/lib/map-context/map-context.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAEvC,oBAAY,uBAAuB;IACjC,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,oBAAoB,EAAE,CAAA;IAC9B,IAAI,CAAC,EAAE,mBAAmB,CAAA;CAC3B;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,KAAK,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;CACb;AAED,UAAU,uBAAuB;IAC/B,IAAI,EAAE,KAAK,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;CACb;AAED,UAAU,aAAa;IACrB,IAAI,EAAE,KAAK,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AACD,UAAU,oBAAqB,SAAQ,aAAa;IAClD,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,KAAK,CAAA;CACb;AACD,UAAU,qBAAsB,SAAQ,aAAa;IACnD,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,GAAG,CAAC,EAAE,KAAK,CAAA;CACZ;AACD,MAAM,MAAM,uBAAuB,GAC/B,oBAAoB,GACpB,qBAAqB,CAAA;AAEzB,UAAU,YAAY;IACpB,IAAI,EAAE,SAAS,CAAA;CAChB;AACD,UAAU,mBAAoB,SAAQ,YAAY;IAChD,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,KAAK,CAAA;CACb;AACD,UAAU,oBAAqB,SAAQ,YAAY;IACjD,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAAA;IAChC,GAAG,CAAC,EAAE,KAAK,CAAA;CACZ;AACD,MAAM,MAAM,2BAA2B,GACnC,mBAAmB,GACnB,oBAAoB,CAAA;AAExB,MAAM,MAAM,oBAAoB,GAC5B,uBAAuB,GACvB,wBAAwB,GACxB,uBAAuB,GACvB,uBAAuB,GACvB,2BAA2B,GAC3B,0BAA0B,CAAA;AAE9B,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-context.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/map/src/lib/map-context/map-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EACL,oBAAoB,EAEpB,uBAAuB,EACvB,eAAe,EACf,mBAAmB,EACpB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,GAAG,MAAM,QAAQ,CAAA;AACxB,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,KAAK,MAAM,eAAe,CAAA;AAOjC,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAA;;AAQnF,eAAO,MAAM,yBAAyB,EAAE,uBAOvC,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,mBAG1B,CAAA;AAED,eAAO,MAAM,gBAAgB,QAAQ,CAAA;AAErC,qBAGa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,YAAY;gBADZ,QAAQ,EAAE,eAAe,EACzB,YAAY,EAAE,eAAe;IAGvC,mBAAmB,CACjB,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,eAAe,EAC3B,SAAS,CAAC,EAAE,SAAS,GACpB,GAAG;IAkBN,WAAW,CAAC,UAAU,EAAE,oBAAoB,GAAG,KAAK;
|
|
1
|
+
{"version":3,"file":"map-context.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/map/src/lib/map-context/map-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EACL,oBAAoB,EAEpB,uBAAuB,EACvB,eAAe,EACf,mBAAmB,EACpB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,GAAG,MAAM,QAAQ,CAAA;AACxB,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,KAAK,MAAM,eAAe,CAAA;AAOjC,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAA;;AAQnF,eAAO,MAAM,yBAAyB,EAAE,uBAOvC,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,mBAG1B,CAAA;AAED,eAAO,MAAM,gBAAgB,QAAQ,CAAA;AAErC,qBAGa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,YAAY;gBADZ,QAAQ,EAAE,eAAe,EACzB,YAAY,EAAE,eAAe;IAGvC,mBAAmB,CACjB,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,eAAe,EAC3B,SAAS,CAAC,EAAE,SAAS,GACpB,GAAG;IAkBN,WAAW,CAAC,UAAU,EAAE,oBAAoB,GAAG,KAAK;IAmHpD,UAAU,CAAC,SAAS,EAAE,mBAAmB,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI;IAqB3D,0BAA0B,CACxB,MAAM,EAAE,oBAAoB,EAAE,GAC7B,oBAAoB,EAAE;IAMzB,yBAAyB,CACvB,UAAU,EAAE,eAAe,EAC3B,SAAS,EAAE,SAAS,GACnB,eAAe;IAsBlB,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,mBAAmB;IAM1D,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,oBAAoB;yCA3MzD,iBAAiB;6CAAjB,iBAAiB;CAsO7B"}
|
|
@@ -8,10 +8,10 @@ import Map from 'ol/Map';
|
|
|
8
8
|
import Source from 'ol/source/Source';
|
|
9
9
|
import { DragPan, Interaction, MouseWheelZoom } from 'ol/interaction';
|
|
10
10
|
import { Observable } from 'rxjs';
|
|
11
|
-
import { MapContextLayerModel, MapContextLayerWmsModel
|
|
11
|
+
import { MapContextLayerModel, MapContextLayerWmsModel } from '../map-context/map-context.model';
|
|
12
12
|
import Collection from 'ol/Collection';
|
|
13
13
|
import MapBrowserEvent from 'ol/MapBrowserEvent';
|
|
14
|
-
import { CatalogRecord
|
|
14
|
+
import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record';
|
|
15
15
|
import { ProxyService } from '../../../../../../libs/util/shared/src';
|
|
16
16
|
import * as i0 from "@angular/core";
|
|
17
17
|
export declare class MapUtilsService {
|
|
@@ -29,7 +29,6 @@ export declare class MapUtilsService {
|
|
|
29
29
|
*/
|
|
30
30
|
getLayerExtent(layer: MapContextLayerModel): Promise<Extent | null>;
|
|
31
31
|
getWmsLayerExtent(layer: MapContextLayerWmsModel): Promise<Extent | null>;
|
|
32
|
-
getWmtsLayerFromCapabilities(link: DatasetDistribution): Observable<MapContextLayerWmtsModel>;
|
|
33
32
|
prioritizePageScroll(interactions: Collection<Interaction>): void;
|
|
34
33
|
getRecordExtent(record: Partial<CatalogRecord>): Extent;
|
|
35
34
|
static ɵfac: i0.ɵɵFactoryDeclaration<MapUtilsService, never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-utils.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/map/src/lib/utils/map-utils.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EAAU,MAAM,EAAW,MAAM,WAAW,CAAA;AACnD,OAAO,OAAO,MAAM,YAAY,CAAA;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,MAAM,gBAAgB,CAAA;AAClC,OAAO,GAAG,MAAM,QAAQ,CAAA;AAExB,OAAO,MAAM,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"map-utils.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/map/src/lib/utils/map-utils.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EAAU,MAAM,EAAW,MAAM,WAAW,CAAA;AACnD,OAAO,OAAO,MAAM,YAAY,CAAA;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,MAAM,gBAAgB,CAAA;AAClC,OAAO,GAAG,MAAM,QAAQ,CAAA;AAExB,OAAO,MAAM,MAAM,kBAAkB,CAAA;AAIrC,OAAO,EAAY,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAO/E,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAEjC,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,kCAAkC,CAAA;AACzC,OAAO,UAAU,MAAM,eAAe,CAAA;AACtC,OAAO,eAAe,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,2DAA2D,CAAA;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;;AAWrE,qBAGa,eAAe;IACd,OAAO,CAAC,IAAI;IAAc,OAAO,CAAC,KAAK;gBAA/B,IAAI,EAAE,UAAU,EAAU,KAAK,EAAE,YAAY;IAEjE,cAAc,IAAI,GAAG;IAOrB,qBAAqB,sBACA,iBAAiB,0DAGnC,QAAQ,QAAQ,CAAC,EAAE,CAKrB;IAED,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO;IAOzC,SAAS,CAAC,KAAK,KAAA,EAAE,GAAG,KAAA,EAAE,UAAU,KAAA,GAAG,MAAM;IAYzC,0BAA0B,CAAC,KAAK,KAAA,EAAE,KAAK,KAAA,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE;IAe7D,kCAAkC,CAChC,KAAK,EAAE,GAAG,EACV,KAAK,EAAE,eAAe,CAAC,YAAY,CAAC,GACnC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;IAoBpC;;OAEG;IACG,cAAc,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAuCnE,iBAAiB,CACrB,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAyBzB,oBAAoB,CAAC,YAAY,EAAE,UAAU,CAAC,WAAW,CAAC;IAuB1D,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,MAAM;yCA1K5C,eAAe;6CAAf,eAAe;CAwL3B;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,eAAe,CAAC,YAAY,CAAC,WAQrC;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,WAMhC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-view.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/record/src/lib/map-view/map-view.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,SAAS,EACT,MAAM,EACP,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EAEpB,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAwB,SAAS,EAAE,MAAM,4CAA4C,CAAA;AAE5F,OAAO,OAAO,MAAM,YAAY,CAAA;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,OAAO,EACL,eAAe,EAIf,UAAU,EAMX,MAAM,MAAM,CAAA;AASb,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAA;;AAE/F,qBAMa,gBAAiB,YAAW,MAAM,EAAE,SAAS;IAsFtD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,YAAY;IA3FtB,SAAS,EAAE,SAAS,CAAyB;IAC7C,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC5B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,cAAc,CAAW;IAEjC,mBAAmB,oCAKlB;IAED,gBAAgB;;;SASf;IACD,kBAAkB,0BAAyB;IAE3C,OAAO,UAAQ;IACf,KAAK,MAAO;IAEZ,aAAa,kCAGiC;IAE9C,cAAc,oBAiBb;IAED,WAAW,8BA+BV;gBAGS,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,kBAAkB,EAC/B,SAAS,EAAE,iBAAiB,EAC5B,YAAY,EAAE,eAAe;IAGvC,WAAW,IAAI,IAAI;IAInB,QAAQ,IAAI,IAAI;IAWhB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI;IASvD,cAAc,IAAI,IAAI;IAOtB,gBAAgB,CACd,IAAI,EAAE,mBAAmB,GACxB,UAAU,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"map-view.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/record/src/lib/map-view/map-view.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,SAAS,EACT,MAAM,EACP,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EAEpB,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAwB,SAAS,EAAE,MAAM,4CAA4C,CAAA;AAE5F,OAAO,OAAO,MAAM,YAAY,CAAA;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,OAAO,EACL,eAAe,EAIf,UAAU,EAMX,MAAM,MAAM,CAAA;AASb,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAA;;AAE/F,qBAMa,gBAAiB,YAAW,MAAM,EAAE,SAAS;IAsFtD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,YAAY;IA3FtB,SAAS,EAAE,SAAS,CAAyB;IAC7C,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC5B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,cAAc,CAAW;IAEjC,mBAAmB,oCAKlB;IAED,gBAAgB;;;SASf;IACD,kBAAkB,0BAAyB;IAE3C,OAAO,UAAQ;IACf,KAAK,MAAO;IAEZ,aAAa,kCAGiC;IAE9C,cAAc,oBAiBb;IAED,WAAW,8BA+BV;gBAGS,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,kBAAkB,EAC/B,SAAS,EAAE,iBAAiB,EAC5B,YAAY,EAAE,eAAe;IAGvC,WAAW,IAAI,IAAI;IAInB,QAAQ,IAAI,IAAI;IAWhB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI;IASvD,cAAc,IAAI,IAAI;IAOtB,gBAAgB,CACd,IAAI,EAAE,mBAAmB,GACxB,UAAU,CAAC,oBAAoB,CAAC;IAgCnC,mBAAmB,CAAC,IAAI,EAAE,MAAM;yCAhKrB,gBAAgB;2CAAhB,gBAAgB;CAmK5B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "geonetwork-ui",
|
|
3
|
-
"version": "2.3.0-dev.
|
|
3
|
+
"version": "2.3.0-dev.6e2b8bea",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">=14.17.0"
|
|
6
6
|
},
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
|
|
50
|
-
"@camptocamp/ogc-client": "^
|
|
50
|
+
"@camptocamp/ogc-client": "^1.1.0-RC.3",
|
|
51
51
|
"@geospatial-sdk/geocoding": "^0.0.5-alpha.2",
|
|
52
52
|
"@ltd/j-toml": "~1.35.2",
|
|
53
53
|
"@messageformat/core": "^3.0.1",
|
|
@@ -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
|
|
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
|
}
|
package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.css
ADDED
|
File without changes
|
package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.html
ADDED
|
@@ -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>
|
package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.ts
ADDED
|
@@ -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
|
-
|
|
28
|
-
|
|
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:
|
|
99
|
+
url: layerModel.url,
|
|
91
100
|
params: { LAYERS: layerModel.name },
|
|
92
101
|
gutter: 20,
|
|
93
102
|
}),
|
|
94
103
|
})
|
|
95
|
-
case MapContextLayerTypeEnum.WMTS:
|
|
96
|
-
|
|
97
|
-
|
|
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
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
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({
|