@antv/l7-layers 2.9.36 → 2.9.37-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.36",
+  "version": "2.9.37-alpha.2",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.2",
-    "@antv/l7-core": "2.9.36",
-    "@antv/l7-maps": "2.9.36",
-    "@antv/l7-source": "2.9.36",
-    "@antv/l7-utils": "2.9.36",
+    "@antv/l7-core": "2.9.37-alpha.2",
+    "@antv/l7-maps": "2.9.37-alpha.2",
+    "@antv/l7-source": "2.9.37-alpha.2",
+    "@antv/l7-utils": "2.9.37-alpha.2",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "31c164f88bfa31eeed98c0b074236493b0b2f78b",
+  "gitHead": "6820a389076688efdaedfe10d324ca5a7b5ae2f5",
   "publishConfig": {
     "access": "public"
   }

package/es/Geometry/index.d.ts

@@ -1,32 +0,0 @@
-import BaseLayer from '../core/BaseLayer';
-import { IGeometryLayerStyleOptions } from '../core/interface';
-import { GeometryModelType } from './models';
-export default class GeometryLayer extends BaseLayer<IGeometryLayerStyleOptions> {
-    type: string;
-    defaultSourceConfig: {
-        data: {
-            x: number;
-            y: number;
-        }[];
-        options: {
-            parser: {
-                type: string;
-                x: string;
-                y: string;
-            };
-        };
-    };
-    buildModels(): void;
-    rebuildModels(): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
-    protected getDefaultConfig(): {} | {} | {};
-    protected getModelType(): GeometryModelType;
-}

package/es/Geometry/index.js

@@ -1,118 +0,0 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-import BaseLayer from "../core/BaseLayer";
-import GeometryModels from "./models";
-
-var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
-  _inherits(GeometryLayer, _BaseLayer);
-
-  var _super = _createSuper(GeometryLayer);
-
-  function GeometryLayer() {
-    var _this;
-
-    _classCallCheck(this, GeometryLayer);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "type", 'GeometryLayer');
-
-    _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
-      data: [{
-        x: 0,
-        y: 0
-      }],
-      options: {
-        parser: {
-          type: 'json',
-          x: 'x',
-          y: 'y'
-        }
-      }
-    });
-
-    return _this;
-  }
-
-  _createClass(GeometryLayer, [{
-    key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var modelType = this.getModelType();
-      this.layerModel = new GeometryModels[modelType](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
-
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
-  }, {
-    key: "getDefaultConfig",
-    value: function getDefaultConfig() {
-      var type = this.getModelType();
-      var defaultConfig = {
-        plane: {},
-        sprite: {},
-        billboard: {}
-      };
-      return defaultConfig[type];
-    }
-  }, {
-    key: "getModelType",
-    value: function getModelType() {
-      var _shapeAttribute$scale;
-
-      var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
-
-      if (shape === 'plane') {
-        return 'plane';
-      } else if (shape === 'sprite') {
-        return 'sprite';
-      } else if (shape === 'billboard') {
-        return 'billboard';
-      } else {
-        return 'plane';
-      }
-    }
-  }]);
-
-  return GeometryLayer;
-}(BaseLayer);
-
-export { GeometryLayer as default };

package/es/Geometry/models/billboard.d.ts

@@ -1,26 +0,0 @@
-import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class BillBoardModel extends BaseModel {
-    protected texture: ITexture2D;
-    private radian;
-    planeGeometryTriangulation: () => {
-        size: number;
-        indices: number[];
-        vertices: number[];
-    };
-    getUninforms(): IModelUniform;
-    clearModels(): void;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
-    updateTexture(drawCanvas: (canvas: HTMLCanvasElement) => void): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
-    protected registerBuiltinAttributes(): void;
-}

package/es/Geometry/models/billboard.js

@@ -1,228 +0,0 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-import { AttributeType, gl } from '@antv/l7-core';
-import { getMask } from '@antv/l7-utils';
-import BaseModel from "../../core/BaseModel";
-
-/* babel-plugin-inline-import '../shaders/billboard_frag.glsl' */
-var planeFrag = "\nuniform sampler2D u_texture;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"picking\"\nvoid main() {\n  gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));\n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
-
-/* babel-plugin-inline-import '../shaders/billboard_vert.glsl' */
-var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform float u_raisingHeight: 0.0;\nuniform mat4 u_Mvp;\nuniform float u_opacity;\nuniform vec2 u_size: [1.0, 1.0];\nuniform mat2 u_RotateMatrix;\n\nattribute vec3 a_Extrude;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nattribute vec3 a_Color;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   vec3 extrude = a_Extrude;\n   v_Color = a_Color;\n   v_uv = a_Uv;\n\n   float raiseHeight = u_raisingHeight;\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      raiseHeight = u_raisingHeight * mapboxZoomScale;\n   }\n\n   // \u8BA1\u7B97\u7ECF\u7EAC\u5EA6\u70B9\u4F4D\u5750\u6807\n   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n   // \u8BA1\u7B97\u7ED5 z \u8F74\u65CB\u8F6C\u540E\u7684\u504F\u79FB\n   vec2 offsetXY = project_pixel(u_RotateMatrix * vec2(extrude.x * u_size.x, 0.0));\n   // \u7ED5 z \u8F74\u65CB\u8F6C\n   float x = project_pos.x + offsetXY.x;\n   float y = project_pos.y + offsetXY.y;\n   // z \u8F74\u4E0D\u53C2\u4E0E\u65CB\u8F6C\n   float z = project_pixel(extrude.y * u_size.y + raiseHeight);\n\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      // gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));\n      gl_Position = u_Mvp * (vec4(x, y, z, 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(x , y, z , 1.0));\n   }\n\n   setPickingColor(a_PickingColor);\n}\n";
-
-var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(BillBoardModel, _BaseModel);
-
-  var _super = _createSuper(BillBoardModel);
-
-  function BillBoardModel() {
-    var _this;
-
-    _classCallCheck(this, BillBoardModel);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "radian", 0);
-
-    _defineProperty(_assertThisInitialized(_this), "planeGeometryTriangulation", function () {
-      var _ref = _this.layer.getLayerConfig(),
-          _ref$center = _ref.center,
-          center = _ref$center === void 0 ? [120, 30] : _ref$center;
-
-      return {
-        size: 4,
-        indices: [0, 1, 2, 2, 3, 0],
-        vertices: [].concat(_toConsumableArray(center), [1, 1], _toConsumableArray(center), [0, 1], _toConsumableArray(center), [0, 0], _toConsumableArray(center), [1, 0])
-      };
-    });
-
-    return _this;
-  }
-
-  _createClass(BillBoardModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var _ref2 = this.layer.getLayerConfig(),
-          opacity = _ref2.opacity,
-          _ref2$width = _ref2.width,
-          width = _ref2$width === void 0 ? 1 : _ref2$width,
-          _ref2$height = _ref2.height,
-          height = _ref2$height === void 0 ? 1 : _ref2$height,
-          _ref2$raisingHeight = _ref2.raisingHeight,
-          raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
-      /**
-       *               rotateFlag
-       * L7MAP            1
-       * MAPBOX           1
-       * GAODE2.x         -1
-       * GAODE1.x         -1
-       */
-
-
-      var rotateFlag = 1;
-
-      if (this.mapService.version === 'GAODE2.x' || this.mapService.version === 'GAODE1.x') {
-        rotateFlag = -1;
-      } // 控制图标的旋转角度（绕 Z 轴旋转）
-
-
-      this.radian = rotateFlag * Math.PI * (this.mapService.getRotation() % 360) / 180;
-      return {
-        u_raisingHeight: Number(raisingHeight),
-        u_RotateMatrix: new Float32Array([// z
-        Math.cos(this.radian), Math.sin(this.radian), -Math.sin(this.radian), Math.cos(this.radian)]),
-        u_opacity: opacity || 1,
-        u_texture: this.texture,
-        u_size: [width, height]
-      };
-    }
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$texture;
-
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
-    }
-  }, {
-    key: "initModels",
-    value: function initModels(callbackModel) {
-      var _ref3 = this.layer.getLayerConfig(),
-          _ref3$mask = _ref3.mask,
-          mask = _ref3$mask === void 0 ? false : _ref3$mask,
-          _ref3$maskInside = _ref3.maskInside,
-          maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside,
-          drawCanvas = _ref3.drawCanvas;
-
-      var createTexture2D = this.rendererService.createTexture2D;
-      this.texture = createTexture2D({
-        height: 0,
-        width: 0
-      });
-
-      if (drawCanvas) {
-        this.updateTexture(drawCanvas);
-      }
-
-      this.layer.buildLayerModel({
-        moduleName: 'geometryBillboard',
-        vertexShader: planeVert,
-        fragmentShader: planeFrag,
-        triangulation: this.planeGeometryTriangulation,
-        primitive: gl.TRIANGLES,
-        depth: {
-          enable: true
-        },
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
-  }, {
-    key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
-  }, {
-    key: "updateTexture",
-    value: function updateTexture(drawCanvas) {
-      var createTexture2D = this.rendererService.createTexture2D;
-
-      var _ref4 = this.layer.getLayerConfig(),
-          _ref4$canvasWidth = _ref4.canvasWidth,
-          canvasWidth = _ref4$canvasWidth === void 0 ? 1 : _ref4$canvasWidth,
-          _ref4$canvasHeight = _ref4.canvasHeight,
-          canvasHeight = _ref4$canvasHeight === void 0 ? 1 : _ref4$canvasHeight;
-
-      var canvas = document.createElement('canvas');
-      canvas.width = canvasWidth;
-      canvas.height = canvasHeight;
-      var ctx = canvas.getContext('2d');
-
-      if (ctx) {
-        drawCanvas(canvas);
-        this.texture = createTexture2D({
-          data: canvas,
-          width: canvas.width,
-          height: canvas.height,
-          wrapS: gl.CLAMP_TO_EDGE,
-          wrapT: gl.CLAMP_TO_EDGE
-        });
-        this.layerService.reRender();
-      }
-    }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'extrude',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Extrude',
-          buffer: {
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
-            var extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];
-            var extrudeIndex = attributeIdx % 4 * 3;
-            return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
-          }
-        }
-      });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'uv',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Uv',
-          buffer: {
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[2], vertex[3]];
-          }
-        }
-      });
-    }
-  }]);
-
-  return BillBoardModel;
-}(BaseModel);
-
-export { BillBoardModel as default };

package/es/Geometry/models/index.d.ts

@@ -1,5 +0,0 @@
-export declare type GeometryModelType = 'plane' | 'sprite' | 'billboard';
-declare const GeometryModels: {
-    [key in GeometryModelType]: any;
-};
-export default GeometryModels;

package/es/Geometry/models/index.js

@@ -1,9 +0,0 @@
-import BillBoardModel from "./billboard";
-import PlaneModel from "./plane";
-import SpriteModel from "./sprite";
-var GeometryModels = {
-  plane: PlaneModel,
-  sprite: SpriteModel,
-  billboard: BillBoardModel
-};
-export default GeometryModels;

package/es/Geometry/models/plane.d.ts

@@ -1,45 +0,0 @@
-import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class PlaneModel extends BaseModel {
-    protected texture: ITexture2D;
-    protected terrainImage: HTMLImageElement;
-    protected terrainImageLoaded: boolean;
-    protected mapTexture: string | undefined;
-    initPlane(width?: number, height?: number, widthSegments?: number, heightSegments?: number, lng?: number, lat?: number): {
-        indices: number[];
-        positions: number[];
-    };
-    planeGeometryTriangulation: () => {
-        vertices: number[];
-        indices: number[];
-        size: number;
-    };
-    getUninforms(): IModelUniform;
-    clearModels(): void;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
-    createModelData(options?: any): {
-        attributes: {
-            [attributeName: string]: import("@antv/l7-core").IAttribute;
-        };
-        elements: import("@antv/l7-core").IElements;
-        count: number | null;
-    };
-    updateTexture(mapTexture: string | undefined): void;
-    protected getImageData(img: HTMLImageElement): ImageData;
-    protected translateVertex(positions: number[], indices: number[], image: HTMLImageElement, widthSegments: number, heightSegments: number, rgb2height: (r: number, g: number, b: number) => number): void;
-    /**
-     * load terrain texture & offset attribute z
-     */
-    protected loadTerrainTexture(positions: number[], indices: number[]): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
-    protected registerBuiltinAttributes(): void;
-}