raain-ui 2.2.1 → 2.3.1

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.
package/RELEASE.md CHANGED
@@ -6,3 +6,5 @@
6
6
  - 1.11.x : Factory refactored, perf monitoring added
7
7
  - 2.0.x : change raain-model
8
8
  - 2.1.x : composite layer could include icons
9
+ - 2.2.x : model polar enhancement
10
+ - 2.3.x : cartesian earth optimization
@@ -19,7 +19,7 @@ class IconGridValue extends GridValue_1.GridValue {
19
19
  return new IconGridValue(tools_1.MapTools.hexStringToNumber('' + value), transparency, '' + Math.round(src.value * 100) / 100, center.x, center.y, src.speed, src.angle);
20
20
  }
21
21
  getPoints(ratio = 1) {
22
- const angle = raain_model_1.QualityTools.GetAzimuthRad(-this.angle);
22
+ const angle = raain_model_1.CartesianTools.GetAzimuthRad(-this.angle);
23
23
  const center = {
24
24
  x: this.centerX,
25
25
  y: this.centerY
@@ -36,4 +36,4 @@ class IconGridValue extends GridValue_1.GridValue {
36
36
  }
37
37
  }
38
38
  exports.IconGridValue = IconGridValue;
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWNvbkdyaWRWYWx1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kcmF3ZXJzL0ljb25HcmlkVmFsdWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsb0NBQWdEO0FBRWhELDJDQUFzQztBQUN0Qyw2Q0FBeUM7QUFFekMsTUFBYSxhQUFjLFNBQVEscUJBQVM7SUFFeEMsWUFDSSxLQUFhLEVBQ2IsWUFBb0IsRUFDcEIsRUFBVSxFQUNILE9BQWUsRUFDZixPQUFlLEVBQ2YsS0FBYSxFQUNiLEtBQWE7UUFFcEIsS0FBSyxDQUFDLEtBQUssRUFBRSxZQUFZLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFMeEIsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQUNmLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFDZixVQUFLLEdBQUwsS0FBSyxDQUFRO1FBQ2IsVUFBSyxHQUFMLEtBQUssQ0FBUTtJQUd4QixDQUFDO0lBRUQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFpQixFQUNqQixNQUFhO1FBRXZCLHFFQUFxRTtRQUNyRSxNQUFNLEtBQUssR0FBRyxTQUFTLENBQUM7UUFDeEIsTUFBTSxZQUFZLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZCLE9BQU8sSUFBSSxhQUFhLENBQ3BCLGdCQUFRLENBQUMsaUJBQWlCLENBQUMsRUFBRSxHQUFHLEtBQUssQ0FBQyxFQUN0QyxZQUFZLEVBQ1osRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEtBQUssR0FBRyxHQUFHLENBQUMsR0FBRyxHQUFHLEVBQ3RDLE1BQU0sQ0FBQyxDQUFDLEVBQ1IsTUFBTSxDQUFDLENBQUMsRUFDUixHQUFHLENBQUMsS0FBSyxFQUNULEdBQUcsQ0FBQyxLQUFLLENBQ1osQ0FBQztJQUNOLENBQUM7SUFFTSxTQUFTLENBQUMsS0FBSyxHQUFHLENBQUM7UUFLdEIsTUFBTSxLQUFLLEdBQUcsMEJBQVksQ0FBQyxhQUFhLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDdEQsTUFBTSxNQUFNLEdBQUc7WUFDWCxDQUFDLEVBQUUsSUFBSSxDQUFDLE9BQU87WUFDZixDQUFDLEVBQUUsSUFBSSxDQUFDLE9BQU87U0FDbEIsQ0FBQztRQUNGLE1BQU0sS0FBSyxHQUFHO1lBQ1YsQ0FBQyxFQUFFLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDO1lBQ3ZDLENBQUMsRUFBRSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztTQUMxQyxDQUFDO1FBQ0YsTUFBTSxHQUFHLEdBQUc7WUFDUixDQUFDLEVBQUUsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztZQUN4QyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztTQUMzQyxDQUFDO1FBQ0YsT0FBTyxFQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFDLENBQUM7SUFDaEMsQ0FBQztDQUVKO0FBcERELHNDQW9EQyJ9
39
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWNvbkdyaWRWYWx1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kcmF3ZXJzL0ljb25HcmlkVmFsdWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsb0NBQWdEO0FBRWhELDJDQUFzQztBQUN0Qyw2Q0FBMkM7QUFFM0MsTUFBYSxhQUFjLFNBQVEscUJBQVM7SUFFeEMsWUFDSSxLQUFhLEVBQ2IsWUFBb0IsRUFDcEIsRUFBVSxFQUNILE9BQWUsRUFDZixPQUFlLEVBQ2YsS0FBYSxFQUNiLEtBQWE7UUFFcEIsS0FBSyxDQUFDLEtBQUssRUFBRSxZQUFZLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFMeEIsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQUNmLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFDZixVQUFLLEdBQUwsS0FBSyxDQUFRO1FBQ2IsVUFBSyxHQUFMLEtBQUssQ0FBUTtJQUd4QixDQUFDO0lBRUQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFpQixFQUNqQixNQUFhO1FBRXZCLHFFQUFxRTtRQUNyRSxNQUFNLEtBQUssR0FBRyxTQUFTLENBQUM7UUFDeEIsTUFBTSxZQUFZLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZCLE9BQU8sSUFBSSxhQUFhLENBQ3BCLGdCQUFRLENBQUMsaUJBQWlCLENBQUMsRUFBRSxHQUFHLEtBQUssQ0FBQyxFQUN0QyxZQUFZLEVBQ1osRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEtBQUssR0FBRyxHQUFHLENBQUMsR0FBRyxHQUFHLEVBQ3RDLE1BQU0sQ0FBQyxDQUFDLEVBQ1IsTUFBTSxDQUFDLENBQUMsRUFDUixHQUFHLENBQUMsS0FBSyxFQUNULEdBQUcsQ0FBQyxLQUFLLENBQ1osQ0FBQztJQUNOLENBQUM7SUFFTSxTQUFTLENBQUMsS0FBSyxHQUFHLENBQUM7UUFLdEIsTUFBTSxLQUFLLEdBQUcsNEJBQWMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDeEQsTUFBTSxNQUFNLEdBQUc7WUFDWCxDQUFDLEVBQUUsSUFBSSxDQUFDLE9BQU87WUFDZixDQUFDLEVBQUUsSUFBSSxDQUFDLE9BQU87U0FDbEIsQ0FBQztRQUNGLE1BQU0sS0FBSyxHQUFHO1lBQ1YsQ0FBQyxFQUFFLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDO1lBQ3ZDLENBQUMsRUFBRSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztTQUMxQyxDQUFDO1FBQ0YsTUFBTSxHQUFHLEdBQUc7WUFDUixDQUFDLEVBQUUsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztZQUN4QyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztTQUMzQyxDQUFDO1FBQ0YsT0FBTyxFQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFDLENBQUM7SUFDaEMsQ0FBQztDQUVKO0FBcERELHNDQW9EQyJ9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "raain-ui",
3
- "version": "2.2.1",
3
+ "version": "2.3.1",
4
4
  "author": "contact@raain.io",
5
5
  "homepage": "https://github.com/raainio/raain-ui",
6
6
  "description": "raain.io ui layers",
@@ -19,14 +19,14 @@
19
19
  "geolib": "^3.3.4",
20
20
  "leaflet": "^1.9.4",
21
21
  "pixi.js": "^5.3.12",
22
- "raain-model": "^2.5.3"
22
+ "raain-model": "^2.6.3"
23
23
  },
24
24
  "peerDependencies": {
25
25
  "chart.js": "^4.4.7",
26
26
  "chartjs-plugin-dragdata": "^2.3.1",
27
27
  "leaflet": "^1.9.4",
28
28
  "pixi.js": "^5.3.12",
29
- "raain-model": "^2.5.3"
29
+ "raain-model": "^2.6.3"
30
30
  },
31
31
  "devDependencies": {
32
32
  "@testdeck/mocha": "^0.3.3",
@@ -39,10 +39,6 @@ class TimeframeContainers {
39
39
  const cartesianMapValues = frameContainer.values;
40
40
  const cartesianDrawerOptimization = new drawers_1.CartesianDrawerOptimization('cumul', 0, false, true);
41
41
  const cartesianMapValuesFiltered = cartesianDrawerOptimization.filteringValues(9 - 9, cartesianMapValues);
42
- // const cartesianMapValuesIncreased = cartesianMapValuesFiltered.map(v => {
43
- // v.value = v.value * 9;
44
- // return v;
45
- // });
46
42
  for (const cartesianMapValue of cartesianMapValuesFiltered) {
47
43
  const alreadyExist = cartesianSummedValues
48
44
  .filter(v => v.equals(cartesianMapValue));
@@ -50,19 +46,15 @@ class TimeframeContainers {
50
46
  alreadyExist[0].value += cartesianMapValue.value;
51
47
  }
52
48
  else {
53
- // cartesianMapValue.lat2 = QualityTools.RoundLatLng(cartesianMapValue.lat2
54
- // + cartesianMapValue.lat2 - cartesianMapValue.lat);
55
- // cartesianMapValue.lng2 = QualityTools.RoundLatLng(cartesianMapValue.lng2
56
- // + cartesianMapValue.lng2 - cartesianMapValue.lng);
57
49
  cartesianSummedValues.push(cartesianMapValue);
58
50
  }
59
51
  }
60
52
  }
61
53
  }
62
54
  return cartesianSummedValues.map(v => {
63
- const lat2 = raain_model_1.QualityTools.RoundLatLng(v.lat2
55
+ const lat2 = raain_model_1.CartesianTools.RoundLatLng(v.lat2
64
56
  + 2 * (v.lat2 - v.lat));
65
- const lng2 = raain_model_1.QualityTools.RoundLatLng(v.lng2
57
+ const lng2 = raain_model_1.CartesianTools.RoundLatLng(v.lng2
66
58
  + 2 * (v.lng2 - v.lng));
67
59
  const value = v.value * 9;
68
60
  return new tools_1.CartesianMapValue(value, v.lat, v.lng, lat2, lng2, v.id, v.name);
@@ -83,12 +75,14 @@ class TimeframeContainers {
83
75
  });
84
76
  }
85
77
  else {
78
+ const cartesianTools = new raain_model_1.CartesianTools();
79
+ cartesianTools.buildLatLngEarthMap();
86
80
  frames = measures.map(m => {
87
81
  let values = [];
88
82
  if (m.values) {
89
83
  m.values.forEach(v => {
90
84
  const cartesianMeasureValue = raain_model_1.CartesianMeasureValue.From(v);
91
- values = values.concat(tools_1.CartesianMapValue.From(cartesianMeasureValue.getCartesianValues(), cartesianMeasureValue.getCartesianPixelWidth()));
85
+ values = values.concat(tools_1.CartesianMapValue.From(cartesianMeasureValue.getCartesianValues(), cartesianTools));
92
86
  });
93
87
  }
94
88
  return new FrameContainer_1.FrameContainer(m.date, values, false, true);
@@ -98,4 +92,4 @@ class TimeframeContainers {
98
92
  }
99
93
  }
100
94
  exports.TimeframeContainers = TimeframeContainers;
101
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGltZWZyYW1lQ29udGFpbmVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90aW1lZnJhbWVzL1RpbWVmcmFtZUNvbnRhaW5lcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkRBQXdEO0FBQ3hELDZDQVNxQjtBQUNyQixxREFBZ0Q7QUFDaEQsb0NBQTBEO0FBRTFELHdDQUF1RDtBQUV2RCxNQUFhLG1CQUFtQjtJQUM1QixZQUFtQixVQUFxQztRQUFyQyxlQUFVLEdBQVYsVUFBVSxDQUEyQjtJQUN4RCxDQUFDO0lBRUQsbUJBQW1CLENBQUMsWUFBMEIsRUFDMUIsT0FBZ0I7UUFFaEMsTUFBTSxhQUFhLEdBQUcsWUFBWSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ2hELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsYUFBYSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQzFELElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksdUNBQWtCLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsWUFBWSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN2RyxDQUFDO0lBRUQseUJBQXlCLENBQUMsa0JBQXNDLEVBQ3RDLE9BQWdCO1FBRXRDLE1BQU0sWUFBWSxHQUFHLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3JELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ3pELElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksdUNBQWtCLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDbkgsQ0FBQztJQUVELGNBQWMsQ0FBQyxJQUFZLEVBQUUsSUFBVTtRQUNuQyxJQUFJLEtBQUssR0FBcUUsRUFBRSxD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
95
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGltZWZyYW1lQ29udGFpbmVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90aW1lZnJhbWVzL1RpbWVmcmFtZUNvbnRhaW5lcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkRBQXdEO0FBQ3hELDZDQVNxQjtBQUNyQixxREFBZ0Q7QUFDaEQsb0NBQTBEO0FBRTFELHdDQUF1RDtBQUV2RCxNQUFhLG1CQUFtQjtJQUM1QixZQUFtQixVQUFxQztRQUFyQyxlQUFVLEdBQVYsVUFBVSxDQUEyQjtJQUN4RCxDQUFDO0lBRUQsbUJBQW1CLENBQUMsWUFBMEIsRUFDMUIsT0FBZ0I7UUFFaEMsTUFBTSxhQUFhLEdBQUcsWUFBWSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ2hELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsYUFBYSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQzFELElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksdUNBQWtCLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsWUFBWSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN2RyxDQUFDO0lBRUQseUJBQXlCLENBQUMsa0JBQXNDLEVBQ3RDLE9BQWdCO1FBRXRDLE1BQU0sWUFBWSxHQUFHLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3JELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ3pELElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksdUNBQWtCLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDbkgsQ0FBQztJQUVELGNBQWMsQ0FBQyxJQUFZLEVBQUUsSUFBVTtRQUNuQyxJQUFJLEtBQUssR0FBcUUsRUFBRSxD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
@@ -1,4 +1,4 @@
1
- import { CartesianValue } from 'raain-model';
1
+ import { CartesianTools, CartesianValue } from 'raain-model';
2
2
  import { MapLatLng } from './MapLatLng';
3
3
  import { LatLng } from 'leaflet';
4
4
  export declare class CartesianMapValue extends MapLatLng {
@@ -6,10 +6,7 @@ export declare class CartesianMapValue extends MapLatLng {
6
6
  lng2: number;
7
7
  constructor(value: number, lat: number, lng: number, lat2: number, lng2: number, id: string, name: string);
8
8
  static Duplicate(src: CartesianMapValue): CartesianMapValue;
9
- static From(cartesianValues: CartesianValue[], widthForMap: MapLatLng | {
10
- lat: number;
11
- lng: number;
12
- }): CartesianMapValue[];
9
+ static From(cartesianValues: CartesianValue[], cartesianTools: CartesianTools): CartesianMapValue[];
13
10
  getPoints(): {
14
11
  point1: LatLng;
15
12
  point2: LatLng;
@@ -12,10 +12,12 @@ class CartesianMapValue extends MapLatLng_1.MapLatLng {
12
12
  static Duplicate(src) {
13
13
  return new CartesianMapValue(src.value, src.lat, src.lng, src.lat2, src.lng2, src.id, src.name);
14
14
  }
15
- static From(cartesianValues, widthForMap) {
15
+ static From(cartesianValues, cartesianTools) {
16
16
  const cartesianMapValues = [];
17
17
  cartesianValues.forEach(cartesianValue => {
18
- cartesianMapValues.push(new CartesianMapValue(cartesianValue.value, cartesianValue.lat, cartesianValue.lng, cartesianValue.lat + widthForMap.lat, cartesianValue.lng + widthForMap.lng, '' + Math.random(), ''));
18
+ const latLngFromEarthMap = cartesianTools.getLatLngFromEarthMap(cartesianValue);
19
+ const scaleLatLngFromEarth = cartesianTools.getScaleLatLngFromEarth(cartesianValue);
20
+ cartesianMapValues.push(new CartesianMapValue(cartesianValue.value, latLngFromEarthMap.lat, latLngFromEarthMap.lng, latLngFromEarthMap.lat + scaleLatLngFromEarth.lat, latLngFromEarthMap.lng + scaleLatLngFromEarth.lng, '' + Math.random(), ''));
19
21
  });
20
22
  return cartesianMapValues;
21
23
  }
@@ -26,4 +28,4 @@ class CartesianMapValue extends MapLatLng_1.MapLatLng {
26
28
  }
27
29
  }
28
30
  exports.CartesianMapValue = CartesianMapValue;
29
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FydGVzaWFuTWFwVmFsdWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdG9vbHMvQ2FydGVzaWFuTWFwVmFsdWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMkNBQXNDO0FBQ3RDLHFDQUErQjtBQUUvQixNQUFhLGlCQUFrQixTQUFRLHFCQUFTO0lBRTVDLFlBQ0ksS0FBYSxFQUNiLEdBQVcsRUFDWCxHQUFXLEVBQ0osSUFBWSxFQUNaLElBQVksRUFDbkIsRUFBVSxFQUNWLElBQVk7UUFFWixLQUFLLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztRQUxyQyxTQUFJLEdBQUosSUFBSSxDQUFRO1FBQ1osU0FBSSxHQUFKLElBQUksQ0FBUTtJQUt2QixDQUFDO0lBRU0sTUFBTSxDQUFDLFNBQVMsQ0FBQyxHQUFzQjtRQUMxQyxPQUFPLElBQUksaUJBQWlCLENBQ3hCLEdBQUcsQ0FBQyxLQUFLLEVBQ1QsR0FBRyxDQUFDLEdBQUcsRUFDUCxHQUFHLENBQUMsR0FBRyxFQUNQLEdBQUcsQ0FBQyxJQUFJLEVBQ1IsR0FBRyxDQUFDLElBQUksRUFDUixHQUFHLENBQUMsRUFBRSxFQUNOLEdBQUcsQ0FBQyxJQUFJLENBQ1gsQ0FBQztJQUNOLENBQUM7SUFFTSxNQUFNLENBQUMsSUFBSSxDQUFDLGVBQWlDLEVBQUUsV0FBcUQ7UUFDdkcsTUFBTSxrQkFBa0IsR0FBRyxFQUFFLENBQUM7UUFDOUIsZUFBZSxDQUFDLE9BQU8sQ0FBQyxjQUFjLENBQUMsRUFBRTtZQUNyQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxpQkFBaUIsQ0FDekMsY0FBYyxDQUFDLEtBQUssRUFDcEIsY0FBYyxDQUFDLEdBQUcsRUFDbEIsY0FBYyxDQUFDLEdBQUcsRUFDbEIsY0FBYyxDQUFDLEdBQUcsR0FBRyxXQUFXLENBQUMsR0FBRyxFQUNwQyxjQUFjLENBQUMsR0FBRyxHQUFHLFdBQVcsQ0FBQyxHQUFHLEVBQ3BDLEVBQUUsR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQ2xCLEVBQUUsQ0FDTCxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUMsQ0FBQztRQUNILE9BQU8sa0JBQWtCLENBQUM7SUFDOUIsQ0FBQztJQUVELFNBQVM7UUFDTCxNQUFNLE1BQU0sR0FBRyxJQUFJLGdCQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDOUMsTUFBTSxNQUFNLEdBQUcsSUFBSSxnQkFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hELE9BQU8sRUFBQyxNQUFNLEVBQUUsTUFBTSxFQUFDLENBQUM7SUFDNUIsQ0FBQztDQUVKO0FBaERELDhDQWdEQyJ9
31
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FydGVzaWFuTWFwVmFsdWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdG9vbHMvQ2FydGVzaWFuTWFwVmFsdWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMkNBQXNDO0FBQ3RDLHFDQUErQjtBQUUvQixNQUFhLGlCQUFrQixTQUFRLHFCQUFTO0lBRTVDLFlBQ0ksS0FBYSxFQUNiLEdBQVcsRUFDWCxHQUFXLEVBQ0osSUFBWSxFQUNaLElBQVksRUFDbkIsRUFBVSxFQUNWLElBQVk7UUFFWixLQUFLLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztRQUxyQyxTQUFJLEdBQUosSUFBSSxDQUFRO1FBQ1osU0FBSSxHQUFKLElBQUksQ0FBUTtJQUt2QixDQUFDO0lBRU0sTUFBTSxDQUFDLFNBQVMsQ0FBQyxHQUFzQjtRQUMxQyxPQUFPLElBQUksaUJBQWlCLENBQ3hCLEdBQUcsQ0FBQyxLQUFLLEVBQ1QsR0FBRyxDQUFDLEdBQUcsRUFDUCxHQUFHLENBQUMsR0FBRyxFQUNQLEdBQUcsQ0FBQyxJQUFJLEVBQ1IsR0FBRyxDQUFDLElBQUksRUFDUixHQUFHLENBQUMsRUFBRSxFQUNOLEdBQUcsQ0FBQyxJQUFJLENBQ1gsQ0FBQztJQUNOLENBQUM7SUFFTSxNQUFNLENBQUMsSUFBSSxDQUFDLGVBQWlDLEVBQUUsY0FBOEI7UUFDaEYsTUFBTSxrQkFBa0IsR0FBRyxFQUFFLENBQUM7UUFDOUIsZUFBZSxDQUFDLE9BQU8sQ0FBQyxjQUFjLENBQUMsRUFBRTtZQUNyQyxNQUFNLGtCQUFrQixHQUFHLGNBQWMsQ0FBQyxxQkFBcUIsQ0FBQyxjQUFjLENBQUMsQ0FBQztZQUNoRixNQUFNLG9CQUFvQixHQUFHLGNBQWMsQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsQ0FBQztZQUVwRixrQkFBa0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxpQkFBaUIsQ0FDekMsY0FBYyxDQUFDLEtBQUssRUFDcEIsa0JBQWtCLENBQUMsR0FBRyxFQUN0QixrQkFBa0IsQ0FBQyxHQUFHLEVBQ3RCLGtCQUFrQixDQUFDLEdBQUcsR0FBRyxvQkFBb0IsQ0FBQyxHQUFHLEVBQ2pELGtCQUFrQixDQUFDLEdBQUcsR0FBRyxvQkFBb0IsQ0FBQyxHQUFHLEVBQ2pELEVBQUUsR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQ2xCLEVBQUUsQ0FDTCxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUMsQ0FBQztRQUNILE9BQU8sa0JBQWtCLENBQUM7SUFDOUIsQ0FBQztJQUVELFNBQVM7UUFDTCxNQUFNLE1BQU0sR0FBRyxJQUFJLGdCQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDOUMsTUFBTSxNQUFNLEdBQUcsSUFBSSxnQkFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hELE9BQU8sRUFBQyxNQUFNLEVBQUUsTUFBTSxFQUFDLENBQUM7SUFDNUIsQ0FBQztDQUVKO0FBbkRELDhDQW1EQyJ9