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
|
@@ -17,31 +17,26 @@ export interface MapContextLayerWmsModel {
|
|
|
17
17
|
type: 'wms';
|
|
18
18
|
url: string;
|
|
19
19
|
name: string;
|
|
20
|
-
attributions?: string;
|
|
21
20
|
}
|
|
22
21
|
export interface MapContextLayerWmtsModel {
|
|
23
22
|
type: 'wmts';
|
|
24
23
|
url: string;
|
|
25
24
|
name: string;
|
|
26
|
-
attributions?: string;
|
|
27
25
|
}
|
|
28
26
|
interface MapContextLayerWfsModel {
|
|
29
27
|
type: 'wfs';
|
|
30
28
|
url: string;
|
|
31
29
|
name: string;
|
|
32
|
-
attributions?: string;
|
|
33
30
|
}
|
|
34
31
|
export interface MapContextLayerOgcapiModel {
|
|
35
32
|
type: 'ogcapi';
|
|
36
33
|
url: string;
|
|
37
34
|
name: string;
|
|
38
35
|
layerType: 'feature' | 'vectorTiles' | 'mapTiles' | 'record';
|
|
39
|
-
attributions?: string;
|
|
40
36
|
}
|
|
41
37
|
interface LayerXyzModel {
|
|
42
38
|
type: 'xyz';
|
|
43
39
|
name?: string;
|
|
44
|
-
attributions?: string;
|
|
45
40
|
}
|
|
46
41
|
interface LayerXyzModelWithUrl extends LayerXyzModel {
|
|
47
42
|
url: string;
|
|
@@ -54,7 +49,6 @@ interface LayerXyzModelWithUrls extends LayerXyzModel {
|
|
|
54
49
|
export type MapContextLayerXyzModel = LayerXyzModelWithUrl | LayerXyzModelWithUrls;
|
|
55
50
|
interface LayerGeojson {
|
|
56
51
|
type: 'geojson';
|
|
57
|
-
attributions?: string;
|
|
58
52
|
}
|
|
59
53
|
interface LayerGeojsonWithUrl extends LayerGeojson {
|
|
60
54
|
url: string;
|
|
@@ -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;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;
|
|
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;IACZ,SAAS,EAAE,SAAS,GAAG,aAAa,GAAG,UAAU,GAAG,QAAQ,CAAA;CAC7D;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;;AAYnF,eAAO,MAAM,yBAAyB,EAAE,
|
|
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;;AAYnF,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;IAiIpD,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;yCAzNzD,iBAAiB;6CAAjB,iBAAiB;CAoP7B"}
|
|
@@ -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;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;
|
|
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":"record-api-form.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,EACL,0BAA0B,EAC1B,eAAe,EAChB,MAAM,2DAA2D,CAAA;AAElE,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"record-api-form.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,EACL,0BAA0B,EAC1B,eAAe,EAChB,MAAM,2DAA2D,CAAA;AAElE,OAAO,EAAE,eAAe,EAAiC,MAAM,MAAM,CAAA;;AAQrE,UAAU,aAAa;IACrB,WAAW,CAAC,EAAE,GAAG,EAAE,CAAA;IACnB,aAAa,CAAC,EAAE,GAAG,EAAE,CAAA;CACtB;AAED,qBAMa,sBAAsB;IACjC,IAAa,OAAO,CAAC,KAAK,EAAE,0BAA0B,EASrD;IAED,OAAO,0BAA6C;IACpD,MAAM,0BAA4C;IAClD,OAAO,0BAA6C;IACpD,SAAS,gDAER;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,UAAO;IACpB,qBAAqB,EAAE,eAAe,GAAG,SAAS,CAAA;IAClD,aAAa;;;QAAqC;IAClD,QAAQ,EAAE,WAAW,GAAG,cAAc,GAAG,SAAS,CAAA;IAClD,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;IAEnC,YAAY,oCASX;IAED,eAAe,qCAEd;IACD,aAAa,oCAEZ;IAED,SAAS,CAAC,KAAK,EAAE,MAAM;IAIvB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjC,QAAQ;IAMF,kBAAkB;IAoBxB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE;;;;IASnB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAcrD,cAAc;IAYd,mBAAmB,CACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC;yCAzHP,sBAAsB;2CAAtB,sBAAsB;CA8IlC"}
|
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.549700bf",
|
|
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": "1.1.1-dev.
|
|
50
|
+
"@camptocamp/ogc-client": "1.1.1-dev.ddbb5b0",
|
|
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",
|
|
@@ -174,9 +174,9 @@ export class DataService {
|
|
|
174
174
|
|
|
175
175
|
async getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo> {
|
|
176
176
|
const endpoint = new OgcApiEndpoint(this.proxy.getProxiedUrl(url))
|
|
177
|
-
return await endpoint.
|
|
177
|
+
return await endpoint.featureCollections
|
|
178
178
|
.then((collections) => {
|
|
179
|
-
return endpoint.getCollectionInfo(collections[0]
|
|
179
|
+
return endpoint.getCollectionInfo(collections[0])
|
|
180
180
|
})
|
|
181
181
|
.catch((error) => {
|
|
182
182
|
throw new Error(`ogc.unreachable.unknown`)
|
|
@@ -20,21 +20,18 @@ export interface MapContextLayerWmsModel {
|
|
|
20
20
|
type: 'wms'
|
|
21
21
|
url: string
|
|
22
22
|
name: string
|
|
23
|
-
attributions?: string
|
|
24
23
|
}
|
|
25
24
|
|
|
26
25
|
export interface MapContextLayerWmtsModel {
|
|
27
26
|
type: 'wmts'
|
|
28
27
|
url: string
|
|
29
28
|
name: string
|
|
30
|
-
attributions?: string
|
|
31
29
|
}
|
|
32
30
|
|
|
33
31
|
interface MapContextLayerWfsModel {
|
|
34
32
|
type: 'wfs'
|
|
35
33
|
url: string
|
|
36
34
|
name: string
|
|
37
|
-
attributions?: string
|
|
38
35
|
}
|
|
39
36
|
|
|
40
37
|
export interface MapContextLayerOgcapiModel {
|
|
@@ -42,13 +39,11 @@ export interface MapContextLayerOgcapiModel {
|
|
|
42
39
|
url: string
|
|
43
40
|
name: string
|
|
44
41
|
layerType: 'feature' | 'vectorTiles' | 'mapTiles' | 'record'
|
|
45
|
-
attributions?: string
|
|
46
42
|
}
|
|
47
43
|
|
|
48
44
|
interface LayerXyzModel {
|
|
49
45
|
type: 'xyz'
|
|
50
46
|
name?: string
|
|
51
|
-
attributions?: string
|
|
52
47
|
}
|
|
53
48
|
interface LayerXyzModelWithUrl extends LayerXyzModel {
|
|
54
49
|
url: string
|
|
@@ -64,7 +59,6 @@ export type MapContextLayerXyzModel =
|
|
|
64
59
|
|
|
65
60
|
interface LayerGeojson {
|
|
66
61
|
type: 'geojson'
|
|
67
|
-
attributions?: string
|
|
68
62
|
}
|
|
69
63
|
interface LayerGeojsonWithUrl extends LayerGeojson {
|
|
70
64
|
url: string
|
|
@@ -37,7 +37,6 @@ export const DEFAULT_BASELAYER_CONTEXT: MapContextLayerXyzModel = {
|
|
|
37
37
|
`https://b.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png`,
|
|
38
38
|
`https://c.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png`,
|
|
39
39
|
],
|
|
40
|
-
attributions: `<span>© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, © <a href="https://carto.com/">Carto</a></span>`,
|
|
41
40
|
}
|
|
42
41
|
|
|
43
42
|
export const DEFAULT_VIEW: MapContextViewModel = {
|
|
@@ -88,14 +87,12 @@ export class MapContextService {
|
|
|
88
87
|
source: new OGCVectorTile({
|
|
89
88
|
url: layerModel.url,
|
|
90
89
|
format: new MVT(),
|
|
91
|
-
attributions: layerModel.attributions,
|
|
92
90
|
}),
|
|
93
91
|
})
|
|
94
92
|
} else if (layerModel.layerType === 'mapTiles') {
|
|
95
93
|
return new TileLayer({
|
|
96
94
|
source: new OGCMapTile({
|
|
97
95
|
url: layerModel.url,
|
|
98
|
-
attributions: layerModel.attributions,
|
|
99
96
|
}),
|
|
100
97
|
})
|
|
101
98
|
} else {
|
|
@@ -103,7 +100,6 @@ export class MapContextService {
|
|
|
103
100
|
source: new VectorSource({
|
|
104
101
|
format: new GeoJSON(),
|
|
105
102
|
url: layerModel.url,
|
|
106
|
-
attributions: layerModel.attributions,
|
|
107
103
|
}),
|
|
108
104
|
style,
|
|
109
105
|
})
|
|
@@ -113,7 +109,6 @@ export class MapContextService {
|
|
|
113
109
|
source: new XYZ({
|
|
114
110
|
url: 'url' in layerModel ? layerModel.url : undefined,
|
|
115
111
|
urls: 'urls' in layerModel ? layerModel.urls : undefined,
|
|
116
|
-
attributions: layerModel.attributions,
|
|
117
112
|
}),
|
|
118
113
|
})
|
|
119
114
|
case MapContextLayerTypeEnum.WMS:
|
|
@@ -122,7 +117,6 @@ export class MapContextService {
|
|
|
122
117
|
url: layerModel.url,
|
|
123
118
|
params: { LAYERS: layerModel.name },
|
|
124
119
|
gutter: 20,
|
|
125
|
-
attributions: layerModel.attributions,
|
|
126
120
|
}),
|
|
127
121
|
})
|
|
128
122
|
case MapContextLayerTypeEnum.WMTS: {
|
|
@@ -147,7 +141,6 @@ export class MapContextService {
|
|
|
147
141
|
tileGrid,
|
|
148
142
|
projection: matrixSet.crs,
|
|
149
143
|
dimensions,
|
|
150
|
-
attributions: layerModel.attributions,
|
|
151
144
|
})
|
|
152
145
|
)
|
|
153
146
|
})
|
|
@@ -173,7 +166,6 @@ export class MapContextService {
|
|
|
173
166
|
})
|
|
174
167
|
},
|
|
175
168
|
strategy: bboxStrategy,
|
|
176
|
-
attributions: layerModel.attributions,
|
|
177
169
|
})
|
|
178
170
|
)
|
|
179
171
|
})
|
|
@@ -26,7 +26,6 @@ import {
|
|
|
26
26
|
MapContextLayerWmsModel,
|
|
27
27
|
} from '../map-context/map-context.model'
|
|
28
28
|
import Collection from 'ol/Collection'
|
|
29
|
-
import { defaults as defaultControls } from 'ol/control.js'
|
|
30
29
|
import MapBrowserEvent from 'ol/MapBrowserEvent'
|
|
31
30
|
import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
32
31
|
import { ProxyService } from '../../../../../../libs/util/shared/src'
|
|
@@ -48,10 +47,7 @@ export class MapUtilsService {
|
|
|
48
47
|
|
|
49
48
|
createEmptyMap(): Map {
|
|
50
49
|
return new Map({
|
|
51
|
-
controls:
|
|
52
|
-
attribution: true,
|
|
53
|
-
attributionOptions: { collapsible: false },
|
|
54
|
-
}),
|
|
50
|
+
controls: [],
|
|
55
51
|
pixelRatio: 1,
|
|
56
52
|
})
|
|
57
53
|
}
|
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
ServiceProtocol,
|
|
6
6
|
} from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
7
7
|
import { mimeTypeToFormat } from '../../../../../../libs/util/shared/src'
|
|
8
|
-
import { BehaviorSubject, combineLatest,
|
|
8
|
+
import { BehaviorSubject, combineLatest, map, switchMap } from 'rxjs'
|
|
9
9
|
|
|
10
10
|
const DEFAULT_PARAMS = {
|
|
11
11
|
OFFSET: '',
|
|
@@ -54,8 +54,7 @@ export class RecordApiFormComponent {
|
|
|
54
54
|
this.offset$,
|
|
55
55
|
this.limit$,
|
|
56
56
|
this.format$,
|
|
57
|
-
|
|
58
|
-
this.endpoint$.pipe(filter((endpoint) => !!endpoint)),
|
|
57
|
+
this.endpoint$,
|
|
59
58
|
]).pipe(
|
|
60
59
|
switchMap(([offset, limit, format]) =>
|
|
61
60
|
this.generateApiQueryUrl(offset, limit, format)
|
|
@@ -122,9 +121,11 @@ export class RecordApiFormComponent {
|
|
|
122
121
|
this.supportOffset = this.endpoint.supportsStartIndex()
|
|
123
122
|
return this.endpoint.getServiceInfo() as OutputFormats
|
|
124
123
|
} else {
|
|
125
|
-
|
|
126
|
-
this.
|
|
127
|
-
|
|
124
|
+
{
|
|
125
|
+
return (await this.endpoint.getCollectionInfo(
|
|
126
|
+
this.firstCollection
|
|
127
|
+
)) as OutputFormats
|
|
128
|
+
}
|
|
128
129
|
}
|
|
129
130
|
}
|
|
130
131
|
|
|
@@ -135,7 +136,7 @@ export class RecordApiFormComponent {
|
|
|
135
136
|
await (this.endpoint as WfsEndpoint).isReady()
|
|
136
137
|
} else {
|
|
137
138
|
this.endpoint = new OgcApiEndpoint(this.apiBaseUrl)
|
|
138
|
-
this.firstCollection = (await this.endpoint.
|
|
139
|
+
this.firstCollection = (await this.endpoint.featureCollections)[0]
|
|
139
140
|
}
|
|
140
141
|
this.endpoint$.next(this.endpoint)
|
|
141
142
|
}
|