@mapcreator/api 5.0.0-alpha.72 → 5.0.0-alpha.74

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.
Files changed (10) hide show
  1. package/cjs/api/choropleth.d.ts +32 -196
  2. package/cjs/api/choropleth.d.ts.map +1 -1
  3. package/cjs/api/choropleth.js +21 -61
  4. package/cjs/api/choropleth.js.map +1 -1
  5. package/esm/api/choropleth.d.ts +32 -196
  6. package/esm/api/choropleth.d.ts.map +1 -1
  7. package/esm/api/choropleth.js +20 -57
  8. package/esm/api/choropleth.js.map +1 -1
  9. package/package.json +1 -1
  10. package/src/api/choropleth.ts +98 -330
package/cjs/api/choropleth.d.ts CHANGED
@@ -1,211 +1,47 @@
1
- import { type ApiCommonData, type ApiError, type ApiSuccess, type Flatten } from '../utils.js';
2
- import type { FeatureCollection, Polygon } from 'geojson';
3
- type FieldName = 'id' | 'name' | 'description' | 'previewJson' | 'previewPath';
4
- export type PartialVectorChoropleth = Pick<VectorChoropleth, FieldName>;
5
- export type VectorChoropleth = {
6
- id: number;
7
- name: string;
8
- description: string;
9
- previewPath: string | null;
10
- previewJson: FeatureCollection | null;
11
- vectorSetUrl: string;
12
- sourceLayerName: string;
13
- lngMin: number;
14
- lngMax: number;
15
- latMin: number;
16
- latMax: number;
17
- keys: string[];
18
- properties: Array<Record<string, unknown>>;
1
+ import type { RequireAtLeastOne } from 'type-fest';
2
+ import type { Polygon } from 'geojson';
3
+ export type ApiSearchPoint = {
4
+ lat: number;
5
+ lng: number;
19
6
  };
20
- export type ApiVectorChoropleth = {
21
- data: {
22
- id: number;
23
- name: string;
24
- description: string;
25
- preview_path: string | null;
26
- preview_json: FeatureCollection | null;
27
- vector_set_url: string;
28
- source_layer_name: string;
29
- lng_min: number;
30
- lng_max: number;
31
- lat_min: number;
32
- lat_max: number;
33
- keys: string[];
34
- properties: Array<Record<string, unknown>>;
35
- } & ApiCommonData;
36
- } & Omit<ApiSuccess, 'data'> | ApiError;
37
- export type ApiVectorChoroplethData = Flatten<Exclude<ApiVectorChoropleth, ApiError>['data']>;
38
- export declare function listVectorChoropleths(name: string): Promise<PartialVectorChoropleth[]>;
39
- export declare function getVectorChoropleth(choroplethId: number): Promise<VectorChoropleth>;
40
- export type SearchBounds = {
7
+ export type ApiSearchBounds = {
41
8
  min_lat: number;
42
9
  min_lng: number;
43
10
  max_lat: number;
44
11
  max_lng: number;
45
12
  };
46
- export type PolygonChoropleth = {
47
- sml: string;
13
+ type SingleOrGroupedAreaBase = {
48
14
  id: number;
15
+ title: string;
16
+ subtitle: string;
17
+ svgPreview: string;
18
+ boundingBox: Polygon;
19
+ };
20
+ export type GroupedArea = SingleOrGroupedAreaBase & {
21
+ isGroup: true;
22
+ };
23
+ export type SingleArea = SingleOrGroupedAreaBase & {
24
+ isGroup: false;
49
25
  vectorSource: string;
50
26
  sourceLayer: string;
51
27
  featureId: number;
52
- svgPreview: string;
53
- previewPath: string;
54
- allowSingle: boolean;
55
- properties: Record<string, unknown>;
56
- boundingBox: Polygon;
57
- restrictedOwnership: number[] | null;
58
- linkId: number | null;
59
- cloning: boolean;
60
- nativeTranslation: {
61
- polygonId: number;
62
- name: string;
63
- };
64
- englishTranslation?: {
65
- polygonId: number;
66
- name: string;
67
- };
68
- translations?: Array<{
69
- polygonId: number;
70
- language: string;
71
- name: string;
72
- }>;
73
- parentGroups: GroupChoropleth[];
28
+ properties: Record<string, string>;
74
29
  };
75
- export type ApiPolygonChoropleth = {
76
- data: {
77
- sml: string;
78
- id: number;
79
- vector_source: string;
80
- source_layer: string;
81
- feature_id: number;
82
- svg_preview: string;
83
- preview_path: string;
84
- allow_single: boolean;
85
- properties: Record<string, unknown>;
86
- bounding_box: Polygon;
87
- restricted_ownership: number[] | null;
88
- link_id: number | null;
89
- cloning: boolean;
90
- native_translation: {
91
- polygon_id: number;
92
- name: string;
93
- };
94
- english_translation?: {
95
- polygon_id: number;
96
- name: string;
97
- };
98
- translations?: Array<{
99
- polygon_id: number;
100
- language: string;
101
- name: string;
102
- }>;
103
- parent_groups: ApiGroupChoroplethData[];
104
- } & ApiCommonData;
105
- } & Omit<ApiSuccess, 'data'> | ApiError;
106
- export type ApiPolygonChoroplethData = Flatten<Exclude<ApiPolygonChoropleth, ApiError>['data']>;
107
- export declare function listPolygonChoropleths(name: string, languages: string[], searchBounds?: SearchBounds, withParentGroups?: boolean): Promise<PolygonChoropleth[]>;
108
- export type GroupChoropleth = {
30
+ export type SingleOrGroupedArea = SingleArea | GroupedArea;
31
+ export declare function searchSingleOrGroupedAreas(language: string, search: RequireAtLeastOne<{
32
+ searchBounds?: ApiSearchBounds;
33
+ query?: string;
34
+ searchPoint?: ApiSearchPoint;
35
+ }>, mode?: 'polygon' | 'group' | 'both'): Promise<SingleOrGroupedArea[]>;
36
+ export type GroupedAreaChild = {
109
37
  id: number;
110
- polygonId: number;
111
- relationId: number;
112
- childrenCount: number;
113
- sml?: string;
114
- svgPreview: string;
115
- previewPath: string;
116
- uniqueProperties: string[];
117
- boundingBox: Polygon;
118
- partialProperties: string[];
119
- restrictedOwnership: number[] | null;
120
- linkId: number | null;
121
- cloning: boolean;
122
- laravelThroughKey?: number;
123
- nativeParentTranslation: {
124
- polygonId: number;
125
- name: string;
126
- laravelThroughKey: number;
127
- };
128
- nativeRelationTranslation: {
129
- relationId: number;
130
- name: string;
131
- laravelThroughKey: number;
132
- };
133
- englishParentTranslation?: {
134
- polygonId: number;
135
- name: string;
136
- laravelThroughKey: number;
137
- };
138
- englishRelationTranslation?: {
139
- relationId: number;
140
- name: string;
141
- laravelThroughKey: number;
142
- };
143
- parentTranslations?: Array<{
144
- polygonId: number;
145
- name: string;
146
- language: string;
147
- laravelThroughKey: number;
148
- }>;
149
- relationTranslations?: Array<{
150
- relationId: number;
151
- name: string;
152
- language: string;
153
- laravelThroughKey: number;
154
- }>;
38
+ title: string;
39
+ vectorSource: string;
40
+ sourceLayer: string;
41
+ featureId: number;
42
+ properties: Record<string, string>;
155
43
  };
156
- export type ApiGroupChoropleth = {
157
- data: {
158
- id: number;
159
- polygon_id: number;
160
- relation_id: number;
161
- children_count: number;
162
- sml?: number;
163
- svg_preview: string;
164
- preview_path: string;
165
- unique_properties: string[];
166
- bounding_box: Polygon;
167
- partial_properties: string[];
168
- restricted_ownership: number[] | null;
169
- link_id: number | null;
170
- cloning: boolean;
171
- laravel_through_key?: number;
172
- native_parent_translation: {
173
- polygon_id: number;
174
- name: string;
175
- laravel_through_key: number;
176
- };
177
- native_relation_translation: {
178
- relation_id: number;
179
- name: string;
180
- laravel_through_key: number;
181
- };
182
- english_parent_translation?: {
183
- polygon_id: number;
184
- name: string;
185
- laravel_through_key: number;
186
- };
187
- english_relation_translation?: {
188
- relation_id: number;
189
- name: string;
190
- laravel_through_key: number;
191
- };
192
- parent_translations?: Array<{
193
- polygon_id: number;
194
- name: string;
195
- language: string;
196
- laravel_through_key: number;
197
- }>;
198
- relation_translations?: Array<{
199
- relation_id: number;
200
- name: string;
201
- language: string;
202
- laravel_through_key: number;
203
- }>;
204
- } & ApiCommonData;
205
- } & Omit<ApiSuccess, 'data'> | ApiError;
206
- export type ApiGroupChoroplethData = Flatten<Exclude<ApiGroupChoropleth, ApiError>['data']>;
207
- export declare function listGroupChoropleths(name: string, languages: string[], searchBounds?: SearchBounds): Promise<GroupChoropleth[]>;
208
- export declare function listChildrenGroupChoropleths(groupId: number, languages: string[]): Promise<PolygonChoropleth[]>;
44
+ export declare function groupedAreaChildren(groupId: number, language: string): Promise<GroupedAreaChild[]>;
209
45
  export type MatchedGroup = {
210
46
  id: number;
211
47
  sml: number;
@@ -222,7 +58,7 @@ export type ApiMatchedGroup = {
222
58
  property: string;
223
59
  name: string;
224
60
  };
225
- export declare function getGroupsByDataSample(sample: Record<string, string[]>, language: string): Promise<MatchedGroup[]>;
61
+ export declare function getGroupsByDataSample(sample: Array<Record<string, string[]>>, language: string): Promise<MatchedGroup[]>;
226
62
  export type BoundPolygon = {
227
63
  index: number;
228
64
  id: number;
package/cjs/api/choropleth.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"choropleth.d.ts","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"choropleth.d.ts","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"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"}
package/cjs/api/choropleth.js CHANGED
@@ -1,71 +1,31 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.listVectorChoropleths = listVectorChoropleths;
4
- exports.getVectorChoropleth = getVectorChoropleth;
5
- exports.listPolygonChoropleths = listPolygonChoropleths;
6
- exports.listGroupChoropleths = listGroupChoropleths;
7
- exports.listChildrenGroupChoropleths = listChildrenGroupChoropleths;
3
+ exports.searchSingleOrGroupedAreas = searchSingleOrGroupedAreas;
4
+ exports.groupedAreaChildren = groupedAreaChildren;
8
5
  exports.getGroupsByDataSample = getGroupsByDataSample;
9
6
  exports.getBoundPolygons = getBoundPolygons;
10
7
  const utils_js_1 = require("../utils.js");
11
- const processGroupData = (group) => (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, group), group.nativeParentTranslation && { nativeParentTranslation: (0, utils_js_1.toAppType)(group.nativeParentTranslation) }), group.nativeRelationTranslation && { nativeRelationTranslation: (0, utils_js_1.toAppType)(group.nativeRelationTranslation) }), group.englishParentTranslation && { englishParentTranslation: (0, utils_js_1.toAppType)(group.englishParentTranslation) }), group.englishRelationTranslation && { englishRelationTranslation: (0, utils_js_1.toAppType)(group.englishRelationTranslation) }), group.parentTranslations && { parentTranslations: (0, utils_js_1.ensureArray)(group.parentTranslations).map(utils_js_1.toAppType) }), group.relationTranslations && { relationTranslations: (0, utils_js_1.ensureArray)(group.relationTranslations).map(utils_js_1.toAppType) }));
12
- const processPolygonData = (polygon) => (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, polygon), polygon.parentGroups && { parentGroups: (0, utils_js_1.ensureArray)(polygon.parentGroups).map(utils_js_1.toAppType).map(processGroupData) }), polygon.nativeTranslation && { nativeTranslation: (0, utils_js_1.toAppType)(polygon.nativeTranslation) }), polygon.englishTranslation && { englishTranslation: (0, utils_js_1.toAppType)(polygon.englishTranslation) }), polygon.translations && { translations: (0, utils_js_1.ensureArray)(polygon.translations).map(utils_js_1.toAppType) }));
13
- async function listVectorChoropleths(name) {
14
- const pathname = `/v1/choropleths/vector`;
15
- const query = (0, utils_js_1.getSearchParams)({ search: { name } });
16
- const path = `${pathname}?${query}`;
17
- // Only request first 50 results
18
- const headers = Object.assign({}, utils_js_1.defaultListHeader);
19
- const options = { withMeta: true };
20
- return (0, utils_js_1.request)(path, null, headers, options)
21
- .catch((error) => {
22
- if (error instanceof utils_js_1.APIMeta) {
23
- return error.data;
24
- }
25
- throw error;
8
+ async function searchSingleOrGroupedAreas(language, search, mode = 'both') {
9
+ /**
10
+ * TODO When SAGA search on click is implemented, remove mode and make searchBounds required
11
+ */
12
+ return (0, utils_js_1.request)(`/v1/choropleth/polygons/search?${(0, utils_js_1.getSearchParams)(Object.assign(Object.assign(Object.assign(Object.assign({ language }, search.searchBounds), (search.query && { query: search.query })), (search.searchPoint && { point: search.searchPoint })), { mode }))}`).then(result => {
13
+ result.forEach(elem => {
14
+ elem.boundingBox = JSON.parse(elem.boundingBox);
15
+ if (!elem.isGroup) {
16
+ elem.properties = JSON.parse(elem.properties);
17
+ }
18
+ });
19
+ return result;
26
20
  });
27
21
  }
28
- async function getVectorChoropleth(choroplethId) {
29
- const path = `/v1/choropleths/vector/${choroplethId}`;
30
- return (0, utils_js_1.request)(path);
31
- }
32
- async function listPolygonChoropleths(name, languages, searchBounds, withParentGroups = false) {
33
- const pathname = `/v1/choropleth/polygons`;
34
- const query = (0, utils_js_1.getSearchParams)(Object.assign({ search: { name, allow_single: true }, with_parent_groups: withParentGroups, languages }, searchBounds));
35
- const path = `${pathname}?${query}`;
36
- // Only request first 50 results
37
- const headers = Object.assign({}, utils_js_1.defaultListHeader);
38
- const options = { withMeta: true };
39
- return (0, utils_js_1.request)(path, null, headers, options)
40
- .catch((error) => {
41
- if (error instanceof utils_js_1.APIMeta) {
42
- return error.data;
43
- }
44
- throw error;
45
- })
46
- .then(result => result.map(processPolygonData));
47
- }
48
- async function listGroupChoropleths(name, languages, searchBounds) {
49
- const pathname = `/v1/choropleth/groups`;
50
- const query = (0, utils_js_1.getSearchParams)(Object.assign({ search: { name }, languages }, searchBounds));
51
- const path = `${pathname}?${query}`;
52
- // Only request first 50 results
53
- const headers = Object.assign({}, utils_js_1.defaultListHeader);
54
- const options = { withMeta: true };
55
- return (0, utils_js_1.request)(path, null, headers, options)
56
- .catch((error) => {
57
- if (error instanceof utils_js_1.APIMeta) {
58
- return error.data;
59
- }
60
- throw error;
61
- })
62
- .then(result => result.map(processGroupData));
63
- }
64
- async function listChildrenGroupChoropleths(groupId, languages) {
65
- const pathname = `/v1/choropleth/groups/${groupId}/children`;
66
- const query = (0, utils_js_1.getSearchParams)({ languages });
67
- const path = `${pathname}?${query}`;
68
- return (0, utils_js_1.request)(path).then(polygons => polygons.map(processPolygonData));
22
+ async function groupedAreaChildren(groupId, language) {
23
+ return (0, utils_js_1.request)(`/v1/choropleth/groups/${groupId}/children-optimized?${(0, utils_js_1.getSearchParams)({ language })}`).then(result => {
24
+ result.forEach(elem => {
25
+ elem.properties = JSON.parse(elem.properties);
26
+ });
27
+ return result;
28
+ });
69
29
  }
70
30
  async function getGroupsByDataSample(sample, language) {
71
31
  const path = `/v1/choropleth/groups/sample`;
package/cjs/api/choropleth.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":";;AA0DA,gEAgCC;AAwBD,kDAYC;AAoBD,sDAWC;AAkBD,4CAcC;AA7LD,0CAAuF;AA0DhF,KAAK,UAAU,0BAA0B,CAC9C,QAAgB,EAChB,MAIE,EACF,OAAqC,MAAM;IAE3C;;OAEG;IACH,OAAO,IAAA,kBAAO,EACZ,kCAAkC,IAAA,0BAAe,4DAC/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,KACxD,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;AAwBM,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;AAoBM,KAAK,UAAU,qBAAqB,CACzC,MAAuC,EACvC,QAAgB;IAEhB,MAAM,IAAI,GAAG,8BAA8B,CAAC;IAM5C,OAAO,IAAA,kBAAO,EAAqC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;AACjF,CAAC;AAkBM,KAAK,UAAU,gBAAgB,CACpC,OAAe,EACf,QAAgB,EAChB,IAAc,EACd,QAAgB;IAEhB,MAAM,IAAI,GAAG,4BAA4B,CAAC;IAC1C,MAAM,QAAQ,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAMjE,OAAO,IAAA,kBAAO,EAAqC,IAAI,EAAE,QAAQ,CAAC,CAAC;AACrE,CAAC"}
package/esm/api/choropleth.d.ts CHANGED
@@ -1,211 +1,47 @@
1
- import { type ApiCommonData, type ApiError, type ApiSuccess, type Flatten } from '../utils.js';
2
- import type { FeatureCollection, Polygon } from 'geojson';
3
- type FieldName = 'id' | 'name' | 'description' | 'previewJson' | 'previewPath';
4
- export type PartialVectorChoropleth = Pick<VectorChoropleth, FieldName>;
5
- export type VectorChoropleth = {
6
- id: number;
7
- name: string;
8
- description: string;
9
- previewPath: string | null;
10
- previewJson: FeatureCollection | null;
11
- vectorSetUrl: string;
12
- sourceLayerName: string;
13
- lngMin: number;
14
- lngMax: number;
15
- latMin: number;
16
- latMax: number;
17
- keys: string[];
18
- properties: Array<Record<string, unknown>>;
1
+ import type { RequireAtLeastOne } from 'type-fest';
2
+ import type { Polygon } from 'geojson';
3
+ export type ApiSearchPoint = {
4
+ lat: number;
5
+ lng: number;
19
6
  };
20
- export type ApiVectorChoropleth = {
21
- data: {
22
- id: number;
23
- name: string;
24
- description: string;
25
- preview_path: string | null;
26
- preview_json: FeatureCollection | null;
27
- vector_set_url: string;
28
- source_layer_name: string;
29
- lng_min: number;
30
- lng_max: number;
31
- lat_min: number;
32
- lat_max: number;
33
- keys: string[];
34
- properties: Array<Record<string, unknown>>;
35
- } & ApiCommonData;
36
- } & Omit<ApiSuccess, 'data'> | ApiError;
37
- export type ApiVectorChoroplethData = Flatten<Exclude<ApiVectorChoropleth, ApiError>['data']>;
38
- export declare function listVectorChoropleths(name: string): Promise<PartialVectorChoropleth[]>;
39
- export declare function getVectorChoropleth(choroplethId: number): Promise<VectorChoropleth>;
40
- export type SearchBounds = {
7
+ export type ApiSearchBounds = {
41
8
  min_lat: number;
42
9
  min_lng: number;
43
10
  max_lat: number;
44
11
  max_lng: number;
45
12
  };
46
- export type PolygonChoropleth = {
47
- sml: string;
13
+ type SingleOrGroupedAreaBase = {
48
14
  id: number;
15
+ title: string;
16
+ subtitle: string;
17
+ svgPreview: string;
18
+ boundingBox: Polygon;
19
+ };
20
+ export type GroupedArea = SingleOrGroupedAreaBase & {
21
+ isGroup: true;
22
+ };
23
+ export type SingleArea = SingleOrGroupedAreaBase & {
24
+ isGroup: false;
49
25
  vectorSource: string;
50
26
  sourceLayer: string;
51
27
  featureId: number;
52
- svgPreview: string;
53
- previewPath: string;
54
- allowSingle: boolean;
55
- properties: Record<string, unknown>;
56
- boundingBox: Polygon;
57
- restrictedOwnership: number[] | null;
58
- linkId: number | null;
59
- cloning: boolean;
60
- nativeTranslation: {
61
- polygonId: number;
62
- name: string;
63
- };
64
- englishTranslation?: {
65
- polygonId: number;
66
- name: string;
67
- };
68
- translations?: Array<{
69
- polygonId: number;
70
- language: string;
71
- name: string;
72
- }>;
73
- parentGroups: GroupChoropleth[];
28
+ properties: Record<string, string>;
74
29
  };
75
- export type ApiPolygonChoropleth = {
76
- data: {
77
- sml: string;
78
- id: number;
79
- vector_source: string;
80
- source_layer: string;
81
- feature_id: number;
82
- svg_preview: string;
83
- preview_path: string;
84
- allow_single: boolean;
85
- properties: Record<string, unknown>;
86
- bounding_box: Polygon;
87
- restricted_ownership: number[] | null;
88
- link_id: number | null;
89
- cloning: boolean;
90
- native_translation: {
91
- polygon_id: number;
92
- name: string;
93
- };
94
- english_translation?: {
95
- polygon_id: number;
96
- name: string;
97
- };
98
- translations?: Array<{
99
- polygon_id: number;
100
- language: string;
101
- name: string;
102
- }>;
103
- parent_groups: ApiGroupChoroplethData[];
104
- } & ApiCommonData;
105
- } & Omit<ApiSuccess, 'data'> | ApiError;
106
- export type ApiPolygonChoroplethData = Flatten<Exclude<ApiPolygonChoropleth, ApiError>['data']>;
107
- export declare function listPolygonChoropleths(name: string, languages: string[], searchBounds?: SearchBounds, withParentGroups?: boolean): Promise<PolygonChoropleth[]>;
108
- export type GroupChoropleth = {
30
+ export type SingleOrGroupedArea = SingleArea | GroupedArea;
31
+ export declare function searchSingleOrGroupedAreas(language: string, search: RequireAtLeastOne<{
32
+ searchBounds?: ApiSearchBounds;
33
+ query?: string;
34
+ searchPoint?: ApiSearchPoint;
35
+ }>, mode?: 'polygon' | 'group' | 'both'): Promise<SingleOrGroupedArea[]>;
36
+ export type GroupedAreaChild = {
109
37
  id: number;
110
- polygonId: number;
111
- relationId: number;
112
- childrenCount: number;
113
- sml?: string;
114
- svgPreview: string;
115
- previewPath: string;
116
- uniqueProperties: string[];
117
- boundingBox: Polygon;
118
- partialProperties: string[];
119
- restrictedOwnership: number[] | null;
120
- linkId: number | null;
121
- cloning: boolean;
122
- laravelThroughKey?: number;
123
- nativeParentTranslation: {
124
- polygonId: number;
125
- name: string;
126
- laravelThroughKey: number;
127
- };
128
- nativeRelationTranslation: {
129
- relationId: number;
130
- name: string;
131
- laravelThroughKey: number;
132
- };
133
- englishParentTranslation?: {
134
- polygonId: number;
135
- name: string;
136
- laravelThroughKey: number;
137
- };
138
- englishRelationTranslation?: {
139
- relationId: number;
140
- name: string;
141
- laravelThroughKey: number;
142
- };
143
- parentTranslations?: Array<{
144
- polygonId: number;
145
- name: string;
146
- language: string;
147
- laravelThroughKey: number;
148
- }>;
149
- relationTranslations?: Array<{
150
- relationId: number;
151
- name: string;
152
- language: string;
153
- laravelThroughKey: number;
154
- }>;
38
+ title: string;
39
+ vectorSource: string;
40
+ sourceLayer: string;
41
+ featureId: number;
42
+ properties: Record<string, string>;
155
43
  };
156
- export type ApiGroupChoropleth = {
157
- data: {
158
- id: number;
159
- polygon_id: number;
160
- relation_id: number;
161
- children_count: number;
162
- sml?: number;
163
- svg_preview: string;
164
- preview_path: string;
165
- unique_properties: string[];
166
- bounding_box: Polygon;
167
- partial_properties: string[];
168
- restricted_ownership: number[] | null;
169
- link_id: number | null;
170
- cloning: boolean;
171
- laravel_through_key?: number;
172
- native_parent_translation: {
173
- polygon_id: number;
174
- name: string;
175
- laravel_through_key: number;
176
- };
177
- native_relation_translation: {
178
- relation_id: number;
179
- name: string;
180
- laravel_through_key: number;
181
- };
182
- english_parent_translation?: {
183
- polygon_id: number;
184
- name: string;
185
- laravel_through_key: number;
186
- };
187
- english_relation_translation?: {
188
- relation_id: number;
189
- name: string;
190
- laravel_through_key: number;
191
- };
192
- parent_translations?: Array<{
193
- polygon_id: number;
194
- name: string;
195
- language: string;
196
- laravel_through_key: number;
197
- }>;
198
- relation_translations?: Array<{
199
- relation_id: number;
200
- name: string;
201
- language: string;
202
- laravel_through_key: number;
203
- }>;
204
- } & ApiCommonData;
205
- } & Omit<ApiSuccess, 'data'> | ApiError;
206
- export type ApiGroupChoroplethData = Flatten<Exclude<ApiGroupChoropleth, ApiError>['data']>;
207
- export declare function listGroupChoropleths(name: string, languages: string[], searchBounds?: SearchBounds): Promise<GroupChoropleth[]>;
208
- export declare function listChildrenGroupChoropleths(groupId: number, languages: string[]): Promise<PolygonChoropleth[]>;
44
+ export declare function groupedAreaChildren(groupId: number, language: string): Promise<GroupedAreaChild[]>;
209
45
  export type MatchedGroup = {
210
46
  id: number;
211
47
  sml: number;
@@ -222,7 +58,7 @@ export type ApiMatchedGroup = {
222
58
  property: string;
223
59
  name: string;
224
60
  };
225
- export declare function getGroupsByDataSample(sample: Record<string, string[]>, language: string): Promise<MatchedGroup[]>;
61
+ export declare function getGroupsByDataSample(sample: Array<Record<string, string[]>>, language: string): Promise<MatchedGroup[]>;
226
62
  export type BoundPolygon = {
227
63
  index: number;
228
64
  id: number;
package/esm/api/choropleth.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"choropleth.d.ts","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"choropleth.d.ts","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"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"}
package/esm/api/choropleth.js CHANGED
@@ -1,62 +1,25 @@
1
- import { APIMeta, defaultListHeader, ensureArray, getSearchParams, request, toAppType, } from '../utils.js';
2
- const processGroupData = (group) => (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, group), group.nativeParentTranslation && { nativeParentTranslation: toAppType(group.nativeParentTranslation) }), group.nativeRelationTranslation && { nativeRelationTranslation: toAppType(group.nativeRelationTranslation) }), group.englishParentTranslation && { englishParentTranslation: toAppType(group.englishParentTranslation) }), group.englishRelationTranslation && { englishRelationTranslation: toAppType(group.englishRelationTranslation) }), group.parentTranslations && { parentTranslations: ensureArray(group.parentTranslations).map(toAppType) }), group.relationTranslations && { relationTranslations: ensureArray(group.relationTranslations).map(toAppType) }));
3
- const processPolygonData = (polygon) => (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, polygon), polygon.parentGroups && { parentGroups: ensureArray(polygon.parentGroups).map(toAppType).map(processGroupData) }), polygon.nativeTranslation && { nativeTranslation: toAppType(polygon.nativeTranslation) }), polygon.englishTranslation && { englishTranslation: toAppType(polygon.englishTranslation) }), polygon.translations && { translations: ensureArray(polygon.translations).map(toAppType) }));
4
- export async function listVectorChoropleths(name) {
5
- const pathname = `/v1/choropleths/vector`;
6
- const query = getSearchParams({ search: { name } });
7
- const path = `${pathname}?${query}`;
8
- // Only request first 50 results
9
- const headers = Object.assign({}, defaultListHeader);
10
- const options = { withMeta: true };
11
- return request(path, null, headers, options)
12
- .catch((error) => {
13
- if (error instanceof APIMeta) {
14
- return error.data;
15
- }
16
- throw error;
1
+ import { getSearchParams, request } from '../utils.js';
2
+ export async function searchSingleOrGroupedAreas(language, search, 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 }, search.searchBounds), (search.query && { query: search.query })), (search.searchPoint && { point: search.searchPoint })), { mode }))}`).then(result => {
7
+ result.forEach(elem => {
8
+ elem.boundingBox = JSON.parse(elem.boundingBox);
9
+ if (!elem.isGroup) {
10
+ elem.properties = JSON.parse(elem.properties);
11
+ }
12
+ });
13
+ return result;
17
14
  });
18
15
  }
19
- export async function getVectorChoropleth(choroplethId) {
20
- const path = `/v1/choropleths/vector/${choroplethId}`;
21
- return request(path);
22
- }
23
- export async function listPolygonChoropleths(name, languages, searchBounds, withParentGroups = false) {
24
- const pathname = `/v1/choropleth/polygons`;
25
- const query = getSearchParams(Object.assign({ search: { name, allow_single: true }, with_parent_groups: withParentGroups, languages }, searchBounds));
26
- const path = `${pathname}?${query}`;
27
- // Only request first 50 results
28
- const headers = Object.assign({}, defaultListHeader);
29
- const options = { withMeta: true };
30
- return request(path, null, headers, options)
31
- .catch((error) => {
32
- if (error instanceof APIMeta) {
33
- return error.data;
34
- }
35
- throw error;
36
- })
37
- .then(result => result.map(processPolygonData));
38
- }
39
- export async function listGroupChoropleths(name, languages, searchBounds) {
40
- const pathname = `/v1/choropleth/groups`;
41
- const query = getSearchParams(Object.assign({ search: { name }, languages }, searchBounds));
42
- const path = `${pathname}?${query}`;
43
- // Only request first 50 results
44
- const headers = Object.assign({}, defaultListHeader);
45
- const options = { withMeta: true };
46
- return request(path, null, headers, options)
47
- .catch((error) => {
48
- if (error instanceof APIMeta) {
49
- return error.data;
50
- }
51
- throw error;
52
- })
53
- .then(result => result.map(processGroupData));
54
- }
55
- export async function listChildrenGroupChoropleths(groupId, languages) {
56
- const pathname = `/v1/choropleth/groups/${groupId}/children`;
57
- const query = getSearchParams({ languages });
58
- const path = `${pathname}?${query}`;
59
- return request(path).then(polygons => polygons.map(processPolygonData));
16
+ 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
+ });
60
23
  }
61
24
  export async function getGroupsByDataSample(sample, language) {
62
25
  const path = `/v1/choropleth/groups/sample`;
package/esm/api/choropleth.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,eAAe,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AA0DvF,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,QAAgB,EAChB,MAIE,EACF,OAAqC,MAAM;IAE3C;;OAEG;IACH,OAAO,OAAO,CACZ,kCAAkC,eAAe,2DAC/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,KACxD,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;AAwBD,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;AAoBD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,MAAuC,EACvC,QAAgB;IAEhB,MAAM,IAAI,GAAG,8BAA8B,CAAC;IAM5C,OAAO,OAAO,CAAqC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;AACjF,CAAC;AAkBD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAe,EACf,QAAgB,EAChB,IAAc,EACd,QAAgB;IAEhB,MAAM,IAAI,GAAG,4BAA4B,CAAC;IAC1C,MAAM,QAAQ,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAMjE,OAAO,OAAO,CAAqC,IAAI,EAAE,QAAQ,CAAC,CAAC;AACrE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mapcreator/api",
3
- "version": "5.0.0-alpha.72",
3
+ "version": "5.0.0-alpha.74",
4
4
  "description": "Mapcreator JavaScript API",
5
5
  "license": "BSD-3-Clause",
6
6
  "main": "./cjs/index.js",
package/src/api/choropleth.ts CHANGED
@@ -1,361 +1,129 @@
1
- import {
2
- APIMeta,
3
- type ApiCommonData,
4
- type ApiError,
5
- type ApiSuccess,
6
- type Flatten,
7
- defaultListHeader,
8
- ensureArray,
9
- getSearchParams,
10
- request,
11
- toAppType,
12
- } from '../utils.js';
13
- import type { FeatureCollection, Polygon } from 'geojson';
14
- import type { SnakeCase } from 'type-fest';
1
+ import { type ApiError, type ApiSuccess, getSearchParams, request } from '../utils.js';
15
2
 
16
- type FieldName = 'id' | 'name' | 'description' | 'previewJson' | 'previewPath';
3
+ import type { RequireAtLeastOne } from 'type-fest';
4
+ import type { Polygon } from 'geojson';
17
5
 
18
- const processGroupData = (group: GroupChoropleth): GroupChoropleth => ({
19
- ...group,
20
- ...group.nativeParentTranslation && { nativeParentTranslation: toAppType(group.nativeParentTranslation) },
21
- ...group.nativeRelationTranslation && { nativeRelationTranslation: toAppType(group.nativeRelationTranslation) },
22
- ...group.englishParentTranslation && { englishParentTranslation: toAppType(group.englishParentTranslation) },
23
- ...group.englishRelationTranslation && { englishRelationTranslation: toAppType(group.englishRelationTranslation) },
24
- ...group.parentTranslations && { parentTranslations: ensureArray(group.parentTranslations).map(toAppType) },
25
- ...group.relationTranslations && { relationTranslations: ensureArray(group.relationTranslations).map(toAppType) },
26
- });
27
-
28
- const processPolygonData = (polygon: PolygonChoropleth): PolygonChoropleth => ({
29
- ...polygon,
30
- ...polygon.parentGroups && { parentGroups: ensureArray(polygon.parentGroups).map(toAppType).map(processGroupData) },
31
- ...polygon.nativeTranslation && { nativeTranslation: toAppType(polygon.nativeTranslation) },
32
- ...polygon.englishTranslation && { englishTranslation: toAppType(polygon.englishTranslation) },
33
- ...polygon.translations && { translations: ensureArray(polygon.translations).map(toAppType) },
34
- });
35
-
36
- export type PartialVectorChoropleth = Pick<VectorChoropleth, FieldName>;
37
-
38
- export type VectorChoropleth = {
39
- id: number;
40
- name: string;
41
- description: string;
42
- previewPath: string | null;
43
- previewJson: FeatureCollection | null;
44
-
45
- vectorSetUrl: string;
46
- sourceLayerName: string;
47
-
48
- lngMin: number;
49
- lngMax: number;
50
- latMin: number;
51
- latMax: number;
52
-
53
- keys: string[];
54
- properties: Array<Record<string, unknown>>;
6
+ export type ApiSearchPoint = {
7
+ lat: number;
8
+ lng: number;
55
9
  };
56
10
 
57
- export type ApiVectorChoropleth = {
58
- data: {
59
- id: number;
60
- name: string;
61
- description: string;
62
- preview_path: string | null;
63
- preview_json: FeatureCollection | null;
64
-
65
- vector_set_url: string;
66
- source_layer_name: string;
67
-
68
- lng_min: number;
69
- lng_max: number;
70
- lat_min: number;
71
- lat_max: number;
72
-
73
- keys: string[];
74
- properties: Array<Record<string, unknown>>;
75
- } & ApiCommonData;
76
- } & Omit<ApiSuccess, 'data'> | ApiError;
77
-
78
- export type ApiVectorChoroplethData = Flatten<Exclude<ApiVectorChoropleth, ApiError>['data']>;
79
-
80
- export async function listVectorChoropleths(name: string): Promise<PartialVectorChoropleth[]> {
81
- const pathname = `/v1/choropleths/vector`;
82
- const query = getSearchParams({ search: { name } });
83
- const path = `${pathname}?${query}`;
84
-
85
- // Only request first 50 results
86
- const headers = { ...defaultListHeader };
87
- const options = { withMeta: true };
88
-
89
- type ApiVectorChoroplethArray = {
90
- data: Array<Pick<ApiVectorChoroplethData, SnakeCase<FieldName>>>;
91
- } & Omit<ApiSuccess, 'data'> | ApiError;
92
-
93
- return request<ApiVectorChoroplethArray, PartialVectorChoropleth>(path, null, headers, options)
94
- .catch((error: Error) => {
95
- if (error instanceof APIMeta) {
96
- return (error as APIMeta<ApiVectorChoroplethArray, PartialVectorChoropleth>).data;
97
- }
98
-
99
- throw error;
100
- });
101
- }
102
-
103
- export async function getVectorChoropleth(choroplethId: number): Promise<VectorChoropleth> {
104
- const path = `/v1/choropleths/vector/${choroplethId}`;
105
-
106
- return request<ApiVectorChoropleth, VectorChoropleth>(path);
107
- }
108
-
109
- export type SearchBounds = {
11
+ export type ApiSearchBounds = {
110
12
  min_lat: number;
111
13
  min_lng: number;
112
14
  max_lat: number;
113
15
  max_lng: number;
114
16
  };
115
17
 
116
- export type PolygonChoropleth = {
117
- sml: string;
18
+ type ApiSingleOrGroupedArea = {
118
19
  id: number;
119
- vectorSource: string;
120
- sourceLayer: string;
121
- featureId: number;
122
- svgPreview: string;
123
- previewPath: string;
124
- allowSingle: boolean;
125
- properties: Record<string, unknown>;
126
- boundingBox: Polygon;
127
- restrictedOwnership: number[] | null;
128
- linkId: number | null;
129
- cloning: boolean;
130
- nativeTranslation: {
131
- polygonId: number;
132
- name: string;
133
- };
134
- englishTranslation?: {
135
- polygonId: number;
136
- name: string;
137
- };
138
- translations?: Array<{
139
- polygonId: number;
140
- language: string;
141
- name: string;
142
- }>;
143
- parentGroups: GroupChoropleth[];
20
+ title: string;
21
+ subtitle: string;
22
+ svg_preview: string;
23
+ bounding_box: string;
24
+ is_group: boolean;
25
+ vector_source: string | null;
26
+ source_layer: string | null;
27
+ feature_id: number | null;
28
+ properties: Record<string, string> | null;
144
29
  };
145
30
 
146
- export type ApiPolygonChoropleth = {
147
- data: {
148
- sml: string;
149
- id: number;
150
- vector_source: string;
151
- source_layer: string;
152
- feature_id: number;
153
- svg_preview: string;
154
- preview_path: string;
155
- allow_single: boolean;
156
- properties: Record<string, unknown>;
157
- bounding_box: Polygon;
158
- restricted_ownership: number[] | null;
159
- link_id: number | null;
160
- cloning: boolean;
161
- native_translation: {
162
- polygon_id: number;
163
- name: string;
164
- };
165
- english_translation?: {
166
- polygon_id: number;
167
- name: string;
168
- };
169
- translations?: Array<{
170
- polygon_id: number;
171
- language: string;
172
- name: string;
173
- }>;
174
- parent_groups: ApiGroupChoroplethData[];
175
- } & ApiCommonData;
31
+ type ApiSingleOrGroupedAreaArray = {
32
+ data: ApiSingleOrGroupedArea[];
176
33
  } & Omit<ApiSuccess, 'data'> | ApiError;
177
34
 
178
- export type ApiPolygonChoroplethData = Flatten<Exclude<ApiPolygonChoropleth, ApiError>['data']>;
179
-
180
- export async function listPolygonChoropleths(
181
- name: string,
182
- languages: string[],
183
- searchBounds?: SearchBounds,
184
- withParentGroups = false,
185
- ): Promise<PolygonChoropleth[]> {
186
- const pathname = `/v1/choropleth/polygons`;
187
- const query = getSearchParams(
188
- {
189
- search: { name, allow_single: true },
190
- with_parent_groups: withParentGroups,
191
- languages,
192
- ...searchBounds,
193
- },
194
- );
195
- const path = `${pathname}?${query}`;
35
+ type SingleOrGroupedAreaBase = {
36
+ id: number;
37
+ title: string;
38
+ subtitle: string;
39
+ svgPreview: string;
40
+ boundingBox: Polygon;
41
+ };
196
42
 
197
- // Only request first 50 results
198
- const headers = { ...defaultListHeader };
199
- const options = { withMeta: true };
43
+ // TODO don't export this once search on click is out
44
+ export type GroupedArea = SingleOrGroupedAreaBase & {
45
+ isGroup: true;
46
+ };
200
47
 
201
- type ApiPolygonChoroplethArray = {
202
- data: ApiPolygonChoroplethData[];
203
- } & Omit<ApiSuccess, 'data'> | ApiError;
48
+ // TODO don't export this once search on click is out
49
+ export type SingleArea = SingleOrGroupedAreaBase & {
50
+ isGroup: false;
51
+ vectorSource: string;
52
+ sourceLayer: string;
53
+ featureId: number;
54
+ properties: Record<string, string>;
55
+ };
204
56
 
205
- return request<ApiPolygonChoroplethArray, PolygonChoropleth>(path, null, headers, options)
206
- .catch((error: Error) => {
207
- if (error instanceof APIMeta) {
208
- return (error as APIMeta<ApiPolygonChoroplethArray, PolygonChoropleth>).data;
209
- }
57
+ export type SingleOrGroupedArea = SingleArea | GroupedArea;
210
58
 
211
- throw error;
212
- })
213
- .then(result => result.map(processPolygonData));
59
+ export async function searchSingleOrGroupedAreas(
60
+ language: string,
61
+ search: RequireAtLeastOne<{
62
+ searchBounds?: ApiSearchBounds;
63
+ query?: string;
64
+ searchPoint?: ApiSearchPoint;
65
+ }>,
66
+ mode: 'polygon' | 'group' | 'both' = 'both',
67
+ ): Promise<SingleOrGroupedArea[]> {
68
+ /**
69
+ * TODO When SAGA search on click is implemented, remove mode and make searchBounds required
70
+ */
71
+ return request<ApiSingleOrGroupedAreaArray, SingleOrGroupedArea>(
72
+ `/v1/choropleth/polygons/search?${getSearchParams({
73
+ language,
74
+ ...search.searchBounds,
75
+ ...(search.query && { query: search.query }),
76
+ ...(search.searchPoint && { point: search.searchPoint }),
77
+ mode,
78
+ })}`,
79
+ ).then(result => {
80
+ result.forEach(
81
+ elem => {
82
+ elem.boundingBox = JSON.parse(elem.boundingBox as unknown as string) as Polygon;
83
+ if (!elem.isGroup) {
84
+ elem.properties = JSON.parse(elem.properties as unknown as string) as Record<string, string>;
85
+ }
86
+ },
87
+ );
88
+
89
+ return result;
90
+ });
214
91
  }
215
92
 
216
- export type GroupChoropleth = {
93
+ type ApiGroupedAreaChild = {
217
94
  id: number;
218
- polygonId: number;
219
- relationId: number;
220
- childrenCount: number;
221
- sml?: string;
222
- svgPreview: string;
223
- previewPath: string;
224
- uniqueProperties: string[];
225
- boundingBox: Polygon;
226
- partialProperties: string[];
227
- restrictedOwnership: number[] | null;
228
- linkId: number | null;
229
- cloning: boolean;
230
- laravelThroughKey?: number;
231
- nativeParentTranslation: {
232
- polygonId: number;
233
- name: string;
234
- laravelThroughKey: number;
235
- };
236
- nativeRelationTranslation: {
237
- relationId: number;
238
- name: string;
239
- laravelThroughKey: number;
240
- };
241
- englishParentTranslation?: {
242
- polygonId: number;
243
- name: string;
244
- laravelThroughKey: number;
245
- };
246
- englishRelationTranslation?: {
247
- relationId: number;
248
- name: string;
249
- laravelThroughKey: number;
250
- };
251
- parentTranslations?: Array<{
252
- polygonId: number;
253
- name: string;
254
- language: string;
255
- laravelThroughKey: number;
256
- }>;
257
- relationTranslations?: Array<{
258
- relationId: number;
259
- name: string;
260
- language: string;
261
- laravelThroughKey: number;
262
- }>;
95
+ title: string;
96
+ vector_source: string;
97
+ source_layer: string;
98
+ feature_id: number;
99
+ properties: Record<string, string>;
263
100
  };
264
101
 
265
- export type ApiGroupChoropleth = {
266
- data: {
267
- id: number;
268
- polygon_id: number;
269
- relation_id: number;
270
- children_count: number;
271
- sml?: number;
272
- svg_preview: string;
273
- preview_path: string;
274
- unique_properties: string[];
275
- bounding_box: Polygon;
276
- partial_properties: string[];
277
- restricted_ownership: number[] | null;
278
- link_id: number | null;
279
- cloning: boolean;
280
- laravel_through_key?: number;
281
- native_parent_translation: {
282
- polygon_id: number;
283
- name: string;
284
- laravel_through_key: number;
285
- };
286
- native_relation_translation: {
287
- relation_id: number;
288
- name: string;
289
- laravel_through_key: number;
290
- };
291
- english_parent_translation?: {
292
- polygon_id: number;
293
- name: string;
294
- laravel_through_key: number;
295
- };
296
- english_relation_translation?: {
297
- relation_id: number;
298
- name: string;
299
- laravel_through_key: number;
300
- };
301
- parent_translations?: Array<{
302
- polygon_id: number;
303
- name: string;
304
- language: string;
305
- laravel_through_key: number;
306
- }>;
307
- relation_translations?: Array<{
308
- relation_id: number;
309
- name: string;
310
- language: string;
311
- laravel_through_key: number;
312
- }>;
313
- } & ApiCommonData;
102
+ type ApiGroupedAreaChildArray = {
103
+ data: ApiGroupedAreaChild[];
314
104
  } & Omit<ApiSuccess, 'data'> | ApiError;
315
105
 
316
- export type ApiGroupChoroplethData = Flatten<Exclude<ApiGroupChoropleth, ApiError>['data']>;
317
-
318
- export async function listGroupChoropleths(
319
- name: string,
320
- languages: string[],
321
- searchBounds?: SearchBounds,
322
- ): Promise<GroupChoropleth[]> {
323
- const pathname = `/v1/choropleth/groups`;
324
- const query = getSearchParams({ search: { name }, languages, ...searchBounds });
325
- const path = `${pathname}?${query}`;
326
-
327
- // Only request first 50 results
328
- const headers = { ...defaultListHeader };
329
- const options = { withMeta: true };
330
-
331
- type ApiGroupChoroplethArray = {
332
- data: ApiGroupChoroplethData[];
333
- } & Omit<ApiSuccess, 'data'> | ApiError;
106
+ export type GroupedAreaChild = {
107
+ id: number;
108
+ title: string;
109
+ vectorSource: string;
110
+ sourceLayer: string;
111
+ featureId: number;
112
+ properties: Record<string, string>;
113
+ };
334
114
 
335
- return request<ApiGroupChoroplethArray, GroupChoropleth>(path, null, headers, options)
336
- .catch((error: Error) => {
337
- if (error instanceof APIMeta) {
338
- return (error as APIMeta<ApiGroupChoroplethArray, GroupChoropleth>).data;
115
+ export async function groupedAreaChildren(groupId: number, language: string): Promise<GroupedAreaChild[]> {
116
+ return request<ApiGroupedAreaChildArray, GroupedAreaChild>(
117
+ `/v1/choropleth/groups/${groupId}/children-optimized?${getSearchParams({ language })}`,
118
+ ).then(result => {
119
+ result.forEach(
120
+ elem => {
121
+ elem.properties = JSON.parse(elem.properties as unknown as string) as Record<string, string>;
339
122
  }
123
+ );
340
124
 
341
- throw error;
342
- })
343
- .then(result => result.map(processGroupData));
344
- }
345
-
346
- export async function listChildrenGroupChoropleths(
347
- groupId: number,
348
- languages: string[],
349
- ): Promise<PolygonChoropleth[]> {
350
- const pathname = `/v1/choropleth/groups/${groupId}/children`;
351
- const query = getSearchParams({ languages });
352
- const path = `${pathname}?${query}`;
353
-
354
- type ApiPolygonChoroplethArray = {
355
- data: ApiPolygonChoroplethData[];
356
- } & Omit<ApiSuccess, 'data'> | ApiError;
357
-
358
- return request<ApiPolygonChoroplethArray, PolygonChoropleth>(path).then(polygons => polygons.map(processPolygonData));
125
+ return result;
126
+ });
359
127
  }
360
128
 
361
129
  export type MatchedGroup = {
@@ -377,7 +145,7 @@ export type ApiMatchedGroup = {
377
145
  };
378
146
 
379
147
  export async function getGroupsByDataSample(
380
- sample: Record<string, string[]>,
148
+ sample: Array<Record<string, string[]>>,
381
149
  language: string,
382
150
  ): Promise<MatchedGroup[]> {
383
151
  const path = `/v1/choropleth/groups/sample`;