geonetwork-ui 2.2.0-dev.95201f8f → 2.2.0-dev.aecf1900

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.
@@ -57,6 +57,7 @@ export interface DatasetDownloadDistribution {
57
57
  sizeBytes?: number;
58
58
  name?: string;
59
59
  description?: string;
60
+ accessServiceProtocol?: ServiceProtocol;
60
61
  }
61
62
  export interface OnlineLinkResource {
62
63
  type: 'link';
@@ -1 +1 @@
1
- {"version":3,"file":"metadata.model.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/common/domain/src/lib/model/record/metadata.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAEnD,KAAK,IAAI,GAAG,MAAM,CAAA;AASlB,MAAM,MAAM,mBAAmB,GAC3B,SAAS,GACT,YAAY,GACZ,UAAU,GACV,WAAW,GACX,WAAW,GACX,UAAU,CAAA;AAOd,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,EAAE,MAAM,CAAA;IACpB,GAAG,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAA;CACvC,CAAA;AACD,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAAG,qBAAqB,CAAA;AAEzE,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,SAAS,CAAA;AAQ9C,eAAO,MAAM,kBAAkB,UAM9B,CAAA;AACD,MAAM,MAAM,YAAY,GAAG,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAA;AAE5D,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAA;AAC7E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,oBAAoB,CAAA;CAC3B;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,GAAG,CAAA;CACV,CAAA;AAED,MAAM,MAAM,yBAAyB,GACjC,MAAM,GACN,QAAQ,GACR,KAAK,GACL,OAAO,GACP,OAAO,CAAA;AAEX,MAAM,WAAW,UAAU;IACzB,gBAAgB,EAAE,IAAI,CAAA;IACtB,iBAAiB,EAAE,YAAY,CAAA;IAC/B,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,IAAI,CAAA;IACpB,aAAa,EAAE,IAAI,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;IAChB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACrB,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACvB,iBAAiB,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAC1C,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IAC7B,gBAAgB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IAChC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACxB,SAAS,EAAE,KAAK,CAAC,eAAe,CAAC,CAAA;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,WAAW,CAAC,EAAE,GAAG,CAAA;IACjB,eAAe,CAAC,EAAE,eAAe,CAAA;CAMlC;AAGD,MAAM,MAAM,eAAe,GACvB,KAAK,GACL,KAAK,GACL,KAAK,GACL,MAAM,GACN,UAAU,GACV,aAAa,GACb,OAAO,CAAA;AAEX,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,CAAA;AAErE,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,SAAS,CAAA;IACf,GAAG,EAAE,GAAG,CAAA;IACR,qBAAqB,EAAE,eAAe,CAAA;IACtC,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,UAAU,CAAA;IAChB,GAAG,EAAE,GAAG,CAAA;IACR,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAIlB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,MAAM,mBAAmB,GAAG,CAC9B,0BAA0B,GAC1B,2BAA2B,GAC3B,kBAAkB,CACrB,GAAG;IACF,IAAI,EAAE,uBAAuB,CAAA;CAC9B,CAAA;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,IAAI,CAAA;IACX,GAAG,EAAE,IAAI,CAAA;IACT,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,IAAI,EAAE,SAAS,CAAA;IACf,mBAAmB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IACtC,MAAM,EAAE,YAAY,CAAA;IACpB,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAA;IACzC,cAAc,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAA;IAC3C,eAAe,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAA;IAC7C,qBAAqB,CAAC,EAAE,yBAAyB,CAAA;CAClD;AAED,MAAM,MAAM,yBAAyB,GAAG,UAAU,GAAG,MAAM,CAAA;AAE3D,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,GAAG,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,UAAU,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,MAAM,qBAAqB,GAAG,CAAC,eAAe,GAAG,kBAAkB,CAAC,GAAG;IAC3E,IAAI,EAAE,yBAAyB,CAAA;CAChC,CAAA;AAED,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,IAAI,EAAE,SAAS,CAAA;IACf,eAAe,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAA;CAC9C;AAED,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG,aAAa,CAAA"}
1
+ {"version":3,"file":"metadata.model.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/common/domain/src/lib/model/record/metadata.model.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,26 @@
1
+ import { WfsVersion } from '@camptocamp/ogc-client';
1
2
  import { BaseReader } from '../../../../../../libs/util/data-fetcher/src';
2
3
  import { ProxyService } from '../../../../../../libs/util/shared/src';
3
4
  import type { FeatureCollection } from 'geojson';
4
5
  import { Observable } from 'rxjs';
5
6
  import { DatasetDistribution, DatasetServiceDistribution } from '../../../../../../libs/common/domain/src/lib/model/record';
6
7
  import * as i0 from "@angular/core";
8
+ interface WfsDownloadUrls {
9
+ all: {
10
+ [format: string]: string;
11
+ };
12
+ geojson: string;
13
+ gml: {
14
+ featureUrl: string;
15
+ namespace: string;
16
+ wfsVersion: WfsVersion;
17
+ };
18
+ }
7
19
  export declare class DataService {
8
20
  private proxy;
9
21
  constructor(proxy: ProxyService);
10
- private getDownloadUrlsFromWfs;
11
- private getDownloadUrlFromEsriRest;
22
+ getDownloadUrlsFromWfs(wfsUrl: string, featureTypeName: string): Observable<WfsDownloadUrls>;
23
+ getDownloadUrlFromEsriRest(apiUrl: string, format: string): string;
12
24
  getDownloadLinksFromWfs(wfsLink: DatasetServiceDistribution): Observable<DatasetDistribution[]>;
13
25
  getDownloadLinksFromEsriRest(esriRestLink: DatasetServiceDistribution): DatasetDistribution[];
14
26
  readAsGeoJson(link: DatasetDistribution): Observable<FeatureCollection>;
@@ -16,4 +28,5 @@ export declare class DataService {
16
28
  static ɵfac: i0.ɵɵFactoryDeclaration<DataService, never>;
17
29
  static ɵprov: i0.ɵɵInjectableDeclaration<DataService>;
18
30
  }
31
+ export {};
19
32
  //# sourceMappingURL=data.service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/dataviz/src/lib/service/data.service.ts"],"names":[],"mappings":"AAGA,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,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,2DAA2D,CAAA;;AAmBlE,qBAGa,WAAW;IACV,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAEvC,OAAO,CAAC,sBAAsB;IA2E9B,OAAO,CAAC,0BAA0B;IAMlC,uBAAuB,CACrB,OAAO,EAAE,0BAA0B,GAClC,UAAU,CAAC,mBAAmB,EAAE,CAAC;IAiBpC,4BAA4B,CAC1B,YAAY,EAAE,0BAA0B,GACvC,mBAAmB,EAAE;IAUxB,aAAa,CAAC,IAAI,EAAE,mBAAmB,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAUvE,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,UAAU,CAAC,UAAU,CAAC;yCA7HlD,WAAW;6CAAX,WAAW;CAmKvB"}
1
+ {"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/dataviz/src/lib/service/data.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAChE,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,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,2DAA2D,CAAA;;AAalE,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,sBAAsB,CACpB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,UAAU,CAAC,eAAe,CAAC;IAwE9B,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAMlE,uBAAuB,CACrB,OAAO,EAAE,0BAA0B,GAClC,UAAU,CAAC,mBAAmB,EAAE,CAAC;IAoBpC,4BAA4B,CAC1B,YAAY,EAAE,0BAA0B,GACvC,mBAAmB,EAAE;IAUxB,aAAa,CAAC,IAAI,EAAE,mBAAmB,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAUvE,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,UAAU,CAAC,UAAU,CAAC;yCAhIlD,WAAW;6CAAX,WAAW;CAsKvB"}
@@ -14,7 +14,7 @@ export declare class DownloadsListComponent {
14
14
  isFilterActive(filter: FilterFormat): boolean;
15
15
  getFilterFormatTitle(format: FilterFormat): any;
16
16
  isLinkOfFormat(link: DatasetDistribution, format: FilterFormat): boolean;
17
- getLinkFormat(link: DatasetDistribution): "json" | "pdf" | "geojson" | "svg" | "csv" | "excel" | "shp" | "kml" | "gpkg" | "zip" | "jpg";
17
+ getLinkFormat(link: DatasetDistribution): "json" | "pdf" | "geojson" | "svg" | "csv" | "excel" | "shp" | "gml" | "kml" | "gpkg" | "zip" | "jpg" | "dxf";
18
18
  getLinkColor(link: DatasetDistribution): string;
19
19
  isFromWfs(link: DatasetDistribution): boolean;
20
20
  static ɵfac: i0.ɵɵFactoryDeclaration<DownloadsListComponent, never>;
@@ -30,47 +30,59 @@ export declare const FORMATS: {
30
30
  readonly color: "#328556";
31
31
  readonly mimeTypes: readonly ["x-gis/x-shapefile"];
32
32
  };
33
+ readonly gml: {
34
+ readonly extensions: readonly ["gml"];
35
+ readonly priority: 5;
36
+ readonly color: "#c92bce";
37
+ readonly mimeTypes: readonly ["application/gml+xml", "text/xml; subtype=gml"];
38
+ };
33
39
  readonly kml: {
34
40
  readonly extensions: readonly ["kml", "kmz"];
35
- readonly priority: 5;
41
+ readonly priority: 6;
36
42
  readonly color: "#348009";
37
43
  readonly mimeTypes: readonly ["application/vnd.google-earth.kml+xml", "application/vnd.google-earth.kmz"];
38
44
  };
39
45
  readonly gpkg: {
40
46
  readonly extensions: readonly ["gpkg", "geopackage"];
41
- readonly priority: 6;
47
+ readonly priority: 7;
42
48
  readonly color: "#ea79ba";
43
49
  readonly mimeTypes: readonly ["application/geopackage+sqlite3"];
44
50
  };
45
51
  readonly zip: {
46
52
  readonly extensions: readonly ["zip", "tar.gz"];
47
- readonly priority: 7;
53
+ readonly priority: 8;
48
54
  readonly color: "#f2bb3a";
49
55
  readonly mimeTypes: readonly ["application/zip", "application/x-zip"];
50
56
  };
51
57
  readonly pdf: {
52
58
  readonly extensions: readonly ["pdf"];
53
- readonly priority: 8;
59
+ readonly priority: 9;
54
60
  readonly color: "#db544a";
55
61
  readonly mimeTypes: readonly ["application/pdf"];
56
62
  };
57
63
  readonly jpg: {
58
64
  readonly extensions: readonly ["jpg", "jpeg", "jfif", "pjpeg", "pjp"];
59
- readonly priority: 8;
65
+ readonly priority: 9;
60
66
  readonly color: "#673ab7";
61
67
  readonly mimeTypes: readonly ["image/jpg"];
62
68
  };
63
69
  readonly svg: {
64
70
  readonly extensions: readonly ["svg"];
65
- readonly priority: 9;
71
+ readonly priority: 10;
66
72
  readonly color: "#d98294";
67
73
  readonly mimeTypes: readonly ["image/svg+xml"];
68
74
  };
75
+ readonly dxf: {
76
+ readonly extensions: readonly ["dxf"];
77
+ readonly priority: 11;
78
+ readonly color: "#de630b";
79
+ readonly mimeTypes: readonly ["application/x-dxf", "image/x-dxf"];
80
+ };
69
81
  };
70
82
  export type FileFormat = keyof typeof FORMATS;
71
83
  export declare function getFormatPriority(linkFormat: FileFormat): number;
72
84
  export declare function getLinkPriority(link: DatasetDistribution): number;
73
- export declare function extensionToFormat(extension: string): FileFormat;
85
+ export declare function getFileFormatFromServiceOutput(serviceOutput: string): FileFormat | null;
74
86
  export declare function getFileFormat(link: DatasetDistribution): FileFormat;
75
87
  export declare function isFormatInQueryParam(link: DatasetDistribution, alias: string): boolean;
76
88
  export declare function mimeTypeToFormat(mimeType: string): FileFormat;
@@ -1 +1 @@
1
- {"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAA;AAI/F,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+EV,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,OAAO,CAAA;AAE7C,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAUhE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAEjE;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAO/D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,mBAAmB,GAAG,UAAU,CAcnE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,MAAM,GACZ,OAAO,CAQT;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAO7D;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,mBAAmB,EACzB,MAAM,EAAE,UAAU,GACjB,OAAO,CAMT;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAQ5D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CA0B9D;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEtE"}
1
+ {"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAA;AAI/F,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2FV,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,OAAO,CAAA;AAE7C,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAUhE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAEjE;AAED,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,GACpB,UAAU,GAAG,IAAI,CAgBnB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,mBAAmB,GAAG,UAAU,CAcnE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,MAAM,GACZ,OAAO,CAQT;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAO7D;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,mBAAmB,EACzB,MAAM,EAAE,UAAU,GACjB,OAAO,CAMT;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAQ5D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CA0B9D;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEtE"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geonetwork-ui",
3
- "version": "2.2.0-dev.95201f8f",
3
+ "version": "2.2.0-dev.aecf1900",
4
4
  "engines": {
5
5
  "node": ">=14.17.0"
6
6
  },
@@ -122,6 +122,7 @@ export interface DatasetDownloadDistribution {
122
122
  // textEncoding?: string
123
123
  name?: string
124
124
  description?: string
125
+ accessServiceProtocol?: ServiceProtocol
125
126
  }
126
127
 
127
128
  export interface OnlineLinkResource {
@@ -9,8 +9,8 @@ import {
9
9
  SupportedTypes,
10
10
  } from '../../../../../../libs/util/data-fetcher/src'
11
11
  import {
12
- extensionToFormat,
13
12
  getFileFormat,
13
+ getFileFormatFromServiceOutput,
14
14
  getMimeTypeForFormat,
15
15
  ProxyService,
16
16
  } from '../../../../../../libs/util/shared/src'
@@ -45,7 +45,7 @@ interface WfsDownloadUrls {
45
45
  export class DataService {
46
46
  constructor(private proxy: ProxyService) {}
47
47
 
48
- private getDownloadUrlsFromWfs(
48
+ getDownloadUrlsFromWfs(
49
49
  wfsUrl: string,
50
50
  featureTypeName: string
51
51
  ): Observable<WfsDownloadUrls> {
@@ -120,7 +120,7 @@ export class DataService {
120
120
  )
121
121
  }
122
122
 
123
- private getDownloadUrlFromEsriRest(apiUrl: string, format: string): string {
123
+ getDownloadUrlFromEsriRest(apiUrl: string, format: string): string {
124
124
  return this.proxy.getProxiedUrl(
125
125
  `${apiUrl}/query?f=${format}&where=1=1&outFields=*`
126
126
  )
@@ -138,8 +138,11 @@ export class DataService {
138
138
  map((urls) =>
139
139
  Object.keys(urls).map((format) => ({
140
140
  ...wfsLink,
141
+ type: 'download',
141
142
  url: new URL(urls[format]),
142
- mimeType: getMimeTypeForFormat(extensionToFormat(format)) || format,
143
+ mimeType: getMimeTypeForFormat(
144
+ getFileFormatFromServiceOutput(format)
145
+ ),
143
146
  }))
144
147
  )
145
148
  )
@@ -153,7 +156,7 @@ export class DataService {
153
156
  url: new URL(
154
157
  this.getDownloadUrlFromEsriRest(esriRestLink.url.toString(), format)
155
158
  ),
156
- mimeType: getMimeTypeForFormat(extensionToFormat(format)) || format,
159
+ mimeType: getMimeTypeForFormat(getFileFormatFromServiceOutput(format)),
157
160
  }))
158
161
  }
159
162
 
@@ -43,9 +43,15 @@ export const FORMATS = {
43
43
  color: '#328556',
44
44
  mimeTypes: ['x-gis/x-shapefile'],
45
45
  },
46
+ gml: {
47
+ extensions: ['gml'],
48
+ priority: 5,
49
+ color: '#c92bce',
50
+ mimeTypes: ['application/gml+xml', 'text/xml; subtype=gml'],
51
+ },
46
52
  kml: {
47
53
  extensions: ['kml', 'kmz'],
48
- priority: 5,
54
+ priority: 6,
49
55
  color: '#348009',
50
56
  mimeTypes: [
51
57
  'application/vnd.google-earth.kml+xml',
@@ -54,34 +60,40 @@ export const FORMATS = {
54
60
  },
55
61
  gpkg: {
56
62
  extensions: ['gpkg', 'geopackage'],
57
- priority: 6,
63
+ priority: 7,
58
64
  color: '#ea79ba',
59
65
  mimeTypes: ['application/geopackage+sqlite3'],
60
66
  },
61
67
  zip: {
62
68
  extensions: ['zip', 'tar.gz'],
63
- priority: 7,
69
+ priority: 8,
64
70
  color: '#f2bb3a',
65
71
  mimeTypes: ['application/zip', 'application/x-zip'],
66
72
  },
67
73
  pdf: {
68
74
  extensions: ['pdf'],
69
- priority: 8,
75
+ priority: 9,
70
76
  color: '#db544a',
71
77
  mimeTypes: ['application/pdf'],
72
78
  },
73
79
  jpg: {
74
80
  extensions: ['jpg', 'jpeg', 'jfif', 'pjpeg', 'pjp'],
75
- priority: 8,
81
+ priority: 9,
76
82
  color: '#673ab7',
77
83
  mimeTypes: ['image/jpg'],
78
84
  },
79
85
  svg: {
80
86
  extensions: ['svg'],
81
- priority: 9,
87
+ priority: 10,
82
88
  color: '#d98294',
83
89
  mimeTypes: ['image/svg+xml'],
84
90
  },
91
+ dxf: {
92
+ extensions: ['dxf'],
93
+ priority: 11,
94
+ color: '#de630b',
95
+ mimeTypes: ['application/x-dxf', 'image/x-dxf'],
96
+ },
85
97
  } as const
86
98
 
87
99
  export type FileFormat = keyof typeof FORMATS
@@ -102,13 +114,24 @@ export function getLinkPriority(link: DatasetDistribution): number {
102
114
  return getFormatPriority(getFileFormat(link))
103
115
  }
104
116
 
105
- export function extensionToFormat(extension: string): FileFormat {
106
- for (const format in FORMATS) {
107
- for (const alias of FORMATS[format].extensions) {
108
- if (alias === extension.toLowerCase()) return format as FileFormat
117
+ export function getFileFormatFromServiceOutput(
118
+ serviceOutput: string
119
+ ): FileFormat | null {
120
+ function formatMatcher(format: typeof FORMATS[FileFormat]): boolean {
121
+ const output = serviceOutput.toLowerCase()
122
+ return (
123
+ format.extensions.some((extension: string) =>
124
+ output.includes(extension)
125
+ ) ||
126
+ format.mimeTypes.some((mimeType: string) => output.includes(mimeType))
127
+ )
128
+ }
129
+ for (const formatName in FORMATS) {
130
+ if (formatMatcher(FORMATS[formatName])) {
131
+ return formatName as FileFormat
109
132
  }
110
133
  }
111
- return undefined
134
+ return null
112
135
  }
113
136
 
114
137
  export function getFileFormat(link: DatasetDistribution): FileFormat {