Merge branch 'master' into draw_doc

lerna.json

@@ -14,7 +14,7 @@
       "message": "chore: publish"
     }
   },
-  "version": "2.1.14",
+  "version": "2.1.15",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "publishConfig": {

packages/component/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -24,8 +24,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.1.14",
-    "@antv/l7-utils": "2.1.14",
+    "@antv/l7-core": "^2.1.15",
+    "@antv/l7-utils": "^2.1.15",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-core",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -23,7 +23,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.1.0",
-    "@antv/l7-utils": "2.1.14",
+    "@antv/l7-utils": "^2.1.15",
     "@babel/runtime": "^7.7.7",
     "@mapbox/tiny-sdf": "^1.1.1",
     "ajv": "^6.10.2",

packages/draw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-draw",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "L7 Draw moudules",
   "keywords": [],
   "author": "thinkinggis <lzx199065@gmail.com>",
@@ -35,8 +35,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@antv/l7": "2.1.14",
-    "@antv/l7-component": "2.1.14",
+    "@antv/l7": "^2.1.15",
+    "@antv/l7-component": "^2.1.15",
     "@babel/runtime": "^7.7.7",
     "@turf/circle": "^6.0.1",
     "@turf/distance": "^6.0.1",

packages/l7/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -24,12 +24,12 @@
   "author": "antv",
   "license": "MIT",
   "dependencies": {
-    "@antv/l7-component": "2.1.14",
-    "@antv/l7-core": "2.1.14",
-    "@antv/l7-layers": "2.1.14",
-    "@antv/l7-maps": "2.1.14",
-    "@antv/l7-scene": "2.1.14",
-    "@antv/l7-utils": "2.1.14",
+    "@antv/l7-component": "^2.1.15",
+    "@antv/l7-core": "^2.1.15",
+    "@antv/l7-layers": "^2.1.15",
+    "@antv/l7-maps": "^2.1.15",
+    "@antv/l7-scene": "^2.1.15",
+    "@antv/l7-utils": "^2.1.15",
     "@babel/runtime": "^7.7.7"
   },
   "gitHead": "a5d354b66873f700730248d015c5e539c54b34b7",

packages/l7/src/version.ts

@@ -1,2 +1,2 @@
-const version = '2.1.14';
+const version = '2.1.15';
 export { version };

packages/layers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -23,9 +23,9 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.1.0",
-    "@antv/l7-core": "2.1.14",
-    "@antv/l7-source": "2.1.14",
-    "@antv/l7-utils": "2.1.14",
+    "@antv/l7-core": "^2.1.15",
+    "@antv/l7-source": "^2.1.15",
+    "@antv/l7-utils": "^2.1.15",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.1.0",
     "@turf/meta": "^6.0.2",

packages/layers/src/plugins/DataMappingPlugin.ts

@@ -51,7 +51,6 @@ export default class DataMappingPlugin implements ILayerPlugin {
         filterData = dataArray.filter((record: IParseDataItem) => {
           return this.applyAttributeMapping(filter, record)[0];
         });
-        filter.needRemapping = false;
       }
       if (attributesToRemapping.length) {
         // 过滤数据

packages/maps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-maps",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -25,8 +25,8 @@
   "author": "xiaoiver",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.1.14",
-    "@antv/l7-utils": "2.1.14",
+    "@antv/l7-core": "^2.1.15",
+    "@antv/l7-utils": "^2.1.15",
     "@babel/runtime": "^7.7.7",
     "@types/amap-js-api": "^1.4.6",
     "gl-matrix": "^3.1.0",

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-react",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -24,8 +24,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7": "2.1.14",
-    "@antv/l7-maps": "2.1.14",
+    "@antv/l7": "^2.1.15",
+    "@antv/l7-maps": "^2.1.15",
     "@babel/runtime": "^7.7.7",
     "load-styles": "^2.0.0"
   },

packages/renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-renderer",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -25,7 +25,7 @@
     "gl": "^4.4.0"
   },
   "dependencies": {
-    "@antv/l7-core": "2.1.14",
+    "@antv/l7-core": "^2.1.15",
     "@babel/runtime": "^7.7.7",
     "inversify": "^5.0.1",
     "lodash": "^4.17.15",

packages/scene/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-scene",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -22,11 +22,11 @@
   "author": "xiaoiver",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-component": "2.1.14",
-    "@antv/l7-core": "2.1.14",
-    "@antv/l7-maps": "2.1.14",
-    "@antv/l7-renderer": "2.1.14",
-    "@antv/l7-utils": "2.1.14",
+    "@antv/l7-component": "^2.1.15",
+    "@antv/l7-core": "^2.1.15",
+    "@antv/l7-maps": "^2.1.15",
+    "@antv/l7-renderer": "^2.1.15",
+    "@antv/l7-utils": "^2.1.15",
     "@babel/runtime": "^7.7.7",
     "inversify": "^5.0.1",
     "mapbox-gl": "^1.2.1",

packages/source/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-source",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -25,8 +25,8 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.1.0",
-    "@antv/l7-core": "2.1.14",
-    "@antv/l7-utils": "2.1.14",
+    "@antv/l7-core": "^2.1.15",
+    "@antv/l7-utils": "^2.1.15",
     "@babel/runtime": "^7.7.7",
     "@mapbox/geojson-rewind": "^0.4.0",
     "@turf/helpers": "^6.1.4",

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-utils",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",

stories/Layers/components/RasterLayer.tsx

@@ -2,7 +2,7 @@ import { RasterLayer, Scene } from '@antv/l7';
 import { Mapbox } from '@antv/l7-maps';
 import * as dat from 'dat.gui';
 // @ts-ignore
-import * as GeoTIFF from 'geotiff/dist/geotiff.bundle.js';
+import * as GeoTIFF from 'geotiff';
 import * as React from 'react';
 import { colorScales } from '../lib/colorscales';
 export default class ImageLayerDemo extends React.Component {

stories/Layers/components/light.tsx

@@ -1,18 +1,23 @@
 import { PointLayer, Scene } from '@antv/l7';
 import { GaodeMap, Mapbox } from '@antv/l7-maps';
+import * as dat from 'dat.gui';
 import * as React from 'react';
 // @ts-ignore
 export default class Light extends React.Component {
   // @ts-ignore
   private scene: Scene;
+  private gui: dat.GUI;
 
   public componentWillUnmount() {
     this.scene.destroy();
+    if (this.gui) {
+      this.gui.destroy();
+    }
   }
 
   public async componentDidMount() {
     const response = await fetch(
-      'https://alipay-rmsdeploy-image.cn-hangzhou.alipay.aliyun-inc.com/antvdemo/assets/city/bj.csv',
+      'https://gw-office.alipayobjects.com/bmw-prod/6698fc37-4fc1-488b-972c-e29c77617a26.csv',
     );
     const pointsData = await response.text();
 
@@ -21,29 +26,49 @@ export default class Light extends React.Component {
       map: new GaodeMap({
         pitch: 0,
         style: 'dark',
-        center: [116.405289, 39.904987],
-        zoom: 6,
+        center: [114.298569, 30.584354],
+        zoom: 11,
       }),
     });
     this.scene = scene;
+    const layerConfig = {
+      type: 'bus',
+    };
+    const gui = new dat.GUI();
+    this.gui = gui;
+    const typeControl = this.gui.add(layerConfig, 'type', [
+      'bus',
+      'elm',
+      'bikeriding',
+      'metro',
+      'parking',
+    ]);
+
     scene.on('loaded', async () => {
-      const pointLayer = new PointLayer({
-        blend: 'normal',
-      })
+      const pointLayer = new PointLayer()
         .source(pointsData, {
           parser: {
             type: 'csv',
-            x: 'lng',
-            y: 'lat',
+            y: 'latitude',
+            x: 'longitude',
           },
         })
-        .size(1)
-        .color('#ffa842')
+        .size(0.5)
+        .filter('type', (v: string) => {
+          return v === 'bus';
+        })
+        .color('#FF2B1F')
         .style({
           opacity: 1,
         });
 
       scene.addLayer(pointLayer);
+      typeControl.onChange((type) => {
+        pointLayer.filter('type', (v) => {
+          return v === type;
+        });
+        scene.render();
+      });
       this.scene = scene;
     });
   }