@mapcreator/api 0.0.0-saga.3 → 0.0.0-saga.5

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.
@@ -1,4 +1,6 @@
1
+ import { type ApiError, type ApiSuccess, Flatten, Revivers } from '../utils.js';
1
2
  import type { Polygon } from 'geojson';
3
+ import { RequireAtLeastOne } from 'type-fest';
2
4
  export type ApiSearchPoint = {
3
5
  lat: number;
4
6
  lng: number;
@@ -16,10 +18,10 @@ type SingleOrGroupedAreaBase = {
16
18
  svgPreview: string;
17
19
  boundingBox: Polygon;
18
20
  };
19
- export type GroupedArea = SingleOrGroupedAreaBase & {
21
+ type GroupedArea = SingleOrGroupedAreaBase & {
20
22
  isGroup: true;
21
23
  };
22
- export type SingleArea = SingleOrGroupedAreaBase & {
24
+ type SingleArea = SingleOrGroupedAreaBase & {
23
25
  isGroup: false;
24
26
  vectorSource: string;
25
27
  sourceLayer: string;
@@ -27,15 +29,33 @@ export type SingleArea = SingleOrGroupedAreaBase & {
27
29
  properties: Record<string, string>;
28
30
  };
29
31
  export type SingleOrGroupedArea = SingleArea | GroupedArea;
30
- export declare function searchSingleOrGroupedAreas(language: string, searchBounds?: ApiSearchBounds, query?: string, searchPoint?: ApiSearchPoint, mode?: 'polygon' | 'group' | 'both'): Promise<SingleOrGroupedArea[]>;
32
+ export declare function searchSingleOrGroupedAreas(language: string, search: RequireAtLeastOne<{
33
+ searchBounds: ApiSearchBounds;
34
+ query?: string;
35
+ searchPoint?: ApiSearchPoint;
36
+ }>): Promise<SingleOrGroupedArea[]>;
31
37
  export type GroupedAreaChild = {
32
38
  id: number;
33
39
  title: string;
34
40
  vectorSource: string;
35
41
  sourceLayer: string;
36
42
  featureId: number;
43
+ boundingBox: Polygon;
37
44
  properties: Record<string, string>;
38
45
  };
46
+ type ApiGroupedAreaChild = {
47
+ data: {
48
+ id: number;
49
+ title: string;
50
+ vector_source: string;
51
+ source_layer: string;
52
+ feature_id: number;
53
+ bounding_box: string;
54
+ properties: string;
55
+ };
56
+ } & Omit<ApiSuccess, 'data'> | ApiError;
57
+ export type ApiGroupedAreaChildData = Flatten<Exclude<ApiGroupedAreaChild, ApiError>['data']>;
58
+ export declare const groupedAreaChildRevivers: Revivers<ApiGroupedAreaChild, GroupedAreaChild>;
39
59
  export declare function groupedAreaChildren(groupId: number, language: string): Promise<GroupedAreaChild[]>;
40
60
  export {};
41
61
  //# sourceMappingURL=choropleth.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"choropleth.d.ts","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAmBF,KAAK,uBAAuB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAGF,MAAM,MAAM,WAAW,GAAG,uBAAuB,GAAG;IAClD,OAAO,EAAE,IAAI,CAAC;CACf,CAAC;AAGF,MAAM,MAAM,UAAU,GAAG,uBAAuB,GAAG;IACjD,OAAO,EAAE,KAAK,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,WAAW,CAAC;AAE3D,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,eAAe,EAC9B,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,cAAc,EAC5B,IAAI,GAAE,SAAS,GAAG,OAAO,GAAG,MAAe,GAC1C,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAwBhC;AAiBD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAYxG"}
1
+ {"version":3,"file":"choropleth.d.ts","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,OAAO,EAAE,QAAQ,EAA4B,MAAM,aAAa,CAAC;AAC1G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAmBF,KAAK,uBAAuB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,KAAK,WAAW,GAAG,uBAAuB,GAAG;IAC3C,OAAO,EAAE,IAAI,CAAC;CACf,CAAC;AAEF,KAAK,UAAU,GAAG,uBAAuB,GAAG;IAC1C,OAAO,EAAE,KAAK,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,WAAW,CAAC;AAE3D,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,CAAC;IACxB,YAAY,EAAE,eAAe,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,cAAc,CAAC;CAC9B,CAAC,GACD,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAoBhC;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE9F,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,mBAAmB,EAAE,gBAAgB,CAGpF,CAAC;AAEF,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAWxG"}
@@ -1,13 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.groupedAreaChildRevivers = void 0;
3
4
  exports.searchSingleOrGroupedAreas = searchSingleOrGroupedAreas;
4
5
  exports.groupedAreaChildren = groupedAreaChildren;
5
6
  const utils_js_1 = require("../utils.js");
6
- async function searchSingleOrGroupedAreas(language, searchBounds, query, searchPoint, mode = 'both') {
7
- /**
8
- * TODO When SAGA search on click is implemented, remove mode and make searchBounds required
9
- */
10
- return (0, utils_js_1.request)(`/v1/choropleth/polygons/search?${(0, utils_js_1.getSearchParams)(Object.assign(Object.assign(Object.assign(Object.assign({ language }, searchBounds), (query && { query })), (searchPoint && { point: searchPoint })), { mode }))}`).then(result => {
7
+ async function searchSingleOrGroupedAreas(language, search) {
8
+ return (0, utils_js_1.request)(`/v1/choropleth/polygons/search?${(0, utils_js_1.getSearchParams)(Object.assign(Object.assign(Object.assign({ language }, search.searchBounds), (search.query && { query: search.query })), (search.searchPoint && { point: search.searchPoint })))}`).then(result => {
11
9
  result.forEach(elem => {
12
10
  elem.boundingBox = JSON.parse(elem.boundingBox);
13
11
  if (!elem.isGroup) {
@@ -17,12 +15,15 @@ async function searchSingleOrGroupedAreas(language, searchBounds, query, searchP
17
15
  return result;
18
16
  });
19
17
  }
18
+ exports.groupedAreaChildRevivers = {
19
+ boundingBox: (data) => JSON.parse(data.bounding_box),
20
+ properties: (data) => JSON.parse(data.properties),
21
+ };
20
22
  async function groupedAreaChildren(groupId, language) {
21
- return (0, utils_js_1.request)(`/v1/choropleth/groups/${groupId}/children-optimized?${(0, utils_js_1.getSearchParams)({ language })}`).then(result => {
22
- result.forEach(elem => {
23
- elem.properties = JSON.parse(elem.properties);
24
- });
25
- return result;
26
- });
23
+ const pathname = `/v1/choropleth/groups/${groupId}/children-optimized`;
24
+ const query = (0, utils_js_1.getSearchParams)({ language });
25
+ const path = `${pathname}?${query}`;
26
+ const options = { revivers: exports.groupedAreaChildRevivers };
27
+ return (0, utils_js_1.request)(path, null, null, options);
27
28
  }
28
29
  //# sourceMappingURL=choropleth.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":";;AAwDA,gEA8BC;AA0BD,kDAYC;AA5HD,0CAAuF;AAwDhF,KAAK,UAAU,0BAA0B,CAC9C,QAAgB,EAChB,YAA8B,EAC9B,KAAc,EACd,WAA4B,EAC5B,OAAqC,MAAM;IAE3C;;OAEG;IACH,OAAO,IAAA,kBAAO,EACZ,kCAAkC,IAAA,0BAAe,4DAC/C,QAAQ,IACL,YAAY,GACZ,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,CAAC,GACpB,CAAC,WAAW,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,KAC1C,IAAI,IACJ,EAAE,CACL,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACd,MAAM,CAAC,OAAO,CACZ,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAgC,CAAY,CAAC;YAChF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAA+B,CAA2B,CAAC;YAC/F,CAAC;QACH,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AA0BM,KAAK,UAAU,mBAAmB,CAAC,OAAe,EAAE,QAAgB;IACzE,OAAO,IAAA,kBAAO,EACZ,yBAAyB,OAAO,uBAAuB,IAAA,0BAAe,EAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CACvF,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACd,MAAM,CAAC,OAAO,CACZ,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAA+B,CAA2B,CAAC;QAC/F,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":";;;AAuDA,gEA2BC;AA+BD,kDAWC;AA5HD,0CAA0G;AAuDnG,KAAK,UAAU,0BAA0B,CAC9C,QAAgB,EAChB,MAIE;IAEF,OAAO,IAAA,kBAAO,EACZ,kCAAkC,IAAA,0BAAe,8CAC/C,QAAQ,IACL,MAAM,CAAC,YAAY,GACnB,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,GACzC,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,EACxD,EAAE,CACL,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACd,MAAM,CAAC,OAAO,CACZ,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAgC,CAAY,CAAC;YAChF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAA+B,CAA2B,CAAC;YAC/F,CAAC;QACH,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AA0BY,QAAA,wBAAwB,GAAoD;IACvF,WAAW,EAAE,CAAC,IAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAY;IACxF,UAAU,EAAE,CAAC,IAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAA2B;CACrG,CAAC;AAEK,KAAK,UAAU,mBAAmB,CAAC,OAAe,EAAE,QAAgB;IACzE,MAAM,QAAQ,GAAG,yBAAyB,OAAO,qBAAqB,CAAC;IACvE,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,gCAAwB,EAAE,CAAC;IAMvD,OAAO,IAAA,kBAAO,EAAgD,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAC3F,CAAC"}
package/cjs/api/font.d.ts CHANGED
@@ -4,6 +4,9 @@ export type Font = {
4
4
  fontFamilyId: number;
5
5
  name: string;
6
6
  label: string;
7
+ weight: number;
8
+ style: string;
9
+ stretch: string;
7
10
  };
8
11
  export type ApiFont = {
9
12
  data: {
@@ -1 +1 @@
1
- {"version":3,"file":"font.d.ts","sourceRoot":"","sources":["../../src/api/font.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAA4B,MAAM,aAAa,CAAC;AAExI,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,cAAc,EAAE,MAAM,CAAC;QACvB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,aAAa,CAAC;CACnB,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEtE,KAAK,iBAAiB,GAAG;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAKhD,CAAC;AAEF,wBAAsB,QAAQ,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAWvF"}
1
+ {"version":3,"file":"font.d.ts","sourceRoot":"","sources":["../../src/api/font.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAA4B,MAAM,aAAa,CAAC;AAExI,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,cAAc,EAAE,MAAM,CAAC;QACvB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,aAAa,CAAC;CACnB,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEtE,KAAK,iBAAiB,GAAG;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAEhD,CAAC;AAEF,wBAAsB,QAAQ,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAWvF"}
package/cjs/api/font.js CHANGED
@@ -4,9 +4,6 @@ exports.fontRevivers = void 0;
4
4
  exports.getFonts = getFonts;
5
5
  const utils_js_1 = require("../utils.js");
6
6
  exports.fontRevivers = {
7
- style: undefined,
8
- stretch: undefined,
9
- weight: undefined,
10
7
  order: undefined,
11
8
  };
12
9
  async function getFonts(searchOptions) {
@@ -1 +1 @@
1
- {"version":3,"file":"font.js","sourceRoot":"","sources":["../../src/api/font.ts"],"names":[],"mappings":";;;AAqCA,4BAWC;AAhDD,0CAAwI;AA8B3H,QAAA,YAAY,GAA4B;IACnD,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE,SAAS;CACjB,CAAC;AAEK,KAAK,UAAU,QAAQ,CAAC,aAAgC;IAC7D,MAAM,QAAQ,GAAG,kBAAkB,CAAC;IACpC,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC,aAAa,CAAC,CAAC;IAE7C,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAMpC,OAAO,IAAA,kBAAO,EAAqB,IAAI,CAAC,CAAC;AAC3C,CAAC"}
1
+ {"version":3,"file":"font.js","sourceRoot":"","sources":["../../src/api/font.ts"],"names":[],"mappings":";;;AAqCA,4BAWC;AAhDD,0CAAwI;AAiC3H,QAAA,YAAY,GAA4B;IACnD,KAAK,EAAE,SAAS;CACjB,CAAC;AAEK,KAAK,UAAU,QAAQ,CAAC,aAAgC;IAC7D,MAAM,QAAQ,GAAG,kBAAkB,CAAC;IACpC,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC,aAAa,CAAC,CAAC;IAE7C,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAMpC,OAAO,IAAA,kBAAO,EAAqB,IAAI,CAAC,CAAC;AAC3C,CAAC"}
@@ -1,6 +1,7 @@
1
1
  import { type ApiOrganisationData, type Organisation } from './organisation.js';
2
2
  import { type ApiDimensionSetData, type DimensionSet } from './dimensionSet.js';
3
3
  import { type ApiMapstyleSetData, type MapstyleSet } from './mapstyleSet.js';
4
+ import { type ApiFontFamilyData, type FontFamily } from './fontFamily.js';
4
5
  import { type ApiDimensionData, type Dimension } from './dimension.js';
5
6
  import { type ApiFeatureData } from './feature.js';
6
7
  import { type ApiJobTypeData, type JobType } from './jobType.js';
@@ -10,6 +11,7 @@ import { type ApiSvgSetData, type SvgSet } from './svgSet.js';
10
11
  import { type ApiLayerData, type Layer } from './layer.js';
11
12
  import { type ApiColorData, type Color } from './color.js';
12
13
  import { type ApiUserData, type User } from './user.js';
14
+ import { type ApiFontData, type Font } from './font.js';
13
15
  import { type ApiCommonData, type ApiError, type ApiSuccess } from '../utils.js';
14
16
  export type CustomFeature = 'custom_dpi' | 'disable_company_maps' | 'eps_plus_log' | 'filename_is_job_title' | 'iframe_sandbox_attributes' | 'keep_layer_visibility' | 'no_copyright' | 'only_shared_company_maps' | 'pdf_output' | 'show_frelex_links' | 'svg_output' | 'svg-georef' | 'tiff_output' | 'video_export' | 'v5_video' | 'web_output' | 'web_download' | 'new_single_and_grouped_areas_menu' | 'export_templates' | 'export_video_tracking_data' | 'hosted_svg_output' | 'hosted_png_output' | 'hosted_jpg_output' | 'developer_menu';
15
17
  export interface Resources {
@@ -25,6 +27,8 @@ export interface Resources {
25
27
  messages: Message[];
26
28
  svgSets: SvgSet[];
27
29
  layers: Layer[];
30
+ fonts: Font[];
31
+ fontFamilies: FontFamily[];
28
32
  }
29
33
  type ApiResources = {
30
34
  data: {
@@ -44,6 +48,8 @@ type ApiResources = {
44
48
  job_types: ApiJobTypeData[];
45
49
  svg_sets: ApiSvgSetData[];
46
50
  layers: ApiLayerData[];
51
+ fonts: ApiFontData[];
52
+ font_families: ApiFontFamilyData[];
47
53
  } & ApiCommonData;
48
54
  } & Omit<ApiSuccess, 'data'> | ApiError;
49
55
  export type ApiResourcesData = Exclude<ApiResources, ApiError>['data'];
@@ -1 +1 @@
1
- {"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ exports.getIndustries = getIndustries;
7
7
  const organisation_js_1 = require("./organisation.js");
8
8
  const dimensionSet_js_1 = require("./dimensionSet.js");
9
9
  const mapstyleSet_js_1 = require("./mapstyleSet.js");
10
+ const fontFamily_js_1 = require("./fontFamily.js");
10
11
  const dimension_js_1 = require("./dimension.js");
11
12
  const feature_js_1 = require("./feature.js");
12
13
  const jobType_js_1 = require("./jobType.js");
@@ -16,9 +17,10 @@ const svgSet_js_1 = require("./svgSet.js");
16
17
  const layer_js_1 = require("./layer.js");
17
18
  const color_js_1 = require("./color.js");
18
19
  const user_js_1 = require("./user.js");
20
+ const font_js_1 = require("./font.js");
19
21
  const utils_js_1 = require("../utils.js");
20
22
  async function loadResources() {
21
- var _a, _b, _c, _d;
23
+ var _a, _b, _c, _d, _e, _f, _g, _h;
22
24
  const path = `/v1/users/${utils_js_1.myUser}/resources`;
23
25
  const raw = await (0, utils_js_1.request)(path);
24
26
  const { user, organisation, messages: { read, unread } } = raw;
@@ -43,6 +45,8 @@ async function loadResources() {
43
45
  messages: allMessages,
44
46
  layers: ((_b = (_a = raw.layers) === null || _a === void 0 ? void 0 : _a.map(utils_js_1.processData, (0, utils_js_1.getContext)(layer_js_1.layerRevivers))) !== null && _b !== void 0 ? _b : []),
45
47
  svgSets: ((_d = (_c = raw.svgSets) === null || _c === void 0 ? void 0 : _c.map(utils_js_1.processData, (0, utils_js_1.getContext)(svgSet_js_1.svgSetRevivers))) !== null && _d !== void 0 ? _d : []),
48
+ fonts: ((_f = (_e = raw.fonts) === null || _e === void 0 ? void 0 : _e.map(utils_js_1.processData, (0, utils_js_1.getContext)(font_js_1.fontRevivers))) !== null && _f !== void 0 ? _f : []),
49
+ fontFamilies: ((_h = (_g = raw.fontFamilies) === null || _g === void 0 ? void 0 : _g.map(utils_js_1.processData, (0, utils_js_1.getContext)(fontFamily_js_1.fontFamilyRevivers))) !== null && _h !== void 0 ? _h : []),
46
50
  };
47
51
  }
48
52
  async function getCountries() {
@@ -1 +1 @@
1
- {"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,6 @@
1
+ import { type ApiError, type ApiSuccess, Flatten, Revivers } from '../utils.js';
1
2
  import type { Polygon } from 'geojson';
3
+ import { RequireAtLeastOne } from 'type-fest';
2
4
  export type ApiSearchPoint = {
3
5
  lat: number;
4
6
  lng: number;
@@ -16,10 +18,10 @@ type SingleOrGroupedAreaBase = {
16
18
  svgPreview: string;
17
19
  boundingBox: Polygon;
18
20
  };
19
- export type GroupedArea = SingleOrGroupedAreaBase & {
21
+ type GroupedArea = SingleOrGroupedAreaBase & {
20
22
  isGroup: true;
21
23
  };
22
- export type SingleArea = SingleOrGroupedAreaBase & {
24
+ type SingleArea = SingleOrGroupedAreaBase & {
23
25
  isGroup: false;
24
26
  vectorSource: string;
25
27
  sourceLayer: string;
@@ -27,15 +29,33 @@ export type SingleArea = SingleOrGroupedAreaBase & {
27
29
  properties: Record<string, string>;
28
30
  };
29
31
  export type SingleOrGroupedArea = SingleArea | GroupedArea;
30
- export declare function searchSingleOrGroupedAreas(language: string, searchBounds?: ApiSearchBounds, query?: string, searchPoint?: ApiSearchPoint, mode?: 'polygon' | 'group' | 'both'): Promise<SingleOrGroupedArea[]>;
32
+ export declare function searchSingleOrGroupedAreas(language: string, search: RequireAtLeastOne<{
33
+ searchBounds: ApiSearchBounds;
34
+ query?: string;
35
+ searchPoint?: ApiSearchPoint;
36
+ }>): Promise<SingleOrGroupedArea[]>;
31
37
  export type GroupedAreaChild = {
32
38
  id: number;
33
39
  title: string;
34
40
  vectorSource: string;
35
41
  sourceLayer: string;
36
42
  featureId: number;
43
+ boundingBox: Polygon;
37
44
  properties: Record<string, string>;
38
45
  };
46
+ type ApiGroupedAreaChild = {
47
+ data: {
48
+ id: number;
49
+ title: string;
50
+ vector_source: string;
51
+ source_layer: string;
52
+ feature_id: number;
53
+ bounding_box: string;
54
+ properties: string;
55
+ };
56
+ } & Omit<ApiSuccess, 'data'> | ApiError;
57
+ export type ApiGroupedAreaChildData = Flatten<Exclude<ApiGroupedAreaChild, ApiError>['data']>;
58
+ export declare const groupedAreaChildRevivers: Revivers<ApiGroupedAreaChild, GroupedAreaChild>;
39
59
  export declare function groupedAreaChildren(groupId: number, language: string): Promise<GroupedAreaChild[]>;
40
60
  export {};
41
61
  //# sourceMappingURL=choropleth.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"choropleth.d.ts","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAmBF,KAAK,uBAAuB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAGF,MAAM,MAAM,WAAW,GAAG,uBAAuB,GAAG;IAClD,OAAO,EAAE,IAAI,CAAC;CACf,CAAC;AAGF,MAAM,MAAM,UAAU,GAAG,uBAAuB,GAAG;IACjD,OAAO,EAAE,KAAK,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,WAAW,CAAC;AAE3D,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,eAAe,EAC9B,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,cAAc,EAC5B,IAAI,GAAE,SAAS,GAAG,OAAO,GAAG,MAAe,GAC1C,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAwBhC;AAiBD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAYxG"}
1
+ {"version":3,"file":"choropleth.d.ts","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,OAAO,EAAE,QAAQ,EAA4B,MAAM,aAAa,CAAC;AAC1G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAmBF,KAAK,uBAAuB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,KAAK,WAAW,GAAG,uBAAuB,GAAG;IAC3C,OAAO,EAAE,IAAI,CAAC;CACf,CAAC;AAEF,KAAK,UAAU,GAAG,uBAAuB,GAAG;IAC1C,OAAO,EAAE,KAAK,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,WAAW,CAAC;AAE3D,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,CAAC;IACxB,YAAY,EAAE,eAAe,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,cAAc,CAAC;CAC9B,CAAC,GACD,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAoBhC;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE9F,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,mBAAmB,EAAE,gBAAgB,CAGpF,CAAC;AAEF,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAWxG"}
@@ -1,9 +1,6 @@
1
1
  import { getSearchParams, request } from '../utils.js';
2
- export async function searchSingleOrGroupedAreas(language, searchBounds, query, searchPoint, mode = 'both') {
3
- /**
4
- * TODO When SAGA search on click is implemented, remove mode and make searchBounds required
5
- */
6
- return request(`/v1/choropleth/polygons/search?${getSearchParams(Object.assign(Object.assign(Object.assign(Object.assign({ language }, searchBounds), (query && { query })), (searchPoint && { point: searchPoint })), { mode }))}`).then(result => {
2
+ export async function searchSingleOrGroupedAreas(language, search) {
3
+ return request(`/v1/choropleth/polygons/search?${getSearchParams(Object.assign(Object.assign(Object.assign({ language }, search.searchBounds), (search.query && { query: search.query })), (search.searchPoint && { point: search.searchPoint })))}`).then(result => {
7
4
  result.forEach(elem => {
8
5
  elem.boundingBox = JSON.parse(elem.boundingBox);
9
6
  if (!elem.isGroup) {
@@ -13,12 +10,15 @@ export async function searchSingleOrGroupedAreas(language, searchBounds, query,
13
10
  return result;
14
11
  });
15
12
  }
13
+ export const groupedAreaChildRevivers = {
14
+ boundingBox: (data) => JSON.parse(data.bounding_box),
15
+ properties: (data) => JSON.parse(data.properties),
16
+ };
16
17
  export async function groupedAreaChildren(groupId, language) {
17
- return request(`/v1/choropleth/groups/${groupId}/children-optimized?${getSearchParams({ language })}`).then(result => {
18
- result.forEach(elem => {
19
- elem.properties = JSON.parse(elem.properties);
20
- });
21
- return result;
22
- });
18
+ const pathname = `/v1/choropleth/groups/${groupId}/children-optimized`;
19
+ const query = getSearchParams({ language });
20
+ const path = `${pathname}?${query}`;
21
+ const options = { revivers: groupedAreaChildRevivers };
22
+ return request(path, null, null, options);
23
23
  }
24
24
  //# sourceMappingURL=choropleth.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,eAAe,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAwDvF,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,QAAgB,EAChB,YAA8B,EAC9B,KAAc,EACd,WAA4B,EAC5B,OAAqC,MAAM;IAE3C;;OAEG;IACH,OAAO,OAAO,CACZ,kCAAkC,eAAe,2DAC/C,QAAQ,IACL,YAAY,GACZ,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,CAAC,GACpB,CAAC,WAAW,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,KAC1C,IAAI,IACJ,EAAE,CACL,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACd,MAAM,CAAC,OAAO,CACZ,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAgC,CAAY,CAAC;YAChF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAA+B,CAA2B,CAAC;YAC/F,CAAC;QACH,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AA0BD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAe,EAAE,QAAgB;IACzE,OAAO,OAAO,CACZ,yBAAyB,OAAO,uBAAuB,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CACvF,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACd,MAAM,CAAC,OAAO,CACZ,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAA+B,CAA2B,CAAC;QAC/F,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqD,eAAe,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAuD1G,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,QAAgB,EAChB,MAIE;IAEF,OAAO,OAAO,CACZ,kCAAkC,eAAe,6CAC/C,QAAQ,IACL,MAAM,CAAC,YAAY,GACnB,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,GACzC,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,EACxD,EAAE,CACL,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACd,MAAM,CAAC,OAAO,CACZ,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAgC,CAAY,CAAC;YAChF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAA+B,CAA2B,CAAC;YAC/F,CAAC;QACH,CAAC,CACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AA0BD,MAAM,CAAC,MAAM,wBAAwB,GAAoD;IACvF,WAAW,EAAE,CAAC,IAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAY;IACxF,UAAU,EAAE,CAAC,IAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAA2B;CACrG,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAe,EAAE,QAAgB;IACzE,MAAM,QAAQ,GAAG,yBAAyB,OAAO,qBAAqB,CAAC;IACvE,MAAM,KAAK,GAAG,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,wBAAwB,EAAE,CAAC;IAMvD,OAAO,OAAO,CAAgD,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAC3F,CAAC"}
package/esm/api/font.d.ts CHANGED
@@ -4,6 +4,9 @@ export type Font = {
4
4
  fontFamilyId: number;
5
5
  name: string;
6
6
  label: string;
7
+ weight: number;
8
+ style: string;
9
+ stretch: string;
7
10
  };
8
11
  export type ApiFont = {
9
12
  data: {
@@ -1 +1 @@
1
- {"version":3,"file":"font.d.ts","sourceRoot":"","sources":["../../src/api/font.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAA4B,MAAM,aAAa,CAAC;AAExI,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,cAAc,EAAE,MAAM,CAAC;QACvB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,aAAa,CAAC;CACnB,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEtE,KAAK,iBAAiB,GAAG;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAKhD,CAAC;AAEF,wBAAsB,QAAQ,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAWvF"}
1
+ {"version":3,"file":"font.d.ts","sourceRoot":"","sources":["../../src/api/font.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAA4B,MAAM,aAAa,CAAC;AAExI,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,cAAc,EAAE,MAAM,CAAC;QACvB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,aAAa,CAAC;CACnB,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEtE,KAAK,iBAAiB,GAAG;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAEhD,CAAC;AAEF,wBAAsB,QAAQ,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAWvF"}
package/esm/api/font.js CHANGED
@@ -1,8 +1,5 @@
1
1
  import { getSearchParams, request } from '../utils.js';
2
2
  export const fontRevivers = {
3
- style: undefined,
4
- stretch: undefined,
5
- weight: undefined,
6
3
  order: undefined,
7
4
  };
8
5
  export async function getFonts(searchOptions) {
@@ -1 +1 @@
1
- {"version":3,"file":"font.js","sourceRoot":"","sources":["../../src/api/font.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmF,eAAe,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AA8BxI,MAAM,CAAC,MAAM,YAAY,GAA4B;IACnD,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE,SAAS;CACjB,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,aAAgC;IAC7D,MAAM,QAAQ,GAAG,kBAAkB,CAAC;IACpC,MAAM,KAAK,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;IAE7C,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAMpC,OAAO,OAAO,CAAqB,IAAI,CAAC,CAAC;AAC3C,CAAC"}
1
+ {"version":3,"file":"font.js","sourceRoot":"","sources":["../../src/api/font.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmF,eAAe,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAiCxI,MAAM,CAAC,MAAM,YAAY,GAA4B;IACnD,KAAK,EAAE,SAAS;CACjB,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,aAAgC;IAC7D,MAAM,QAAQ,GAAG,kBAAkB,CAAC;IACpC,MAAM,KAAK,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;IAE7C,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAMpC,OAAO,OAAO,CAAqB,IAAI,CAAC,CAAC;AAC3C,CAAC"}
@@ -1,6 +1,7 @@
1
1
  import { type ApiOrganisationData, type Organisation } from './organisation.js';
2
2
  import { type ApiDimensionSetData, type DimensionSet } from './dimensionSet.js';
3
3
  import { type ApiMapstyleSetData, type MapstyleSet } from './mapstyleSet.js';
4
+ import { type ApiFontFamilyData, type FontFamily } from './fontFamily.js';
4
5
  import { type ApiDimensionData, type Dimension } from './dimension.js';
5
6
  import { type ApiFeatureData } from './feature.js';
6
7
  import { type ApiJobTypeData, type JobType } from './jobType.js';
@@ -10,6 +11,7 @@ import { type ApiSvgSetData, type SvgSet } from './svgSet.js';
10
11
  import { type ApiLayerData, type Layer } from './layer.js';
11
12
  import { type ApiColorData, type Color } from './color.js';
12
13
  import { type ApiUserData, type User } from './user.js';
14
+ import { type ApiFontData, type Font } from './font.js';
13
15
  import { type ApiCommonData, type ApiError, type ApiSuccess } from '../utils.js';
14
16
  export type CustomFeature = 'custom_dpi' | 'disable_company_maps' | 'eps_plus_log' | 'filename_is_job_title' | 'iframe_sandbox_attributes' | 'keep_layer_visibility' | 'no_copyright' | 'only_shared_company_maps' | 'pdf_output' | 'show_frelex_links' | 'svg_output' | 'svg-georef' | 'tiff_output' | 'video_export' | 'v5_video' | 'web_output' | 'web_download' | 'new_single_and_grouped_areas_menu' | 'export_templates' | 'export_video_tracking_data' | 'hosted_svg_output' | 'hosted_png_output' | 'hosted_jpg_output' | 'developer_menu';
15
17
  export interface Resources {
@@ -25,6 +27,8 @@ export interface Resources {
25
27
  messages: Message[];
26
28
  svgSets: SvgSet[];
27
29
  layers: Layer[];
30
+ fonts: Font[];
31
+ fontFamilies: FontFamily[];
28
32
  }
29
33
  type ApiResources = {
30
34
  data: {
@@ -44,6 +48,8 @@ type ApiResources = {
44
48
  job_types: ApiJobTypeData[];
45
49
  svg_sets: ApiSvgSetData[];
46
50
  layers: ApiLayerData[];
51
+ fonts: ApiFontData[];
52
+ font_families: ApiFontFamilyData[];
47
53
  } & ApiCommonData;
48
54
  } & Omit<ApiSuccess, 'data'> | ApiError;
49
55
  export type ApiResourcesData = Exclude<ApiResources, ApiError>['data'];
@@ -1 +1 @@
1
- {"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import { organisationRevivers } from './organisation.js';
2
2
  import { dimensionSetRevivers } from './dimensionSet.js';
3
3
  import { mapstyleSetRevivers } from './mapstyleSet.js';
4
+ import { fontFamilyRevivers } from './fontFamily.js';
4
5
  import { dimensionRevivers } from './dimension.js';
5
6
  import { featureRevivers } from './feature.js';
6
7
  import { jobTypeRevivers } from './jobType.js';
@@ -10,9 +11,10 @@ import { svgSetRevivers } from './svgSet.js';
10
11
  import { layerRevivers } from './layer.js';
11
12
  import { colorRevivers } from './color.js';
12
13
  import { userRevivers } from './user.js';
14
+ import { fontRevivers } from './font.js';
13
15
  import { getContext, myUser, processData, request, } from '../utils.js';
14
16
  export async function loadResources() {
15
- var _a, _b, _c, _d;
17
+ var _a, _b, _c, _d, _e, _f, _g, _h;
16
18
  const path = `/v1/users/${myUser}/resources`;
17
19
  const raw = await request(path);
18
20
  const { user, organisation, messages: { read, unread } } = raw;
@@ -37,6 +39,8 @@ export async function loadResources() {
37
39
  messages: allMessages,
38
40
  layers: ((_b = (_a = raw.layers) === null || _a === void 0 ? void 0 : _a.map(processData, getContext(layerRevivers))) !== null && _b !== void 0 ? _b : []),
39
41
  svgSets: ((_d = (_c = raw.svgSets) === null || _c === void 0 ? void 0 : _c.map(processData, getContext(svgSetRevivers))) !== null && _d !== void 0 ? _d : []),
42
+ fonts: ((_f = (_e = raw.fonts) === null || _e === void 0 ? void 0 : _e.map(processData, getContext(fontRevivers))) !== null && _f !== void 0 ? _f : []),
43
+ fontFamilies: ((_h = (_g = raw.fontFamilies) === null || _g === void 0 ? void 0 : _g.map(processData, getContext(fontFamilyRevivers))) !== null && _h !== void 0 ? _h : []),
40
44
  };
41
45
  }
42
46
  export async function getCountries() {
@@ -1 +1 @@
1
- {"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mapcreator/api",
3
- "version": "0.0.0-saga.3",
3
+ "version": "0.0.0-saga.5",
4
4
  "description": "Mapcreator JavaScript API",
5
5
  "license": "BSD-3-Clause",
6
6
  "main": "./cjs/index.js",
@@ -1,5 +1,6 @@
1
- import { type ApiError, type ApiSuccess, getSearchParams, request } from '../utils.js';
1
+ import { type ApiError, type ApiSuccess, Flatten, Revivers, getSearchParams, request } from '../utils.js';
2
2
  import type { Polygon } from 'geojson';
3
+ import { RequireAtLeastOne } from 'type-fest';
3
4
 
4
5
  export type ApiSearchPoint = {
5
6
  lat: number;
@@ -13,10 +14,6 @@ export type ApiSearchBounds = {
13
14
  max_lng: number;
14
15
  };
15
16
 
16
- type ApiSingleOrGroupedAreaArray =
17
- | ({ data: ApiSingleOrGroupedArea[] } & Omit<ApiSuccess, 'data'>)
18
- | ApiError;
19
-
20
17
  type ApiSingleOrGroupedArea = {
21
18
  id: number;
22
19
  title: string;
@@ -30,6 +27,10 @@ type ApiSingleOrGroupedArea = {
30
27
  properties: Record<string, string> | null;
31
28
  };
32
29
 
30
+ type ApiSingleOrGroupedAreaArray = {
31
+ data: ApiSingleOrGroupedArea[];
32
+ } & Omit<ApiSuccess, 'data'> | ApiError;
33
+
33
34
  type SingleOrGroupedAreaBase = {
34
35
  id: number;
35
36
  title: string;
@@ -38,13 +39,11 @@ type SingleOrGroupedAreaBase = {
38
39
  boundingBox: Polygon;
39
40
  };
40
41
 
41
- // TODO don't export this once search on click is out
42
- export type GroupedArea = SingleOrGroupedAreaBase & {
42
+ type GroupedArea = SingleOrGroupedAreaBase & {
43
43
  isGroup: true;
44
44
  };
45
45
 
46
- // TODO don't export this once search on click is out
47
- export type SingleArea = SingleOrGroupedAreaBase & {
46
+ type SingleArea = SingleOrGroupedAreaBase & {
48
47
  isGroup: false;
49
48
  vectorSource: string;
50
49
  sourceLayer: string;
@@ -56,21 +55,18 @@ export type SingleOrGroupedArea = SingleArea | GroupedArea;
56
55
 
57
56
  export async function searchSingleOrGroupedAreas(
58
57
  language: string,
59
- searchBounds?: ApiSearchBounds,
60
- query?: string,
61
- searchPoint?: ApiSearchPoint,
62
- mode: 'polygon' | 'group' | 'both' = 'both',
58
+ search: RequireAtLeastOne<{
59
+ searchBounds: ApiSearchBounds;
60
+ query?: string;
61
+ searchPoint?: ApiSearchPoint;
62
+ }>,
63
63
  ): Promise<SingleOrGroupedArea[]> {
64
- /**
65
- * TODO When SAGA search on click is implemented, remove mode and make searchBounds required
66
- */
67
64
  return request<ApiSingleOrGroupedAreaArray, SingleOrGroupedArea>(
68
65
  `/v1/choropleth/polygons/search?${getSearchParams({
69
66
  language,
70
- ...searchBounds,
71
- ...(query && { query }),
72
- ...(searchPoint && { point: searchPoint }),
73
- mode,
67
+ ...search.searchBounds,
68
+ ...(search.query && { query: search.query }),
69
+ ...(search.searchPoint && { point: search.searchPoint }),
74
70
  })}`,
75
71
  ).then(result => {
76
72
  result.forEach(
@@ -86,40 +82,44 @@ export async function searchSingleOrGroupedAreas(
86
82
  });
87
83
  }
88
84
 
89
- type ApiGroupedAreaChildArray =
90
- | ({
91
- data: ApiGroupedAreaChild[];
92
- } & Omit<ApiSuccess, 'data'>)
93
- | ApiError;
94
-
95
- type ApiGroupedAreaChild = {
96
- id: number;
97
- title: string;
98
- vector_source: string;
99
- source_layer: string;
100
- feature_id: number;
101
- properties: Record<string, string>;
102
- };
103
-
104
85
  export type GroupedAreaChild = {
105
86
  id: number;
106
87
  title: string;
107
88
  vectorSource: string;
108
89
  sourceLayer: string;
109
90
  featureId: number;
91
+ boundingBox: Polygon;
110
92
  properties: Record<string, string>;
111
93
  };
112
94
 
95
+ type ApiGroupedAreaChild = {
96
+ data: {
97
+ id: number;
98
+ title: string;
99
+ vector_source: string;
100
+ source_layer: string;
101
+ feature_id: number;
102
+ bounding_box: string;
103
+ properties: string;
104
+ };
105
+ } & Omit<ApiSuccess, 'data'> | ApiError;
106
+
107
+ export type ApiGroupedAreaChildData = Flatten<Exclude<ApiGroupedAreaChild, ApiError>['data']>;
108
+
109
+ export const groupedAreaChildRevivers: Revivers<ApiGroupedAreaChild, GroupedAreaChild> = {
110
+ boundingBox: (data: ApiGroupedAreaChildData) => JSON.parse(data.bounding_box) as Polygon,
111
+ properties: (data: ApiGroupedAreaChildData) => JSON.parse(data.properties) as Record<string, string>,
112
+ };
113
+
113
114
  export async function groupedAreaChildren(groupId: number, language: string): Promise<GroupedAreaChild[]> {
114
- return request<ApiGroupedAreaChildArray, GroupedAreaChild>(
115
- `/v1/choropleth/groups/${groupId}/children-optimized?${getSearchParams({ language })}`,
116
- ).then(result => {
117
- result.forEach(
118
- elem => {
119
- elem.properties = JSON.parse(elem.properties as unknown as string) as Record<string, string>;
120
- }
121
- );
115
+ const pathname = `/v1/choropleth/groups/${groupId}/children-optimized`;
116
+ const query = getSearchParams({ language });
117
+ const path = `${pathname}?${query}`;
118
+ const options = { revivers: groupedAreaChildRevivers };
122
119
 
123
- return result;
124
- });
120
+ type ApiApiGroupedAreaChildArray = {
121
+ data: ApiGroupedAreaChildData[];
122
+ } & Omit<ApiSuccess, 'data'> | ApiError;
123
+
124
+ return request<ApiApiGroupedAreaChildArray, GroupedAreaChild>(path, null, null, options);
125
125
  }
package/src/api/font.ts CHANGED
@@ -5,6 +5,9 @@ export type Font = {
5
5
  fontFamilyId: number;
6
6
  name: string;
7
7
  label: string;
8
+ weight: number;
9
+ style: string;
10
+ stretch: string;
8
11
  };
9
12
 
10
13
  export type ApiFont = {
@@ -29,9 +32,6 @@ type FontSearchOptions = {
29
32
  };
30
33
 
31
34
  export const fontRevivers: Revivers<ApiFont, Font> = {
32
- style: undefined,
33
- stretch: undefined,
34
- weight: undefined,
35
35
  order: undefined,
36
36
  };
37
37
 
@@ -1,6 +1,7 @@
1
1
  import { type ApiOrganisationData, type Organisation, organisationRevivers } from './organisation.js';
2
2
  import { type ApiDimensionSetData, type DimensionSet, dimensionSetRevivers } from './dimensionSet.js';
3
3
  import { type ApiMapstyleSetData, type MapstyleSet, mapstyleSetRevivers } from './mapstyleSet.js';
4
+ import { type ApiFontFamilyData, type FontFamily, fontFamilyRevivers } from './fontFamily.js';
4
5
  import { type ApiDimensionData, type Dimension, dimensionRevivers } from './dimension.js';
5
6
  import { type ApiFeatureData, type Feature, featureRevivers } from './feature.js';
6
7
  import { type ApiJobTypeData, type JobType, jobTypeRevivers } from './jobType.js';
@@ -10,6 +11,7 @@ import { type ApiSvgSetData, type SvgSet, svgSetRevivers } from './svgSet.js';
10
11
  import { type ApiLayerData, type Layer, layerRevivers } from './layer.js';
11
12
  import { type ApiColorData, type Color, colorRevivers } from './color.js';
12
13
  import { type ApiUserData, type User, userRevivers } from './user.js';
14
+ import { type ApiFontData, type Font, fontRevivers } from './font.js';
13
15
  import type { CamelCasedProperties } from 'type-fest';
14
16
  import {
15
17
  type ApiCommon,
@@ -62,6 +64,8 @@ export interface Resources {
62
64
  messages: Message[];
63
65
  svgSets: SvgSet[];
64
66
  layers: Layer[];
67
+ fonts: Font[];
68
+ fontFamilies: FontFamily[];
65
69
  }
66
70
 
67
71
  type ApiResources = {
@@ -82,6 +86,8 @@ type ApiResources = {
82
86
  job_types: ApiJobTypeData[];
83
87
  svg_sets: ApiSvgSetData[];
84
88
  layers: ApiLayerData[];
89
+ fonts: ApiFontData[];
90
+ font_families: ApiFontFamilyData[];
85
91
  } & ApiCommonData;
86
92
  } & Omit<ApiSuccess, 'data'> | ApiError;
87
93
 
@@ -129,6 +135,8 @@ export async function loadResources(): Promise<Resources> {
129
135
  messages: allMessages,
130
136
  layers: (raw.layers?.map(processData, getContext(layerRevivers)) ?? []) as Layer[],
131
137
  svgSets: (raw.svgSets?.map(processData, getContext(svgSetRevivers)) ?? []) as SvgSet[],
138
+ fonts: (raw.fonts?.map(processData, getContext(fontRevivers)) ?? []) as Font[],
139
+ fontFamilies: (raw.fontFamilies?.map(processData, getContext(fontFamilyRevivers)) ?? []) as FontFamily[],
132
140
  };
133
141
  }
134
142