@flowmap.gl/layers 8.0.0-alpha.5 → 8.0.0-alpha.6

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 (16) hide show
  1. package/dist/FlowCirclesLayer/FlowCirclesLayer.d.ts +3 -3
  2. package/dist/FlowCirclesLayer/FlowCirclesLayer.d.ts.map +1 -1
  3. package/dist/FlowCirclesLayer/FlowCirclesLayer.js +5 -5
  4. package/dist/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.d.ts +1 -1
  5. package/dist/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.d.ts.map +1 -1
  6. package/dist/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.js +13 -10
  7. package/dist/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.d.ts +1 -1
  8. package/dist/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.js +2 -2
  9. package/dist/FlowmapLayer.d.ts +3 -2
  10. package/dist/FlowmapLayer.d.ts.map +1 -1
  11. package/dist/FlowmapLayer.js +21 -14
  12. package/package.json +2 -2
  13. package/src/FlowCirclesLayer/FlowCirclesLayer.ts +5 -5
  14. package/src/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.ts +12 -9
  15. package/src/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.ts +1 -1
  16. package/src/FlowmapLayer.ts +23 -13
package/dist/FlowCirclesLayer/FlowCirclesLayer.d.ts CHANGED
@@ -7,7 +7,7 @@ export interface Props extends LayerProps {
7
7
  opacity?: number;
8
8
  pickable?: boolean;
9
9
  emptyColor?: RGBA;
10
- emptyOutlineColor?: RGBA;
10
+ outlineEmptyMix?: number;
11
11
  getColor?: (d: FlowCirclesDatum) => RGBA;
12
12
  getPosition?: (d: FlowCirclesDatum) => [number, number];
13
13
  getInRadius?: (d: FlowCirclesDatum) => number;
@@ -28,9 +28,9 @@ declare class FlowCirclesLayer extends Layer {
28
28
  type: string;
29
29
  value: number[];
30
30
  };
31
- emptyOutlineColor: {
31
+ outlineEmptyMix: {
32
32
  type: string;
33
- value: number[];
33
+ value: number;
34
34
  };
35
35
  getPosition: {
36
36
  type: string;
package/dist/FlowCirclesLayer/FlowCirclesLayer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FlowCirclesLayer.d.ts","sourceRoot":"","sources":["../../src/FlowCirclesLayer/FlowCirclesLayer.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAC,KAAK,EAAqB,MAAM,eAAe,CAAC;AAKxD,OAAO,EAAC,0BAA0B,EAAE,IAAI,EAAC,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEvD,MAAM,WAAW,KAAM,SAAQ,UAAU;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,iBAAiB,CAAC,EAAE,IAAI,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACzC,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAC9C,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAC/C,IAAI,EAAE,gBAAgB,EAAE,GAAG,0BAA0B,CAAC;IACtD,cAAc,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAC,CAAC;CAC3D;AAMD,cAAM,gBAAiB,SAAQ,KAAK;IAClC,MAAM,CAAC,SAAS,SAAsB;IAEtC,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;uBAI0B,gBAAgB;;;;;;;;;;;;;MAM3D;gBAGU,KAAK,EAAE,KAAK;IAIxB,UAAU;IAQV,eAAe;IA+Bf,WAAW,CAAC,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAC,EAAE,GAAG;IAY/C,IAAI,CAAC,EAAC,QAAQ,EAAC,EAAE,GAAG;IAWpB,SAAS,CAAC,EAAE,EAAE,qBAAqB;CAmBpC;AAED,eAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"FlowCirclesLayer.d.ts","sourceRoot":"","sources":["../../src/FlowCirclesLayer/FlowCirclesLayer.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAC,KAAK,EAAqB,MAAM,eAAe,CAAC;AAKxD,OAAO,EAAC,0BAA0B,EAAE,IAAI,EAAC,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,oBAAY,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEvD,MAAM,WAAW,KAAM,SAAQ,UAAU;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACzC,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAC9C,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAC/C,IAAI,EAAE,gBAAgB,EAAE,GAAG,0BAA0B,CAAC;IACtD,cAAc,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAC,CAAC;CAC3D;AAMD,cAAM,gBAAiB,SAAQ,KAAK;IAClC,MAAM,CAAC,SAAS,SAAsB;IAEtC,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;uBAI0B,gBAAgB;;;;;;;;;;;;;MAM3D;gBAGU,KAAK,EAAE,KAAK;IAIxB,UAAU;IAQV,eAAe;IA+Bf,WAAW,CAAC,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAC,EAAE,GAAG;IAY/C,IAAI,CAAC,EAAC,QAAQ,EAAC,EAAE,GAAG;IAWpB,SAAS,CAAC,EAAE,EAAE,qBAAqB;CAmBpC;AAED,eAAe,gBAAgB,CAAC"}
package/dist/FlowCirclesLayer/FlowCirclesLayer.js CHANGED
@@ -22,7 +22,7 @@ import FragmentShader from './FlowCirclesLayerFragment.glsl';
22
22
  import VertexShader from './FlowCirclesLayerVertex.glsl';
23
23
  const DEFAULT_COLOR = [0, 0, 0, 255];
24
24
  const DEFAULT_EMPTY_COLOR = [255, 255, 255, 255];
25
- const DEFAULT_EMPTY_OUTLINE_COLOR = [180, 180, 180, 255];
25
+ const DEFAULT_OUTLINE_EMPTY_MIX = 0.4;
26
26
  class FlowCirclesLayer extends Layer {
27
27
  // props!: Props;
28
28
  constructor(props) {
@@ -77,10 +77,10 @@ class FlowCirclesLayer extends Layer {
77
77
  }
78
78
  }
79
79
  draw({ uniforms }) {
80
- const { emptyColor, emptyOutlineColor } = this.props;
80
+ const { emptyColor, outlineEmptyMix } = this.props;
81
81
  this.state.model
82
82
  .setUniforms(Object.assign(Object.assign({}, uniforms), { emptyColor,
83
- emptyOutlineColor }))
83
+ outlineEmptyMix }))
84
84
  .draw();
85
85
  }
86
86
  _getModel(gl) {
@@ -103,7 +103,7 @@ FlowCirclesLayer.layerName = 'FlowCirclesLayer';
103
103
  FlowCirclesLayer.defaultProps = {
104
104
  getColor: { type: 'accessor', value: DEFAULT_COLOR },
105
105
  emptyColor: { type: 'accessor', value: DEFAULT_EMPTY_COLOR },
106
- emptyOutlineColor: { type: 'accessor', value: DEFAULT_EMPTY_OUTLINE_COLOR },
106
+ outlineEmptyMix: { type: 'accessor', value: DEFAULT_OUTLINE_EMPTY_MIX },
107
107
  getPosition: { type: 'accessor', value: (d) => d.position },
108
108
  getInRadius: { type: 'accessor', value: 1 },
109
109
  getOutRadius: { type: 'accessor', value: 1 },
@@ -112,4 +112,4 @@ FlowCirclesLayer.defaultProps = {
112
112
  },
113
113
  };
114
114
  export default FlowCirclesLayer;
115
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"FlowCirclesLayer.js","sourceRoot":"","sources":["../../src/FlowCirclesLayer/FlowCirclesLayer.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright 2022 FlowmapBlue\n * Copyright 2018-2020 Teralytics, modified by FlowmapBlue\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n\nimport {Layer, picking, project32} from '@deck.gl/core';\nimport GL from '@luma.gl/constants';\nimport {Geometry, Model} from '@luma.gl/core';\nimport FragmentShader from './FlowCirclesLayerFragment.glsl';\nimport VertexShader from './FlowCirclesLayerVertex.glsl';\nimport {FlowCirclesLayerAttributes, RGBA} from '@flowmap.gl/data';\nimport {LayerProps} from '../types';\n\nexport type FlowCirclesDatum = Record<string, unknown>;\n\nexport interface Props extends LayerProps {\n  id: string;\n  opacity?: number;\n  pickable?: boolean;\n  emptyColor?: RGBA;\n  emptyOutlineColor?: RGBA;\n  getColor?: (d: FlowCirclesDatum) => RGBA;\n  getPosition?: (d: FlowCirclesDatum) => [number, number];\n  getInRadius?: (d: FlowCirclesDatum) => number;\n  getOutRadius?: (d: FlowCirclesDatum) => number;\n  data: FlowCirclesDatum[] | FlowCirclesLayerAttributes;\n  updateTriggers?: {[key: string]: Record<string, unknown>};\n}\n\nconst DEFAULT_COLOR = [0, 0, 0, 255];\nconst DEFAULT_EMPTY_COLOR = [255, 255, 255, 255];\nconst DEFAULT_EMPTY_OUTLINE_COLOR = [180, 180, 180, 255];\n\nclass FlowCirclesLayer extends Layer {\n  static layerName = 'FlowCirclesLayer';\n\n  static defaultProps = {\n    getColor: {type: 'accessor', value: DEFAULT_COLOR},\n    emptyColor: {type: 'accessor', value: DEFAULT_EMPTY_COLOR},\n    emptyOutlineColor: {type: 'accessor', value: DEFAULT_EMPTY_OUTLINE_COLOR},\n    getPosition: {type: 'accessor', value: (d: FlowCirclesDatum) => d.position},\n    getInRadius: {type: 'accessor', value: 1},\n    getOutRadius: {type: 'accessor', value: 1},\n    parameters: {\n      depthTest: false,\n    },\n  };\n  // props!: Props;\n\n  constructor(props: Props) {\n    super(props);\n  }\n\n  getShaders() {\n    return super.getShaders({\n      vs: VertexShader,\n      fs: FragmentShader,\n      modules: [project32, picking],\n    });\n  }\n\n  initializeState() {\n    this.getAttributeManager().addInstanced({\n      instancePositions: {\n        size: 3,\n        type: GL.DOUBLE,\n        fp64: this.use64bitPositions(),\n        transition: true,\n        accessor: 'getPosition',\n      },\n      instanceInRadius: {\n        size: 1,\n        transition: true,\n        accessor: 'getInRadius',\n        defaultValue: 1,\n      },\n      instanceOutRadius: {\n        size: 1,\n        transition: true,\n        accessor: 'getOutRadius',\n        defaultValue: 1,\n      },\n      instanceColors: {\n        size: 4,\n        transition: true,\n        type: GL.UNSIGNED_BYTE,\n        accessor: 'getColor',\n        defaultValue: DEFAULT_COLOR,\n      },\n    });\n  }\n\n  updateState({props, oldProps, changeFlags}: any) {\n    super.updateState({props, oldProps, changeFlags});\n    if (changeFlags.extensionsChanged) {\n      const {gl} = this.context;\n      if (this.state.model) {\n        this.state.model.delete();\n      }\n      this.setState({model: this._getModel(gl)});\n      this.getAttributeManager().invalidateAll();\n    }\n  }\n\n  draw({uniforms}: any) {\n    const {emptyColor, emptyOutlineColor} = this.props;\n    this.state.model\n      .setUniforms({\n        ...uniforms,\n        emptyColor,\n        emptyOutlineColor,\n      })\n      .draw();\n  }\n\n  _getModel(gl: WebGLRenderingContext) {\n    // a square that minimally cover the unit circle\n    const positions = [-1, -1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0];\n\n    return new Model(\n      gl,\n      Object.assign(this.getShaders(), {\n        id: this.props.id,\n        geometry: new Geometry({\n          drawMode: GL.TRIANGLE_FAN,\n          vertexCount: 4,\n          attributes: {\n            positions: {size: 3, value: new Float32Array(positions)},\n          },\n        }),\n        isInstanced: true,\n      }),\n    );\n  }\n}\n\nexport default FlowCirclesLayer;\n"]}
115
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"FlowCirclesLayer.js","sourceRoot":"","sources":["../../src/FlowCirclesLayer/FlowCirclesLayer.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright 2022 FlowmapBlue\n * Copyright 2018-2020 Teralytics, modified by FlowmapBlue\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\n\nimport {Layer, picking, project32} from '@deck.gl/core';\nimport GL from '@luma.gl/constants';\nimport {Geometry, Model} from '@luma.gl/core';\nimport FragmentShader from './FlowCirclesLayerFragment.glsl';\nimport VertexShader from './FlowCirclesLayerVertex.glsl';\nimport {FlowCirclesLayerAttributes, RGBA} from '@flowmap.gl/data';\nimport {LayerProps} from '../types';\n\nexport type FlowCirclesDatum = Record<string, unknown>;\n\nexport interface Props extends LayerProps {\n  id: string;\n  opacity?: number;\n  pickable?: boolean;\n  emptyColor?: RGBA;\n  outlineEmptyMix?: number;\n  getColor?: (d: FlowCirclesDatum) => RGBA;\n  getPosition?: (d: FlowCirclesDatum) => [number, number];\n  getInRadius?: (d: FlowCirclesDatum) => number;\n  getOutRadius?: (d: FlowCirclesDatum) => number;\n  data: FlowCirclesDatum[] | FlowCirclesLayerAttributes;\n  updateTriggers?: {[key: string]: Record<string, unknown>};\n}\n\nconst DEFAULT_COLOR = [0, 0, 0, 255];\nconst DEFAULT_EMPTY_COLOR = [255, 255, 255, 255];\nconst DEFAULT_OUTLINE_EMPTY_MIX = 0.4;\n\nclass FlowCirclesLayer extends Layer {\n  static layerName = 'FlowCirclesLayer';\n\n  static defaultProps = {\n    getColor: {type: 'accessor', value: DEFAULT_COLOR},\n    emptyColor: {type: 'accessor', value: DEFAULT_EMPTY_COLOR},\n    outlineEmptyMix: {type: 'accessor', value: DEFAULT_OUTLINE_EMPTY_MIX},\n    getPosition: {type: 'accessor', value: (d: FlowCirclesDatum) => d.position},\n    getInRadius: {type: 'accessor', value: 1},\n    getOutRadius: {type: 'accessor', value: 1},\n    parameters: {\n      depthTest: false,\n    },\n  };\n  // props!: Props;\n\n  constructor(props: Props) {\n    super(props);\n  }\n\n  getShaders() {\n    return super.getShaders({\n      vs: VertexShader,\n      fs: FragmentShader,\n      modules: [project32, picking],\n    });\n  }\n\n  initializeState() {\n    this.getAttributeManager().addInstanced({\n      instancePositions: {\n        size: 3,\n        type: GL.DOUBLE,\n        fp64: this.use64bitPositions(),\n        transition: true,\n        accessor: 'getPosition',\n      },\n      instanceInRadius: {\n        size: 1,\n        transition: true,\n        accessor: 'getInRadius',\n        defaultValue: 1,\n      },\n      instanceOutRadius: {\n        size: 1,\n        transition: true,\n        accessor: 'getOutRadius',\n        defaultValue: 1,\n      },\n      instanceColors: {\n        size: 4,\n        transition: true,\n        type: GL.UNSIGNED_BYTE,\n        accessor: 'getColor',\n        defaultValue: DEFAULT_COLOR,\n      },\n    });\n  }\n\n  updateState({props, oldProps, changeFlags}: any) {\n    super.updateState({props, oldProps, changeFlags});\n    if (changeFlags.extensionsChanged) {\n      const {gl} = this.context;\n      if (this.state.model) {\n        this.state.model.delete();\n      }\n      this.setState({model: this._getModel(gl)});\n      this.getAttributeManager().invalidateAll();\n    }\n  }\n\n  draw({uniforms}: any) {\n    const {emptyColor, outlineEmptyMix} = this.props;\n    this.state.model\n      .setUniforms({\n        ...uniforms,\n        emptyColor,\n        outlineEmptyMix,\n      })\n      .draw();\n  }\n\n  _getModel(gl: WebGLRenderingContext) {\n    // a square that minimally cover the unit circle\n    const positions = [-1, -1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0];\n\n    return new Model(\n      gl,\n      Object.assign(this.getShaders(), {\n        id: this.props.id,\n        geometry: new Geometry({\n          drawMode: GL.TRIANGLE_FAN,\n          vertexCount: 4,\n          attributes: {\n            positions: {size: 3, value: new Float32Array(positions)},\n          },\n        }),\n        isInstanced: true,\n      }),\n    );\n  }\n}\n\nexport default FlowCirclesLayer;\n"]}
package/dist/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.d.ts CHANGED
@@ -1,3 +1,3 @@
1
- declare const _default: "#define SHADER_NAME flow-circles-layer-fragment-shader\n#define SOFT_OUTLINE 0.1\n#define EPS 0.05\nprecision highp float;\n\nuniform vec4 emptyColor;\nuniform vec4 emptyOutlineColor;\n\nvarying vec4 vColor;\nvarying vec2 unitPosition;\nvarying float unitInRadius;\nvarying float unitOutRadius;\n\nfloat when_gt(float x, float y) {\n return max(sign(x - y), 0.0);\n}\n\nvoid main(void) {\n geometry.uv = unitPosition;\n float distToCenter = length(unitPosition);\n if (distToCenter > 1.0) {\n discard;\n }\n\n // See https://stackoverflow.com/questions/47285778\n vec4 ringColor = mix(\n emptyColor / 255., vColor,\n when_gt(unitInRadius, unitOutRadius)\n );\n vec4 outlineColor = mix(\n emptyOutlineColor / 255., vColor,\n when_gt(unitInRadius, unitOutRadius)\n );\n \n float innerR = min(unitInRadius, unitOutRadius) * (1.0 - SOFT_OUTLINE);\n \n // Inner circle\n float step2 = innerR - EPS; \n float step3 = innerR;\n \n // Ring\n float step4 = innerR + EPS;\n float step5 = 1.0 - SOFT_OUTLINE - EPS*2.0;\n float step6 = 1.0 - SOFT_OUTLINE;\n \n gl_FragColor = vColor;\n gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step2, step3, distToCenter));\n gl_FragColor = mix(gl_FragColor, ringColor, smoothstep(step3, step4, distToCenter));\n gl_FragColor = mix(gl_FragColor, outlineColor, smoothstep(step5, step6, distToCenter));\n gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step6, 1.0, distToCenter));\n gl_FragColor.a *= smoothstep(0.0, SOFT_OUTLINE, 1.0 - distToCenter);\n DECKGL_FILTER_COLOR(gl_FragColor, geometry);\n}\n";
1
+ declare const _default: "#define SHADER_NAME flow-circles-layer-fragment-shader\n#define SOFT_OUTLINE 0.05\n#define EPS 0.05\nprecision highp float;\n\nuniform vec4 emptyColor;\nuniform float outlineEmptyMix;\n\nvarying vec4 vColor;\nvarying vec2 unitPosition;\nvarying float unitInRadius;\nvarying float unitOutRadius;\n\nfloat when_gt(float x, float y) {\n return max(sign(x - y), 0.0);\n}\n\nvoid main(void) {\n geometry.uv = unitPosition;\n float distToCenter = length(unitPosition);\n if (distToCenter > 1.0) {\n discard;\n }\n\n // See https://stackoverflow.com/questions/47285778\n vec4 ringColor = mix(\n emptyColor / 255., vColor,\n when_gt(unitInRadius, unitOutRadius)\n );\n vec4 outlineColor = mix(\n mix(vColor, emptyColor / 255., outlineEmptyMix),\n vColor,\n when_gt(unitInRadius, unitOutRadius)\n );\n \n float innerR = min(unitInRadius, unitOutRadius) * (1.0 - SOFT_OUTLINE);\n \n // Inner circle\n float step2 = innerR - 2.0 * EPS; \n float step3 = innerR - EPS;\n \n // Ring\n float step4 = innerR;\n // float step5 = 1.0 - SOFT_OUTLINE - EPS;\n // float step6 = 1.0 - SOFT_OUTLINE;\n float step5 = 1.0 - 5.0 * EPS;\n float step6 = 1.0;\n \n gl_FragColor = vColor;\n gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step2, step3, distToCenter));\n gl_FragColor = mix(gl_FragColor, ringColor, smoothstep(step3, step4, distToCenter));\n gl_FragColor = mix(gl_FragColor, outlineColor, smoothstep(step5, step6, distToCenter));\n // gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step6, 1.0, distToCenter));\n gl_FragColor.a *= smoothstep(0.0, SOFT_OUTLINE, 1.0 - distToCenter);\n DECKGL_FILTER_COLOR(gl_FragColor, geometry);\n}\n";
2
2
  export default _default;
3
3
  //# sourceMappingURL=FlowCirclesLayerFragment.glsl.d.ts.map
package/dist/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FlowCirclesLayerFragment.glsl.d.ts","sourceRoot":"","sources":["../../src/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.ts"],"names":[],"mappings":";AAiBA,wBAsDE"}
1
+ {"version":3,"file":"FlowCirclesLayerFragment.glsl.d.ts","sourceRoot":"","sources":["../../src/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.ts"],"names":[],"mappings":";AAiBA,wBAyDE"}
package/dist/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.js CHANGED
@@ -17,12 +17,12 @@
17
17
  */
18
18
  export default `\
19
19
  #define SHADER_NAME flow-circles-layer-fragment-shader
20
- #define SOFT_OUTLINE 0.1
20
+ #define SOFT_OUTLINE 0.05
21
21
  #define EPS 0.05
22
22
  precision highp float;
23
23
 
24
24
  uniform vec4 emptyColor;
25
- uniform vec4 emptyOutlineColor;
25
+ uniform float outlineEmptyMix;
26
26
 
27
27
  varying vec4 vColor;
28
28
  varying vec2 unitPosition;
@@ -46,28 +46,31 @@ void main(void) {
46
46
  when_gt(unitInRadius, unitOutRadius)
47
47
  );
48
48
  vec4 outlineColor = mix(
49
- emptyOutlineColor / 255., vColor,
49
+ mix(vColor, emptyColor / 255., outlineEmptyMix),
50
+ vColor,
50
51
  when_gt(unitInRadius, unitOutRadius)
51
52
  );
52
53
 
53
54
  float innerR = min(unitInRadius, unitOutRadius) * (1.0 - SOFT_OUTLINE);
54
55
 
55
56
  // Inner circle
56
- float step2 = innerR - EPS;
57
- float step3 = innerR;
57
+ float step2 = innerR - 2.0 * EPS;
58
+ float step3 = innerR - EPS;
58
59
 
59
60
  // Ring
60
- float step4 = innerR + EPS;
61
- float step5 = 1.0 - SOFT_OUTLINE - EPS*2.0;
62
- float step6 = 1.0 - SOFT_OUTLINE;
61
+ float step4 = innerR;
62
+ // float step5 = 1.0 - SOFT_OUTLINE - EPS;
63
+ // float step6 = 1.0 - SOFT_OUTLINE;
64
+ float step5 = 1.0 - 5.0 * EPS;
65
+ float step6 = 1.0;
63
66
 
64
67
  gl_FragColor = vColor;
65
68
  gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step2, step3, distToCenter));
66
69
  gl_FragColor = mix(gl_FragColor, ringColor, smoothstep(step3, step4, distToCenter));
67
70
  gl_FragColor = mix(gl_FragColor, outlineColor, smoothstep(step5, step6, distToCenter));
68
- gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step6, 1.0, distToCenter));
71
+ // gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step6, 1.0, distToCenter));
69
72
  gl_FragColor.a *= smoothstep(0.0, SOFT_OUTLINE, 1.0 - distToCenter);
70
73
  DECKGL_FILTER_COLOR(gl_FragColor, geometry);
71
74
  }
72
75
  `;
73
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmxvd0NpcmNsZXNMYXllckZyYWdtZW50Lmdsc2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvRmxvd0NpcmNsZXNMYXllci9GbG93Q2lyY2xlc0xheWVyRnJhZ21lbnQuZ2xzbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7Ozs7OztHQWdCRztBQUNILGVBQWU7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQXNEZCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLypcbiAqIENvcHlyaWdodCAyMDIyIEZsb3dtYXBCbHVlXG4gKiBDb3B5cmlnaHQgMjAxOC0yMDIwIFRlcmFseXRpY3MsIG1vZGlmaWVkIGJ5IEZsb3dtYXBCbHVlXG4gKlxuICogTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKTtcbiAqIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS5cbiAqIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdFxuICpcbiAqIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmVcbiAqIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuIFwiQVMgSVNcIiBCQVNJUyxcbiAqIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLlxuICogU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZFxuICogbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKlxuICovXG5leHBvcnQgZGVmYXVsdCBgXFxcbiNkZWZpbmUgU0hBREVSX05BTUUgZmxvdy1jaXJjbGVzLWxheWVyLWZyYWdtZW50LXNoYWRlclxuI2RlZmluZSBTT0ZUX09VVExJTkUgMC4xXG4jZGVmaW5lIEVQUyAwLjA1XG5wcmVjaXNpb24gaGlnaHAgZmxvYXQ7XG5cbnVuaWZvcm0gdmVjNCBlbXB0eUNvbG9yO1xudW5pZm9ybSB2ZWM0IGVtcHR5T3V0bGluZUNvbG9yO1xuXG52YXJ5aW5nIHZlYzQgdkNvbG9yO1xudmFyeWluZyB2ZWMyIHVuaXRQb3NpdGlvbjtcbnZhcnlpbmcgZmxvYXQgdW5pdEluUmFkaXVzO1xudmFyeWluZyBmbG9hdCB1bml0T3V0UmFkaXVzO1xuXG5mbG9hdCB3aGVuX2d0KGZsb2F0IHgsIGZsb2F0IHkpIHtcbiAgcmV0dXJuIG1heChzaWduKHggLSB5KSwgMC4wKTtcbn1cblxudm9pZCBtYWluKHZvaWQpIHtcbiAgZ2VvbWV0cnkudXYgPSB1bml0UG9zaXRpb247XG4gIGZsb2F0IGRpc3RUb0NlbnRlciA9IGxlbmd0aCh1bml0UG9zaXRpb24pO1xuICBpZiAoZGlzdFRvQ2VudGVyID4gMS4wKSB7XG4gICAgZGlzY2FyZDtcbiAgfVxuXG4gIC8vIFNlZSBodHRwczovL3N0YWNrb3ZlcmZsb3cuY29tL3F1ZXN0aW9ucy80NzI4NTc3OFxuICB2ZWM0IHJpbmdDb2xvciA9IG1peChcbiAgICBlbXB0eUNvbG9yIC8gMjU1LiwgdkNvbG9yLFxuICAgIHdoZW5fZ3QodW5pdEluUmFkaXVzLCB1bml0T3V0UmFkaXVzKVxuICApO1xuICB2ZWM0IG91dGxpbmVDb2xvciA9IG1peChcbiAgICBlbXB0eU91dGxpbmVDb2xvciAvIDI1NS4sIHZDb2xvcixcbiAgICB3aGVuX2d0KHVuaXRJblJhZGl1cywgdW5pdE91dFJhZGl1cylcbiAgKTtcbiAgXG4gIGZsb2F0IGlubmVyUiA9IG1pbih1bml0SW5SYWRpdXMsIHVuaXRPdXRSYWRpdXMpICogKDEuMCAtIFNPRlRfT1VUTElORSk7XG4gIFxuICAvLyBJbm5lciBjaXJjbGVcbiAgZmxvYXQgc3RlcDIgPSBpbm5lclIgLSBFUFM7IFxuICBmbG9hdCBzdGVwMyA9IGlubmVyUjtcbiAgXG4gIC8vIFJpbmdcbiAgZmxvYXQgc3RlcDQgPSBpbm5lclIgKyBFUFM7XG4gIGZsb2F0IHN0ZXA1ID0gMS4wIC0gU09GVF9PVVRMSU5FIC0gRVBTKjIuMDtcbiAgZmxvYXQgc3RlcDYgPSAxLjAgLSBTT0ZUX09VVExJTkU7XG4gIFxuICBnbF9GcmFnQ29sb3IgPSB2Q29sb3I7XG4gIGdsX0ZyYWdDb2xvciA9IG1peChnbF9GcmFnQ29sb3IsIGVtcHR5Q29sb3IgLyAyNTUuLCBzbW9vdGhzdGVwKHN0ZXAyLCBzdGVwMywgZGlzdFRvQ2VudGVyKSk7XG4gIGdsX0ZyYWdDb2xvciA9IG1peChnbF9GcmFnQ29sb3IsIHJpbmdDb2xvciwgc21vb3Roc3RlcChzdGVwMywgc3RlcDQsIGRpc3RUb0NlbnRlcikpO1xuICBnbF9GcmFnQ29sb3IgPSBtaXgoZ2xfRnJhZ0NvbG9yLCBvdXRsaW5lQ29sb3IsIHNtb290aHN0ZXAoc3RlcDUsIHN0ZXA2LCBkaXN0VG9DZW50ZXIpKTtcbiAgZ2xfRnJhZ0NvbG9yID0gbWl4KGdsX0ZyYWdDb2xvciwgZW1wdHlDb2xvciAvIDI1NS4sIHNtb290aHN0ZXAoc3RlcDYsIDEuMCwgZGlzdFRvQ2VudGVyKSk7XG4gIGdsX0ZyYWdDb2xvci5hICo9IHNtb290aHN0ZXAoMC4wLCBTT0ZUX09VVExJTkUsIDEuMCAtIGRpc3RUb0NlbnRlcik7XG4gIERFQ0tHTF9GSUxURVJfQ09MT1IoZ2xfRnJhZ0NvbG9yLCBnZW9tZXRyeSk7XG59XG5gO1xuIl19
76
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmxvd0NpcmNsZXNMYXllckZyYWdtZW50Lmdsc2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvRmxvd0NpcmNsZXNMYXllci9GbG93Q2lyY2xlc0xheWVyRnJhZ21lbnQuZ2xzbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7Ozs7OztHQWdCRztBQUNILGVBQWU7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQXlEZCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLypcbiAqIENvcHlyaWdodCAyMDIyIEZsb3dtYXBCbHVlXG4gKiBDb3B5cmlnaHQgMjAxOC0yMDIwIFRlcmFseXRpY3MsIG1vZGlmaWVkIGJ5IEZsb3dtYXBCbHVlXG4gKlxuICogTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKTtcbiAqIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS5cbiAqIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdFxuICpcbiAqIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmVcbiAqIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuIFwiQVMgSVNcIiBCQVNJUyxcbiAqIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLlxuICogU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZFxuICogbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKlxuICovXG5leHBvcnQgZGVmYXVsdCBgXFxcbiNkZWZpbmUgU0hBREVSX05BTUUgZmxvdy1jaXJjbGVzLWxheWVyLWZyYWdtZW50LXNoYWRlclxuI2RlZmluZSBTT0ZUX09VVExJTkUgMC4wNVxuI2RlZmluZSBFUFMgMC4wNVxucHJlY2lzaW9uIGhpZ2hwIGZsb2F0O1xuXG51bmlmb3JtIHZlYzQgZW1wdHlDb2xvcjtcbnVuaWZvcm0gZmxvYXQgb3V0bGluZUVtcHR5TWl4O1xuXG52YXJ5aW5nIHZlYzQgdkNvbG9yO1xudmFyeWluZyB2ZWMyIHVuaXRQb3NpdGlvbjtcbnZhcnlpbmcgZmxvYXQgdW5pdEluUmFkaXVzO1xudmFyeWluZyBmbG9hdCB1bml0T3V0UmFkaXVzO1xuXG5mbG9hdCB3aGVuX2d0KGZsb2F0IHgsIGZsb2F0IHkpIHtcbiAgcmV0dXJuIG1heChzaWduKHggLSB5KSwgMC4wKTtcbn1cblxudm9pZCBtYWluKHZvaWQpIHtcbiAgZ2VvbWV0cnkudXYgPSB1bml0UG9zaXRpb247XG4gIGZsb2F0IGRpc3RUb0NlbnRlciA9IGxlbmd0aCh1bml0UG9zaXRpb24pO1xuICBpZiAoZGlzdFRvQ2VudGVyID4gMS4wKSB7XG4gICAgZGlzY2FyZDtcbiAgfVxuXG4gIC8vIFNlZSBodHRwczovL3N0YWNrb3ZlcmZsb3cuY29tL3F1ZXN0aW9ucy80NzI4NTc3OFxuICB2ZWM0IHJpbmdDb2xvciA9IG1peChcbiAgICBlbXB0eUNvbG9yIC8gMjU1LiwgdkNvbG9yLFxuICAgIHdoZW5fZ3QodW5pdEluUmFkaXVzLCB1bml0T3V0UmFkaXVzKVxuICApO1xuICB2ZWM0IG91dGxpbmVDb2xvciA9IG1peChcbiAgICBtaXgodkNvbG9yLCBlbXB0eUNvbG9yIC8gMjU1Liwgb3V0bGluZUVtcHR5TWl4KSxcbiAgICB2Q29sb3IsXG4gICAgd2hlbl9ndCh1bml0SW5SYWRpdXMsIHVuaXRPdXRSYWRpdXMpXG4gICk7XG4gIFxuICBmbG9hdCBpbm5lclIgPSBtaW4odW5pdEluUmFkaXVzLCB1bml0T3V0UmFkaXVzKSAqICgxLjAgLSBTT0ZUX09VVExJTkUpO1xuICBcbiAgLy8gSW5uZXIgY2lyY2xlXG4gIGZsb2F0IHN0ZXAyID0gaW5uZXJSIC0gMi4wICogRVBTOyBcbiAgZmxvYXQgc3RlcDMgPSBpbm5lclIgLSBFUFM7XG4gIFxuICAvLyBSaW5nXG4gIGZsb2F0IHN0ZXA0ID0gaW5uZXJSO1xuICAvLyBmbG9hdCBzdGVwNSA9IDEuMCAtIFNPRlRfT1VUTElORSAtIEVQUztcbiAgLy8gZmxvYXQgc3RlcDYgPSAxLjAgLSBTT0ZUX09VVExJTkU7XG4gIGZsb2F0IHN0ZXA1ID0gMS4wIC0gNS4wICogRVBTO1xuICBmbG9hdCBzdGVwNiA9IDEuMDtcbiAgXG4gIGdsX0ZyYWdDb2xvciA9IHZDb2xvcjtcbiAgZ2xfRnJhZ0NvbG9yID0gbWl4KGdsX0ZyYWdDb2xvciwgZW1wdHlDb2xvciAvIDI1NS4sIHNtb290aHN0ZXAoc3RlcDIsIHN0ZXAzLCBkaXN0VG9DZW50ZXIpKTtcbiAgZ2xfRnJhZ0NvbG9yID0gbWl4KGdsX0ZyYWdDb2xvciwgcmluZ0NvbG9yLCBzbW9vdGhzdGVwKHN0ZXAzLCBzdGVwNCwgZGlzdFRvQ2VudGVyKSk7XG4gIGdsX0ZyYWdDb2xvciA9IG1peChnbF9GcmFnQ29sb3IsIG91dGxpbmVDb2xvciwgc21vb3Roc3RlcChzdGVwNSwgc3RlcDYsIGRpc3RUb0NlbnRlcikpO1xuICAvLyBnbF9GcmFnQ29sb3IgPSBtaXgoZ2xfRnJhZ0NvbG9yLCBlbXB0eUNvbG9yIC8gMjU1Liwgc21vb3Roc3RlcChzdGVwNiwgMS4wLCBkaXN0VG9DZW50ZXIpKTtcbiAgZ2xfRnJhZ0NvbG9yLmEgKj0gc21vb3Roc3RlcCgwLjAsIFNPRlRfT1VUTElORSwgMS4wIC0gZGlzdFRvQ2VudGVyKTtcbiAgREVDS0dMX0ZJTFRFUl9DT0xPUihnbF9GcmFnQ29sb3IsIGdlb21ldHJ5KTtcbn1cbmA7XG4iXX0=
package/dist/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.d.ts CHANGED
@@ -1,3 +1,3 @@
1
- declare const _default: "#define SHADER_NAME flow-circles-layer-vertex-shader\n#define radiusScale 100\n\nattribute vec3 positions;\n\nattribute vec3 instancePositions;\nattribute vec3 instancePositions64Low;\nattribute float instanceInRadius;\nattribute float instanceOutRadius;\nattribute vec4 instanceColors;\nattribute vec3 instancePickingColors;\n\nuniform float opacity;\nuniform vec4 emptyColor;\nuniform vec4 emptyOutlineColor;\n\nvarying vec4 vColor;\nvarying vec2 unitPosition;\nvarying float unitInRadius;\nvarying float unitOutRadius;\n\nvoid main(void) {\n geometry.worldPosition = instancePositions;\n\n float outerRadiusPixels = max(instanceInRadius, instanceOutRadius);\n unitInRadius = instanceInRadius / outerRadiusPixels; \n unitOutRadius = instanceOutRadius / outerRadiusPixels; \n\n // position on the containing square in [-1, 1] space\n unitPosition = positions.xy;\n geometry.uv = unitPosition;\n geometry.pickingColor = instancePickingColors;\n \n // Find the center of the point and add the current vertex\n vec3 offset = positions * project_pixel_size(outerRadiusPixels);\n DECKGL_FILTER_SIZE(offset, geometry);\n gl_Position = project_position_to_clipspace(instancePositions, instancePositions64Low, offset, geometry.position);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n \n // Apply opacity to instance color, or return instance picking color\n vColor = vec4(instanceColors.rgb / 255., instanceColors.a / 255. * opacity);\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
1
+ declare const _default: "#define SHADER_NAME flow-circles-layer-vertex-shader\n#define radiusScale 100\n\nattribute vec3 positions;\n\nattribute vec3 instancePositions;\nattribute vec3 instancePositions64Low;\nattribute float instanceInRadius;\nattribute float instanceOutRadius;\nattribute vec4 instanceColors;\nattribute vec3 instancePickingColors;\n\nuniform float opacity;\nuniform vec4 emptyColor;\nuniform float outlineEmptyMix;\n\nvarying vec4 vColor;\nvarying vec2 unitPosition;\nvarying float unitInRadius;\nvarying float unitOutRadius;\n\nvoid main(void) {\n geometry.worldPosition = instancePositions;\n\n float outerRadiusPixels = max(instanceInRadius, instanceOutRadius);\n unitInRadius = instanceInRadius / outerRadiusPixels; \n unitOutRadius = instanceOutRadius / outerRadiusPixels; \n\n // position on the containing square in [-1, 1] space\n unitPosition = positions.xy;\n geometry.uv = unitPosition;\n geometry.pickingColor = instancePickingColors;\n \n // Find the center of the point and add the current vertex\n vec3 offset = positions * project_pixel_size(outerRadiusPixels);\n DECKGL_FILTER_SIZE(offset, geometry);\n gl_Position = project_position_to_clipspace(instancePositions, instancePositions64Low, offset, geometry.position);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n \n // Apply opacity to instance color, or return instance picking color\n vColor = vec4(instanceColors.rgb / 255., instanceColors.a / 255. * opacity);\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
2
2
  export default _default;
3
3
  //# sourceMappingURL=FlowCirclesLayerVertex.glsl.d.ts.map
package/dist/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.js CHANGED
@@ -30,7 +30,7 @@ attribute vec3 instancePickingColors;
30
30
 
31
31
  uniform float opacity;
32
32
  uniform vec4 emptyColor;
33
- uniform vec4 emptyOutlineColor;
33
+ uniform float outlineEmptyMix;
34
34
 
35
35
  varying vec4 vColor;
36
36
  varying vec2 unitPosition;
@@ -60,4 +60,4 @@ void main(void) {
60
60
  DECKGL_FILTER_COLOR(vColor, geometry);
61
61
  }
62
62
  `;
63
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmxvd0NpcmNsZXNMYXllclZlcnRleC5nbHNsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Zsb3dDaXJjbGVzTGF5ZXIvRmxvd0NpcmNsZXNMYXllclZlcnRleC5nbHNsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7Ozs7O0dBZ0JHO0FBQ0gsZUFBZTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0E0Q2QsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qXG4gKiBDb3B5cmlnaHQgMjAyMiBGbG93bWFwQmx1ZVxuICogQ29weXJpZ2h0IDIwMTgtMjAyMCBUZXJhbHl0aWNzLCBtb2RpZmllZCBieSBGbG93bWFwQmx1ZVxuICpcbiAqIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIik7XG4gKiB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuXG4gKiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXRcbiAqXG4gKiBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlXG4gKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiBcIkFTIElTXCIgQkFTSVMsXG4gKiBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC5cbiAqIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmRcbiAqIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICpcbiAqL1xuZXhwb3J0IGRlZmF1bHQgYFxcXG4jZGVmaW5lIFNIQURFUl9OQU1FIGZsb3ctY2lyY2xlcy1sYXllci12ZXJ0ZXgtc2hhZGVyXG4jZGVmaW5lIHJhZGl1c1NjYWxlIDEwMFxuXG5hdHRyaWJ1dGUgdmVjMyBwb3NpdGlvbnM7XG5cbmF0dHJpYnV0ZSB2ZWMzIGluc3RhbmNlUG9zaXRpb25zO1xuYXR0cmlidXRlIHZlYzMgaW5zdGFuY2VQb3NpdGlvbnM2NExvdztcbmF0dHJpYnV0ZSBmbG9hdCBpbnN0YW5jZUluUmFkaXVzO1xuYXR0cmlidXRlIGZsb2F0IGluc3RhbmNlT3V0UmFkaXVzO1xuYXR0cmlidXRlIHZlYzQgaW5zdGFuY2VDb2xvcnM7XG5hdHRyaWJ1dGUgdmVjMyBpbnN0YW5jZVBpY2tpbmdDb2xvcnM7XG5cbnVuaWZvcm0gZmxvYXQgb3BhY2l0eTtcbnVuaWZvcm0gdmVjNCBlbXB0eUNvbG9yO1xudW5pZm9ybSB2ZWM0IGVtcHR5T3V0bGluZUNvbG9yO1xuXG52YXJ5aW5nIHZlYzQgdkNvbG9yO1xudmFyeWluZyB2ZWMyIHVuaXRQb3NpdGlvbjtcbnZhcnlpbmcgZmxvYXQgdW5pdEluUmFkaXVzO1xudmFyeWluZyBmbG9hdCB1bml0T3V0UmFkaXVzO1xuXG52b2lkIG1haW4odm9pZCkge1xuICBnZW9tZXRyeS53b3JsZFBvc2l0aW9uID0gaW5zdGFuY2VQb3NpdGlvbnM7XG5cbiAgZmxvYXQgb3V0ZXJSYWRpdXNQaXhlbHMgPSBtYXgoaW5zdGFuY2VJblJhZGl1cywgaW5zdGFuY2VPdXRSYWRpdXMpO1xuICB1bml0SW5SYWRpdXMgPSBpbnN0YW5jZUluUmFkaXVzIC8gb3V0ZXJSYWRpdXNQaXhlbHM7IFxuICB1bml0T3V0UmFkaXVzID0gaW5zdGFuY2VPdXRSYWRpdXMgLyBvdXRlclJhZGl1c1BpeGVsczsgXG5cbiAgLy8gcG9zaXRpb24gb24gdGhlIGNvbnRhaW5pbmcgc3F1YXJlIGluIFstMSwgMV0gc3BhY2VcbiAgdW5pdFBvc2l0aW9uID0gcG9zaXRpb25zLnh5O1xuICBnZW9tZXRyeS51diA9IHVuaXRQb3NpdGlvbjtcbiAgZ2VvbWV0cnkucGlja2luZ0NvbG9yID0gaW5zdGFuY2VQaWNraW5nQ29sb3JzO1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICAvLyBGaW5kIHRoZSBjZW50ZXIgb2YgdGhlIHBvaW50IGFuZCBhZGQgdGhlIGN1cnJlbnQgdmVydGV4XG4gIHZlYzMgb2Zmc2V0ID0gcG9zaXRpb25zICogcHJvamVjdF9waXhlbF9zaXplKG91dGVyUmFkaXVzUGl4ZWxzKTtcbiAgREVDS0dMX0ZJTFRFUl9TSVpFKG9mZnNldCwgZ2VvbWV0cnkpO1xuICBnbF9Qb3NpdGlvbiA9IHByb2plY3RfcG9zaXRpb25fdG9fY2xpcHNwYWNlKGluc3RhbmNlUG9zaXRpb25zLCBpbnN0YW5jZVBvc2l0aW9uczY0TG93LCBvZmZzZXQsIGdlb21ldHJ5LnBvc2l0aW9uKTtcbiAgREVDS0dMX0ZJTFRFUl9HTF9QT1NJVElPTihnbF9Qb3NpdGlvbiwgZ2VvbWV0cnkpO1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICAvLyBBcHBseSBvcGFjaXR5IHRvIGluc3RhbmNlIGNvbG9yLCBvciByZXR1cm4gaW5zdGFuY2UgcGlja2luZyBjb2xvclxuICB2Q29sb3IgPSB2ZWM0KGluc3RhbmNlQ29sb3JzLnJnYiAvIDI1NS4sIGluc3RhbmNlQ29sb3JzLmEgLyAyNTUuICogb3BhY2l0eSk7XG4gIERFQ0tHTF9GSUxURVJfQ09MT1IodkNvbG9yLCBnZW9tZXRyeSk7XG59XG5gO1xuIl19
63
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmxvd0NpcmNsZXNMYXllclZlcnRleC5nbHNsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Zsb3dDaXJjbGVzTGF5ZXIvRmxvd0NpcmNsZXNMYXllclZlcnRleC5nbHNsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7Ozs7O0dBZ0JHO0FBQ0gsZUFBZTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0E0Q2QsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qXG4gKiBDb3B5cmlnaHQgMjAyMiBGbG93bWFwQmx1ZVxuICogQ29weXJpZ2h0IDIwMTgtMjAyMCBUZXJhbHl0aWNzLCBtb2RpZmllZCBieSBGbG93bWFwQmx1ZVxuICpcbiAqIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIik7XG4gKiB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuXG4gKiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXRcbiAqXG4gKiBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlXG4gKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiBcIkFTIElTXCIgQkFTSVMsXG4gKiBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC5cbiAqIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmRcbiAqIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICpcbiAqL1xuZXhwb3J0IGRlZmF1bHQgYFxcXG4jZGVmaW5lIFNIQURFUl9OQU1FIGZsb3ctY2lyY2xlcy1sYXllci12ZXJ0ZXgtc2hhZGVyXG4jZGVmaW5lIHJhZGl1c1NjYWxlIDEwMFxuXG5hdHRyaWJ1dGUgdmVjMyBwb3NpdGlvbnM7XG5cbmF0dHJpYnV0ZSB2ZWMzIGluc3RhbmNlUG9zaXRpb25zO1xuYXR0cmlidXRlIHZlYzMgaW5zdGFuY2VQb3NpdGlvbnM2NExvdztcbmF0dHJpYnV0ZSBmbG9hdCBpbnN0YW5jZUluUmFkaXVzO1xuYXR0cmlidXRlIGZsb2F0IGluc3RhbmNlT3V0UmFkaXVzO1xuYXR0cmlidXRlIHZlYzQgaW5zdGFuY2VDb2xvcnM7XG5hdHRyaWJ1dGUgdmVjMyBpbnN0YW5jZVBpY2tpbmdDb2xvcnM7XG5cbnVuaWZvcm0gZmxvYXQgb3BhY2l0eTtcbnVuaWZvcm0gdmVjNCBlbXB0eUNvbG9yO1xudW5pZm9ybSBmbG9hdCBvdXRsaW5lRW1wdHlNaXg7XG5cbnZhcnlpbmcgdmVjNCB2Q29sb3I7XG52YXJ5aW5nIHZlYzIgdW5pdFBvc2l0aW9uO1xudmFyeWluZyBmbG9hdCB1bml0SW5SYWRpdXM7XG52YXJ5aW5nIGZsb2F0IHVuaXRPdXRSYWRpdXM7XG5cbnZvaWQgbWFpbih2b2lkKSB7XG4gIGdlb21ldHJ5LndvcmxkUG9zaXRpb24gPSBpbnN0YW5jZVBvc2l0aW9ucztcblxuICBmbG9hdCBvdXRlclJhZGl1c1BpeGVscyA9IG1heChpbnN0YW5jZUluUmFkaXVzLCBpbnN0YW5jZU91dFJhZGl1cyk7XG4gIHVuaXRJblJhZGl1cyA9IGluc3RhbmNlSW5SYWRpdXMgLyBvdXRlclJhZGl1c1BpeGVsczsgXG4gIHVuaXRPdXRSYWRpdXMgPSBpbnN0YW5jZU91dFJhZGl1cyAvIG91dGVyUmFkaXVzUGl4ZWxzOyBcblxuICAvLyBwb3NpdGlvbiBvbiB0aGUgY29udGFpbmluZyBzcXVhcmUgaW4gWy0xLCAxXSBzcGFjZVxuICB1bml0UG9zaXRpb24gPSBwb3NpdGlvbnMueHk7XG4gIGdlb21ldHJ5LnV2ID0gdW5pdFBvc2l0aW9uO1xuICBnZW9tZXRyeS5waWNraW5nQ29sb3IgPSBpbnN0YW5jZVBpY2tpbmdDb2xvcnM7XG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIC8vIEZpbmQgdGhlIGNlbnRlciBvZiB0aGUgcG9pbnQgYW5kIGFkZCB0aGUgY3VycmVudCB2ZXJ0ZXhcbiAgdmVjMyBvZmZzZXQgPSBwb3NpdGlvbnMgKiBwcm9qZWN0X3BpeGVsX3NpemUob3V0ZXJSYWRpdXNQaXhlbHMpO1xuICBERUNLR0xfRklMVEVSX1NJWkUob2Zmc2V0LCBnZW9tZXRyeSk7XG4gIGdsX1Bvc2l0aW9uID0gcHJvamVjdF9wb3NpdGlvbl90b19jbGlwc3BhY2UoaW5zdGFuY2VQb3NpdGlvbnMsIGluc3RhbmNlUG9zaXRpb25zNjRMb3csIG9mZnNldCwgZ2VvbWV0cnkucG9zaXRpb24pO1xuICBERUNLR0xfRklMVEVSX0dMX1BPU0lUSU9OKGdsX1Bvc2l0aW9uLCBnZW9tZXRyeSk7XG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIC8vIEFwcGx5IG9wYWNpdHkgdG8gaW5zdGFuY2UgY29sb3IsIG9yIHJldHVybiBpbnN0YW5jZSBwaWNraW5nIGNvbG9yXG4gIHZDb2xvciA9IHZlYzQoaW5zdGFuY2VDb2xvcnMucmdiIC8gMjU1LiwgaW5zdGFuY2VDb2xvcnMuYSAvIDI1NS4gKiBvcGFjaXR5KTtcbiAgREVDS0dMX0ZJTFRFUl9DT0xPUih2Q29sb3IsIGdlb21ldHJ5KTtcbn1cbmA7XG4iXX0=
package/dist/FlowmapLayer.d.ts CHANGED
@@ -2,7 +2,8 @@ import { CompositeLayer } from '@deck.gl/core';
2
2
  import { FlowLinesLayerAttributes, FlowmapData, FlowmapDataAccessors, FlowmapDataProvider, LayersData, FlowmapAggregateAccessors } from '@flowmap.gl/data';
3
3
  import { FlowmapLayerPickingInfo, LayerProps } from './types';
4
4
  export declare type FlowmapLayerProps<L, F> = {
5
- data: FlowmapData<L, F> | FlowmapDataProvider<L, F>;
5
+ data?: FlowmapData<L, F>;
6
+ dataProvider?: FlowmapDataProvider<L, F>;
6
7
  locationTotalsEnabled?: boolean;
7
8
  adaptiveScalesEnabled?: boolean;
8
9
  animationEnabled?: boolean;
@@ -62,7 +63,7 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
62
63
  constructor(props: FlowmapLayerProps<L, F>);
63
64
  initializeState(): void;
64
65
  private _updateAccessors;
65
- private _makeDataProvider;
66
+ private _getOrMakeDataProvider;
66
67
  private _updateDataProvider;
67
68
  shouldUpdateState(params: Record<string, any>): boolean;
68
69
  updateState({ oldProps, props, changeFlags }: Record<string, any>): void;
package/dist/FlowmapLayer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FlowmapLayer.d.ts","sourceRoot":"","sources":["../src/FlowmapLayer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FlowmapLayer.d.ts","sourceRoot":"","sources":["../src/FlowmapLayer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAE7C,OAAO,EAEL,wBAAwB,EACxB,WAAW,EACX,oBAAoB,EACpB,mBAAmB,EAOnB,UAAU,EAIV,yBAAyB,EAC1B,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EACL,uBAAuB,EACvB,UAAU,EAGX,MAAM,SAAS,CAAC;AAEjB,oBAAY,iBAAiB,CAAC,CAAC,EAAE,CAAC,IAAI;IACpC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzB,YAAY,CAAC,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,CACR,IAAI,EAAE,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,EAC/C,KAAK,EAAE,WAAW,KACf,IAAI,CAAC;IACV,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;CAC7E,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GACrC,UAAU,CAAC;AAEb,aAAK,aAAa;IAChB,QAAQ,aAAa;IACrB,IAAI,SAAS;CACd;AAED,aAAK,yBAAyB,GAAG;IAC/B,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC;IAC7B,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,aAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC;IACzB,cAAc,EAAE,wBAAwB,CAAC;CAC1C,CAAC;AAEF,aAAK,iBAAiB,GAAG,yBAAyB,GAAG,qBAAqB,CAAC;AAE3E,aAAK,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI;IACjB,SAAS,EAAE,yBAAyB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3C,YAAY,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;IACnC,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;CAClD,CAAC;AAEF,oBAAY,WAAW,GAAG;IAAC,QAAQ,EAAE,UAAU,CAAA;CAAC,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,cAAc;IAC5D,MAAM,CAAC,YAAY;;;;;;;;;;;;;;MAcjB;IACF,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;gBAEZ,KAAK,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAiCjD,eAAe;IASf,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,mBAAmB;IAI3B,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO;IAavD,WAAW,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IA8BtE,OAAO,CAAC,iBAAiB;IAiCzB,OAAO,CAAC,gBAAgB;YAYV,2BAA2B;IAuEzC,OAAO,CAAC,qBAAqB;IA6C7B,YAAY,IAAI,KAAK,CAAC,GAAG,CAAC;CAgG3B"}
package/dist/FlowmapLayer.js CHANGED
@@ -37,7 +37,10 @@ var HighlightType;
37
37
  })(HighlightType || (HighlightType = {}));
38
38
  export default class FlowmapLayer extends CompositeLayer {
39
39
  constructor(props) {
40
- super(Object.assign(Object.assign({}, props), { onHover: (info, event) => {
40
+ super(Object.assign(Object.assign({}, props), { dataProvider: {
41
+ // To avoid deck.gl props diffing on comlink worker proxy causing an exception
42
+ dataProvider: props.dataProvider,
43
+ }, onHover: (info, event) => {
41
44
  // TODO: if (lastHoverEventStartTimeRef > startTime) {
42
45
  // // Skipping, because this is not the latest hover event
43
46
  // return;
@@ -61,7 +64,7 @@ export default class FlowmapLayer extends CompositeLayer {
61
64
  initializeState() {
62
65
  this.state = {
63
66
  accessors: new FlowmapAggregateAccessors(this.props),
64
- dataProvider: this._makeDataProvider(),
67
+ dataProvider: this._getOrMakeDataProvider(),
65
68
  layersData: undefined,
66
69
  highlightedObject: undefined,
67
70
  };
@@ -71,10 +74,10 @@ export default class FlowmapLayer extends CompositeLayer {
71
74
  (_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.dataProvider) === null || _b === void 0 ? void 0 : _b.setAccessors(this.props);
72
75
  this.setState({ accessors: new FlowmapAggregateAccessors(this.props) });
73
76
  }
74
- _makeDataProvider() {
75
- const { data } = this.props;
76
- if (isFlowmapDataProvider(data)) {
77
- return data;
77
+ _getOrMakeDataProvider() {
78
+ const { data, dataProvider } = this.props;
79
+ if (isFlowmapDataProvider(dataProvider === null || dataProvider === void 0 ? void 0 : dataProvider.dataProvider)) {
80
+ return dataProvider.dataProvider;
78
81
  }
79
82
  else if (isFlowmapData(data)) {
80
83
  const dataProvider = new LocalFlowmapDataProvider(this.props);
@@ -84,7 +87,7 @@ export default class FlowmapLayer extends CompositeLayer {
84
87
  throw new Error('FlowmapLayer: data must be a FlowmapDataProvider or FlowmapData');
85
88
  }
86
89
  _updateDataProvider() {
87
- this.setState({ dataProvider: this._makeDataProvider() });
90
+ this.setState({ dataProvider: this._getOrMakeDataProvider() });
88
91
  }
89
92
  shouldUpdateState(params) {
90
93
  const { changeFlags } = params;
@@ -104,7 +107,7 @@ export default class FlowmapLayer extends CompositeLayer {
104
107
  return;
105
108
  }
106
109
  if (changeFlags.propsChanged) {
107
- this._updateAccessors();
110
+ // this._updateAccessors();
108
111
  }
109
112
  if (changeFlags.dataChanged) {
110
113
  this._updateDataProvider();
@@ -114,7 +117,9 @@ export default class FlowmapLayer extends CompositeLayer {
114
117
  highlightedObject: undefined,
115
118
  });
116
119
  }
117
- if (changeFlags.viewportChanged || changeFlags.propsOrDataChanged) {
120
+ if (changeFlags.viewportChanged ||
121
+ changeFlags.propsOrDataChanged // TODO can we ignore accessor props changes?
122
+ ) {
118
123
  dataProvider.setFlowmapState(this._getFlowmapState());
119
124
  (() => __awaiter(this, void 0, void 0, function* () {
120
125
  const layersData = yield dataProvider.getLayersData();
@@ -142,7 +147,7 @@ export default class FlowmapLayer extends CompositeLayer {
142
147
  }
143
148
  _getFlowmapState() {
144
149
  return {
145
- viewport: asViewState(this.context.viewport),
150
+ viewport: pickViewportProps(this.context.viewport),
146
151
  filterState: {
147
152
  selectedLocations: undefined,
148
153
  locationFilterMode: LocationFilterMode.ALL,
@@ -256,8 +261,10 @@ export default class FlowmapLayer extends CompositeLayer {
256
261
  layers.push(new FlowCirclesLayer(this.getSubLayerProps({
257
262
  id: 'circles',
258
263
  data: circleAttributes,
259
- emptyColor: [0, 0, 0, 255],
260
- emptyOutlineColor: [0, 0, 0, 255],
264
+ emptyColor: this.props.darkMode
265
+ ? [0, 0, 0, 255]
266
+ : [255, 255, 255, 255],
267
+ outlineEmptyMix: 0.4,
261
268
  })));
262
269
  if (highlightedObject) {
263
270
  switch (highlightedObject.type) {
@@ -308,7 +315,7 @@ FlowmapLayer.defaultProps = {
308
315
  highlightColor: 'orange',
309
316
  maxTopFlowsDisplayNum: 5000,
310
317
  };
311
- function asViewState(viewport) {
318
+ function pickViewportProps(viewport) {
312
319
  const { width, height, longitude, latitude, zoom, pitch, bearing } = viewport;
313
320
  return {
314
321
  width,
@@ -320,4 +327,4 @@ function asViewState(viewport) {
320
327
  bearing,
321
328
  };
322
329
  }
323
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"FlowmapLayer.js","sourceRoot":"","sources":["../src/FlowmapLayer.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright 2022 FlowmapBlue\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\nimport {CompositeLayer} from '@deck.gl/core';\nimport {ScatterplotLayer} from '@deck.gl/layers';\nimport {\n  colorAsRgba,\n  FlowLinesLayerAttributes,\n  FlowmapData,\n  FlowmapDataAccessors,\n  FlowmapDataProvider,\n  getFlowLineAttributesByIndex,\n  getFlowmapColors,\n  getOuterCircleRadiusByIndex,\n  getLocationCentroidByIndex,\n  isFlowmapData,\n  isFlowmapDataProvider,\n  LayersData,\n  LocalFlowmapDataProvider,\n  LocationFilterMode,\n  ViewportProps,\n  FlowmapAggregateAccessors,\n} from '@flowmap.gl/data';\nimport AnimatedFlowLinesLayer from './AnimatedFlowLinesLayer';\nimport FlowCirclesLayer from './FlowCirclesLayer';\nimport FlowLinesLayer from './FlowLinesLayer';\nimport {\n  FlowmapLayerPickingInfo,\n  LayerProps,\n  PickingInfo,\n  PickingType,\n} from './types';\n\nexport type FlowmapLayerProps<L, F> = {\n  data: FlowmapData<L, F> | FlowmapDataProvider<L, F>;\n  locationTotalsEnabled?: boolean;\n  adaptiveScalesEnabled?: boolean;\n  animationEnabled?: boolean;\n  clusteringEnabled?: boolean;\n  clusteringLevel?: number;\n  fadeEnabled?: boolean;\n  fadeOpacityEnabled?: boolean;\n  clusteringAuto?: boolean;\n  darkMode?: boolean;\n  fadeAmount?: number;\n  colorScheme?: string;\n  highlightColor?: string;\n  maxTopFlowsDisplayNum?: number;\n  onHover?: (\n    info: FlowmapLayerPickingInfo<L, F> | undefined,\n    event: SourceEvent,\n  ) => void;\n  onClick?: (info: FlowmapLayerPickingInfo<L, F>, event: SourceEvent) => void;\n} & Partial<FlowmapDataAccessors<L, F>> &\n  LayerProps;\n\nenum HighlightType {\n  LOCATION = 'location',\n  FLOW = 'flow',\n}\n\ntype HighlightedLocationObject = {\n  type: HighlightType.LOCATION;\n  centroid: [number, number];\n  radius: number;\n};\n\ntype HighlightedFlowObject = {\n  type: HighlightType.FLOW;\n  lineAttributes: FlowLinesLayerAttributes;\n};\n\ntype HighlightedObject = HighlightedLocationObject | HighlightedFlowObject;\n\ntype State<L, F> = {\n  accessors: FlowmapAggregateAccessors<L, F>;\n  dataProvider: FlowmapDataProvider<L, F>;\n  layersData: LayersData | undefined;\n  highlightedObject: HighlightedObject | undefined;\n};\n\nexport type SourceEvent = {srcEvent: MouseEvent};\n\nexport default class FlowmapLayer<L, F> extends CompositeLayer {\n  static defaultProps = {\n    darkMode: true,\n    fadeAmount: 50,\n    locationTotalsEnabled: true,\n    animationEnabled: false,\n    clusteringEnabled: true,\n    fadeEnabled: true,\n    fadeOpacityEnabled: false,\n    clusteringAuto: true,\n    clusteringLevel: undefined,\n    adaptiveScalesEnabled: true,\n    colorScheme: 'Teal',\n    highlightColor: 'orange',\n    maxTopFlowsDisplayNum: 5000,\n  };\n  state: State<L, F> | undefined;\n\n  public constructor(props: FlowmapLayerProps<L, F>) {\n    super({\n      ...props,\n      onHover: (info: PickingInfo<any>, event: SourceEvent) => {\n        // TODO: if (lastHoverEventStartTimeRef > startTime) {\n        //   // Skipping, because this is not the latest hover event\n        //   return;\n        // }\n        this.setState({highlightedObject: this._getHighlightedObject(info)});\n        const {onHover} = props;\n        if (onHover) {\n          this._getFlowmapLayerPickingInfo(info).then((info) =>\n            onHover(info, event),\n          );\n        }\n      },\n      onClick: (info: PickingInfo<any>, event: SourceEvent) => {\n        const {onClick} = props;\n        if (onClick) {\n          this._getFlowmapLayerPickingInfo(info).then((info) => {\n            if (info) {\n              onClick(info, event);\n            }\n          });\n        }\n      },\n    });\n  }\n\n  initializeState() {\n    this.state = {\n      accessors: new FlowmapAggregateAccessors<L, F>(this.props),\n      dataProvider: this._makeDataProvider(),\n      layersData: undefined,\n      highlightedObject: undefined,\n    };\n  }\n\n  private _updateAccessors() {\n    this.state?.dataProvider?.setAccessors(this.props);\n    this.setState({accessors: new FlowmapAggregateAccessors(this.props)});\n  }\n\n  private _makeDataProvider() {\n    const {data} = this.props;\n    if (isFlowmapDataProvider<L, F>(data)) {\n      return data;\n    } else if (isFlowmapData<L, F>(data)) {\n      const dataProvider = new LocalFlowmapDataProvider<L, F>(this.props);\n      dataProvider.setFlowmapData(data);\n      return dataProvider;\n    }\n    throw new Error(\n      'FlowmapLayer: data must be a FlowmapDataProvider or FlowmapData',\n    );\n  }\n\n  private _updateDataProvider() {\n    this.setState({dataProvider: this._makeDataProvider()});\n  }\n\n  shouldUpdateState(params: Record<string, any>): boolean {\n    const {changeFlags} = params;\n    // if (this._viewportChanged()) {\n    //   return true;\n    // }\n    if (changeFlags.viewportChanged) {\n      return true;\n    }\n    return super.shouldUpdateState(params);\n    // TODO: be smarter on when to update\n    // (e.g. ignore viewport changes when adaptiveScalesEnabled and clustering are false)\n  }\n\n  updateState({oldProps, props, changeFlags}: Record<string, any>): void {\n    const {dataProvider, highlightedObject} = this.state || {};\n    if (!dataProvider) {\n      return;\n    }\n\n    if (changeFlags.propsChanged) {\n      this._updateAccessors();\n    }\n    if (changeFlags.dataChanged) {\n      this._updateDataProvider();\n    }\n    if (changeFlags.viewportChanged || changeFlags.dataChanged) {\n      this.setState({\n        highlightedObject: undefined,\n      });\n    }\n\n    if (changeFlags.viewportChanged || changeFlags.propsOrDataChanged) {\n      dataProvider.setFlowmapState(this._getFlowmapState());\n      (async () => {\n        const layersData = await dataProvider.getLayersData();\n        this.setState({layersData});\n      })();\n    }\n  }\n\n  private _getSettingsState() {\n    const {\n      locationTotalsEnabled,\n      adaptiveScalesEnabled,\n      animationEnabled,\n      clusteringEnabled,\n      clusteringLevel,\n      fadeEnabled,\n      fadeOpacityEnabled,\n      clusteringAuto,\n      darkMode,\n      fadeAmount,\n      colorScheme,\n      highlightColor,\n      maxTopFlowsDisplayNum,\n    } = this.props;\n    return {\n      locationTotalsEnabled,\n      adaptiveScalesEnabled,\n      animationEnabled,\n      clusteringEnabled,\n      clusteringLevel,\n      fadeEnabled,\n      fadeOpacityEnabled,\n      clusteringAuto,\n      darkMode,\n      fadeAmount,\n      colorScheme,\n      highlightColor,\n      maxTopFlowsDisplayNum,\n    };\n  }\n\n  private _getFlowmapState() {\n    return {\n      viewport: asViewState(this.context.viewport),\n      filterState: {\n        selectedLocations: undefined,\n        locationFilterMode: LocationFilterMode.ALL,\n        selectedTimeRange: undefined,\n      },\n      settingsState: this._getSettingsState(),\n    };\n  }\n\n  private async _getFlowmapLayerPickingInfo(\n    info: Record<string, any>,\n  ): Promise<FlowmapLayerPickingInfo<L, F> | undefined> {\n    const {index, sourceLayer} = info;\n    const {dataProvider, accessors} = this.state || {};\n    if (!dataProvider || !accessors) {\n      return undefined;\n    }\n    const commonInfo = {\n      // ...info,\n      layer: info.layer,\n      index: info.index,\n      x: info.x,\n      y: info.y,\n      coordinate: info.coordinate,\n    };\n    if (\n      sourceLayer instanceof FlowLinesLayer ||\n      sourceLayer instanceof AnimatedFlowLinesLayer\n    ) {\n      const flow =\n        index === -1 ? undefined : await dataProvider.getFlowByIndex(index);\n      if (flow) {\n        const origin = await dataProvider.getLocationById(\n          accessors.getFlowOriginId(flow),\n        );\n        const dest = await dataProvider.getLocationById(\n          accessors.getFlowDestId(flow),\n        );\n        if (origin && dest) {\n          return {\n            ...commonInfo,\n            type: PickingType.FLOW,\n            object: flow,\n            origin: origin,\n            dest: dest,\n            count: accessors.getFlowMagnitude(flow),\n          };\n        }\n      }\n    } else if (sourceLayer instanceof FlowCirclesLayer) {\n      const location =\n        index === -1 ? undefined : await dataProvider.getLocationByIndex(index);\n\n      if (location) {\n        const id = accessors.getLocationId(location);\n        const name = accessors.getLocationName(location);\n        const totals = await dataProvider.getTotalsForLocation(id);\n        const {circleAttributes} = this.state?.layersData || {};\n        if (totals && circleAttributes) {\n          const circleRadius = getOuterCircleRadiusByIndex(\n            circleAttributes,\n            info.index,\n          );\n          return {\n            ...commonInfo,\n            type: PickingType.LOCATION,\n            object: location,\n            id,\n            name,\n            totals,\n            circleRadius: circleRadius,\n            event: undefined,\n          };\n        }\n      }\n    }\n\n    return undefined;\n  }\n\n  private _getHighlightedObject(\n    info: Record<string, any>,\n  ): HighlightedObject | undefined {\n    const {index, sourceLayer} = info;\n    if (index < 0) return undefined;\n    if (\n      sourceLayer instanceof FlowLinesLayer ||\n      sourceLayer instanceof AnimatedFlowLinesLayer\n    ) {\n      const {lineAttributes} = this.state?.layersData || {};\n      if (lineAttributes) {\n        let attrs = getFlowLineAttributesByIndex(lineAttributes, index);\n        if (this.props.fadeOpacityEnabled) {\n          attrs = {\n            ...attrs,\n            attributes: {\n              ...attrs.attributes,\n              getColor: {\n                ...attrs.attributes.getColor,\n                value: new Uint8Array([\n                  ...attrs.attributes.getColor.value.slice(0, 3),\n                  255, // the highlight color should be always opaque\n                ]),\n              },\n            },\n          };\n        }\n        return {\n          type: HighlightType.FLOW,\n          lineAttributes: attrs,\n        };\n      }\n    } else if (sourceLayer instanceof FlowCirclesLayer) {\n      const {circleAttributes} = this.state?.layersData || {};\n      if (circleAttributes) {\n        return {\n          type: HighlightType.LOCATION,\n          centroid: getLocationCentroidByIndex(circleAttributes, index),\n          radius: getOuterCircleRadiusByIndex(circleAttributes, index),\n        };\n      }\n    }\n    return undefined;\n  }\n\n  renderLayers(): Array<any> {\n    const layers = [];\n    if (this.state?.layersData) {\n      const {layersData, highlightedObject} = this.state;\n      const {circleAttributes, lineAttributes} = layersData || {};\n      if (circleAttributes && lineAttributes) {\n        const flowmapColors = getFlowmapColors(this._getSettingsState());\n        const outlineColor = colorAsRgba(\n          flowmapColors.outlineColor || (this.props.darkMode ? '#000' : '#fff'),\n        );\n        const commonLineLayerProps = {\n          data: lineAttributes,\n          parameters: {\n            ...this.props.parameters,\n            // prevent z-fighting at non-zero bearing/pitch\n            depthTest: false,\n          },\n        };\n        if (this.props.animationEnabled) {\n          layers.push(\n            // @ts-ignore\n            new AnimatedFlowLinesLayer({\n              ...this.getSubLayerProps({\n                ...commonLineLayerProps,\n                id: 'animated-flow-lines',\n                drawOutline: false,\n                thicknessUnit: 20,\n              }),\n            }),\n          );\n        } else {\n          layers.push(\n            new FlowLinesLayer({\n              ...this.getSubLayerProps({\n                ...commonLineLayerProps,\n                id: 'flow-lines',\n                drawOutline: true,\n                outlineColor: outlineColor,\n              }),\n            }),\n          );\n        }\n        layers.push(\n          new FlowCirclesLayer(\n            this.getSubLayerProps({\n              id: 'circles',\n              data: circleAttributes,\n              emptyColor: [0, 0, 0, 255],\n              emptyOutlineColor: [0, 0, 0, 255],\n            }),\n          ),\n        );\n        if (highlightedObject) {\n          switch (highlightedObject.type) {\n            case HighlightType.LOCATION:\n              layers.push(\n                new ScatterplotLayer({\n                  ...this.getSubLayerProps({\n                    id: 'location-highlight',\n                    data: [highlightedObject],\n                    pickable: false,\n                    stroked: true,\n                    filled: false,\n                    lineWidthUnits: 'pixels',\n                    getLineWidth: 2,\n                    radiusUnits: 'pixels',\n                    getRadius: (d: HighlightedLocationObject) => d.radius,\n                    getLineColor: colorAsRgba(this.props.highlightColor),\n                    getPosition: (d: HighlightedLocationObject) => d.centroid,\n                  }),\n                }),\n              );\n              break;\n            case HighlightType.FLOW:\n              layers.push(\n                new FlowLinesLayer({\n                  ...this.getSubLayerProps({\n                    id: 'flow-highlight',\n                    data: highlightedObject.lineAttributes,\n                    drawOutline: true,\n                    pickable: false,\n                    outlineColor: colorAsRgba(this.props.highlightColor),\n                    outlineThickness: 1,\n                  }),\n                }),\n              );\n              break;\n          }\n        }\n      }\n    }\n\n    return layers;\n  }\n}\n\nfunction asViewState(viewport: Record<string, any>): ViewportProps {\n  const {width, height, longitude, latitude, zoom, pitch, bearing} = viewport;\n  return {\n    width,\n    height,\n    longitude,\n    latitude,\n    zoom,\n    pitch,\n    bearing,\n  };\n}\n"]}
330
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"FlowmapLayer.js","sourceRoot":"","sources":["../src/FlowmapLayer.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright 2022 FlowmapBlue\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\nimport {CompositeLayer} from '@deck.gl/core';\nimport {ScatterplotLayer} from '@deck.gl/layers';\nimport {\n  colorAsRgba,\n  FlowLinesLayerAttributes,\n  FlowmapData,\n  FlowmapDataAccessors,\n  FlowmapDataProvider,\n  getFlowLineAttributesByIndex,\n  getFlowmapColors,\n  getOuterCircleRadiusByIndex,\n  getLocationCentroidByIndex,\n  isFlowmapData,\n  isFlowmapDataProvider,\n  LayersData,\n  LocalFlowmapDataProvider,\n  LocationFilterMode,\n  ViewportProps,\n  FlowmapAggregateAccessors,\n} from '@flowmap.gl/data';\nimport AnimatedFlowLinesLayer from './AnimatedFlowLinesLayer';\nimport FlowCirclesLayer from './FlowCirclesLayer';\nimport FlowLinesLayer from './FlowLinesLayer';\nimport {\n  FlowmapLayerPickingInfo,\n  LayerProps,\n  PickingInfo,\n  PickingType,\n} from './types';\n\nexport type FlowmapLayerProps<L, F> = {\n  data?: FlowmapData<L, F>;\n  dataProvider?: FlowmapDataProvider<L, F>;\n  locationTotalsEnabled?: boolean;\n  adaptiveScalesEnabled?: boolean;\n  animationEnabled?: boolean;\n  clusteringEnabled?: boolean;\n  clusteringLevel?: number;\n  fadeEnabled?: boolean;\n  fadeOpacityEnabled?: boolean;\n  clusteringAuto?: boolean;\n  darkMode?: boolean;\n  fadeAmount?: number;\n  colorScheme?: string;\n  highlightColor?: string;\n  maxTopFlowsDisplayNum?: number;\n  onHover?: (\n    info: FlowmapLayerPickingInfo<L, F> | undefined,\n    event: SourceEvent,\n  ) => void;\n  onClick?: (info: FlowmapLayerPickingInfo<L, F>, event: SourceEvent) => void;\n} & Partial<FlowmapDataAccessors<L, F>> &\n  LayerProps;\n\nenum HighlightType {\n  LOCATION = 'location',\n  FLOW = 'flow',\n}\n\ntype HighlightedLocationObject = {\n  type: HighlightType.LOCATION;\n  centroid: [number, number];\n  radius: number;\n};\n\ntype HighlightedFlowObject = {\n  type: HighlightType.FLOW;\n  lineAttributes: FlowLinesLayerAttributes;\n};\n\ntype HighlightedObject = HighlightedLocationObject | HighlightedFlowObject;\n\ntype State<L, F> = {\n  accessors: FlowmapAggregateAccessors<L, F>;\n  dataProvider: FlowmapDataProvider<L, F>;\n  layersData: LayersData | undefined;\n  highlightedObject: HighlightedObject | undefined;\n};\n\nexport type SourceEvent = {srcEvent: MouseEvent};\n\nexport default class FlowmapLayer<L, F> extends CompositeLayer {\n  static defaultProps = {\n    darkMode: true,\n    fadeAmount: 50,\n    locationTotalsEnabled: true,\n    animationEnabled: false,\n    clusteringEnabled: true,\n    fadeEnabled: true,\n    fadeOpacityEnabled: false,\n    clusteringAuto: true,\n    clusteringLevel: undefined,\n    adaptiveScalesEnabled: true,\n    colorScheme: 'Teal',\n    highlightColor: 'orange',\n    maxTopFlowsDisplayNum: 5000,\n  };\n  state: State<L, F> | undefined;\n\n  public constructor(props: FlowmapLayerProps<L, F>) {\n    super({\n      ...props,\n      dataProvider: {\n        // To avoid deck.gl props diffing on comlink worker proxy causing an exception\n        dataProvider: props.dataProvider,\n      },\n      onHover: (info: PickingInfo<any>, event: SourceEvent) => {\n        // TODO: if (lastHoverEventStartTimeRef > startTime) {\n        //   // Skipping, because this is not the latest hover event\n        //   return;\n        // }\n        this.setState({highlightedObject: this._getHighlightedObject(info)});\n        const {onHover} = props;\n        if (onHover) {\n          this._getFlowmapLayerPickingInfo(info).then((info) =>\n            onHover(info, event),\n          );\n        }\n      },\n      onClick: (info: PickingInfo<any>, event: SourceEvent) => {\n        const {onClick} = props;\n        if (onClick) {\n          this._getFlowmapLayerPickingInfo(info).then((info) => {\n            if (info) {\n              onClick(info, event);\n            }\n          });\n        }\n      },\n    });\n  }\n\n  initializeState() {\n    this.state = {\n      accessors: new FlowmapAggregateAccessors<L, F>(this.props),\n      dataProvider: this._getOrMakeDataProvider(),\n      layersData: undefined,\n      highlightedObject: undefined,\n    };\n  }\n\n  private _updateAccessors() {\n    this.state?.dataProvider?.setAccessors(this.props);\n    this.setState({accessors: new FlowmapAggregateAccessors(this.props)});\n  }\n\n  private _getOrMakeDataProvider() {\n    const {data, dataProvider} = this.props;\n    if (isFlowmapDataProvider<L, F>(dataProvider?.dataProvider)) {\n      return dataProvider.dataProvider;\n    } else if (isFlowmapData<L, F>(data)) {\n      const dataProvider = new LocalFlowmapDataProvider<L, F>(this.props);\n      dataProvider.setFlowmapData(data);\n      return dataProvider;\n    }\n    throw new Error(\n      'FlowmapLayer: data must be a FlowmapDataProvider or FlowmapData',\n    );\n  }\n\n  private _updateDataProvider() {\n    this.setState({dataProvider: this._getOrMakeDataProvider()});\n  }\n\n  shouldUpdateState(params: Record<string, any>): boolean {\n    const {changeFlags} = params;\n    // if (this._viewportChanged()) {\n    //   return true;\n    // }\n    if (changeFlags.viewportChanged) {\n      return true;\n    }\n    return super.shouldUpdateState(params);\n    // TODO: be smarter on when to update\n    // (e.g. ignore viewport changes when adaptiveScalesEnabled and clustering are false)\n  }\n\n  updateState({oldProps, props, changeFlags}: Record<string, any>): void {\n    const {dataProvider, highlightedObject} = this.state || {};\n    if (!dataProvider) {\n      return;\n    }\n\n    if (changeFlags.propsChanged) {\n      // this._updateAccessors();\n    }\n    if (changeFlags.dataChanged) {\n      this._updateDataProvider();\n    }\n    if (changeFlags.viewportChanged || changeFlags.dataChanged) {\n      this.setState({\n        highlightedObject: undefined,\n      });\n    }\n\n    if (\n      changeFlags.viewportChanged ||\n      changeFlags.propsOrDataChanged // TODO can we ignore accessor props changes?\n    ) {\n      dataProvider.setFlowmapState(this._getFlowmapState());\n      (async () => {\n        const layersData = await dataProvider.getLayersData();\n        this.setState({layersData});\n      })();\n    }\n  }\n\n  private _getSettingsState() {\n    const {\n      locationTotalsEnabled,\n      adaptiveScalesEnabled,\n      animationEnabled,\n      clusteringEnabled,\n      clusteringLevel,\n      fadeEnabled,\n      fadeOpacityEnabled,\n      clusteringAuto,\n      darkMode,\n      fadeAmount,\n      colorScheme,\n      highlightColor,\n      maxTopFlowsDisplayNum,\n    } = this.props;\n    return {\n      locationTotalsEnabled,\n      adaptiveScalesEnabled,\n      animationEnabled,\n      clusteringEnabled,\n      clusteringLevel,\n      fadeEnabled,\n      fadeOpacityEnabled,\n      clusteringAuto,\n      darkMode,\n      fadeAmount,\n      colorScheme,\n      highlightColor,\n      maxTopFlowsDisplayNum,\n    };\n  }\n\n  private _getFlowmapState() {\n    return {\n      viewport: pickViewportProps(this.context.viewport),\n      filterState: {\n        selectedLocations: undefined,\n        locationFilterMode: LocationFilterMode.ALL,\n        selectedTimeRange: undefined,\n      },\n      settingsState: this._getSettingsState(),\n    };\n  }\n\n  private async _getFlowmapLayerPickingInfo(\n    info: Record<string, any>,\n  ): Promise<FlowmapLayerPickingInfo<L, F> | undefined> {\n    const {index, sourceLayer} = info;\n    const {dataProvider, accessors} = this.state || {};\n    if (!dataProvider || !accessors) {\n      return undefined;\n    }\n    const commonInfo = {\n      // ...info,\n      layer: info.layer,\n      index: info.index,\n      x: info.x,\n      y: info.y,\n      coordinate: info.coordinate,\n    };\n    if (\n      sourceLayer instanceof FlowLinesLayer ||\n      sourceLayer instanceof AnimatedFlowLinesLayer\n    ) {\n      const flow =\n        index === -1 ? undefined : await dataProvider.getFlowByIndex(index);\n      if (flow) {\n        const origin = await dataProvider.getLocationById(\n          accessors.getFlowOriginId(flow),\n        );\n        const dest = await dataProvider.getLocationById(\n          accessors.getFlowDestId(flow),\n        );\n        if (origin && dest) {\n          return {\n            ...commonInfo,\n            type: PickingType.FLOW,\n            object: flow,\n            origin: origin,\n            dest: dest,\n            count: accessors.getFlowMagnitude(flow),\n          };\n        }\n      }\n    } else if (sourceLayer instanceof FlowCirclesLayer) {\n      const location =\n        index === -1 ? undefined : await dataProvider.getLocationByIndex(index);\n\n      if (location) {\n        const id = accessors.getLocationId(location);\n        const name = accessors.getLocationName(location);\n        const totals = await dataProvider.getTotalsForLocation(id);\n        const {circleAttributes} = this.state?.layersData || {};\n        if (totals && circleAttributes) {\n          const circleRadius = getOuterCircleRadiusByIndex(\n            circleAttributes,\n            info.index,\n          );\n          return {\n            ...commonInfo,\n            type: PickingType.LOCATION,\n            object: location,\n            id,\n            name,\n            totals,\n            circleRadius: circleRadius,\n            event: undefined,\n          };\n        }\n      }\n    }\n\n    return undefined;\n  }\n\n  private _getHighlightedObject(\n    info: Record<string, any>,\n  ): HighlightedObject | undefined {\n    const {index, sourceLayer} = info;\n    if (index < 0) return undefined;\n    if (\n      sourceLayer instanceof FlowLinesLayer ||\n      sourceLayer instanceof AnimatedFlowLinesLayer\n    ) {\n      const {lineAttributes} = this.state?.layersData || {};\n      if (lineAttributes) {\n        let attrs = getFlowLineAttributesByIndex(lineAttributes, index);\n        if (this.props.fadeOpacityEnabled) {\n          attrs = {\n            ...attrs,\n            attributes: {\n              ...attrs.attributes,\n              getColor: {\n                ...attrs.attributes.getColor,\n                value: new Uint8Array([\n                  ...attrs.attributes.getColor.value.slice(0, 3),\n                  255, // the highlight color should be always opaque\n                ]),\n              },\n            },\n          };\n        }\n        return {\n          type: HighlightType.FLOW,\n          lineAttributes: attrs,\n        };\n      }\n    } else if (sourceLayer instanceof FlowCirclesLayer) {\n      const {circleAttributes} = this.state?.layersData || {};\n      if (circleAttributes) {\n        return {\n          type: HighlightType.LOCATION,\n          centroid: getLocationCentroidByIndex(circleAttributes, index),\n          radius: getOuterCircleRadiusByIndex(circleAttributes, index),\n        };\n      }\n    }\n    return undefined;\n  }\n\n  renderLayers(): Array<any> {\n    const layers = [];\n    if (this.state?.layersData) {\n      const {layersData, highlightedObject} = this.state;\n      const {circleAttributes, lineAttributes} = layersData || {};\n      if (circleAttributes && lineAttributes) {\n        const flowmapColors = getFlowmapColors(this._getSettingsState());\n        const outlineColor = colorAsRgba(\n          flowmapColors.outlineColor || (this.props.darkMode ? '#000' : '#fff'),\n        );\n        const commonLineLayerProps = {\n          data: lineAttributes,\n          parameters: {\n            ...this.props.parameters,\n            // prevent z-fighting at non-zero bearing/pitch\n            depthTest: false,\n          },\n        };\n        if (this.props.animationEnabled) {\n          layers.push(\n            // @ts-ignore\n            new AnimatedFlowLinesLayer({\n              ...this.getSubLayerProps({\n                ...commonLineLayerProps,\n                id: 'animated-flow-lines',\n                drawOutline: false,\n                thicknessUnit: 20,\n              }),\n            }),\n          );\n        } else {\n          layers.push(\n            new FlowLinesLayer({\n              ...this.getSubLayerProps({\n                ...commonLineLayerProps,\n                id: 'flow-lines',\n                drawOutline: true,\n                outlineColor: outlineColor,\n              }),\n            }),\n          );\n        }\n        layers.push(\n          new FlowCirclesLayer(\n            this.getSubLayerProps({\n              id: 'circles',\n              data: circleAttributes,\n              emptyColor: this.props.darkMode\n                ? [0, 0, 0, 255]\n                : [255, 255, 255, 255],\n              outlineEmptyMix: 0.4,\n            }),\n          ),\n        );\n        if (highlightedObject) {\n          switch (highlightedObject.type) {\n            case HighlightType.LOCATION:\n              layers.push(\n                new ScatterplotLayer({\n                  ...this.getSubLayerProps({\n                    id: 'location-highlight',\n                    data: [highlightedObject],\n                    pickable: false,\n                    stroked: true,\n                    filled: false,\n                    lineWidthUnits: 'pixels',\n                    getLineWidth: 2,\n                    radiusUnits: 'pixels',\n                    getRadius: (d: HighlightedLocationObject) => d.radius,\n                    getLineColor: colorAsRgba(this.props.highlightColor),\n                    getPosition: (d: HighlightedLocationObject) => d.centroid,\n                  }),\n                }),\n              );\n              break;\n            case HighlightType.FLOW:\n              layers.push(\n                new FlowLinesLayer({\n                  ...this.getSubLayerProps({\n                    id: 'flow-highlight',\n                    data: highlightedObject.lineAttributes,\n                    drawOutline: true,\n                    pickable: false,\n                    outlineColor: colorAsRgba(this.props.highlightColor),\n                    outlineThickness: 1,\n                  }),\n                }),\n              );\n              break;\n          }\n        }\n      }\n    }\n\n    return layers;\n  }\n}\n\nfunction pickViewportProps(viewport: Record<string, any>): ViewportProps {\n  const {width, height, longitude, latitude, zoom, pitch, bearing} = viewport;\n  return {\n    width,\n    height,\n    longitude,\n    latitude,\n    zoom,\n    pitch,\n    bearing,\n  };\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flowmap.gl/layers",
3
- "version": "8.0.0-alpha.5",
3
+ "version": "8.0.0-alpha.6",
4
4
  "main": "dist/index.js",
5
5
  "module": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
18
18
  "@luma.gl/constants": "^8.5.10",
19
19
  "@luma.gl/core": "^8.5.10"
20
20
  },
21
- "gitHead": "301087551f76980d8d366ec6cdc39d8ad6fef2f2",
21
+ "gitHead": "3d9b5831461c4df182f289892dc7af90718d9fbc",
22
22
  "publishConfig": {
23
23
  "access": "public"
24
24
  }
package/src/FlowCirclesLayer/FlowCirclesLayer.ts CHANGED
@@ -31,7 +31,7 @@ export interface Props extends LayerProps {
31
31
  opacity?: number;
32
32
  pickable?: boolean;
33
33
  emptyColor?: RGBA;
34
- emptyOutlineColor?: RGBA;
34
+ outlineEmptyMix?: number;
35
35
  getColor?: (d: FlowCirclesDatum) => RGBA;
36
36
  getPosition?: (d: FlowCirclesDatum) => [number, number];
37
37
  getInRadius?: (d: FlowCirclesDatum) => number;
@@ -42,7 +42,7 @@ export interface Props extends LayerProps {
42
42
 
43
43
  const DEFAULT_COLOR = [0, 0, 0, 255];
44
44
  const DEFAULT_EMPTY_COLOR = [255, 255, 255, 255];
45
- const DEFAULT_EMPTY_OUTLINE_COLOR = [180, 180, 180, 255];
45
+ const DEFAULT_OUTLINE_EMPTY_MIX = 0.4;
46
46
 
47
47
  class FlowCirclesLayer extends Layer {
48
48
  static layerName = 'FlowCirclesLayer';
@@ -50,7 +50,7 @@ class FlowCirclesLayer extends Layer {
50
50
  static defaultProps = {
51
51
  getColor: {type: 'accessor', value: DEFAULT_COLOR},
52
52
  emptyColor: {type: 'accessor', value: DEFAULT_EMPTY_COLOR},
53
- emptyOutlineColor: {type: 'accessor', value: DEFAULT_EMPTY_OUTLINE_COLOR},
53
+ outlineEmptyMix: {type: 'accessor', value: DEFAULT_OUTLINE_EMPTY_MIX},
54
54
  getPosition: {type: 'accessor', value: (d: FlowCirclesDatum) => d.position},
55
55
  getInRadius: {type: 'accessor', value: 1},
56
56
  getOutRadius: {type: 'accessor', value: 1},
@@ -116,12 +116,12 @@ class FlowCirclesLayer extends Layer {
116
116
  }
117
117
 
118
118
  draw({uniforms}: any) {
119
- const {emptyColor, emptyOutlineColor} = this.props;
119
+ const {emptyColor, outlineEmptyMix} = this.props;
120
120
  this.state.model
121
121
  .setUniforms({
122
122
  ...uniforms,
123
123
  emptyColor,
124
- emptyOutlineColor,
124
+ outlineEmptyMix,
125
125
  })
126
126
  .draw();
127
127
  }
package/src/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.ts CHANGED
@@ -17,12 +17,12 @@
17
17
  */
18
18
  export default `\
19
19
  #define SHADER_NAME flow-circles-layer-fragment-shader
20
- #define SOFT_OUTLINE 0.1
20
+ #define SOFT_OUTLINE 0.05
21
21
  #define EPS 0.05
22
22
  precision highp float;
23
23
 
24
24
  uniform vec4 emptyColor;
25
- uniform vec4 emptyOutlineColor;
25
+ uniform float outlineEmptyMix;
26
26
 
27
27
  varying vec4 vColor;
28
28
  varying vec2 unitPosition;
@@ -46,26 +46,29 @@ void main(void) {
46
46
  when_gt(unitInRadius, unitOutRadius)
47
47
  );
48
48
  vec4 outlineColor = mix(
49
- emptyOutlineColor / 255., vColor,
49
+ mix(vColor, emptyColor / 255., outlineEmptyMix),
50
+ vColor,
50
51
  when_gt(unitInRadius, unitOutRadius)
51
52
  );
52
53
 
53
54
  float innerR = min(unitInRadius, unitOutRadius) * (1.0 - SOFT_OUTLINE);
54
55
 
55
56
  // Inner circle
56
- float step2 = innerR - EPS;
57
- float step3 = innerR;
57
+ float step2 = innerR - 2.0 * EPS;
58
+ float step3 = innerR - EPS;
58
59
 
59
60
  // Ring
60
- float step4 = innerR + EPS;
61
- float step5 = 1.0 - SOFT_OUTLINE - EPS*2.0;
62
- float step6 = 1.0 - SOFT_OUTLINE;
61
+ float step4 = innerR;
62
+ // float step5 = 1.0 - SOFT_OUTLINE - EPS;
63
+ // float step6 = 1.0 - SOFT_OUTLINE;
64
+ float step5 = 1.0 - 5.0 * EPS;
65
+ float step6 = 1.0;
63
66
 
64
67
  gl_FragColor = vColor;
65
68
  gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step2, step3, distToCenter));
66
69
  gl_FragColor = mix(gl_FragColor, ringColor, smoothstep(step3, step4, distToCenter));
67
70
  gl_FragColor = mix(gl_FragColor, outlineColor, smoothstep(step5, step6, distToCenter));
68
- gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step6, 1.0, distToCenter));
71
+ // gl_FragColor = mix(gl_FragColor, emptyColor / 255., smoothstep(step6, 1.0, distToCenter));
69
72
  gl_FragColor.a *= smoothstep(0.0, SOFT_OUTLINE, 1.0 - distToCenter);
70
73
  DECKGL_FILTER_COLOR(gl_FragColor, geometry);
71
74
  }
package/src/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.ts CHANGED
@@ -30,7 +30,7 @@ attribute vec3 instancePickingColors;
30
30
 
31
31
  uniform float opacity;
32
32
  uniform vec4 emptyColor;
33
- uniform vec4 emptyOutlineColor;
33
+ uniform float outlineEmptyMix;
34
34
 
35
35
  varying vec4 vColor;
36
36
  varying vec2 unitPosition;
package/src/FlowmapLayer.ts CHANGED
@@ -45,7 +45,8 @@ import {
45
45
  } from './types';
46
46
 
47
47
  export type FlowmapLayerProps<L, F> = {
48
- data: FlowmapData<L, F> | FlowmapDataProvider<L, F>;
48
+ data?: FlowmapData<L, F>;
49
+ dataProvider?: FlowmapDataProvider<L, F>;
49
50
  locationTotalsEnabled?: boolean;
50
51
  adaptiveScalesEnabled?: boolean;
51
52
  animationEnabled?: boolean;
@@ -115,6 +116,10 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
115
116
  public constructor(props: FlowmapLayerProps<L, F>) {
116
117
  super({
117
118
  ...props,
119
+ dataProvider: {
120
+ // To avoid deck.gl props diffing on comlink worker proxy causing an exception
121
+ dataProvider: props.dataProvider,
122
+ },
118
123
  onHover: (info: PickingInfo<any>, event: SourceEvent) => {
119
124
  // TODO: if (lastHoverEventStartTimeRef > startTime) {
120
125
  // // Skipping, because this is not the latest hover event
@@ -144,7 +149,7 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
144
149
  initializeState() {
145
150
  this.state = {
146
151
  accessors: new FlowmapAggregateAccessors<L, F>(this.props),
147
- dataProvider: this._makeDataProvider(),
152
+ dataProvider: this._getOrMakeDataProvider(),
148
153
  layersData: undefined,
149
154
  highlightedObject: undefined,
150
155
  };
@@ -155,10 +160,10 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
155
160
  this.setState({accessors: new FlowmapAggregateAccessors(this.props)});
156
161
  }
157
162
 
158
- private _makeDataProvider() {
159
- const {data} = this.props;
160
- if (isFlowmapDataProvider<L, F>(data)) {
161
- return data;
163
+ private _getOrMakeDataProvider() {
164
+ const {data, dataProvider} = this.props;
165
+ if (isFlowmapDataProvider<L, F>(dataProvider?.dataProvider)) {
166
+ return dataProvider.dataProvider;
162
167
  } else if (isFlowmapData<L, F>(data)) {
163
168
  const dataProvider = new LocalFlowmapDataProvider<L, F>(this.props);
164
169
  dataProvider.setFlowmapData(data);
@@ -170,7 +175,7 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
170
175
  }
171
176
 
172
177
  private _updateDataProvider() {
173
- this.setState({dataProvider: this._makeDataProvider()});
178
+ this.setState({dataProvider: this._getOrMakeDataProvider()});
174
179
  }
175
180
 
176
181
  shouldUpdateState(params: Record<string, any>): boolean {
@@ -193,7 +198,7 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
193
198
  }
194
199
 
195
200
  if (changeFlags.propsChanged) {
196
- this._updateAccessors();
201
+ // this._updateAccessors();
197
202
  }
198
203
  if (changeFlags.dataChanged) {
199
204
  this._updateDataProvider();
@@ -204,7 +209,10 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
204
209
  });
205
210
  }
206
211
 
207
- if (changeFlags.viewportChanged || changeFlags.propsOrDataChanged) {
212
+ if (
213
+ changeFlags.viewportChanged ||
214
+ changeFlags.propsOrDataChanged // TODO can we ignore accessor props changes?
215
+ ) {
208
216
  dataProvider.setFlowmapState(this._getFlowmapState());
209
217
  (async () => {
210
218
  const layersData = await dataProvider.getLayersData();
@@ -248,7 +256,7 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
248
256
 
249
257
  private _getFlowmapState() {
250
258
  return {
251
- viewport: asViewState(this.context.viewport),
259
+ viewport: pickViewportProps(this.context.viewport),
252
260
  filterState: {
253
261
  selectedLocations: undefined,
254
262
  locationFilterMode: LocationFilterMode.ALL,
@@ -421,8 +429,10 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
421
429
  this.getSubLayerProps({
422
430
  id: 'circles',
423
431
  data: circleAttributes,
424
- emptyColor: [0, 0, 0, 255],
425
- emptyOutlineColor: [0, 0, 0, 255],
432
+ emptyColor: this.props.darkMode
433
+ ? [0, 0, 0, 255]
434
+ : [255, 255, 255, 255],
435
+ outlineEmptyMix: 0.4,
426
436
  }),
427
437
  ),
428
438
  );
@@ -470,7 +480,7 @@ export default class FlowmapLayer<L, F> extends CompositeLayer {
470
480
  }
471
481
  }
472
482
 
473
- function asViewState(viewport: Record<string, any>): ViewportProps {
483
+ function pickViewportProps(viewport: Record<string, any>): ViewportProps {
474
484
  const {width, height, longitude, latitude, zoom, pitch, bearing} = viewport;
475
485
  return {
476
486
  width,