@flowmap.gl/data 8.0.0-alpha.13 → 8.0.0-alpha.17

package/src/FlowmapSelectors.ts

@@ -17,8 +17,7 @@
  */
 
 import {WebMercatorViewport} from '@math.gl/web-mercator';
-import {ascending, descending, extent, min} from 'd3-array';
-import {nest} from 'd3-collection';
+import {ascending, rollup, descending, extent, min} from 'd3-array';
 import {ScaleLinear, scaleLinear, scaleSqrt} from 'd3-scale';
 import KDBush from 'kdbush';
 import {
@@ -158,25 +157,34 @@ export default class FlowmapSelectors<L, F> {
     },
   );
 
-  getLocations: Selector<L, F, L[] | undefined> = createSelector(
+  getLocations: Selector<L, F, Iterable<L> | undefined> = createSelector(
     this.getFetchedLocations,
     this.getInvalidLocationIds,
     (locations, invalidIds) => {
       if (!locations) return undefined;
       if (!invalidIds || invalidIds.length === 0) return locations;
       const invalid = new Set(invalidIds);
-      return locations.filter(
-        (location: L) => !invalid.has(this.accessors.getLocationId(location)),
-      );
+      const filtered: L[] = [];
+      for (const location of locations) {
+        const id = this.accessors.getLocationId(location);
+        if (!invalid.has(id)) {
+          filtered.push(location);
+        }
+      }
+      return filtered;
     },
   );
 
   getLocationIds: Selector<L, F, Set<string> | undefined> = createSelector(
     this.getLocations,
-    (locations) =>
-      locations
-        ? new Set(locations.map(this.accessors.getLocationId))
-        : undefined,
+    (locations) => {
+      if (!locations) return undefined;
+      const ids = new Set<string>();
+      for (const id of locations) {
+        ids.add(this.accessors.getLocationId(id));
+      }
+      return ids;
+    },
   );
 
   getSelectedLocationsSet: Selector<L, F, Set<string> | undefined> =
@@ -187,18 +195,20 @@ export default class FlowmapSelectors<L, F> {
   getSortedFlowsForKnownLocations: Selector<L, F, F[] | undefined> =
     createSelector(this.getFetchedFlows, this.getLocationIds, (flows, ids) => {
       if (!ids || !flows) return undefined;
-      return flows
-        .filter(
-          (flow: F) =>
-            ids.has(this.accessors.getFlowOriginId(flow)) &&
-            ids.has(this.accessors.getFlowDestId(flow)),
-        )
-        .sort((a: F, b: F) =>
-          descending(
-            Math.abs(this.accessors.getFlowMagnitude(a)),
-            Math.abs(this.accessors.getFlowMagnitude(b)),
-          ),
-        );
+      const filtered = [];
+      for (const flow of flows) {
+        const srcId = this.accessors.getFlowOriginId(flow);
+        const dstId = this.accessors.getFlowDestId(flow);
+        if (ids.has(srcId) && ids.has(dstId)) {
+          filtered.push(flow);
+        }
+      }
+      return filtered.sort((a: F, b: F) =>
+        descending(
+          Math.abs(this.accessors.getFlowMagnitude(a)),
+          Math.abs(this.accessors.getFlowMagnitude(b)),
+        ),
+      );
     });
 
   getActualTimeExtent: Selector<L, F, [Date, Date] | undefined> =
@@ -271,30 +281,36 @@ export default class FlowmapSelectors<L, F> {
     },
   );
 
-  getLocationsHavingFlows: Selector<L, F, L[] | undefined> = createSelector(
-    this.getSortedFlowsForKnownLocations,
-    this.getLocations,
-    (flows, locations) => {
-      if (!locations || !flows) return locations;
-      const withFlows = new Set();
-      for (const flow of flows) {
-        withFlows.add(this.accessors.getFlowOriginId(flow));
-        withFlows.add(this.accessors.getFlowDestId(flow));
-      }
-      return locations.filter((location: L) =>
-        withFlows.has(this.accessors.getLocationId(location)),
-      );
-    },
-  );
+  getLocationsHavingFlows: Selector<L, F, Iterable<L> | undefined> =
+    createSelector(
+      this.getSortedFlowsForKnownLocations,
+      this.getLocations,
+      (flows, locations) => {
+        if (!locations || !flows) return locations;
+        const withFlows = new Set();
+        for (const flow of flows) {
+          withFlows.add(this.accessors.getFlowOriginId(flow));
+          withFlows.add(this.accessors.getFlowDestId(flow));
+        }
+        const filtered = [];
+        for (const location of locations) {
+          if (withFlows.has(this.accessors.getLocationId(location))) {
+            filtered.push(location);
+          }
+        }
+        return filtered;
+      },
+    );
 
   getLocationsById: Selector<L, F, Map<string, L> | undefined> = createSelector(
     this.getLocationsHavingFlows,
     (locations) => {
       if (!locations) return undefined;
-      return nest<L, L>()
-        .key((d: L) => this.accessors.getLocationId(d))
-        .rollup(([d]) => d)
-        .map(locations) as any as Map<string, L>;
+      const locationsById = new Map<string, L>();
+      for (const location of locations) {
+        locationsById.set(this.accessors.getLocationId(location), location);
+      }
+      return locationsById;
     },
   );
 
@@ -438,7 +454,7 @@ export default class FlowmapSelectors<L, F> {
         clusterIndex,
       ) => {
         if (!locations) return undefined;
-        let result: (L | Cluster)[] = locations;
+        let result: (L | Cluster)[] = Array.from(locations);
         // if (clusteringEnabled) {
         //   if (clusterIndex) {
         //     const zoomItems = clusterIndex.getClusterNodesFor(clusterZoom);
@@ -448,7 +464,7 @@ export default class FlowmapSelectors<L, F> {
         //   }
         // }
 
-        if (result && clusterIndex && selectedLocations) {
+        if (clusterIndex && selectedLocations) {
           const toAppend = [];
           for (const id of selectedLocations) {
             const cluster = clusterIndex.getClusterById(id);
@@ -475,11 +491,12 @@ export default class FlowmapSelectors<L, F> {
   getDiffMode: Selector<L, F, boolean> = createSelector(
     this.getFetchedFlows,
     (flows) => {
-      if (
-        flows &&
-        flows.find((f: F) => this.accessors.getFlowMagnitude(f) < 0)
-      ) {
-        return true;
+      if (flows) {
+        for (const f of flows) {
+          if (this.accessors.getFlowMagnitude(f) < 0) {
+            return true;
+          }
+        }
       }
       return false;
     },
@@ -512,8 +529,8 @@ export default class FlowmapSelectors<L, F> {
     (ids, flows, flowsForKnownLocations) => {
       if (!ids || !flows) return undefined;
       if (
-        flowsForKnownLocations &&
-        flows.length === flowsForKnownLocations.length
+        flowsForKnownLocations
+        // && flows.length === flowsForKnownLocations.length
       )
         return undefined;
       const missing = new Set<string>();
@@ -656,7 +673,7 @@ export default class FlowmapSelectors<L, F> {
       },
     );
 
-  getLocationsForZoom: Selector<L, F, L[] | ClusterNode[] | undefined> =
+  getLocationsForZoom: Selector<L, F, Iterable<L> | ClusterNode[] | undefined> =
     createSelector(
       this.getClusteringEnabled,
       this.getLocationsHavingFlows,
@@ -1403,10 +1420,9 @@ function aggregateFlows<F>(
   flowAccessors: FlowAccessors<F>,
 ): AggregateFlow[] {
   // Sum up flows with same origin, dest
-  const byOriginDest = nest<F, AggregateFlow>()
-    .key(flowAccessors.getFlowOriginId)
-    .key(flowAccessors.getFlowDestId)
-    .rollup((ff: F[]) => {
+  const byOriginDest = rollup(
+    flows,
+    (ff: F[]) => {
       const origin = flowAccessors.getFlowOriginId(ff[0]);
       const dest = flowAccessors.getFlowDestId(ff[0]);
       // const color = ff[0].color;
@@ -1425,11 +1441,14 @@ function aggregateFlows<F>(
       };
       // if (color) rv.color = color;
       return rv;
-    })
-    .entries(flows);
+    },
+    flowAccessors.getFlowOriginId,
+    flowAccessors.getFlowDestId,
+  );
+
   const rv: AggregateFlow[] = [];
-  for (const {values} of byOriginDest) {
-    for (const {value} of values) {
+  for (const values of byOriginDest.values()) {
+    for (const value of values.values()) {
       rv.push(value);
     }
   }

package/src/cluster/cluster.ts

@@ -69,8 +69,9 @@ interface BasePoint {
   parentId: number; // parent cluster id
 }
 
-interface LeafPoint extends BasePoint {
+interface LeafPoint<L> extends BasePoint {
   index: number; // index of the source feature in the original input array,
+  location: L;
 }
 
 interface ClusterPoint extends BasePoint {
@@ -78,14 +79,14 @@ interface ClusterPoint extends BasePoint {
   numPoints: number;
 }
 
-type Point = LeafPoint | ClusterPoint;
+type Point<L> = LeafPoint<L> | ClusterPoint;
 
-export function isLeafPoint(p: Point): p is LeafPoint {
-  const {index} = p as LeafPoint;
+export function isLeafPoint<L>(p: Point<L>): p is LeafPoint<L> {
+  const {index} = p as LeafPoint<L>;
   return index != null;
 }
 
-export function isClusterPoint(p: Point): p is ClusterPoint {
+export function isClusterPoint<L>(p: Point<L>): p is ClusterPoint {
   const {id} = p as ClusterPoint;
   return id != null;
 }
@@ -93,7 +94,7 @@ export function isClusterPoint(p: Point): p is ClusterPoint {
 type ZoomLevelKDBush = any;
 
 export function clusterLocations<L>(
-  locations: L[],
+  locations: Iterable<L>,
   locationAccessors: LocationAccessors<L>,
   getLocationWeight: LocationWeightGetter,
   options?: Partial<Options>,
@@ -108,18 +109,21 @@ export function clusterLocations<L>(
   const trees = new Array<ZoomLevelKDBush>(maxZoom + 1);
 
   // generate a cluster object for each point and index input points into a KD-tree
-  let clusters = new Array<Point>();
-  for (let i = 0; i < locations.length; i++) {
-    const x = getLocationLon(locations[i]);
-    const y = getLocationLat(locations[i]);
+  let clusters = new Array<Point<L>>();
+  let i = 0;
+  for (const location of locations) {
+    const x = getLocationLon(location);
+    const y = getLocationLat(location);
     clusters.push({
       x: lngX(x), // projected point coordinates
       y: latY(y),
-      weight: getLocationWeight(getLocationId(locations[i])),
+      weight: getLocationWeight(getLocationId(location)),
       zoom: Infinity, // the last zoom the point was processed at
       index: i, // index of the source feature in the original input array,
       parentId: -1, // parent cluster id
+      location,
     });
+    i++;
   }
   trees[maxZoom + 1] = new KDBush(clusters, getX, getY, nodeSize, Float32Array);
 
@@ -148,11 +152,11 @@ export function clusterLocations<L>(
     let childrenByParent: Map<number, string[]> | undefined;
     const tree = trees[zoom];
     if (zoom < maxAvailZoom) {
-      childrenByParent = rollup<Point, string[], number>(
+      childrenByParent = rollup<Point<L>, string[], number>(
         trees[zoom + 1].points,
         (points: any[]) =>
           points.map((p: any) =>
-            p.id ? makeClusterId(p.id) : getLocationId(locations[p.index]),
+            p.id ? makeClusterId(p.id) : getLocationId(p.location),
           ),
         (point: any) => point.parentId,
       );
@@ -160,9 +164,8 @@ export function clusterLocations<L>(
 
     const nodes: ClusterNode[] = [];
     for (const point of tree.points) {
-      const {x, y, numPoints} = point;
+      const {x, y, numPoints, location} = point;
       if (isLeafPoint(point)) {
-        const location = locations[point.index];
         nodes.push({
           id: getLocationId(location),
           zoom,
@@ -211,13 +214,13 @@ function createCluster(
   };
 }
 
-function cluster(
-  points: Point[],
+function cluster<L>(
+  points: Point<L>[],
   zoom: number,
   tree: ZoomLevelKDBush,
   options: Options,
 ) {
-  const clusters: Point[] = [];
+  const clusters: Point<L>[] = [];
   const {radius, extent} = options;
   const r = radius / (extent * Math.pow(2, zoom));
 
@@ -293,10 +296,10 @@ function latY(lat: number) {
   return y < 0 ? 0 : y > 1 ? 1 : y;
 }
 
-function getX(p: Point) {
+function getX<L>(p: Point<L>) {
   return p.x;
 }
 
-function getY(p: Point) {
+function getY<L>(p: Point<L>) {
   return p.y;
 }

package/src/getViewStateForLocations.ts

@@ -50,19 +50,29 @@ export function getViewStateForFeatures(
   };
 }
 
-export function getViewStateForLocations(
-  locations: any[],
-  getLocationCoords: (location: any) => [number, number],
+export function getViewStateForLocations<L>(
+  locations: Iterable<L>,
+  getLocationCoords: (location: L) => [number, number],
   size: [number, number],
   opts?: GetViewStateOptions,
 ): ViewState & {width: number; height: number} {
+  const asGeometry = (location: L) => ({
+    type: 'Point',
+    coordinates: getLocationCoords(location),
+  });
+  let geometries;
+  if (Array.isArray(locations)) {
+    geometries = locations.map(asGeometry);
+  } else {
+    geometries = [];
+    for (const location of locations) {
+      geometries.push(asGeometry(location));
+    }
+  }
   return getViewStateForFeatures(
     {
       type: 'GeometryCollection',
-      geometries: locations.map((location) => ({
-        type: 'Point',
-        coordinates: getLocationCoords(location),
-      })),
+      geometries,
     } as any,
     size,
     opts,

package/src/provider/FlowmapDataProvider.ts

@@ -42,11 +42,10 @@ export function isFlowmapData<L, F>(
   data: Record<string, any>,
 ): data is FlowmapData<L, F> {
   return (
-    data &&
-    data.locations &&
-    data.flows &&
-    Array.isArray(data.locations) &&
-    Array.isArray(data.flows)
+    data && data.locations && data.flows
+    // TODO: test that they are iterable
+    // Array.isArray(data.locations) &&
+    // Array.isArray(data.flows)
   );
 }
 

package/src/provider/LocalFlowmapDataProvider.ts

@@ -53,6 +53,7 @@ export default class LocalFlowmapDataProvider<L, F>
     return flows?.[idx];
   }
 
+  // TODO: this is unreliable, should replace by unqiue ID
   async getLocationByIndex(idx: number): Promise<L | ClusterNode | undefined> {
     if (!this.flowmapState || !this.flowmapData) {
       return undefined;

package/src/types.ts

@@ -1,6 +1,6 @@
 export type FlowmapData<L, F> = {
-  locations: L[] | undefined;
-  flows: F[] | undefined;
+  locations: Iterable<L> | undefined;
+  flows: Iterable<F> | undefined;
 };
 
 export interface ViewState {
@@ -115,9 +115,9 @@ export function isAggregateFlow(
 ): flow is AggregateFlow {
   return (
     flow &&
-    flow.origin !== undefined &&
-    flow.dest !== undefined &&
-    flow.count !== undefined &&
+    // flow.origin !== undefined &&
+    // flow.dest !== undefined &&
+    // flow.count !== undefined &&
     (flow.aggregate ? true : false)
   );
 }

package/dist-es5/FlowmapAggregateAccessors.d.ts

@@ -1,16 +0,0 @@
-import { AggregateFlow, ClusterNode, FlowmapDataAccessors } from './types';
-export default class FlowmapAggregateAccessors<L, F> {
-    private accessors;
-    constructor(accessors: FlowmapDataAccessors<L, F>);
-    setAccessors(accessors: FlowmapDataAccessors<L, F>): void;
-    getFlowmapDataAccessors(): FlowmapDataAccessors<L, F>;
-    getLocationId: (location: L | ClusterNode) => string;
-    getLocationName: (location: L | ClusterNode) => string;
-    getLocationLat: (location: L | ClusterNode) => number;
-    getLocationLon: (location: L | ClusterNode) => number;
-    getFlowOriginId: (f: F | AggregateFlow) => string;
-    getFlowDestId: (f: F | AggregateFlow) => string;
-    getFlowMagnitude: (f: F | AggregateFlow) => number;
-    getFlowTime: (f: F) => Date | undefined;
-}
-//# sourceMappingURL=FlowmapAggregateAccessors.d.ts.map

package/dist-es5/FlowmapAggregateAccessors.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"FlowmapAggregateAccessors.d.ts","sourceRoot":"","sources":["../src/FlowmapAggregateAccessors.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,WAAW,EACX,oBAAoB,EAIrB,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,OAAO,OAAO,yBAAyB,CAAC,CAAC,EAAE,CAAC;IACjD,OAAO,CAAC,SAAS,CAA6B;gBAClC,SAAS,EAAE,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC;IAIjD,YAAY,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC;IAIlD,uBAAuB;IAIvB,aAAa,aAAc,CAAC,GAAG,WAAW,KAAG,MAAM,CAGN;IAE7C,eAAe,aAAc,CAAC,GAAG,WAAW,KAAG,MAAM,CAGJ;IAMjD,cAAc,aAAc,CAAC,GAAG,WAAW,KAAG,MAAM,CAGN;IAE9C,cAAc,aAAc,CAAC,GAAG,WAAW,KAAG,MAAM,CAGN;IAE9C,eAAe,MAAO,CAAC,GAAG,aAAa,YAErC;IAEF,aAAa,MAAO,CAAC,GAAG,aAAa,YAEnC;IAEF,gBAAgB,MAAO,CAAC,GAAG,aAAa,YAEtC;IAGF,WAAW,MAAO,CAAC,sBAGjB;CACH"}

package/dist-es5/FlowmapAggregateAccessors.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var types_1 = require("./types");
-var FlowmapAggregateAccessors = /** @class */ (function () {
-    function FlowmapAggregateAccessors(accessors) {
-        var _this = this;
-        this.getLocationId = function (location) {
-            return (0, types_1.isLocationClusterNode)(location)
-                ? location.id
-                : _this.accessors.getLocationId(location);
-        };
-        this.getLocationName = function (location) {
-            var _a;
-            return (_a = ((0, types_1.isLocationClusterNode)(location) && (0, types_1.isCluster)(location)
-                ? location.name
-                : undefined)) !== null && _a !== void 0 ? _a : _this.getLocationId(location);
-        };
-        // ? location.name // TODO getLocationName for locations and clusters
-        // : this.accessors.getLocationName
-        // ? this.accessors.getLocationName(location)
-        // : this.getLocationId(location);
-        this.getLocationLat = function (location) {
-            return (0, types_1.isLocationClusterNode)(location)
-                ? location.lat
-                : _this.accessors.getLocationLat(location);
-        };
-        this.getLocationLon = function (location) {
-            return (0, types_1.isLocationClusterNode)(location)
-                ? location.lon
-                : _this.accessors.getLocationLon(location);
-        };
-        this.getFlowOriginId = function (f) {
-            return (0, types_1.isAggregateFlow)(f) ? f.origin : _this.accessors.getFlowOriginId(f);
-        };
-        this.getFlowDestId = function (f) {
-            return (0, types_1.isAggregateFlow)(f) ? f.dest : _this.accessors.getFlowDestId(f);
-        };
-        this.getFlowMagnitude = function (f) {
-            return (0, types_1.isAggregateFlow)(f) ? f.count : _this.accessors.getFlowMagnitude(f);
-        };
-        // Note: Aggregate flows have no time
-        this.getFlowTime = function (f) {
-            var getFlowTime = _this.accessors.getFlowTime;
-            return getFlowTime ? getFlowTime(f) : undefined;
-        };
-        this.accessors = accessors;
-    }
-    FlowmapAggregateAccessors.prototype.setAccessors = function (accessors) {
-        this.accessors = accessors;
-    };
-    FlowmapAggregateAccessors.prototype.getFlowmapDataAccessors = function () {
-        return this.accessors;
-    };
-    return FlowmapAggregateAccessors;
-}());
-exports.default = FlowmapAggregateAccessors;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmxvd21hcEFnZ3JlZ2F0ZUFjY2Vzc29ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9GbG93bWFwQWdncmVnYXRlQWNjZXNzb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsaUNBT2lCO0FBRWpCO0lBRUUsbUNBQVksU0FBcUM7UUFBakQsaUJBRUM7UUFVRCxrQkFBYSxHQUFHLFVBQUMsUUFBeUI7WUFDeEMsT0FBQSxJQUFBLDZCQUFxQixFQUFDLFFBQVEsQ0FBQztnQkFDN0IsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFO2dCQUNiLENBQUMsQ0FBQyxLQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUM7UUFGMUMsQ0FFMEMsQ0FBQztRQUU3QyxvQkFBZSxHQUFHLFVBQUMsUUFBeUI7O1lBQzFDLE9BQUEsTUFBQSxDQUFDLElBQUEsNkJBQXFCLEVBQUMsUUFBUSxDQUFDLElBQUksSUFBQSxpQkFBUyxFQUFDLFFBQVEsQ0FBQztnQkFDckQsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJO2dCQUNmLENBQUMsQ0FBQyxTQUFTLENBQUMsbUNBQUksS0FBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQTtTQUFBLENBQUM7UUFDakQscUVBQXFFO1FBQ3JFLG1DQUFtQztRQUNuQyw2Q0FBNkM7UUFDN0Msa0NBQWtDO1FBRWxDLG1CQUFjLEdBQUcsVUFBQyxRQUF5QjtZQUN6QyxPQUFBLElBQUEsNkJBQXFCLEVBQUMsUUFBUSxDQUFDO2dCQUM3QixDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUc7Z0JBQ2QsQ0FBQyxDQUFDLEtBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQztRQUYzQyxDQUUyQyxDQUFDO1FBRTlDLG1CQUFjLEdBQUcsVUFBQyxRQUF5QjtZQUN6QyxPQUFBLElBQUEsNkJBQXFCLEVBQUMsUUFBUSxDQUFDO2dCQUM3QixDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUc7Z0JBQ2QsQ0FBQyxDQUFDLEtBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQztRQUYzQyxDQUUyQyxDQUFDO1FBRTlDLG9CQUFlLEdBQUcsVUFBQyxDQUFvQjtZQUNyQyxPQUFPLElBQUEsdUJBQWUsRUFBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsS0FBSSxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDM0UsQ0FBQyxDQUFDO1FBRUYsa0JBQWEsR0FBRyxVQUFDLENBQW9CO1lBQ25DLE9BQU8sSUFBQSx1QkFBZSxFQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2RSxDQUFDLENBQUM7UUFFRixxQkFBZ0IsR0FBRyxVQUFDLENBQW9CO1lBQ3RDLE9BQU8sSUFBQSx1QkFBZSxFQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFJLENBQUMsU0FBUyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzNFLENBQUMsQ0FBQztRQUVGLHFDQUFxQztRQUNyQyxnQkFBVyxHQUFHLFVBQUMsQ0FBSTtZQUNWLElBQUEsV0FBVyxHQUFJLEtBQUksQ0FBQyxTQUFTLFlBQWxCLENBQW1CO1lBQ3JDLE9BQU8sV0FBVyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUNsRCxDQUFDLENBQUM7UUFuREEsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDN0IsQ0FBQztJQUVELGdEQUFZLEdBQVosVUFBYSxTQUFxQztRQUNoRCxJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUM3QixDQUFDO0lBRUQsMkRBQXVCLEdBQXZCO1FBQ0UsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQ3hCLENBQUM7SUEyQ0gsZ0NBQUM7QUFBRCxDQUFDLEFBdkRELElBdURDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgQWdncmVnYXRlRmxvdyxcbiAgQ2x1c3Rlck5vZGUsXG4gIEZsb3dtYXBEYXRhQWNjZXNzb3JzLFxuICBpc0FnZ3JlZ2F0ZUZsb3csXG4gIGlzQ2x1c3RlcixcbiAgaXNMb2NhdGlvbkNsdXN0ZXJOb2RlLFxufSBmcm9tICcuL3R5cGVzJztcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgRmxvd21hcEFnZ3JlZ2F0ZUFjY2Vzc29yczxMLCBGPiB7XG4gIHByaXZhdGUgYWNjZXNzb3JzOiBGbG93bWFwRGF0YUFjY2Vzc29yczxMLCBGPjtcbiAgY29uc3RydWN0b3IoYWNjZXNzb3JzOiBGbG93bWFwRGF0YUFjY2Vzc29yczxMLCBGPikge1xuICAgIHRoaXMuYWNjZXNzb3JzID0gYWNjZXNzb3JzO1xuICB9XG5cbiAgc2V0QWNjZXNzb3JzKGFjY2Vzc29yczogRmxvd21hcERhdGFBY2Nlc3NvcnM8TCwgRj4pIHtcbiAgICB0aGlzLmFjY2Vzc29ycyA9IGFjY2Vzc29ycztcbiAgfVxuXG4gIGdldEZsb3dtYXBEYXRhQWNjZXNzb3JzKCkge1xuICAgIHJldHVybiB0aGlzLmFjY2Vzc29ycztcbiAgfVxuXG4gIGdldExvY2F0aW9uSWQgPSAobG9jYXRpb246IEwgfCBDbHVzdGVyTm9kZSk6IHN0cmluZyA9PlxuICAgIGlzTG9jYXRpb25DbHVzdGVyTm9kZShsb2NhdGlvbilcbiAgICAgID8gbG9jYXRpb24uaWRcbiAgICAgIDogdGhpcy5hY2Nlc3NvcnMuZ2V0TG9jYXRpb25JZChsb2NhdGlvbik7XG5cbiAgZ2V0TG9jYXRpb25OYW1lID0gKGxvY2F0aW9uOiBMIHwgQ2x1c3Rlck5vZGUpOiBzdHJpbmcgPT5cbiAgICAoaXNMb2NhdGlvbkNsdXN0ZXJOb2RlKGxvY2F0aW9uKSAmJiBpc0NsdXN0ZXIobG9jYXRpb24pXG4gICAgICA/IGxvY2F0aW9uLm5hbWVcbiAgICAgIDogdW5kZWZpbmVkKSA/PyB0aGlzLmdldExvY2F0aW9uSWQobG9jYXRpb24pO1xuICAvLyA/IGxvY2F0aW9uLm5hbWUgLy8gVE9ETyBnZXRMb2NhdGlvbk5hbWUgZm9yIGxvY2F0aW9ucyBhbmQgY2x1c3RlcnNcbiAgLy8gOiB0aGlzLmFjY2Vzc29ycy5nZXRMb2NhdGlvbk5hbWVcbiAgLy8gPyB0aGlzLmFjY2Vzc29ycy5nZXRMb2NhdGlvbk5hbWUobG9jYXRpb24pXG4gIC8vIDogdGhpcy5nZXRMb2NhdGlvbklkKGxvY2F0aW9uKTtcblxuICBnZXRMb2NhdGlvbkxhdCA9IChsb2NhdGlvbjogTCB8IENsdXN0ZXJOb2RlKTogbnVtYmVyID0+XG4gICAgaXNMb2NhdGlvbkNsdXN0ZXJOb2RlKGxvY2F0aW9uKVxuICAgICAgPyBsb2NhdGlvbi5sYXRcbiAgICAgIDogdGhpcy5hY2Nlc3NvcnMuZ2V0TG9jYXRpb25MYXQobG9jYXRpb24pO1xuXG4gIGdldExvY2F0aW9uTG9uID0gKGxvY2F0aW9uOiBMIHwgQ2x1c3Rlck5vZGUpOiBudW1iZXIgPT5cbiAgICBpc0xvY2F0aW9uQ2x1c3Rlck5vZGUobG9jYXRpb24pXG4gICAgICA/IGxvY2F0aW9uLmxvblxuICAgICAgOiB0aGlzLmFjY2Vzc29ycy5nZXRMb2NhdGlvbkxvbihsb2NhdGlvbik7XG5cbiAgZ2V0Rmxvd09yaWdpbklkID0gKGY6IEYgfCBBZ2dyZWdhdGVGbG93KSA9PiB7XG4gICAgcmV0dXJuIGlzQWdncmVnYXRlRmxvdyhmKSA/IGYub3JpZ2luIDogdGhpcy5hY2Nlc3NvcnMuZ2V0Rmxvd09yaWdpbklkKGYpO1xuICB9O1xuXG4gIGdldEZsb3dEZXN0SWQgPSAoZjogRiB8IEFnZ3JlZ2F0ZUZsb3cpID0+IHtcbiAgICByZXR1cm4gaXNBZ2dyZWdhdGVGbG93KGYpID8gZi5kZXN0IDogdGhpcy5hY2Nlc3NvcnMuZ2V0Rmxvd0Rlc3RJZChmKTtcbiAgfTtcblxuICBnZXRGbG93TWFnbml0dWRlID0gKGY6IEYgfCBBZ2dyZWdhdGVGbG93KSA9PiB7XG4gICAgcmV0dXJuIGlzQWdncmVnYXRlRmxvdyhmKSA/IGYuY291bnQgOiB0aGlzLmFjY2Vzc29ycy5nZXRGbG93TWFnbml0dWRlKGYpO1xuICB9O1xuXG4gIC8vIE5vdGU6IEFnZ3JlZ2F0ZSBmbG93cyBoYXZlIG5vIHRpbWVcbiAgZ2V0Rmxvd1RpbWUgPSAoZjogRikgPT4ge1xuICAgIGNvbnN0IHtnZXRGbG93VGltZX0gPSB0aGlzLmFjY2Vzc29ycztcbiAgICByZXR1cm4gZ2V0Rmxvd1RpbWUgPyBnZXRGbG93VGltZShmKSA6IHVuZGVmaW5lZDtcbiAgfTtcbn1cbiJdfQ==