feat(source): add join transfroms

antvis · Dec 12, 2019 · 6da2528 · 6da2528
1 parent 27a09a7
commit 6da2528
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 14 deletions.
diff --git a/packages/core/src/services/renderer/passes/PixelPickingPass.ts b/packages/core/src/services/renderer/passes/PixelPickingPass.ts
@@ -195,20 +195,20 @@ export default class PixelPickingPass<
     feature: unknown;
   }) {
     const { onHover, onClick } = this.layer.getLayerConfig();
-    if (onHover) {
-      onHover({
-        x,
-        y,
-        feature,
-      });
-    }
-    if (onClick) {
-      onClick({
-        x,
-        y,
-        feature,
-      });
-    }
+    // if (onHover) {
+    //   onHover({
+    //     x,
+    //     y,
+    //     feature,
+    //   });
+    // }
+    // if (onClick) {
+    //   onClick({
+    //     x,
+    //     y,
+    //     feature,
+    //   });
+    // }
     this.layer.emit(type, {
       x,
       y,

diff --git a/packages/l7/package.json b/packages/l7/package.json
@@ -5,6 +5,7 @@
   "main": "lib/index.js",
   "module": "es/index.js",
   "types": "es/index.d.ts",
+  "unpkg": "dist/l7.js",
   "sideEffects": true,
   "files": [
     "dist",

diff --git a/packages/source/src/index.ts b/packages/source/src/index.ts
@@ -9,6 +9,7 @@ import { cluster } from './transform/cluster';
 import { filter } from './transform/filter';
 import { aggregatorToGrid } from './transform/grid';
 import { pointToHexbin } from './transform/hexagon';
+import { join } from './transform/join';
 import { map } from './transform/map';
 export default Source;
 registerParser('geojson', geojson);

diff --git a/packages/source/src/transform/join.ts b/packages/source/src/transform/join.ts
@@ -0,0 +1,28 @@
+import { IParseDataItem, IParserData } from '@antv/l7-core';
+
+interface IJoinOption {
+  field: 'string';
+  data: any[];
+}
+
+/**
+ *
+ * @param data
+ * @param options
+ */
+export function filter(geoData: IParserData, options: { [key: string]: any }) {
+  const { field, data } = options;
+  const dataObj: { [key: string]: any } = {};
+  data.forEach((element: { [key: string]: any }) => {
+    dataObj[element.field] = element;
+  });
+  geoData.dataArray = data.dataArray.map((item: IParseDataItem) => {
+    const joinName = item[field];
+    return {
+      ...dataObj[joinName],
+      ...item,
+    };
+  });
+
+  return data;
+}