@zimo-elektronik/zcan 1.0.48 → 1.0.50

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 (11) hide show
  1. package/dist/data/dataGroup.d.ts +6 -3
  2. package/dist/data/dataGroup.js +43 -10
  3. package/dist/data/dataGroup.js.map +1 -1
  4. package/dist/data/dataMsg.d.ts +7 -0
  5. package/dist/data/dataMsg.js +14 -0
  6. package/dist/data/dataMsg.js.map +1 -1
  7. package/dist/data/lanDataGroup.js +1 -1
  8. package/package.json +1 -1
  9. package/src/data/dataGroup.ts +53 -11
  10. package/src/data/dataMsg.ts +19 -0
  11. package/src/data/lanDataGroup.ts +1 -1
package/dist/data/dataGroup.d.ts CHANGED
@@ -1,19 +1,20 @@
1
1
  import MX10 from '../MX10';
2
2
  import { Buffer } from 'buffer';
3
3
  import { Subject } from 'rxjs';
4
- import { RemoveLocomotiveData, ItemFxMode, ItemFxConfig, ItemImageData, ItemListByNidData } from '../common/models';
4
+ import { RemoveLocomotiveData, ItemFxMode, ItemFxConfig, ItemListByNidData } from '../common/models';
5
5
  import { FxConfigType, ImageType } from '../common/enums';
6
- import { MsgDataName, MsgGroupCount, MsgItemsByIndexRsp } from './dataMsg';
6
+ import { MsgDataName, MsgGroupCount, MsgItemImage, MsgItemsByIndexRsp } from './dataMsg';
7
7
  export default class DataGroup {
8
8
  readonly onGroupCount: Subject<MsgGroupCount>;
9
9
  readonly onListItemsByIndex: Subject<MsgItemsByIndexRsp>;
10
10
  readonly onListItemsByNID: Subject<ItemListByNidData>;
11
11
  readonly onRemoveLocomotive: Subject<RemoveLocomotiveData>;
12
- readonly onItemImageConfig: Subject<ItemImageData>;
12
+ readonly onItemImageConfig: Subject<MsgItemImage>;
13
13
  readonly onItemFxMode: Subject<ItemFxMode>;
14
14
  readonly onItemFxConfig: Subject<ItemFxConfig>;
15
15
  readonly onDataNameExtended: Subject<MsgDataName>;
16
16
  private nameQ;
17
+ private imageQ;
17
18
  private groupCountQ;
18
19
  private byIndexQ;
19
20
  private mx10;
@@ -27,6 +28,8 @@ export default class DataGroup {
27
28
  itemFxConfig(nid: number, fx: number, type: FxConfigType, data: number): void;
28
29
  getName(nid: number, subId: number): Promise<MsgDataName | undefined>;
29
30
  setName(nid: number, subId: number, name: string): Promise<MsgDataName | undefined>;
31
+ getImage(nid: number, type: number): Promise<MsgItemImage | undefined>;
32
+ setImage(nid: number, type: number, id: number): Promise<MsgItemImage | undefined>;
30
33
  parse(size: number, command: number, mode: number, nid: number, buffer: Buffer): void;
31
34
  private parseGroupCount;
32
35
  private parseItemListByIndex;
package/dist/data/dataGroup.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { Subject } from 'rxjs';
2
2
  import { MsgMode, NameType } from '../common/enums';
3
3
  import ExtendedASCII from '../common/extendedAscii';
4
- import { MsgDataName, MsgGroupCount, MsgItemsByIndexReq, MsgItemsByIndexRsp } from './dataMsg';
4
+ import { MsgDataName, MsgGroupCount, MsgItemImage, MsgItemsByIndexReq, MsgItemsByIndexRsp } from './dataMsg';
5
5
  import { Query } from '../docs_entrypoint';
6
6
  export default class DataGroup {
7
7
  onGroupCount = new Subject();
@@ -13,6 +13,7 @@ export default class DataGroup {
13
13
  onItemFxConfig = new Subject();
14
14
  onDataNameExtended = new Subject();
15
15
  nameQ = undefined;
16
+ imageQ = undefined;
16
17
  groupCountQ = undefined;
17
18
  byIndexQ = undefined;
18
19
  mx10;
@@ -205,14 +206,46 @@ export default class DataGroup {
205
206
  this.nameQ.unlock();
206
207
  this.nameQ = undefined;
207
208
  return rv;
208
- this.mx10.sendData(0x07, 0x21, [
209
- { value: nid, length: 2 },
210
- { value: subId, length: 2 },
211
- { value: 0, length: 4 },
212
- { value: 0, length: 4 },
213
- { value: name, length: name.length },
214
- { value: 0, length: 1 },
215
- ], 0b01);
209
+ }
210
+ async getImage(nid, type) {
211
+ if (this.imageQ !== undefined && !await this.imageQ.lock()) {
212
+ this.mx10.logInfo.next("mx10.getImage: failed to acquire lock");
213
+ return undefined;
214
+ }
215
+ this.imageQ = new Query(MsgItemImage.header(MsgMode.REQ, this.mx10.mx10NID), this.onItemImageConfig);
216
+ this.imageQ.tx = ((header) => {
217
+ const msg = new MsgItemImage(header, nid, type);
218
+ this.mx10.sendMsg(msg);
219
+ });
220
+ this.imageQ.match = ((msg) => {
221
+ return (msg.itemNid() === nid && msg.imageType() === type);
222
+ });
223
+ const rv = await this.imageQ.run();
224
+ this.imageQ.unlock();
225
+ this.imageQ = undefined;
226
+ return rv;
227
+ }
228
+ async setImage(nid, type, id) {
229
+ if (this.imageQ !== undefined && !await this.imageQ.lock()) {
230
+ this.mx10.logInfo.next("mx10.setImage: failed to acquire lock");
231
+ return undefined;
232
+ }
233
+ this.imageQ = new Query(MsgItemImage.header(MsgMode.CMD, nid), this.onItemImageConfig);
234
+ this.imageQ.log = ((msg) => {
235
+ this.mx10.logInfo.next(msg);
236
+ });
237
+ this.imageQ.tx = ((header) => {
238
+ const msg = new MsgItemImage(header, nid, type, id);
239
+ this.mx10.sendMsg(msg);
240
+ });
241
+ this.imageQ.match = ((msg) => {
242
+ return (msg.itemNid() === nid && msg.imageType() === type);
243
+ });
244
+ this.imageQ.subscribe(false);
245
+ const rv = await this.imageQ.run();
246
+ this.imageQ.unlock();
247
+ this.imageQ = undefined;
248
+ return rv;
216
249
  }
217
250
  parse(size, command, mode, nid, buffer) {
218
251
  switch (command) {
@@ -284,7 +317,7 @@ export default class DataGroup {
284
317
  const NID = buffer.readUInt16LE(0);
285
318
  const type = buffer.readUInt16LE(2);
286
319
  const imageId = buffer.readUInt16LE(4);
287
- this.onItemImageConfig.next({ nid: NID, type, imageId });
320
+ this.onItemImageConfig.next(new MsgItemImage(MsgItemImage.header(mode, nid), NID, type, imageId));
288
321
  }
289
322
  parseItemFxMode(size, mode, nid, buffer) {
290
323
  if (!this.onItemFxMode.observed)
package/dist/data/dataGroup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dataGroup.js","sourceRoot":"","sources":["../../src/data/dataGroup.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAG7B,OAAO,EAAsC,OAAO,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACvF,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/F,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAM3C,MAAM,CAAC,OAAO,OAAO,SAAS;IAEb,YAAY,GAAG,IAAI,OAAO,EAAiB,CAAC;IAC5C,kBAAkB,GAAG,IAAI,OAAO,EAAsB,CAAC;IACvD,gBAAgB,GAAG,IAAI,OAAO,EAAqB,CAAC;IACpD,kBAAkB,GAAG,IAAI,OAAO,EAAwB,CAAC;IACzD,iBAAiB,GAAG,IAAI,OAAO,EAAiB,CAAC;IACjD,YAAY,GAAG,IAAI,OAAO,EAAc,CAAC;IACzC,cAAc,GAAG,IAAI,OAAO,EAAgB,CAAC;IAC7C,kBAAkB,GAAG,IAAI,OAAO,EAAe,CAAC;IAExD,KAAK,GAAmC,SAAS,CAAC;IAClD,WAAW,GAAqC,SAAS,CAAC;IAC1D,QAAQ,GAA0C,SAAS,CAAC;IAE5D,IAAI,CAAO;IAEnB,YAAY,IAAU;QAErB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC;QAE5B,IAAG,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;YACrE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;YAClE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACtG,IAAI,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACjC,MAAM,GAAG,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAEhD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAEjC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,QAAQ,CAAC,CAAC;QACnC,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QAExC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC7B,OAAO,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAgB,EAAE,KAAa;QAErD,IAAG,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YACxE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC9G,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,MAAM,GAAG,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;YAE7E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAG9B,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;YAC1B,QAAO,QAAQ,EAAE,CAAC;gBACjB,KAAK,CAAC;oBACL,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,IAAI,MAAM,CAAC;YACvB,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,OAAO,EAAE,CAAC;IACX,CAAC;IAWD,cAAc,CAAC,gBAAwB;QAEtC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAC;YACrC,EAAC,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC,EAAC;SACpC,EAAE,IAAI,CAAC,CAAC;IACV,CAAC;IAED,gBAAgB,CAAC,QAAgB,EAAE,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO;QAEhE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAC;YAC9B,EAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAC;SAC5B,CAAC,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,GAAW,EAAE,IAAe,EAAE,OAAe;QAE5D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC;YACxB,EAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAC;SAC3B,CAAC,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,GAAW,EAAE,KAAa,EAAE,IAAc;QAErD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAC;YACzB,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YACrB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YACxE,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YACxE,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YAC1E,EAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;SAC5E,CAAC,CAAC;IACJ,CAAC;IASD,YAAY,CAAC,GAAW,EAAE,EAAU,EAAE,IAAkB,EAAE,IAAY;QAErE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAC;YACtB,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC;YACxB,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC;SACxB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa;QAEvC,IAAG,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACzD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YAC/D,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACpG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAE3C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAE3B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,CAAC,CAAC;QACzD,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAElC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa,EAAE,IAAY;QAErD,IAAG,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACzD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YAC/D,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACtF,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAEjD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAE3B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,CAAC,CAAC;QACzD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAElC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,OAAO,EAAE,CAAC;QAEV,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAC;YACzB,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YACrB,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YACrB,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC;YAClC,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;SACrB,EAAE,IAAI,CAAC,CAAC;IACV,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,OAAe,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE7E,QAAQ,OAAO,EACf,CAAC;YACA,KAAK,IAAI;gBAER,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC9C,MAAM;YACP,KAAK,IAAI;gBAER,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBACnD,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;gBACxE,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBACjD,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBACnD,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC9C,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAChD,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC7C,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBACpD,MAAM;YACP;gBACC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,GAAG,OAAO,GAAG,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACpG,CAAC;IACF,CAAC;IAGO,eAAe,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE9E,IAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ;YAC7B,OAAO;QACR,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1F,CAAC;IAGO,oBAAoB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEnF,IAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ;YACnC,OAAO;QACR,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,wBAAwB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxD,IAAG,CAAC,SAAS;YACZ,OAAO;QACR,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,EACvF,KAAK,EAAE,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAC/C,CAAC;IAGO,kBAAkB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEjF,IAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YACjC,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAC,CAAC,CAAC;IACpE,CAAC;IAGO,cAAc,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE7E,IAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ;YACnC,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;IACxD,CAAC;IAGO,oBAAoB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEnF,IAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ;YAClC,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAC,CAAC,CAAC;IACxD,CAAC;IAGO,eAAe,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE9E,IAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ;YAC7B,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,MAAM,GAAiB,EAAE,CAAC;QAChC,KAAI,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,EAAE,EAAE,CAAC,IAAE,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,IAAE,CAAC,CAAC,GAAC,IAAI,CAAC,CAAC;QAChC,MAAM,GAAG,GAAe,EAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IA0BO,iBAAiB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEhF,IAAG,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ;YAC/B,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,GAAG,GAAiB,EAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAGO,qBAAqB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEpF,IAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ;YACnC,OAAO;QAER,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,yBAAyB,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACxF,MAAM,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO;QAEP,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9D,IAAI,MAAkC,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,IAAc,CAAC;QAEnB,QAAQ,GAAG,EACX,CAAC;YACA,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC;gBAC7B,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC;gBACxB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC;gBAC5B,MAAM,GAAG,EAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE;oBAC1D,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAC,CAAC;gBAC5D,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;gBACtB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;gBACrB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;gBACrB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC;gBAC7B,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;gBACrB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;gBAC3B,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;gBAC3B,MAAM;YACP;gBACC,IAAI,KAAK,IAAI,CAAC;oBACb,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;qBACvB,IAAI,KAAK,IAAI,CAAC;oBAClB,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC;;oBAExB,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;QAC9B,CAAC;IAGF,CAAC;CACD"}
1
+ {"version":3,"file":"dataGroup.js","sourceRoot":"","sources":["../../src/data/dataGroup.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAG7B,OAAO,EAAsC,OAAO,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACvF,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC7G,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAM3C,MAAM,CAAC,OAAO,OAAO,SAAS;IAEb,YAAY,GAAG,IAAI,OAAO,EAAiB,CAAC;IAC5C,kBAAkB,GAAG,IAAI,OAAO,EAAsB,CAAC;IACvD,gBAAgB,GAAG,IAAI,OAAO,EAAqB,CAAC;IACpD,kBAAkB,GAAG,IAAI,OAAO,EAAwB,CAAC;IACzD,iBAAiB,GAAG,IAAI,OAAO,EAAgB,CAAC;IAChD,YAAY,GAAG,IAAI,OAAO,EAAc,CAAC;IACzC,cAAc,GAAG,IAAI,OAAO,EAAgB,CAAC;IAC7C,kBAAkB,GAAG,IAAI,OAAO,EAAe,CAAC;IAExD,KAAK,GAAmC,SAAS,CAAC;IAClD,MAAM,GAAoC,SAAS,CAAC;IACpD,WAAW,GAAqC,SAAS,CAAC;IAC1D,QAAQ,GAA0C,SAAS,CAAC;IAE5D,IAAI,CAAO;IAEnB,YAAY,IAAU;QAErB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC;QAE5B,IAAG,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;YACrE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;YAClE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACtG,IAAI,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACjC,MAAM,GAAG,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAEhD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAEjC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,QAAQ,CAAC,CAAC;QACnC,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QAExC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC7B,OAAO,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAgB,EAAE,KAAa;QAErD,IAAG,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YACxE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC9G,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,MAAM,GAAG,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;YAE7E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAG9B,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;YAC1B,QAAO,QAAQ,EAAE,CAAC;gBACjB,KAAK,CAAC;oBACL,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,GAAG,MAAM,CAAC;gBACrB,KAAK,MAAM;oBACV,OAAO,GAAG,IAAI,MAAM,CAAC;YACvB,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,OAAO,EAAE,CAAC;IACX,CAAC;IAWD,cAAc,CAAC,gBAAwB;QAEtC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAC;YACrC,EAAC,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC,EAAC;SACpC,EAAE,IAAI,CAAC,CAAC;IACV,CAAC;IAED,gBAAgB,CAAC,QAAgB,EAAE,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO;QAEhE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAC;YAC9B,EAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAC;SAC5B,CAAC,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,GAAW,EAAE,IAAe,EAAE,OAAe;QAE5D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC;YACxB,EAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAC;SAC3B,CAAC,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,GAAW,EAAE,KAAa,EAAE,IAAc;QAErD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAC;YACzB,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YACrB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YACxE,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YACxE,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YAC1E,EAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;SAC5E,CAAC,CAAC;IACJ,CAAC;IASD,YAAY,CAAC,GAAW,EAAE,EAAU,EAAE,IAAkB,EAAE,IAAY;QAErE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAC;YACtB,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC;YACxB,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC;SACxB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa;QAEvC,IAAG,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACzD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YAC/D,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACpG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAE3C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAE3B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,CAAC,CAAC;QACzD,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAElC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa,EAAE,IAAY;QAErD,IAAG,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACzD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YAC/D,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACtF,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAEjD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAE3B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,CAAC,CAAC;QACzD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAElC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,IAAY;QAEvC,IAAG,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YAC3D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YAChE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACrG,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5B,MAAM,GAAG,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAEhD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAE5B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,KAAK,IAAI,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,IAAY,EAAE,EAAU;QAEnD,IAAG,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YAC3D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YAChE,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACvF,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5B,MAAM,GAAG,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAEpD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAE5B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI,GAAG,CAAC,SAAS,EAAE,KAAK,IAAI,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,OAAe,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE7E,QAAQ,OAAO,EACf,CAAC;YACA,KAAK,IAAI;gBAER,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC9C,MAAM;YACP,KAAK,IAAI;gBAER,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBACnD,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;gBACxE,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBACjD,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBACnD,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC9C,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAChD,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC7C,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBACpD,MAAM;YACP;gBACC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,GAAG,OAAO,GAAG,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACpG,CAAC;IACF,CAAC;IAGO,eAAe,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE9E,IAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ;YAC7B,OAAO;QACR,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1F,CAAC;IAGO,oBAAoB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEnF,IAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ;YACnC,OAAO;QACR,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,wBAAwB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxD,IAAG,CAAC,SAAS;YACZ,OAAO;QACR,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,EACvF,KAAK,EAAE,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAC/C,CAAC;IAGO,kBAAkB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEjF,IAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YACjC,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAC,CAAC,CAAC;IACpE,CAAC;IAGO,cAAc,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE7E,IAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ;YACnC,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;IACxD,CAAC;IAGO,oBAAoB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEnF,IAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ;YAClC,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACnG,CAAC;IAGO,eAAe,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE9E,IAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ;YAC7B,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,MAAM,GAAiB,EAAE,CAAC;QAChC,KAAI,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,EAAE,EAAE,CAAC,IAAE,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,IAAE,CAAC,CAAC,GAAC,IAAI,CAAC,CAAC;QAChC,MAAM,GAAG,GAAe,EAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IA0BO,iBAAiB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEhF,IAAG,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ;YAC/B,OAAO;QACR,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,GAAG,GAAiB,EAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAGO,qBAAqB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEpF,IAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ;YACnC,OAAO;QAER,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,yBAAyB,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACxF,MAAM,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO;QAEP,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9D,IAAI,MAAkC,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,IAAc,CAAC;QAEnB,QAAQ,GAAG,EACX,CAAC;YACA,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC;gBAC7B,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC;gBACxB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC;gBAC5B,MAAM,GAAG,EAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE;oBAC1D,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAC,CAAC;gBAC5D,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;gBACtB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;gBACrB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;gBACrB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC;gBAC7B,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;gBACrB,MAAM;YACP,KAAK,MAAM;gBACV,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;gBAC3B,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;gBAC3B,MAAM;YACP;gBACC,IAAI,KAAK,IAAI,CAAC;oBACb,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;qBACvB,IAAI,KAAK,IAAI,CAAC;oBAClB,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC;;oBAExB,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;QAC9B,CAAC;IAGF,CAAC;CACD"}
package/dist/data/dataMsg.d.ts CHANGED
@@ -40,3 +40,10 @@ export declare class MsgDataName extends Message {
40
40
  type(): NameType;
41
41
  static fromBuffer(mode: MsgMode, mx10Nid: number, buffer: Buffer): MsgDataName;
42
42
  }
43
+ export declare class MsgItemImage extends Message {
44
+ static header(mode: MsgMode, nid: number): Header;
45
+ constructor(header: Header, itemNid: number, imageType: number, imageId?: number);
46
+ itemNid(): number;
47
+ imageType(): number;
48
+ imageId(): number;
49
+ }
package/dist/data/dataMsg.js CHANGED
@@ -122,4 +122,18 @@ export class MsgDataName extends Message {
122
122
  return msg;
123
123
  }
124
124
  }
125
+ export class MsgItemImage extends Message {
126
+ static header(mode, nid) { return { group: 0x7, cmd: 0x12, mode: mode, nid: nid }; }
127
+ constructor(header, itemNid, imageType, imageId) {
128
+ super(header);
129
+ super.push({ value: itemNid, length: 2 });
130
+ super.push({ value: imageType, length: 2 });
131
+ if (header.mode === MsgMode.REQ || imageId === undefined)
132
+ return;
133
+ super.push({ value: imageId, length: 2 });
134
+ }
135
+ itemNid() { return (this.header.mode === MsgMode.REQ ? this.data[0].value : this.header.nid || 0); }
136
+ imageType() { return this.data[this.header.mode === MsgMode.REQ ? 1 : 0].value; }
137
+ imageId() { return (this.header.mode === MsgMode.REQ ? 0 : this.data[1].value); }
138
+ }
125
139
  //# sourceMappingURL=dataMsg.js.map
package/dist/data/dataMsg.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dataMsg.js","sourceRoot":"","sources":["../../src/data/dataMsg.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dataMsg.js","sourceRoot":"","sources":["../../src/data/dataMsg.ts"],"names":[],"mappings":"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"}
package/dist/data/lanDataGroup.js CHANGED
@@ -181,7 +181,7 @@ export default class LanDataGroup {
181
181
  }
182
182
  const funMode = [];
183
183
  for (let i = 0; i < 64; i++) {
184
- const fun = buffer.readUInt16LE(132 + 2 * i);
184
+ const fun = buffer.readUInt16LE(196 + 2 * i);
185
185
  funMode.push(fun);
186
186
  }
187
187
  const msg = new MsgLocoGuiRsp(MsgLocoGuiRsp.header(mode, nid), NID, SubID, version, flags, group, name, imageId, imageCrc, tachoId, tachoCrc, speedFwd, speedRev, speedRank, driveType, era, countryCode, funImg, funMode);
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "types": "dist/index.d.ts",
6
6
  "license": "MIT",
7
7
  "repository": "https://github.com/ZIMO-Elektronik/zcan",
8
- "version": "1.0.48",
8
+ "version": "1.0.50",
9
9
  "scripts": {
10
10
  "start": "node dist/main.js",
11
11
  "start:dev": "nodemon --ext js,ts,json,env --exec \"node --experimental-specifier-resolution=node --loader ts-node/esm\" src/main.ts",
package/src/data/dataGroup.ts CHANGED
@@ -6,7 +6,7 @@ import {RemoveLocomotiveData, DataNameExtended, DataNameValue1,
6
6
  ItemFxMode, ItemFxConfig, ItemImageData, ItemListByIndexData, ItemListByNidData} from '../common/models';
7
7
  import {FxConfigType, FxModeType, ImageType, MsgMode, NameType} from '../common/enums';
8
8
  import ExtendedASCII from '../common/extendedAscii';
9
- import { MsgDataName, MsgGroupCount, MsgItemsByIndexReq, MsgItemsByIndexRsp } from './dataMsg';
9
+ import { MsgDataName, MsgGroupCount, MsgItemImage, MsgItemsByIndexReq, MsgItemsByIndexRsp } from './dataMsg';
10
10
  import { Query } from '../docs_entrypoint';
11
11
 
12
12
  /**
@@ -19,12 +19,13 @@ export default class DataGroup
19
19
  public readonly onListItemsByIndex = new Subject<MsgItemsByIndexRsp>();
20
20
  public readonly onListItemsByNID = new Subject<ItemListByNidData>();
21
21
  public readonly onRemoveLocomotive = new Subject<RemoveLocomotiveData>();
22
- public readonly onItemImageConfig = new Subject<ItemImageData>();
22
+ public readonly onItemImageConfig = new Subject<MsgItemImage>();
23
23
  public readonly onItemFxMode = new Subject<ItemFxMode>();
24
24
  public readonly onItemFxConfig = new Subject<ItemFxConfig>();
25
25
  public readonly onDataNameExtended = new Subject<MsgDataName>();
26
26
 
27
27
  private nameQ: Query<MsgDataName> | undefined = undefined;
28
+ private imageQ: Query<MsgItemImage> | undefined = undefined;
28
29
  private groupCountQ: Query<MsgGroupCount> | undefined = undefined;
29
30
  private byIndexQ: Query<MsgItemsByIndexRsp> | undefined = undefined;
30
31
 
@@ -266,15 +267,56 @@ export default class DataGroup
266
267
  this.nameQ.unlock();
267
268
  this.nameQ = undefined;
268
269
  return rv;
270
+ }
269
271
 
270
- this.mx10.sendData(0x07, 0x21, [
271
- {value: nid, length: 2},
272
- {value: subId, length: 2},
273
- {value: 0, length: 4},
274
- {value: 0, length: 4},
275
- {value: name, length: name.length},
276
- {value: 0, length: 1},
277
- ], 0b01);
272
+ async getImage(nid: number, type: number)
273
+ {
274
+ if(this.imageQ !== undefined && !await this.imageQ.lock()) {
275
+ this.mx10.logInfo.next("mx10.getImage: failed to acquire lock");
276
+ return undefined;
277
+ }
278
+ this.imageQ = new Query(MsgItemImage.header(MsgMode.REQ, this.mx10.mx10NID), this.onItemImageConfig);
279
+ this.imageQ.tx = ((header) => {
280
+ const msg = new MsgItemImage(header, nid, type);
281
+ // this.mx10.logInfo.next('getImage query tx: ' + JSON.stringify(msg));
282
+ this.mx10.sendMsg(msg);
283
+ });
284
+ this.imageQ.match = ((msg) => {
285
+ // this.mx10.logInfo.next('getImage query rx: ' + JSON.stringify(msg));
286
+ return (msg.itemNid() === nid && msg.imageType() === type);
287
+ })
288
+ const rv = await this.imageQ.run();
289
+ // this.mx10.logInfo.next("mx10.getImage.rv: " + JSON.stringify(rv));
290
+ this.imageQ.unlock();
291
+ this.imageQ = undefined;
292
+ return rv;
293
+ }
294
+
295
+ async setImage(nid: number, type: number, id: number)
296
+ {
297
+ if(this.imageQ !== undefined && !await this.imageQ.lock()) {
298
+ this.mx10.logInfo.next("mx10.setImage: failed to acquire lock");
299
+ return undefined;
300
+ }
301
+ this.imageQ = new Query(MsgItemImage.header(MsgMode.CMD, nid), this.onItemImageConfig);
302
+ this.imageQ.log = ((msg) => {
303
+ this.mx10.logInfo.next(msg);
304
+ });
305
+ this.imageQ.tx = ((header) => {
306
+ const msg = new MsgItemImage(header, nid, type, id);
307
+ // this.mx10.logInfo.next('setImage query tx: ' + JSON.stringify(msg));
308
+ this.mx10.sendMsg(msg);
309
+ });
310
+ this.imageQ.match = ((msg) => {
311
+ // this.mx10.logInfo.next('setImage query rx: ' + JSON.stringify(msg));
312
+ return (msg.itemNid() === nid && msg.imageType() === type);
313
+ })
314
+ this.imageQ.subscribe(false);
315
+ const rv = await this.imageQ.run();
316
+ // this.mx10.logInfo.next("mx10.setImage.rv: " + JSON.stringify(rv));
317
+ this.imageQ.unlock();
318
+ this.imageQ = undefined;
319
+ return rv;
278
320
  }
279
321
 
280
322
  parse(size: number, command: number, mode: number, nid: number, buffer: Buffer)
@@ -367,7 +409,7 @@ export default class DataGroup
367
409
  const NID = buffer.readUInt16LE(0);
368
410
  const type = buffer.readUInt16LE(2);
369
411
  const imageId = buffer.readUInt16LE(4);
370
- this.onItemImageConfig.next({nid: NID, type, imageId});
412
+ this.onItemImageConfig.next(new MsgItemImage(MsgItemImage.header(mode, nid), NID, type, imageId));
371
413
  }
372
414
 
373
415
  // 0x07.0x14
package/src/data/dataMsg.ts CHANGED
@@ -164,4 +164,23 @@ export class MsgDataName extends Message
164
164
  const msg = new MsgDataName(MsgDataName.header(mode, nid), subId, name, v1, v2);
165
165
  return msg;
166
166
  }
167
+ }
168
+
169
+ export class MsgItemImage extends Message
170
+ {
171
+ public static header(mode: MsgMode, nid: number): Header
172
+ {return {group: 0x7, cmd: 0x12, mode: mode, nid: nid}}
173
+
174
+ constructor(header: Header, itemNid: number, imageType: number, imageId?: number)
175
+ {
176
+ super(header);
177
+ super.push({value: itemNid, length: 2});
178
+ super.push({value: imageType, length: 2});
179
+ if(header.mode === MsgMode.REQ || imageId === undefined)
180
+ return;
181
+ super.push({value: imageId, length: 2});
182
+ }
183
+ itemNid(): number {return (this.header.mode === MsgMode.REQ ? this.data[0].value as number : this.header.nid || 0)}
184
+ imageType(): number {return (this.data[this.header.mode === MsgMode.REQ ? 1 : 0].value as number)}
185
+ imageId(): number {return (this.header.mode === MsgMode.REQ ? 0 : this.data[1].value as number)}
167
186
  }
package/src/data/lanDataGroup.ts CHANGED
@@ -303,7 +303,7 @@ export default class LanDataGroup
303
303
  }
304
304
  const funMode: number[] = [];
305
305
  for (let i = 0; i < 64; i++) {
306
- const fun = buffer.readUInt16LE(132 + 2*i);
306
+ const fun = buffer.readUInt16LE(196 + 2*i);
307
307
  funMode.push(fun);
308
308
  }
309
309