@antv/l7-layers 2.17.4 → 2.17.5

package/lib/heatmap/models/hexagon.js

@@ -1,60 +1,40 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _l7Core = require("@antv/l7-core");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
-
 var _triangulation = require("../../core/triangulation");
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
-
 /* babel-plugin-inline-import '../shaders/hexagon_frag.glsl' */
 var heatmapGridFrag = "precision highp float;\nvarying vec4 v_color;\nuniform float u_opacity: 1;\n\n#pragma include \"picking\"\n\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor.a *= u_opacity;\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
-
 /* babel-plugin-inline-import '../shaders/hexagon_vert.glsl' */
 var heatmapGridVert = "precision highp float;\n// \u591A\u8FB9\u5F62\u9876\u70B9\u5750\u6807\nattribute vec3 a_Position;\n// \u591A\u8FB9\u5F62\u7ECF\u7EAC\u5EA6\u5750\u6807\nattribute vec3 a_Pos;\nattribute float a_Size;\nattribute vec4 a_Color;\nuniform vec2 u_radius;\nuniform float u_coverage: 0.9;\nuniform float u_angle: 0;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nvarying vec4 v_color;\n\nuniform vec2 u_sceneCenterMercator;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"picking\"\n\nvoid main() {\n  v_color = a_Color;\n    \n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\n  vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));\n  vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\n \n  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // gl_Position = u_Mvp * (vec4(project_pos.xy, 0., 1.0));\n    // gl_Position = u_Mvp * (vec4(a_Pos.xy + offset, 0., 1.0));\n    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator;\n    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));\n    gl_Position = u_Mvp * vec4(project_pos.xy, 0.0, 1.0);\n  } else {\n    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));\n  }\n  setPickingColor(a_PickingColor);\n}\n";
-
 var HexagonModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(HexagonModel, _BaseModel);
-
   var _super = _createSuper(HexagonModel);
-
   function HexagonModel() {
     (0, _classCallCheck2.default)(this, HexagonModel);
     return _super.apply(this, arguments);
   }
-
   (0, _createClass2.default)(HexagonModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-          opacity = _ref.opacity,
-          coverage = _ref.coverage,
-          angle = _ref.angle;
-
+        opacity = _ref.opacity,
+        coverage = _ref.coverage,
+        angle = _ref.angle;
       return {
         u_opacity: opacity || 1.0,
         u_coverage: coverage || 0.9,
@@ -67,23 +47,18 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                return _context.abrupt("return", this.buildModels());
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", this.buildModels());
+            case 1:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function initModels() {
         return _initModels.apply(this, arguments);
       }
-
       return initModels;
     }()
   }, {
@@ -92,37 +67,31 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.layer.buildLayerModel({
-                  moduleName: 'heatmapHexagon',
-                  vertexShader: heatmapGridVert,
-                  fragmentShader: heatmapGridFrag,
-                  triangulation: _triangulation.HeatmapGridTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  primitive: _l7Core.gl.TRIANGLES
-                });
-
-              case 2:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 4:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return this.layer.buildLayerModel({
+                moduleName: 'heatmapHexagon',
+                vertexShader: heatmapGridVert,
+                fragmentShader: heatmapGridFrag,
+                triangulation: _triangulation.HeatmapGridTriangulation,
+                depth: {
+                  enable: false
+                },
+                primitive: _l7Core.gl.TRIANGLES
+              });
+            case 2:
+              model = _context2.sent;
+              return _context2.abrupt("return", [model]);
+            case 4:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -150,5 +119,4 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
   }]);
   return HexagonModel;
 }(_BaseModel2.default);
-
 exports.default = HexagonModel;

package/lib/heatmap/models/index.js

@@ -1,20 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _grid = _interopRequireDefault(require("./grid"));
-
 var _grid3d = _interopRequireDefault(require("./grid3d"));
-
 var _heatmap = _interopRequireDefault(require("./heatmap"));
-
 var _hexagon = _interopRequireDefault(require("./hexagon"));
-
 var HeatMapModels = {
   heatmap: _heatmap.default,
   heatmap3d: _heatmap.default,

package/lib/heatmap/triangulation.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.heatMap3DTriangulation = heatMap3DTriangulation;
-
 function heatMap3DTriangulation(width, height) {
   var indices = [];
   var vertices = [];
@@ -13,10 +12,8 @@ function heatMap3DTriangulation(width, height) {
   var gridY1 = height + 1;
   var widthHalf = width / 2;
   var heightHalf = height / 2;
-
   for (var iy = 0; iy < gridY1; iy++) {
     var y = iy - heightHalf;
-
     for (var ix = 0; ix < gridX1; ix++) {
       var x = ix - widthHalf;
       vertices.push(x / widthHalf, -y / heightHalf, 0);
@@ -24,7 +21,6 @@ function heatMap3DTriangulation(width, height) {
       uvs.push(1 - iy / height);
     }
   }
-
   for (var _iy = 0; _iy < height; _iy++) {
     for (var _ix = 0; _ix < width; _ix++) {
       var a = _ix + gridX1 * _iy;
@@ -35,7 +31,6 @@ function heatMap3DTriangulation(width, height) {
       indices.push(b, c, d);
     }
   }
-
   return {
     vertices: vertices,
     indices: indices,

package/lib/image/index.js

@@ -1,83 +1,57 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
-
 var _index = _interopRequireDefault(require("./models/index"));
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
-
 var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(ImageLayer, _BaseLayer);
-
   var _super = _createSuper(ImageLayer);
-
   function ImageLayer() {
     var _this;
-
     (0, _classCallCheck2.default)(this, ImageLayer);
-
     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));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'ImageLayer');
     return _this;
   }
-
   (0, _createClass2.default)(ImageLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var modelType;
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-                this.layerModel = new _index.default[modelType](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              modelType = this.getModelType();
+              this.layerModel = new _index.default[modelType](this);
+              _context.next = 4;
+              return this.initLayerModels();
+            case 4:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -97,5 +71,4 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
   }]);
   return ImageLayer;
 }(_BaseLayer2.default);
-
 exports.default = ImageLayer;

package/lib/image/models/image.js

@@ -1,60 +1,39 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _l7Core = require("@antv/l7-core");
-
 var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
-
 var _triangulation = require("../../core/triangulation");
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
-
 /* babel-plugin-inline-import '../shaders/image_frag.glsl' */
 var ImageFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nvarying vec2 v_texCoord;\nvoid main() {\n  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n  gl_FragColor = color;\n  gl_FragColor.a *= u_opacity;\n  if(gl_FragColor.a < 0.01)\n    discard;\n}\n";
-
 /* babel-plugin-inline-import '../shaders/image_vert.glsl' */
 var ImageVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
-
 var ImageModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(ImageModel, _BaseModel);
-
   var _super = _createSuper(ImageModel);
-
   function ImageModel() {
     (0, _classCallCheck2.default)(this, ImageModel);
     return _super.apply(this, arguments);
   }
-
   (0, _createClass2.default)(ImageModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-          opacity = _ref.opacity;
-
+        opacity = _ref.opacity;
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture
@@ -65,97 +44,81 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _this = this;
-
         var source, createTexture2D, canvas, img, imageData, model;
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                source = this.layer.getSource();
-                createTexture2D = this.rendererService.createTexture2D;
-                this.texture = createTexture2D({
-                  height: 0,
-                  width: 0
-                });
-
-                if (!_l7Utils.isMini) {
-                  _context.next = 11;
-                  break;
-                }
-
-                // @ts-ignore
-                canvas = this.layerService.sceneService.getSceneConfig().canvas;
-                img = canvas.createImage();
-                img.crossOrigin = 'anonymous';
-                img.src = source.data.originData;
-
-                img.onload = function () {
-                  _this.texture = createTexture2D({
-                    data: img,
-                    width: img.width,
-                    height: img.height
-                  });
-
-                  _this.layerService.reRender();
-                };
-
-                _context.next = 15;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              source = this.layer.getSource();
+              createTexture2D = this.rendererService.createTexture2D;
+              this.texture = createTexture2D({
+                height: 0,
+                width: 0
+              });
+              if (!_l7Utils.isMini) {
+                _context.next = 11;
                 break;
-
-              case 11:
-                _context.next = 13;
-                return source.data.images;
-
-              case 13:
-                imageData = _context.sent;
-                this.texture = createTexture2D({
-                  data: imageData[0],
-                  width: imageData[0].width,
-                  height: imageData[0].height,
-                  mag: _l7Core.gl.LINEAR,
-                  min: _l7Core.gl.LINEAR
-                });
-
-              case 15:
-                _context.next = 17;
-                return this.layer.buildLayerModel({
-                  moduleName: 'rasterImage',
-                  vertexShader: ImageVert,
-                  fragmentShader: ImageFrag,
-                  triangulation: _triangulation.RasterImageTriangulation,
-                  primitive: _l7Core.gl.TRIANGLES,
-                  blend: {
-                    // Tip: 优化显示效果
-                    enable: true
-                  },
-                  depth: {
-                    enable: false
-                  }
+              }
+              // @ts-ignore
+              canvas = this.layerService.sceneService.getSceneConfig().canvas;
+              img = canvas.createImage();
+              img.crossOrigin = 'anonymous';
+              img.src = source.data.originData;
+              img.onload = function () {
+                _this.texture = createTexture2D({
+                  data: img,
+                  width: img.width,
+                  height: img.height
                 });
-
-              case 17:
-                model = _context.sent;
-                return _context.abrupt("return", [model]);
-
-              case 19:
-              case "end":
-                return _context.stop();
-            }
+                _this.layerService.reRender();
+              };
+              _context.next = 15;
+              break;
+            case 11:
+              _context.next = 13;
+              return source.data.images;
+            case 13:
+              imageData = _context.sent;
+              this.texture = createTexture2D({
+                data: imageData[0],
+                width: imageData[0].width,
+                height: imageData[0].height,
+                mag: _l7Core.gl.LINEAR,
+                min: _l7Core.gl.LINEAR
+              });
+            case 15:
+              _context.next = 17;
+              return this.layer.buildLayerModel({
+                moduleName: 'rasterImage',
+                vertexShader: ImageVert,
+                fragmentShader: ImageFrag,
+                triangulation: _triangulation.RasterImageTriangulation,
+                primitive: _l7Core.gl.TRIANGLES,
+                blend: {
+                  // Tip: 优化显示效果
+                  enable: true
+                },
+                depth: {
+                  enable: false
+                }
+              });
+            case 17:
+              model = _context.sent;
+              return _context.abrupt("return", [model]);
+            case 19:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function initModels() {
         return _initModels.apply(this, arguments);
       }
-
       return initModels;
     }()
   }, {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-
       (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
     }
   }, {
@@ -163,23 +126,18 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                return _context2.abrupt("return", this.initModels());
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", this.initModels());
+            case 1:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -205,5 +163,4 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
   }]);
   return ImageModel;
 }(_BaseModel2.default);
-
 exports.default = ImageModel;

package/lib/image/models/index.js

@@ -1,14 +1,11 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _image = _interopRequireDefault(require("./image"));
-
 var ImageModels = {
   image: _image.default
 };