@golemio/core 1.20.1-dev.1696905644 → 1.20.1-dev.1703302178

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,9 +1,11 @@
1
- import { ILogger } from "../../../logger";
1
+ import { ILogger } from "@golemio/validator/dist/Logger";
2
2
  import { IAzureTableStorageConfig } from "./interfaces/IAzureTableStorageConfig";
3
3
  import { ITableStorageService } from "./interfaces/ITableStorageService";
4
4
  export declare class AzureTableStorageService implements ITableStorageService {
5
5
  private config;
6
6
  private log;
7
+ private readonly maxPageSize;
8
+ private readonly pageQueueLimit;
7
9
  private tableClientDict;
8
10
  constructor(config: IAzureTableStorageConfig, log: ILogger);
9
11
  createEntities<T extends object>(tableName: string, entities: T[]): Promise<void>;
@@ -6,12 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.AzureTableStorageService = void 0;
7
7
  const _helpers_1 = require("../../..");
8
8
  const data_tables_1 = require("@azure/data-tables");
9
- const crypto_1 = __importDefault(require("crypto"));
10
9
  const identity_1 = require("@azure/identity");
10
+ const node_crypto_1 = __importDefault(require("node:crypto"));
11
+ const MAX_ALLOWED_PAGE_SIZE = 1000;
12
+ /** Azure tables may start returning 503 if we go over this number */
13
+ const MAX_ADMISSIBLE_PARALLEL_REQUESTS = 30;
11
14
  class AzureTableStorageService {
12
15
  constructor(config, log) {
13
16
  this.config = config;
14
17
  this.log = log;
18
+ this.maxPageSize = config.maxPageSize ? Math.min(config.maxPageSize, MAX_ALLOWED_PAGE_SIZE) : MAX_ALLOWED_PAGE_SIZE;
19
+ this.pageQueueLimit = Math.ceil(2 * ((MAX_ADMISSIBLE_PARALLEL_REQUESTS * config.entityBatchSize) / this.maxPageSize));
15
20
  this.tableClientDict = new Map();
16
21
  }
17
22
  async createEntities(tableName, entities) {
@@ -20,7 +25,7 @@ class AzureTableStorageService {
20
25
  }
21
26
  const nowDateTime = new _helpers_1.DateTime(new Date(), { timeZone: "Europe/Prague" });
22
27
  const fallbackPartitionKey = nowDateTime.format("yyyy-MM-dd");
23
- const rowKeyPrefix = nowDateTime.format("HH_mm_ss.SSS") + "_" + crypto_1.default.randomBytes(3).toString("hex");
28
+ const rowKeyPrefix = nowDateTime.format("HH_mm_ss.SSS") + "_" + node_crypto_1.default.randomBytes(3).toString("hex");
24
29
  const tableEntities = entities.map((entity, i) => {
25
30
  if (!this.isEntityValid(entity)) {
26
31
  entity = {
@@ -47,16 +52,37 @@ class AzureTableStorageService {
47
52
  select: ["PartitionKey", "RowKey"],
48
53
  },
49
54
  })
50
- .byPage({ maxPageSize: this.config.entityBatchSize });
55
+ .byPage({ maxPageSize: this.maxPageSize });
56
+ let pageQueue = [];
51
57
  for await (const page of resultsIterator) {
52
- if (!page.length)
58
+ if (page.length === 0 && pageQueue.length === 0) {
53
59
  break;
54
- const partitionKeyMap = page.reduce((groups, el) => groups.set(el.partitionKey, [...(groups.get(el.partitionKey) || []), el]), new Map());
55
- for (const [_, value] of partitionKeyMap) {
56
- const actions = value.map((entity) => ["delete", entity]);
57
- await tableClient.submitTransaction(actions);
58
60
  }
61
+ pageQueue.push(page);
62
+ if (pageQueue.length < this.pageQueueLimit && page.length === this.maxPageSize) {
63
+ continue;
64
+ }
65
+ const partitionKeyMap = pageQueue
66
+ .flat()
67
+ .reduce((groups, el) => groups.set(el.partitionKey, [...(groups.get(el.partitionKey) || []), el]), new Map());
68
+ let promiseQueue = [];
69
+ for (const [_, entities] of partitionKeyMap) {
70
+ for (let i = 0; i < entities.length; i += this.config.entityBatchSize) {
71
+ const entityChunk = entities.slice(i, i + this.config.entityBatchSize);
72
+ const actions = entityChunk.map((entity) => ["delete", entity]);
73
+ promiseQueue.push(tableClient.submitTransaction(actions));
74
+ if (promiseQueue.length >= MAX_ADMISSIBLE_PARALLEL_REQUESTS) {
75
+ await Promise.all(promiseQueue).catch((err) => resultsIterator.throw?.(err));
76
+ promiseQueue = [];
77
+ }
78
+ }
79
+ }
80
+ if (promiseQueue.length > 0) {
81
+ await Promise.all(promiseQueue).catch((err) => resultsIterator.throw?.(err));
82
+ }
83
+ pageQueue = [];
59
84
  }
85
+ await resultsIterator.return?.([]);
60
86
  }
61
87
  getTableClient(tableName) {
62
88
  if (this.tableClientDict.has(tableName)) {
@@ -1 +1 @@
1
- {"version":3,"file":"AzureTableStorageService.js","sourceRoot":"","sources":["../../../../../src/helpers/data-access/table-storage/providers/AzureTableStorageService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AzureTableStorageService.js","sourceRoot":"","sources":["../../../../../src/helpers/data-access/table-storage/providers/AzureTableStorageService.ts"],"names":[],"mappings":"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"}
@@ -4,4 +4,5 @@ export interface IAzureTableStorageConfig {
4
4
  clientSecret: string;
5
5
  account: string;
6
6
  entityBatchSize: number;
7
+ maxPageSize?: number;
7
8
  }
@@ -48,5 +48,13 @@ export declare class GeocodeApi {
48
48
  getExtendedAddressFromPhoton: (lat: number, lng: number) => Promise<IPostalAddress & {
49
49
  house_number: string;
50
50
  }>;
51
+ /**
52
+ * Gets Address by Coordinates from Photon API extended version.
53
+ *
54
+ * @param {number} lat Latitude
55
+ * @param {number} lng Longitude
56
+ */
57
+ getAddressForVehicleSharing: (lat: number, lng: number) => Promise<string | null>;
58
+ private fetchPhotonData;
51
59
  private getFormattedAddress;
52
60
  }
@@ -108,21 +108,8 @@ let GeocodeApi = exports.GeocodeApi = class GeocodeApi {
108
108
  * @param {number} lng Longitude
109
109
  */
110
110
  this.getAddressByLatLngFromPhoton = async (lat, lng) => {
111
- const urlWithParams = new URL(this.photonApiUrlReverse);
112
- urlWithParams.searchParams.append("lon", lng.toString());
113
- urlWithParams.searchParams.append("lat", lat.toString());
114
- urlWithParams.searchParams.append("query_string_filter", "osm_key:place");
115
- urlWithParams.searchParams.append("lang", "cs");
116
- let headers = {};
117
- if (this.photonApiKey) {
118
- headers = {
119
- "x-access-token": this.photonApiKey,
120
- };
121
- }
122
111
  try {
123
- const data = await fetch(urlWithParams.toString(), {
124
- headers,
125
- }).then((response) => response.json());
112
+ const data = await this.fetchPhotonData(lat, lng, "osm_key:place");
126
113
  const addressPropsFromPhoton = data.features[0].properties;
127
114
  const address = {
128
115
  address_country: addressPropsFromPhoton.country,
@@ -145,28 +132,10 @@ let GeocodeApi = exports.GeocodeApi = class GeocodeApi {
145
132
  * @param {number} lng Longitude
146
133
  */
147
134
  this.getExtendedAddressFromPhoton = async (lat, lng) => {
148
- const urlWithParams = new URL(this.photonApiUrlReverse);
149
- urlWithParams.searchParams.append("lon", lng.toString());
150
- urlWithParams.searchParams.append("lat", lat.toString());
151
- urlWithParams.searchParams.append("query_string_filter", "osm_value:house");
152
- urlWithParams.searchParams.append("radius", "0.1");
153
- urlWithParams.searchParams.append("lang", "cs");
154
- let headers = {};
155
- let data;
156
- if (this.photonApiKey) {
157
- headers = {
158
- "x-access-token": this.photonApiKey,
159
- };
160
- }
161
135
  try {
162
- data = await fetch(urlWithParams.toString(), {
163
- headers,
164
- }).then((response) => response.json());
136
+ let data = await this.fetchPhotonData(lat, lng, "osm_value:house");
165
137
  if (!data?.features[0]?.properties?.city && !data?.features[0]?.properties?.housenumber) {
166
- urlWithParams.searchParams.set("query_string_filter", "osm_key:highway");
167
- data = await fetch(urlWithParams.toString(), {
168
- headers,
169
- }).then((response) => response.json());
138
+ data = await this.fetchPhotonData(lat, lng, "osm_key:highway");
170
139
  }
171
140
  const addressPropsFromPhoton = data.features[0].properties;
172
141
  const address = {
@@ -184,6 +153,70 @@ let GeocodeApi = exports.GeocodeApi = class GeocodeApi {
184
153
  throw new errors_1.RecoverableError("Retrieving address from Photon failed.", this.constructor.name, err);
185
154
  }
186
155
  };
156
+ /**
157
+ * Gets Address by Coordinates from Photon API extended version.
158
+ *
159
+ * @param {number} lat Latitude
160
+ * @param {number} lng Longitude
161
+ */
162
+ this.getAddressForVehicleSharing = async (lat, lng) => {
163
+ try {
164
+ let data = await this.fetchPhotonData(lat, lng, "osm_value:house");
165
+ if (data?.features[0]?.properties?.city && data?.features[0]?.properties?.housenumber) {
166
+ const addressPropsFromPhoton = data.features[0].properties;
167
+ if (addressPropsFromPhoton?.street) {
168
+ return (addressPropsFromPhoton.street +
169
+ " " +
170
+ addressPropsFromPhoton.housenumber +
171
+ ", " +
172
+ addressPropsFromPhoton.city);
173
+ }
174
+ if (addressPropsFromPhoton?.locality && addressPropsFromPhoton?.locality !== addressPropsFromPhoton?.city) {
175
+ return (addressPropsFromPhoton.locality +
176
+ " " +
177
+ addressPropsFromPhoton.housenumber +
178
+ ", " +
179
+ addressPropsFromPhoton.city);
180
+ }
181
+ return addressPropsFromPhoton.city + " " + addressPropsFromPhoton.housenumber;
182
+ }
183
+ data = await this.fetchPhotonData(lat, lng, "osm_key:highway");
184
+ const addressPropsFromPhoton = data?.features[0]?.properties;
185
+ if (addressPropsFromPhoton?.name && addressPropsFromPhoton?.city) {
186
+ return addressPropsFromPhoton.name + ", " + addressPropsFromPhoton.city;
187
+ }
188
+ if (addressPropsFromPhoton?.district && addressPropsFromPhoton?.district !== addressPropsFromPhoton?.city) {
189
+ return addressPropsFromPhoton.locality + ", " + addressPropsFromPhoton.city;
190
+ }
191
+ if (addressPropsFromPhoton?.city) {
192
+ return addressPropsFromPhoton.city;
193
+ }
194
+ return null;
195
+ }
196
+ catch (err) {
197
+ throw new errors_1.RecoverableError("Retrieving address from Photon failed.", this.constructor.name, err);
198
+ }
199
+ };
200
+ this.fetchPhotonData = async (lat, lng, queryFilter) => {
201
+ const urlWithParams = new URL(this.photonApiUrlReverse);
202
+ urlWithParams.searchParams.append("lon", lng.toString());
203
+ urlWithParams.searchParams.append("lat", lat.toString());
204
+ urlWithParams.searchParams.append("query_string_filter", queryFilter);
205
+ urlWithParams.searchParams.append("lang", "cs");
206
+ if (queryFilter !== "osm_key:place") {
207
+ urlWithParams.searchParams.append("radius", "0.1");
208
+ }
209
+ let headers = {};
210
+ if (this.photonApiKey) {
211
+ headers = {
212
+ "x-access-token": this.photonApiKey.trim(),
213
+ };
214
+ }
215
+ const response = await fetch(urlWithParams.toString(), {
216
+ headers,
217
+ });
218
+ return response.json();
219
+ };
187
220
  this.openStreetApiUrlReverse = config.OPEN_STREET_MAP_API_URL_REVERSE;
188
221
  this.openStreetApiUrlSearch = config.OPEN_STREET_MAP_API_URL_SEARCH;
189
222
  this.photonApiUrlReverse = config.PHOTON_MAP_API_URL_REVERSE;
@@ -1 +1 @@
1
- {"version":3,"file":"GeocodeApi.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/GeocodeApi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GeocodeApi.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/GeocodeApi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,gCAAyC;AACzC,4CAAmD;AACnD,uCAA8C;AAY9C;;GAEG;AAEI,IAAM,UAAU,wBAAhB,MAAM,UAAU;IAMnB,YACmC,MAAsB,EACtB,GAA6B;QAAZ,QAAG,GAAH,GAAG,CAAS;QAQhE;;;;;WAKG;QACI,uBAAkB,GAAG,KAAK,EAAE,GAAW,EAAE,GAAW,EAA2B,EAAE;YACpF,MAAM,OAAO,GAAG;gBACZ,OAAO,EAAE;oBACL,eAAe,EAAE,UAAU;oBAC3B,OAAO,EAAE,wBAAwB;iBACpC;gBACD,GAAG,EAAE,IAAI,CAAC,uBAAuB,GAAG,OAAO,GAAG,GAAG,GAAG,OAAO,GAAG,GAAG;aACpE,CAAC;YAEF,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;oBAClC,OAAO,EAAE,OAAO,CAAC,OAAO;iBAC3B,CAAC,CAAC;gBACH,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC;gBAC/C,IAAI,OAAO,GAAG;oBACV,eAAe,EAAE,EAAE;oBACnB,iBAAiB,EAAE,EAAE;iBACxB,CAAC;gBAEF,IAAI,UAAU,CAAC,IAAI,EAAE;oBACjB,IAAI,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC;oBACpC,IAAI,UAAU,CAAC,YAAY,EAAE;wBACzB,aAAa,IAAI,GAAG,GAAG,UAAU,CAAC,YAAY,CAAC;qBAClD;oBACD,OAAO,CAAC,iBAAiB,IAAI,aAAa,GAAG,IAAI,CAAC;oBAClD,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,aAAa,EAAE,EAAE,CAAC;iBAClE;gBACD,IAAI,UAAU,CAAC,IAAI,EAAE;oBACjB,IAAI,UAAU,CAAC,QAAQ,EAAE;wBACrB,OAAO,CAAC,iBAAiB,IAAI,UAAU,CAAC,QAAQ,GAAG,GAAG,CAAC;wBACvD,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;qBACrE;oBACD,OAAO,CAAC,iBAAiB,IAAI,UAAU,CAAC,IAAI,CAAC;oBAC7C,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,gBAAgB,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;oBACnE,IAAI,UAAU,CAAC,MAAM,EAAE;wBACnB,OAAO,CAAC,iBAAiB,IAAI,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC;wBACrD,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;qBACtE;oBACD,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC;iBACrC;gBACD,OAAO,CAAC,iBAAiB,IAAI,UAAU,CAAC,OAAO,CAAC;gBAChD,OAAO,CAAC,eAAe,GAAG,UAAU,CAAC,OAAO,CAAC;gBAC7C,OAAO,OAAO,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,yBAAgB,CAAC,0DAA0D,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACtH;QACL,CAAC,CAAC;QAEF;;;;;WAKG;QACI,oBAAe,GAAG,KAAK,EAAE,MAAc,EAAE,IAAY,EAAqB,EAAE;YAC/E,MAAM,OAAO,GAAG;gBACZ,OAAO,EAAE;oBACL,eAAe,EAAE,UAAU;oBAC3B,OAAO,EAAE,wBAAwB;iBACpC;gBACD,GAAG,EAAE,IAAI,CAAC,sBAAsB,GAAG,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC;aACjG,CAAC;YAEF,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;gBACpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBACjC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;oBACrB,MAAM,IAAI,yBAAgB,CACtB,+CAA+C,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,GAAG,EAC5E,IAAI,CAAC,WAAW,CAAC,IAAI,CACxB,CAAC;iBACL;gBACD,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;aACjE;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACpB,MAAM,IAAI,yBAAgB,CAAC,0DAA0D,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACtH;QACL,CAAC,CAAC;QACF;;;;;WAKG;QACI,iCAA4B,GAAG,KAAK,EAAE,GAAW,EAAE,GAAW,EAA2B,EAAE;YAC9F,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;gBACnE,MAAM,sBAAsB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;gBAE3D,MAAM,OAAO,GAAmB;oBAC5B,eAAe,EAAE,sBAAsB,CAAC,OAAO;oBAC/C,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,CAAC,sBAAsB,CAAC;oBACnE,gBAAgB,EAAE,sBAAsB,CAAC,IAAI;oBAC7C,cAAc,EAAE,sBAAsB,CAAC,QAAQ;oBAC/C,WAAW,EAAE,sBAAsB,CAAC,QAAQ;oBAC5C,cAAc,EAAE,sBAAsB,CAAC,MAAM;iBAChD,CAAC;gBAEF,OAAO,OAAO,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,yBAAgB,CAAC,wCAAwC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACpG;QACL,CAAC,CAAC;QAEF;;;;;WAKG;QACI,iCAA4B,GAAG,KAAK,EACvC,GAAW,EACX,GAAW,EACuC,EAAE;YACpD,IAAI;gBACA,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;gBAEnE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE;oBACrF,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;iBAClE;gBAED,MAAM,sBAAsB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;gBAE3D,MAAM,OAAO,GAA8C;oBACvD,eAAe,EAAE,sBAAsB,CAAC,OAAO;oBAC/C,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,CAAC,sBAAsB,CAAC;oBACnE,gBAAgB,EAAE,sBAAsB,CAAC,IAAI;oBAC7C,cAAc,EAAE,sBAAsB,CAAC,QAAQ;oBAC/C,WAAW,EAAE,sBAAsB,CAAC,QAAQ;oBAC5C,cAAc,EAAE,sBAAsB,CAAC,MAAM;oBAC7C,YAAY,EAAE,sBAAsB,CAAC,WAAW;iBACnD,CAAC;gBAEF,OAAO,OAAO,CAAC;aAClB;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,yBAAgB,CAAC,wCAAwC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACpG;QACL,CAAC,CAAC;QAEF;;;;;WAKG;QACI,gCAA2B,GAAG,KAAK,EAAE,GAAW,EAAE,GAAW,EAA0B,EAAE;YAC5F,IAAI;gBACA,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;gBAEnE,IAAI,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,IAAI,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE;oBACnF,MAAM,sBAAsB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;oBAC3D,IAAI,sBAAsB,EAAE,MAAM,EAAE;wBAChC,OAAO,CACH,sBAAsB,CAAC,MAAM;4BAC7B,GAAG;4BACH,sBAAsB,CAAC,WAAW;4BAClC,IAAI;4BACJ,sBAAsB,CAAC,IAAI,CAC9B,CAAC;qBACL;oBACD,IAAI,sBAAsB,EAAE,QAAQ,IAAI,sBAAsB,EAAE,QAAQ,KAAK,sBAAsB,EAAE,IAAI,EAAE;wBACvG,OAAO,CACH,sBAAsB,CAAC,QAAQ;4BAC/B,GAAG;4BACH,sBAAsB,CAAC,WAAW;4BAClC,IAAI;4BACJ,sBAAsB,CAAC,IAAI,CAC9B,CAAC;qBACL;oBACD,OAAO,sBAAsB,CAAC,IAAI,GAAG,GAAG,GAAG,sBAAsB,CAAC,WAAW,CAAC;iBACjF;gBAED,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;gBAC/D,MAAM,sBAAsB,GAAG,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC;gBAE7D,IAAI,sBAAsB,EAAE,IAAI,IAAI,sBAAsB,EAAE,IAAI,EAAE;oBAC9D,OAAO,sBAAsB,CAAC,IAAI,GAAG,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC;iBAC3E;gBAED,IAAI,sBAAsB,EAAE,QAAQ,IAAI,sBAAsB,EAAE,QAAQ,KAAK,sBAAsB,EAAE,IAAI,EAAE;oBACvG,OAAO,sBAAsB,CAAC,QAAQ,GAAG,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC;iBAC/E;gBAED,IAAI,sBAAsB,EAAE,IAAI,EAAE;oBAC9B,OAAO,sBAAsB,CAAC,IAAI,CAAC;iBACtC;gBAED,OAAO,IAAI,CAAC;aACf;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,yBAAgB,CAAC,wCAAwC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACpG;QACL,CAAC,CAAC;QAEM,oBAAe,GAAG,KAAK,EAAE,GAAW,EAAE,GAAW,EAAE,WAAmB,EAAwB,EAAE;YACpG,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,mBAAoB,CAAC,CAAC;YACzD,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzD,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzD,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC;YACtE,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAEhD,IAAI,WAAW,KAAK,eAAe,EAAE;gBACjC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aACtD;YAED,IAAI,OAAO,GAAG,EAAE,CAAC;YAEjB,IAAI,IAAI,CAAC,YAAY,EAAE;gBACnB,OAAO,GAAG;oBACN,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE;iBAC7C,CAAC;aACL;YAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE;gBACnD,OAAO;aACV,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC3B,CAAC,CAAC;QApOE,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC,+BAA+B,CAAC;QACtE,IAAI,CAAC,sBAAsB,GAAG,MAAM,CAAC,8BAA8B,CAAC;QACpE,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,0BAA0B,CAAC;QAC7D,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,kBAAkB,CAAC;IAClD,CAAC;IAkOO,mBAAmB,CAAC,sBAAgD;QACxE,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,6BAA6B;QAC7B,gBAAgB,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,sBAAsB,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9F,gBAAgB,IAAI,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACjG,gBAAgB,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,gBAAgB,IAAI,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAClG,gBAAgB,IAAI,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAEzF,OAAO,gBAAgB,CAAC;IAC5B,CAAC;CACJ,CAAA;qBA3PY,UAAU;IADtB,IAAA,qBAAU,GAAE;IAQJ,WAAA,IAAA,iBAAM,EAAC,oBAAc,CAAC,MAAM,CAAC,CAAA;IAC7B,WAAA,IAAA,iBAAM,EAAC,oBAAc,CAAC,MAAM,CAAC,CAAA;;GARzB,UAAU,CA2PtB"}
@@ -13,6 +13,7 @@ export interface IPhotonFeatureProperties {
13
13
  street: string;
14
14
  district: string;
15
15
  osm_value: string;
16
+ name: string;
16
17
  }
17
18
  export interface IPhotonData {
18
19
  type: "FeatureCollection";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@golemio/core",
3
- "version": "1.20.1-dev.1696905644",
3
+ "version": "1.20.1-dev.1703302178",
4
4
  "description": "Golemio Core Module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",