fix: merge conflict

2020-02-22 23:48:24 +08:00 · 2020-02-22 23:48:24 +08:00 · d3e9a8d77b
parent 927175308c cf7c037fc5
commit d3e9a8d77b
17 changed files with 120 additions and 42 deletions
--- a/jest.config.js
+++ b/jest.config.js
@ -28,7 +28,8 @@ module.exports = {
  moduleFileExtensions: [ 'ts', 'tsx', 'js' ],
  modulePathIgnorePatterns: [ 'dist' ],
  moduleNameMapper: {
-    '@antv/l7-(.+)$': '<rootDir>packages/$1/src'
+    '@antv/l7-(.+)$': '<rootDir>packages/$1/src',
+    '@antv/async-hook$': '<rootDir>packages/async-hook/src'
  },
  notify: true,
  notifyMode: 'always',
--- a/lerna.json
+++ b/lerna.json
@ -14,7 +14,7 @@
      "message": "chore: publish"
    }
  },
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "npmClient": "yarn",
  "useWorkspaces": true,
  "publishConfig": {
--- a/packages/component/package.json
+++ b/packages/component/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-component",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -24,8 +24,8 @@
  "author": "lzxue",
  "license": "ISC",
  "dependencies": {
-    "@antv/l7-core": "^2.0.26",
-    "@antv/l7-utils": "^2.0.26",
+    "@antv/l7-core": "^2.0.27-alpha.0",
+    "@antv/l7-utils": "^2.0.27-alpha.0",
    "@babel/runtime": "^7.7.7",
    "eventemitter3": "^4.0.0",
    "inversify": "^5.0.1",
--- a/packages/core/package.json
+++ b/packages/core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-core",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -22,8 +22,8 @@
  "author": "xiaoiver",
  "license": "ISC",
  "dependencies": {
-    "@antv/l7-utils": "^2.0.25",
    "@antv/async-hook": "^2.0.25",
+    "@antv/l7-utils": "^2.0.27-alpha.0",
    "@babel/runtime": "^7.7.7",
    "@mapbox/tiny-sdf": "^1.1.1",
    "ajv": "^6.10.2",
--- a/packages/l7/demo/index.html
+++ b/packages/l7/demo/index.html
@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>L7 IE</title>
+    <style>
+      html,
+      body {
+        overflow: hidden;
+        margin: 0;
+      }
+      #map {
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        width: 100%;
+      }
+    </style>
+    <link
+      href="https://api.mapbox.com/mapbox-gl-js/v1.8.0/mapbox-gl.css"
+      rel="stylesheet"
+    />
+  </head>
+  <body>
+    <div id="map"></div>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.8.3/polyfill.min.js"></script>
+     <!-- <script src="https://cdn.jsdelivr.net/npm/symbol-es6@0.1.2/symbol-es6.min.js"></script> -->
+    <script src="https://api.mapbox.com/mapbox-gl-js/v1.8.0/mapbox-gl.js"></script>
+
+    <script src="../dist/l7-dev.js"></script>
+    <script>
+      console.log(L7);
+      const scene = new L7.Scene({
+        id: "map",
+        map: new L7.Mapbox({
+          style: "dark", // 样式URL
+          center: [108.6167, 19.1000],
+          pitch: 0,
+          zoom: 5
+        })
+      });
+
+      const data = {"list":[{"w":19.1000,"t":24.6000,"s":"海南","l":11,"m":"东方","j":108.6167,"h":"59838"},{"w":20.0000,"t":23.8000,"s":"海南","l":11,"m":"海口","j":110.2500,"h":"59758"},{"w":22.2750,"t":23.6000,"s":"广东","l":12,"m":"珠海","j":113.5669,"h":"59488"},{"w":20.3372,"t":23.4000,"s":"广东","l":12,"m":"徐闻","j":110.1794,"h":"59754"},{"w":19.2089,"t":23.2000,"s":"海南","l":12,"m":"琼海","j":110.4819,"h":"59855"},{"w":21.7358,"t":23.2000,"s":"广东","l":11,"m":"上川岛","j":112.7731,"h":"59673"},{"w":23.3853,"t":23.0000,"s":"广东","l":11,"m":"汕头","j":116.6792,"h":"59316"},{"w":22.5417,"t":23.0000,"s":"广东","l":12,"m":"深圳","j":114.0033,"h":"59493"},{"w":19.5167,"t":22.9000,"s":"海南","l":12,"m":"儋州","j":109.5833,"h":"59845"},{"w":21.1547,"t":22.7000,"s":"广东","l":12,"m":"湛江","j":110.3022,"h":"59658"},{"w":21.4500,"t":22.7000,"s":"广西","l":12,"m":"北海","j":109.1333,"h":"59644"},{"w":22.5000,"t":22.6000,"s":"广东","l":12,"m":"中山","j":113.4000,"h":"59485"},{"w":21.8453,"t":22.6000,"s":"广东","l":12,"m":"阳江","j":111.9783,"h":"59663"},{"w":22.3469,"t":22.6000,"s":"广东","l":12,"m":"信宜","j":110.9250,"h":"59456"},{"w":22.8000,"t":22.5000,"s":"广东","l":12,"m":"汕尾","j":115.3667,"h":"59501"},{"w":23.4275,"t":22.3000,"s":"广东","l":12,"m":"南澳","j":117.0292,"h":"59324"},{"w":22.7100,"t":22.3000,"s":"广东","l":12,"m":"罗定","j":111.6000,"h":"59462"},{"w":19.0333,"t":22.3000,"s":"海南","l":12,"m":"琼中","j":109.8333,"h":"59849"},{"w":21.5458,"t":22.2000,"s":"广东","l":11,"m":"电白","j":110.9886,"h":"59664"},{"w":22.9661,"t":21.9000,"s":"广东","l":12,"m":"东莞","j":113.7389,"h":"59289"},{"w":22.2472,"t":21.8000,"s":"广东","l":12,"m":"台山","j":112.7858,"h":"59478"},{"w":22.9836,"t":21.6000,"s":"广东","l":12,"m":"惠来","j":116.3014,"h":"59317"},{"w":22.9906,"t":21.0000,"s":"广东","l":12,"m":"高要","j":112.4786,"h":"59278"},{"w":23.9000,"t":20.8000,"s":"广西","l":12,"m":"百色","j":106.6000,"h":"59211"},{"w":23.0711,"t":20.4000,"s":"广东","l":12,"m":"惠阳","j":114.3744,"h":"59298"},{"w":23.4497,"t":20.4000,"s":"广东","l":12,"m":"揭西","j":115.8492,"h":"59306"},{"w":23.3353,"t":20.4000,"s":"广东","l":11,"m":"增城","j":113.8275,"h":"59294"},{"w":23.4167,"t":19.9000,"s":"广西","l":12,"m":"那坡","j":105.8333,"h":"59209"},{"w":24.9000,"t":19.7000,"s":"福建","l":11,"m":"崇武","j":118.9167,"h":"59133"},{"w":24.4833,"t":19.7000,"s":"福建","l":12,"m":"厦门","j":118.0667,"h":"59134"},{"w":23.7936,"t":19.6000,"s":"广东","l":12,"m":"河源","j":114.7297,"h":"59293"},{"w":23.7106,"t":19.4000,"s":"广东","l":12,"m":"清远","j":113.0850,"h":"59280"},{"w":23.1000,"t":19.4000,"s":"广西","l":12,"m":"靖西","j":106.4500,"h":"59218"},{"w":23.6000,"t":19.4000,"s":"广西","l":13,"m":"田东","j":107.1167,"h":"59224"},{"w":25.5167,"t":19.2000,"s":"福建","l":12,"m":"平潭","j":119.7833,"h":"58944"},{"w":25.0500,"t":19.2000,"s":"福建","l":12,"m":"龙岩","j":117.0167,"h":"58927"},{"w":23.2100,"t":19.0000,"s":"广东","l":12,"m":"广州","j":113.4822,"h":"59287"},{"w":21.9833,"t":18.9000,"s":"广西","l":12,"m":"钦州","j":108.6000,"h":"59632"}]}
+
+
+          const pointLayer = new L7.PointLayer({})
+            .source(data.list, {
+              parser: {
+                type: "json",
+                x: "j",
+                y: "w"
+              }
+            })
+           // .shape("cylinder")
+           // .size([8,8,10])
+            .shape('dot')
+            .size(25)
+            .color("t", [
+              "#094D4A",
+              "#146968",
+              "#1D7F7E",
+              "#289899",
+              "#34B6B7",
+              "#4AC5AF",
+              "#5FD3A6",
+              "#7BE39E",
+              "#A1EDB8",
+              "#CEF8D6"
+            ])
+            .style({
+              opacity: 0.1
+            });
+          scene.addLayer(pointLayer);
+    </script>
+  </body>
+</html>
--- a/packages/l7/package.json
+++ b/packages/l7/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -24,11 +24,11 @@
  "author": "antv",
  "license": "MIT",
  "dependencies": {
-    "@antv/l7-component": "^2.0.26",
-    "@antv/l7-core": "^2.0.26",
-    "@antv/l7-layers": "^2.0.26",
-    "@antv/l7-maps": "^2.0.26",
-    "@antv/l7-scene": "^2.0.26",
+    "@antv/l7-component": "^2.0.27-alpha.0",
+    "@antv/l7-core": "^2.0.27-alpha.0",
+    "@antv/l7-layers": "^2.0.27-alpha.0",
+    "@antv/l7-maps": "^2.0.27-alpha.0",
+    "@antv/l7-scene": "^2.0.27-alpha.0",
    "@babel/runtime": "^7.7.7"
  },
  "gitHead": "f2bd3c6473df79d815467b1677c6f985cf68800e",
--- a/packages/layers/package.json
+++ b/packages/layers/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-layers",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "L7's collection of built-in layers",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -22,10 +22,10 @@
  "author": "xiaoiver",
  "license": "ISC",
  "dependencies": {
-    "@antv/l7-core": "^2.0.25",
-    "@antv/l7-source": "^2.0.25",
-    "@antv/l7-utils": "^2.0.25",
    "@antv/async-hook": "^2.0.25",
+    "@antv/l7-core": "^2.0.27-alpha.0",
+    "@antv/l7-source": "^2.0.27-alpha.0",
+    "@antv/l7-utils": "^2.0.27-alpha.0",
    "@babel/runtime": "^7.7.7",
    "@mapbox/martini": "^0.1.0",
    "@turf/meta": "^6.0.2",
--- a/packages/maps/package.json
+++ b/packages/maps/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-maps",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -23,8 +23,8 @@
  "author": "xiaoiver",
  "license": "ISC",
  "dependencies": {
-    "@antv/l7-core": "^2.0.26",
-    "@antv/l7-utils": "^2.0.26",
+    "@antv/l7-core": "^2.0.27-alpha.0",
+    "@antv/l7-utils": "^2.0.27-alpha.0",
    "@babel/runtime": "^7.7.7",
    "gl-matrix": "^3.1.0",
    "inversify": "^5.0.1",
--- a/packages/react/package.json
+++ b/packages/react/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-react",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -24,8 +24,8 @@
  "author": "lzxue",
  "license": "ISC",
  "dependencies": {
-    "@antv/l7": "^2.0.26",
-    "@antv/l7-maps": "^2.0.26",
+    "@antv/l7": "^2.0.27-alpha.0",
+    "@antv/l7-maps": "^2.0.27-alpha.0",
    "@babel/runtime": "^7.7.7",
    "load-styles": "^2.0.0",
    "react": "^16.8.6",
--- a/packages/react/src/component/AMapScene.tsx
+++ b/packages/react/src/component/AMapScene.tsx
@ -33,7 +33,7 @@ const AMapScene = React.memo((props: IMapSceneConig) => {
    scene.setMapStyle(map.style);
  }, [map.style]);

-  return scene !== undefined ? (
+  return (
    <SceneContext.Provider value={scene}>
      {createElement(
        'div',
@ -45,7 +45,7 @@ const AMapScene = React.memo((props: IMapSceneConig) => {
        scene && props.children,
      )}
    </SceneContext.Provider>
-  ) : null;
+  );
 });

 export default AMapScene;
--- a/packages/react/src/component/MapboxScene.tsx
+++ b/packages/react/src/component/MapboxScene.tsx
@ -58,7 +58,7 @@ const MapboxScene = React.memo((props: IMapSceneConig) => {
    }
  }, [map.rotation]);

-  return scene !== undefined ? (
+  return (
    <SceneContext.Provider value={scene}>
      {createElement(
        'div',
@ -70,7 +70,7 @@ const MapboxScene = React.memo((props: IMapSceneConig) => {
        scene && props.children,
      )}
    </SceneContext.Provider>
-  ) : null;
+  );
 });

 export default MapboxScene;
--- a/packages/react/src/component/Scene.tsx
+++ b/packages/react/src/component/Scene.tsx
@ -25,7 +25,7 @@ export default React.memo((props: IMapSceneConig) => {
    };
  }, []);

-  return scene !== null && scene !== undefined ? (
+  return (
    <SceneContext.Provider value={scene}>
      {createElement(
        'div',
@ -37,5 +37,5 @@ export default React.memo((props: IMapSceneConig) => {
        scene && props.children,
      )}
    </SceneContext.Provider>
-  ) : null;
+  );
 });
--- a/packages/react/src/component/SceneContext.tsx
+++ b/packages/react/src/component/SceneContext.tsx
@ -1,7 +1,8 @@
 import { Scene } from '@antv/l7';
 import { createContext, useContext } from 'react';

-export const SceneContext = createContext({});
+// tslint:disable-next-line: no-object-literal-type-assertion
+export const SceneContext = createContext<Scene | undefined>({} as Scene);
 export function useSceneValue(): Scene {
  return (useContext(SceneContext) as unknown) as Scene;
 }
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-renderer",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -25,7 +25,7 @@
    "gl": "^4.4.0"
  },
  "dependencies": {
-    "@antv/l7-core": "^2.0.26",
+    "@antv/l7-core": "^2.0.27-alpha.0",
    "@babel/runtime": "^7.7.7",
    "inversify": "^5.0.1",
    "lodash": "^4.17.15",
--- a/packages/scene/package.json
+++ b/packages/scene/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-scene",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -22,11 +22,11 @@
  "author": "xiaoiver",
  "license": "ISC",
  "dependencies": {
-    "@antv/l7-component": "^2.0.26",
-    "@antv/l7-core": "^2.0.26",
-    "@antv/l7-maps": "^2.0.26",
-    "@antv/l7-renderer": "^2.0.26",
-    "@antv/l7-utils": "^2.0.26",
+    "@antv/l7-component": "^2.0.27-alpha.0",
+    "@antv/l7-core": "^2.0.27-alpha.0",
+    "@antv/l7-maps": "^2.0.27-alpha.0",
+    "@antv/l7-renderer": "^2.0.27-alpha.0",
+    "@antv/l7-utils": "^2.0.27-alpha.0",
    "@babel/runtime": "^7.7.7",
    "inversify": "^5.0.1",
    "mapbox-gl": "^1.2.1",
--- a/packages/source/package.json
+++ b/packages/source/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-source",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",
@ -24,9 +24,9 @@
  "author": "lzxue",
  "license": "ISC",
  "dependencies": {
-    "@antv/l7-core": "^2.0.25",
-    "@antv/l7-utils": "^2.0.25",
    "@antv/async-hook": "^2.0.25",
+    "@antv/l7-core": "^2.0.27-alpha.0",
+    "@antv/l7-utils": "^2.0.27-alpha.0",
    "@babel/runtime": "^7.7.7",
    "@mapbox/geojson-rewind": "^0.4.0",
    "@turf/helpers": "^6.1.4",
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@ -1,6 +1,6 @@
 {
  "name": "@antv/l7-utils",
-  "version": "2.0.26",
+  "version": "2.0.27-alpha.0",
  "description": "",
  "main": "lib/index.js",
  "module": "es/index.js",