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

package/src/cluster/cluster.ts

@@ -98,7 +98,7 @@ export function clusterLocations<L>(
   getLocationWeight: LocationWeightGetter,
   options?: Partial<Options>,
 ): ClusterLevel[] {
-  const {getLocationCentroid, getLocationId} = locationAccessors;
+  const {getLocationLon, getLocationLat, getLocationId} = locationAccessors;
   const opts = {
     ...defaultOptions,
     ...options,
@@ -110,7 +110,8 @@ export function clusterLocations<L>(
   // 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, y] = getLocationCentroid(locations[i]);
+    const x = getLocationLon(locations[i]);
+    const y = getLocationLat(locations[i]);
     clusters.push({
       x: lngX(x), // projected point coordinates
       y: latY(y),
@@ -165,7 +166,8 @@ export function clusterLocations<L>(
         nodes.push({
           id: getLocationId(location),
           zoom,
-          centroid: getLocationCentroid(location),
+          lat: getLocationLat(location),
+          lon: getLocationLon(location),
         });
       } else if (isClusterPoint(point)) {
         const {id} = point;
@@ -177,7 +179,8 @@ export function clusterLocations<L>(
           id: makeClusterId(id),
           name: makeClusterName(id, numPoints),
           zoom,
-          centroid: [xLng(x), yLat(y)] as [number, number],
+          lat: yLat(y),
+          lon: xLng(x),
           children,
         } as Cluster);
       }

package/src/colors.ts

@@ -26,9 +26,9 @@ import {
 } from 'd3-scale-chromatic';
 import {range} from 'd3-array';
 import {scalePow, scaleSequential, scaleSequentialPow} from 'd3-scale';
-import {interpolateRgbBasis} from 'd3-interpolate';
-import {color as d3color, hcl} from 'd3-color';
-import {SettingsState} from './FlowMapState';
+import {interpolateBasis, interpolateRgbBasis} from 'd3-interpolate';
+import {color as d3color, hcl, rgb as colorRgb} from 'd3-color';
+import {SettingsState} from './FlowmapState';
 
 const DEFAULT_OUTLINE_COLOR = '#fff';
 const DEFAULT_DIMMED_OPACITY = 0.4;
@@ -58,7 +58,10 @@ export function opacifyHex(hexCode: string, opacity: number): string {
   return `rgba(${col.r}, ${col.g}, ${col.b}, ${opacity})`;
 }
 
-export function colorAsRgba(color: string): RGBA {
+export function colorAsRgba(color: string | number[]): RGBA {
+  if (Array.isArray(color)) {
+    return color as RGBA;
+  }
   const col = d3color(color);
   if (!col) {
     console.warn('Invalid color: ', color);
@@ -100,7 +103,7 @@ const getColorSteps = (interpolate: (x: number) => string) =>
     .reverse();
 
 const FLOW_MIN_COLOR = 'rgba(240,240,240,0.5)';
-export const BLUES_PALE = [FLOW_MIN_COLOR, ColorScheme.primary];
+export const GRAYISH = [FLOW_MIN_COLOR, ColorScheme.primary];
 const schemeBluYl = [
   '#f7feae',
   '#b7e6a5',
@@ -134,7 +137,6 @@ export const schemeTeal = [
 export const DEFAULT_COLOR_SCHEME = schemeTeal;
 export const COLOR_SCHEMES: {[key: string]: string[]} = {
   Blues: asScheme(schemeBlues),
-  BluesPale: BLUES_PALE,
   BluGrn: [
     '#c4e6c3',
     '#96d2a4',
@@ -186,6 +188,7 @@ export const COLOR_SCHEMES: {[key: string]: string[]} = {
   ],
   Emrld: schemeEmrld,
   GnBu: asScheme(schemeGnBu),
+  Grayish: GRAYISH,
   Greens: asScheme(schemeGreens),
   Greys: asScheme(schemeGreys),
   Inferno: getColorSteps(interpolateInferno),
@@ -330,7 +333,7 @@ const diffColors: DiffColors = {
   outlineColor: 'rgb(230,233,237)',
 };
 
-export function getFlowMapColors(
+export function getFlowmapColors(
   settingsState: SettingsState,
 ): Colors | DiffColors {
   return getColors(
@@ -338,6 +341,7 @@ export function getFlowMapColors(
     settingsState.colorScheme,
     settingsState.darkMode,
     settingsState.fadeEnabled,
+    settingsState.fadeOpacityEnabled,
     settingsState.fadeAmount,
     settingsState.animationEnabled,
   );
@@ -345,9 +349,10 @@ export function getFlowMapColors(
 
 export function getColors(
   diffMode: boolean,
-  schemeKey: string | undefined,
+  colorScheme: string | string[] | undefined,
   darkMode: boolean,
   fadeEnabled: boolean,
+  fadeOpacityEnabled: boolean,
   fadeAmount: number,
   animate: boolean,
 ): Colors | DiffColors {
@@ -355,11 +360,18 @@ export function getColors(
     return diffColors;
   }
 
-  let scheme = (schemeKey && COLOR_SCHEMES[schemeKey]) || DEFAULT_COLOR_SCHEME;
+  let scheme;
 
-  if (darkMode) {
-    scheme = scheme.slice().reverse();
+  if (Array.isArray(colorScheme)) {
+    scheme = colorScheme;
+  } else {
+    scheme =
+      (colorScheme && COLOR_SCHEMES[colorScheme]) || DEFAULT_COLOR_SCHEME;
+    if (darkMode) {
+      scheme = scheme.slice().reverse();
+    }
   }
+
   // if (animate)
   // if (fadeAmount > 0)
   {
@@ -390,13 +402,14 @@ export function getColors(
       scheme = indices.map(
         (c, i) => {
           const color = colorScale(i);
-          const alpha = amount(i);
-          if (color == null || alpha == null) return '#000';
+          const a = amount(i);
+          if (color == null || a == null) return '#000';
           const col = hcl(color);
-          col.l = darkMode
-            ? col.l - col.l * alpha
-            : col.l + (100 - col.l) * alpha;
-          col.c = col.c - col.c * (alpha / 4);
+          col.l = darkMode ? col.l - col.l * a : col.l + (100 - col.l) * a;
+          col.c = col.c - col.c * (a / 4);
+          if (fadeOpacityEnabled) {
+            col.opacity = col.opacity * (1.0 - a);
+          }
           return col.toString();
         },
         // interpolateRgbBasis([colorScale(i), darkMode ? '#000' : '#fff'])(amount(i))
@@ -417,15 +430,46 @@ export function getColors(
   };
 }
 
+function interpolateRgbaBasis(colors: string[]) {
+  const spline = interpolateBasis;
+  const n = colors.length;
+  let r: any = new Array(n),
+    g: any = new Array(n),
+    b: any = new Array(n),
+    opacity: any = new Array(n),
+    i,
+    color: any;
+  for (i = 0; i < n; ++i) {
+    color = colorRgb(colors[i]);
+    r[i] = color.r || 0;
+    g[i] = color.g || 0;
+    b[i] = color.b || 0;
+    opacity[i] = color.opacity || 0;
+  }
+  r = spline(r);
+  g = spline(g);
+  b = spline(b);
+  opacity = spline(opacity);
+  // color.opacity = 1;
+  return function (t: number) {
+    color.r = r(t);
+    color.g = g(t);
+    color.b = b(t);
+    color.opacity = opacity(t);
+    return color + '';
+  };
+}
+
 export function createFlowColorScale(
   domain: [number, number],
   scheme: string[],
   animate: boolean | undefined,
 ): ColorScale {
-  const scale = scaleSequentialPow(interpolateRgbBasis(scheme))
+  const scale = scaleSequentialPow(interpolateRgbaBasis(scheme))
     // @ts-ignore
     .exponent(animate ? 1 / 2 : 1 / 3)
     .domain(domain);
+
   return (value: number) => colorAsRgba(scale(value));
 }
 
@@ -516,7 +560,7 @@ export interface LocationCircleColors {
   incoming?: string;
   highlighted?: string;
   empty?: string;
-  emptyOutline?: string;
+  outlineEmptyMix?: number;
 }
 
 export interface LocationAreaColors {
@@ -563,7 +607,7 @@ export interface LocationCircleColorsRGBA {
   incoming: RGBA;
   highlighted: RGBA;
   empty: RGBA;
-  emptyOutline: RGBA;
+  outlineEmptyMix: number;
 }
 
 export interface LocationAreaColorsRGBA {
@@ -648,7 +692,7 @@ function getFlowAndCircleColors(
         flowColorHighlighted,
       ),
       empty: emptyColor,
-      emptyOutline: mixColorsRGBA(innerColor, emptyColor, 0.4),
+      outlineEmptyMix: inputColors?.locationCircles?.outlineEmptyMix ?? 0.4,
     },
   };
 }

package/src/getViewStateForLocations.ts

@@ -1,39 +1,50 @@
-import {BoundingBox, viewport} from '@mapbox/geo-viewport';
 import {geoBounds} from 'd3-geo';
-import {FeatureCollection, GeometryCollection, GeometryObject} from 'geojson';
-import {ViewState} from './types';
+import {fitBounds} from '@math.gl/web-mercator';
+import type {
+  FeatureCollection,
+  GeometryCollection,
+  GeometryObject,
+} from 'geojson';
+import type {ViewState} from './types';
 
 export type LocationProperties = any;
 
+export type GetViewStateOptions = {
+  pad?: number; // size ratio
+  padding?: {top: number; bottom: number; left: number; right: number};
+  tileSize?: number;
+  // minZoom?: number;  // not supported by fitBounds
+  maxZoom?: number;
+};
+
 export function getViewStateForFeatures(
   featureCollection:
     | FeatureCollection<GeometryObject, LocationProperties>
     | GeometryCollection,
   size: [number, number],
-  opts?: {
-    pad?: number;
-    tileSize?: number;
-    minZoom?: number;
-    maxZoom?: number;
-  },
-): ViewState {
-  const {pad = 0.05, tileSize = 512, minZoom = 0, maxZoom = 100} = opts || {};
-  const [[x1, y1], [x2, y2]] = geoBounds(featureCollection as any);
-  const bounds: BoundingBox = [
-    x1 - pad * (x2 - x1),
-    y1 - pad * (y2 - y1),
-    x2 + pad * (x2 - x1),
-    y2 + pad * (y2 - y1),
-  ];
-  const {
-    center: [longitude, latitude],
-    zoom,
-  } = viewport(bounds, size, undefined, undefined, tileSize, true);
-
+  opts?: GetViewStateOptions,
+): ViewState & {width: number; height: number} {
+  const {pad = 0.05, maxZoom = 100} = opts || {};
+  const bounds = geoBounds(featureCollection as any);
+  const [[x1, y1], [x2, y2]] = bounds;
+  const paddedBounds: [[number, number], [number, number]] = pad
+    ? [
+        [x1 - pad * (x2 - x1), y1 - pad * (y2 - y1)],
+        [x2 + pad * (x2 - x1), y2 + pad * (y2 - y1)],
+      ]
+    : bounds;
+  const [width, height] = size;
   return {
-    longitude,
-    latitude,
-    zoom: Math.max(Math.min(maxZoom, zoom), minZoom),
+    ...fitBounds({
+      width,
+      height,
+      bounds: paddedBounds,
+      padding: opts?.padding,
+      // minZoom,
+      maxZoom,
+    }),
+    width,
+    height,
     bearing: 0,
     pitch: 0,
   };
@@ -41,21 +52,16 @@ export function getViewStateForFeatures(
 
 export function getViewStateForLocations(
   locations: any[],
-  getLocationCentroid: (location: any) => [number, number],
+  getLocationCoords: (location: any) => [number, number],
   size: [number, number],
-  opts?: {
-    pad?: number;
-    tileSize?: number;
-    minZoom?: number;
-    maxZoom?: number;
-  },
-): ViewState {
+  opts?: GetViewStateOptions,
+): ViewState & {width: number; height: number} {
   return getViewStateForFeatures(
     {
       type: 'GeometryCollection',
       geometries: locations.map((location) => ({
         type: 'Point',
-        coordinates: getLocationCentroid(location),
+        coordinates: getLocationCoords(location),
       })),
     } as any,
     size,

package/src/index.ts

@@ -1,10 +1,10 @@
 export * from './types';
 export * from './colors';
-export * from './FlowMapState';
-export * from './FlowMapSelectors';
+export * from './FlowmapState';
+export * from './FlowmapSelectors';
 export * from './time';
 export * from './getViewStateForLocations';
-export * from './provider/FlowMapDataProvider';
-export {default as FlowMapAggregateAccessors} from './FlowMapAggregateAccessors';
-export type {default as FlowMapDataProvider} from './provider/FlowMapDataProvider';
-export {default as LocalFlowMapDataProvider} from './provider/LocalFlowMapDataProvider';
+export * from './provider/FlowmapDataProvider';
+export {default as FlowmapAggregateAccessors} from './FlowmapAggregateAccessors';
+export type {default as FlowmapDataProvider} from './provider/FlowmapDataProvider';
+export {default as LocalFlowmapDataProvider} from './provider/LocalFlowmapDataProvider';

package/src/provider/{FlowMapDataProvider.ts → FlowmapDataProvider.ts}

@@ -1,21 +1,23 @@
 import {AggregateFlow, Cluster, LocationAccessors, LocationTotals} from '..';
-import {FlowMapState} from '../FlowMapState';
+import {FlowmapState} from '../FlowmapState';
 import {
   ClusterNode,
-  FlowMapData,
-  FlowMapDataAccessors,
+  FlowmapData,
+  FlowmapDataAccessors,
   LayersData,
   ViewportProps,
 } from '../types';
 
-export default interface FlowMapDataProvider<L, F> {
-  setAccessors(accessors: FlowMapDataAccessors<L, F>): void;
+export default interface FlowmapDataProvider<L, F> {
+  setAccessors(accessors: FlowmapDataAccessors<L, F>): void;
 
-  setFlowMapState(flowMapState: FlowMapState): Promise<void>;
+  setFlowmapState(flowmapState: FlowmapState): Promise<void>;
 
   // clearData(): void;
 
-  getViewportForLocations(dims: [number, number]): Promise<ViewportProps>;
+  getViewportForLocations(
+    dims: [number, number],
+  ): Promise<ViewportProps | undefined>;
 
   // getFlowTotals(): Promise<FlowTotals>;
 
@@ -36,9 +38,9 @@ export default interface FlowMapDataProvider<L, F> {
   getLayersData(): Promise<LayersData | undefined>;
 }
 
-export function isFlowMapData<L, F>(
+export function isFlowmapData<L, F>(
   data: Record<string, any>,
-): data is FlowMapData<L, F> {
+): data is FlowmapData<L, F> {
   return (
     data &&
     data.locations &&
@@ -48,12 +50,12 @@ export function isFlowMapData<L, F>(
   );
 }
 
-export function isFlowMapDataProvider<L, F>(
+export function isFlowmapDataProvider<L, F>(
   dataProvider: Record<string, any>,
-): dataProvider is FlowMapDataProvider<L, F> {
+): dataProvider is FlowmapDataProvider<L, F> {
   return (
     dataProvider &&
-    typeof dataProvider.setFlowMapState === 'function' &&
+    typeof dataProvider.setFlowmapState === 'function' &&
     typeof dataProvider.getViewportForLocations === 'function' &&
     typeof dataProvider.getFlowByIndex === 'function' &&
     typeof dataProvider.getLocationById === 'function' &&

package/src/provider/LocalFlowmapDataProvider.ts

@@ -0,0 +1,122 @@
+import type FlowmapDataProvider from './FlowmapDataProvider';
+import type {
+  Cluster,
+  ClusterNode,
+  FlowmapData,
+  FlowmapDataAccessors,
+  LayersData,
+  LocationTotals,
+  ViewportProps,
+  AggregateFlow,
+} from '../types';
+import {FlowmapState} from '../FlowmapState';
+import FlowmapSelectors from '../FlowmapSelectors';
+import {
+  GetViewStateOptions,
+  getViewStateForLocations,
+} from '../getViewStateForLocations';
+
+export default class LocalFlowmapDataProvider<L, F>
+  implements FlowmapDataProvider<L, F>
+{
+  private selectors: FlowmapSelectors<L, F>;
+  private flowmapData: FlowmapData<L, F> | undefined;
+  private flowmapState: FlowmapState | undefined;
+
+  constructor(accessors: FlowmapDataAccessors<L, F>) {
+    // scope selectors to the concrete instance of FlowmapDataProvider
+    this.selectors = new FlowmapSelectors<L, F>(accessors);
+    this.flowmapData = undefined;
+    this.flowmapState = undefined;
+  }
+
+  setAccessors(accessors: FlowmapDataAccessors<L, F>) {
+    this.selectors.setAccessors(accessors);
+  }
+
+  async setFlowmapData(flowmapData: FlowmapData<L, F>): Promise<void> {
+    this.flowmapData = flowmapData;
+  }
+
+  async setFlowmapState(flowmapState: FlowmapState): Promise<void> {
+    this.flowmapState = flowmapState;
+  }
+
+  async getFlowByIndex(idx: number): Promise<F | AggregateFlow | undefined> {
+    if (!this.flowmapState || !this.flowmapData) {
+      return undefined;
+    }
+    const flows = this.selectors.getFlowsForFlowmapLayer(
+      this.flowmapState,
+      this.flowmapData,
+    );
+    return flows?.[idx];
+  }
+
+  async getLocationByIndex(idx: number): Promise<L | ClusterNode | undefined> {
+    if (!this.flowmapState || !this.flowmapData) {
+      return undefined;
+    }
+    const locations = this.selectors.getLocationsForFlowmapLayer(
+      this.flowmapState,
+      this.flowmapData,
+    );
+    return locations?.[idx];
+  }
+
+  async getLayersData(): Promise<LayersData | undefined> {
+    if (!this.flowmapState || !this.flowmapData) {
+      return undefined;
+    }
+    return this.selectors.getLayersData(this.flowmapState, this.flowmapData);
+  }
+
+  async getLocationById(id: string): Promise<L | Cluster | undefined> {
+    if (!this.flowmapState || !this.flowmapData) {
+      return undefined;
+    }
+    const clusterIndex = this.selectors.getClusterIndex(
+      this.flowmapState,
+      this.flowmapData,
+    );
+    if (clusterIndex) {
+      const cluster = clusterIndex.getClusterById(id);
+      if (cluster) {
+        return cluster;
+      }
+    }
+    const locationsById = this.selectors.getLocationsById(
+      this.flowmapState,
+      this.flowmapData,
+    );
+    return locationsById?.get(id);
+  }
+
+  async getTotalsForLocation(id: string): Promise<LocationTotals | undefined> {
+    if (!this.flowmapState || !this.flowmapData) {
+      return undefined;
+    }
+    return this.selectors
+      .getLocationTotals(this.flowmapState, this.flowmapData)
+      ?.get(id);
+  }
+
+  async getViewportForLocations(
+    dims: [number, number],
+    opts?: GetViewStateOptions,
+  ): Promise<ViewportProps | undefined> {
+    if (!this.flowmapData?.locations) {
+      return undefined;
+    }
+    // @ts-ignore
+    return getViewStateForLocations(
+      this.flowmapData.locations,
+      (loc) => [
+        this.selectors.accessors.getLocationLon(loc),
+        this.selectors.accessors.getLocationLat(loc),
+      ],
+      dims,
+      opts,
+    );
+  }
+}

package/src/types.ts

@@ -1,4 +1,4 @@
-export type FlowMapData<L, F> = {
+export type FlowmapData<L, F> = {
   locations: L[] | undefined;
   flows: F[] | undefined;
 };
@@ -26,14 +26,15 @@ export interface FlowAccessors<F> {
 export interface LocationAccessors<L> {
   getLocationId: LocationAccessor<L, string>;
   getLocationName?: LocationAccessor<L, string>;
-  getLocationCentroid: LocationAccessor<L, [number, number]>;
+  getLocationLat: LocationAccessor<L, number>;
+  getLocationLon: LocationAccessor<L, number>;
   getLocationClusterName?: (locationIds: string[]) => string;
   // getLocationTotalIn?: LocationAccessor<number>;
   // getLocationTotalOut?: LocationAccessor<number>;
   // getLocationTotalInternal?: LocationAccessor<number>;
 }
 
-export type FlowMapDataAccessors<L, F> = LocationAccessors<L> &
+export type FlowmapDataAccessors<L, F> = LocationAccessors<L> &
   FlowAccessors<F>;
 
 export interface LocationTotals {
@@ -75,7 +76,8 @@ export interface ViewportProps {
 export interface ClusterNode {
   id: string;
   zoom: number;
-  centroid: [number, number];
+  lat: number;
+  lon: number;
 }
 
 export interface ClusterLevel {

package/src/util.ts

@@ -1,9 +1,5 @@
 import {createSelectorCreator, defaultMemoize} from 'reselect';
 
-export function flatMap<S, T>(xs: S[], f: (item: S) => T | T[]): T[] {
-  return xs.reduce((acc: T[], x: S) => acc.concat(f(x)), []);
-}
-
 export const createDebugSelector = createSelectorCreator(defaultMemoize, {
   equalityCheck: (previousVal: any, currentVal: any) => {
     const rv = currentVal === previousVal;

package/tsconfig.es5.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "outDir": "dist-es5",
+    "lib": [
+      "es2015", "dom"
+    ]
+  }
+}

package/dist/FlowMapAggregateAccessors.d.ts

@@ -1,15 +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;
-    getLocationCentroid: (location: L | ClusterNode) => [number, 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/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,mBAAmB,aAAc,CAAC,GAAG,WAAW,KAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAGhB;IAEnD,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/FlowMapAggregateAccessors.js

@@ -1,43 +0,0 @@
-import { isAggregateFlow, isCluster, isLocationClusterNode, } from './types';
-export default class FlowMapAggregateAccessors {
-    constructor(accessors) {
-        this.getLocationId = (location) => isLocationClusterNode(location)
-            ? location.id
-            : this.accessors.getLocationId(location);
-        this.getLocationName = (location) => {
-            var _a;
-            return (_a = (isLocationClusterNode(location) && 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.getLocationCentroid = (location) => isLocationClusterNode(location)
-            ? location.centroid
-            : this.accessors.getLocationCentroid(location);
-        this.getFlowOriginId = (f) => {
-            return isAggregateFlow(f) ? f.origin : this.accessors.getFlowOriginId(f);
-        };
-        this.getFlowDestId = (f) => {
-            return isAggregateFlow(f) ? f.dest : this.accessors.getFlowDestId(f);
-        };
-        this.getFlowMagnitude = (f) => {
-            return isAggregateFlow(f) ? f.count : this.accessors.getFlowMagnitude(f);
-        };
-        // Note: Aggregate flows have no time
-        this.getFlowTime = (f) => {
-            const { getFlowTime } = this.accessors;
-            return getFlowTime ? getFlowTime(f) : undefined;
-        };
-        this.accessors = accessors;
-    }
-    setAccessors(accessors) {
-        this.accessors = accessors;
-    }
-    getFlowMapDataAccessors() {
-        return this.accessors;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmxvd01hcEFnZ3JlZ2F0ZUFjY2Vzc29ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9GbG93TWFwQWdncmVnYXRlQWNjZXNzb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFJTCxlQUFlLEVBQ2YsU0FBUyxFQUNULHFCQUFxQixHQUN0QixNQUFNLFNBQVMsQ0FBQztBQUVqQixNQUFNLENBQUMsT0FBTyxPQUFPLHlCQUF5QjtJQUU1QyxZQUFZLFNBQXFDO1FBWWpELGtCQUFhLEdBQUcsQ0FBQyxRQUF5QixFQUFVLEVBQUUsQ0FDcEQscUJBQXFCLENBQUMsUUFBUSxDQUFDO1lBQzdCLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRTtZQUNiLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUU3QyxvQkFBZSxHQUFHLENBQUMsUUFBeUIsRUFBVSxFQUFFOztZQUN0RCxPQUFBLE1BQUEsQ0FBQyxxQkFBcUIsQ0FBQyxRQUFRLENBQUMsSUFBSSxTQUFTLENBQUMsUUFBUSxDQUFDO2dCQUNyRCxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUk7Z0JBQ2YsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQ0FBSSxJQUFJLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFBO1NBQUEsQ0FBQztRQUNqRCxxRUFBcUU7UUFDckUsbUNBQW1DO1FBQ25DLDZDQUE2QztRQUM3QyxrQ0FBa0M7UUFFbEMsd0JBQW1CLEdBQUcsQ0FBQyxRQUF5QixFQUFvQixFQUFFLENBQ3BFLHFCQUFxQixDQUFDLFFBQVEsQ0FBQztZQUM3QixDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVE7WUFDbkIsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFbkQsb0JBQWUsR0FBRyxDQUFDLENBQW9CLEVBQUUsRUFBRTtZQUN6QyxPQUFPLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDM0UsQ0FBQyxDQUFDO1FBRUYsa0JBQWEsR0FBRyxDQUFDLENBQW9CLEVBQUUsRUFBRTtZQUN2QyxPQUFPLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdkUsQ0FBQyxDQUFDO1FBRUYscUJBQWdCLEdBQUcsQ0FBQyxDQUFvQixFQUFFLEVBQUU7WUFDMUMsT0FBTyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDM0UsQ0FBQyxDQUFDO1FBRUYscUNBQXFDO1FBQ3JDLGdCQUFXLEdBQUcsQ0FBQyxDQUFJLEVBQUUsRUFBRTtZQUNyQixNQUFNLEVBQUMsV0FBVyxFQUFDLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQztZQUNyQyxPQUFPLFdBQVcsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDbEQsQ0FBQyxDQUFDO1FBOUNBLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO0lBQzdCLENBQUM7SUFFRCxZQUFZLENBQUMsU0FBcUM7UUFDaEQsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDN0IsQ0FBQztJQUVELHVCQUF1QjtRQUNyQixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDeEIsQ0FBQztDQXNDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEFnZ3JlZ2F0ZUZsb3csXG4gIENsdXN0ZXJOb2RlLFxuICBGbG93TWFwRGF0YUFjY2Vzc29ycyxcbiAgaXNBZ2dyZWdhdGVGbG93LFxuICBpc0NsdXN0ZXIsXG4gIGlzTG9jYXRpb25DbHVzdGVyTm9kZSxcbn0gZnJvbSAnLi90eXBlcyc7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIEZsb3dNYXBBZ2dyZWdhdGVBY2Nlc3NvcnM8TCwgRj4ge1xuICBwcml2YXRlIGFjY2Vzc29yczogRmxvd01hcERhdGFBY2Nlc3NvcnM8TCwgRj47XG4gIGNvbnN0cnVjdG9yKGFjY2Vzc29yczogRmxvd01hcERhdGFBY2Nlc3NvcnM8TCwgRj4pIHtcbiAgICB0aGlzLmFjY2Vzc29ycyA9IGFjY2Vzc29ycztcbiAgfVxuXG4gIHNldEFjY2Vzc29ycyhhY2Nlc3NvcnM6IEZsb3dNYXBEYXRhQWNjZXNzb3JzPEwsIEY+KSB7XG4gICAgdGhpcy5hY2Nlc3NvcnMgPSBhY2Nlc3NvcnM7XG4gIH1cblxuICBnZXRGbG93TWFwRGF0YUFjY2Vzc29ycygpIHtcbiAgICByZXR1cm4gdGhpcy5hY2Nlc3NvcnM7XG4gIH1cblxuICBnZXRMb2NhdGlvbklkID0gKGxvY2F0aW9uOiBMIHwgQ2x1c3Rlck5vZGUpOiBzdHJpbmcgPT5cbiAgICBpc0xvY2F0aW9uQ2x1c3Rlck5vZGUobG9jYXRpb24pXG4gICAgICA/IGxvY2F0aW9uLmlkXG4gICAgICA6IHRoaXMuYWNjZXNzb3JzLmdldExvY2F0aW9uSWQobG9jYXRpb24pO1xuXG4gIGdldExvY2F0aW9uTmFtZSA9IChsb2NhdGlvbjogTCB8IENsdXN0ZXJOb2RlKTogc3RyaW5nID0+XG4gICAgKGlzTG9jYXRpb25DbHVzdGVyTm9kZShsb2NhdGlvbikgJiYgaXNDbHVzdGVyKGxvY2F0aW9uKVxuICAgICAgPyBsb2NhdGlvbi5uYW1lXG4gICAgICA6IHVuZGVmaW5lZCkgPz8gdGhpcy5nZXRMb2NhdGlvbklkKGxvY2F0aW9uKTtcbiAgLy8gPyBsb2NhdGlvbi5uYW1lIC8vIFRPRE8gZ2V0TG9jYXRpb25OYW1lIGZvciBsb2NhdGlvbnMgYW5kIGNsdXN0ZXJzXG4gIC8vIDogdGhpcy5hY2Nlc3NvcnMuZ2V0TG9jYXRpb25OYW1lXG4gIC8vID8gdGhpcy5hY2Nlc3NvcnMuZ2V0TG9jYXRpb25OYW1lKGxvY2F0aW9uKVxuICAvLyA6IHRoaXMuZ2V0TG9jYXRpb25JZChsb2NhdGlvbik7XG5cbiAgZ2V0TG9jYXRpb25DZW50cm9pZCA9IChsb2NhdGlvbjogTCB8IENsdXN0ZXJOb2RlKTogW251bWJlciwgbnVtYmVyXSA9PlxuICAgIGlzTG9jYXRpb25DbHVzdGVyTm9kZShsb2NhdGlvbilcbiAgICAgID8gbG9jYXRpb24uY2VudHJvaWRcbiAgICAgIDogdGhpcy5hY2Nlc3NvcnMuZ2V0TG9jYXRpb25DZW50cm9pZChsb2NhdGlvbik7XG5cbiAgZ2V0Rmxvd09yaWdpbklkID0gKGY6IEYgfCBBZ2dyZWdhdGVGbG93KSA9PiB7XG4gICAgcmV0dXJuIGlzQWdncmVnYXRlRmxvdyhmKSA/IGYub3JpZ2luIDogdGhpcy5hY2Nlc3NvcnMuZ2V0Rmxvd09yaWdpbklkKGYpO1xuICB9O1xuXG4gIGdldEZsb3dEZXN0SWQgPSAoZjogRiB8IEFnZ3JlZ2F0ZUZsb3cpID0+IHtcbiAgICByZXR1cm4gaXNBZ2dyZWdhdGVGbG93KGYpID8gZi5kZXN0IDogdGhpcy5hY2Nlc3NvcnMuZ2V0Rmxvd0Rlc3RJZChmKTtcbiAgfTtcblxuICBnZXRGbG93TWFnbml0dWRlID0gKGY6IEYgfCBBZ2dyZWdhdGVGbG93KSA9PiB7XG4gICAgcmV0dXJuIGlzQWdncmVnYXRlRmxvdyhmKSA/IGYuY291bnQgOiB0aGlzLmFjY2Vzc29ycy5nZXRGbG93TWFnbml0dWRlKGYpO1xuICB9O1xuXG4gIC8vIE5vdGU6IEFnZ3JlZ2F0ZSBmbG93cyBoYXZlIG5vIHRpbWVcbiAgZ2V0Rmxvd1RpbWUgPSAoZjogRikgPT4ge1xuICAgIGNvbnN0IHtnZXRGbG93VGltZX0gPSB0aGlzLmFjY2Vzc29ycztcbiAgICByZXR1cm4gZ2V0Rmxvd1RpbWUgPyBnZXRGbG93VGltZShmKSA6IHVuZGVmaW5lZDtcbiAgfTtcbn1cbiJdfQ==