@antv/l7-layers 2.15.5 → 2.16.1

package/lib/core/LayerPickService.js

@@ -1,31 +1,41 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _l7Core = require("@antv/l7-core");
+
 var _l7Utils = require("@antv/l7-utils");
+
 var BaseLayerPickService = /*#__PURE__*/function () {
   function BaseLayerPickService(layer) {
     (0, _classCallCheck2.default)(this, BaseLayerPickService);
     this.layer = layer;
   }
+
   (0, _createClass2.default)(BaseLayerPickService, [{
     key: "pickRender",
     value: function pickRender(target) {
       var container = this.layer.getContainer();
       var layerService = container.get(_l7Core.TYPES.ILayerService);
-      var layer = this.layer;
-      // 瓦片图层的拾取绘制
+      var layer = this.layer; // 瓦片图层的拾取绘制
+
       if (layer.tileLayer) {
         return layer.tileLayer.pickRender(target);
       }
+
       layer.hooks.beforePickingEncode.call();
       layerService.renderTileLayerMask(layer);
       layer.renderModels({
@@ -38,9 +48,11 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     value: function pick(layer, target) {
       var container = this.layer.getContainer();
       var pickingService = container.get(_l7Core.TYPES.IPickingService);
+
       if (layer.type === 'RasterLayer') {
         return this.pickRasterLayer(layer, target);
       }
+
       this.pickRender(target);
       return pickingService.pickFromPickingFBO(layer, target);
     }
@@ -61,6 +73,7 @@ var BaseLayerPickService = /*#__PURE__*/function () {
         rasterValue: null
       };
       var adviceTarget = parent ? parent : layer;
+
       if (isPick) {
         var rasterValue = this.readRasterValue(layer, extent, mapService, target.x, target.y);
         layerTarget.rasterValue = rasterValue;
@@ -79,24 +92,24 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     key: "readRasterValue",
     value: function readRasterValue(layer, bbox, mapService, x, y) {
       var rasterData = layer.getSource().data.dataArray[0];
+
       var _bbox = (0, _slicedToArray2.default)(bbox, 4),
-        _bbox$ = _bbox[0],
-        minLng = _bbox$ === void 0 ? 0 : _bbox$,
-        _bbox$2 = _bbox[1],
-        minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
-        _bbox$3 = _bbox[2],
-        maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
-        _bbox$4 = _bbox[3],
-        maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
+          _bbox$ = _bbox[0],
+          minLng = _bbox$ === void 0 ? 0 : _bbox$,
+          _bbox$2 = _bbox[1],
+          minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
+          _bbox$3 = _bbox[2],
+          maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
+          _bbox$4 = _bbox[3],
+          maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
+
       var tileXY = mapService.lngLatToContainer([minLng, minLat]);
       var tileMaxXY = mapService.lngLatToContainer([maxLng, maxLat]);
       var tilePixelWidth = tileMaxXY.x - tileXY.x;
       var tilePixelHeight = tileXY.y - tileMaxXY.y;
-      var pos = [(x - tileXY.x) / tilePixelWidth,
-      // x
+      var pos = [(x - tileXY.x) / tilePixelWidth, // x
       (y - tileMaxXY.y) / tilePixelHeight // y
       ];
-
       var tileWidth = rasterData.width || 1;
       var tileHeight = rasterData.height || 1;
       var indexX = Math.floor(pos[0] * tileWidth);
@@ -108,12 +121,13 @@ var BaseLayerPickService = /*#__PURE__*/function () {
   }, {
     key: "selectFeature",
     value: function selectFeature(pickedColors) {
-      var layer = this.layer;
-      // @ts-ignore
+      var layer = this.layer; // @ts-ignore
+
       var _pickedColors = (0, _slicedToArray2.default)(pickedColors, 3),
-        r = _pickedColors[0],
-        g = _pickedColors[1],
-        b = _pickedColors[2];
+          r = _pickedColors[0],
+          g = _pickedColors[1],
+          b = _pickedColors[2];
+
       layer.hooks.beforeSelect.call([r, g, b]);
     }
   }, {
@@ -121,9 +135,10 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     value: function highlightPickedFeature(pickedColors) {
       // @ts-ignore
       var _pickedColors2 = (0, _slicedToArray2.default)(pickedColors, 3),
-        r = _pickedColors2[0],
-        g = _pickedColors2[1],
-        b = _pickedColors2[2];
+          r = _pickedColors2[0],
+          g = _pickedColors2[1],
+          b = _pickedColors2[2];
+
       this.layer.hooks.beforeHighlight.call([r, g, b]);
     }
   }, {
@@ -134,4 +149,5 @@ var BaseLayerPickService = /*#__PURE__*/function () {
   }]);
   return BaseLayerPickService;
 }();
+
 exports.default = BaseLayerPickService;

package/lib/core/TextureService.js

@@ -1,14 +1,20 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _l7Core = require("@antv/l7-core");
+
 var _l7Utils = require("@antv/l7-utils");
+
 var TextureService = /*#__PURE__*/function () {
   function TextureService(layer) {
     (0, _classCallCheck2.default)(this, TextureService);
@@ -16,16 +22,19 @@ var TextureService = /*#__PURE__*/function () {
     var container = this.layer.getContainer();
     this.rendererService = container.get(_l7Core.TYPES.IRendererService);
   }
+
   (0, _createClass2.default)(TextureService, [{
     key: "getColorTexture",
     value: function getColorTexture(colorRamp, domain) {
       // TODO 支持传入图片
       var currentkey = this.getTextureKey(colorRamp, domain);
+
       if (this.key === currentkey) {
         return this.colorTexture;
       } else {
         this.createColorTexture(colorRamp, domain);
       }
+
       this.key = currentkey;
       return this.colorTexture;
     }
@@ -53,6 +62,7 @@ var TextureService = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {
       var _this$colorTexture;
+
       (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
     }
   }, {
@@ -61,12 +71,16 @@ var TextureService = /*#__PURE__*/function () {
       switch (colorRamp.type) {
         case 'cat':
           return (0, _l7Utils.generateCatRamp)(colorRamp);
+
         case 'quantize':
           return (0, _l7Utils.generateQuantizeRamp)(colorRamp);
+
         case 'custom':
           return (0, _l7Utils.generateCustomRamp)(colorRamp, domain);
+
         case 'linear':
           return (0, _l7Utils.generateLinearRamp)(colorRamp, domain);
+
         default:
           return (0, _l7Utils.generateColorRamp)(colorRamp);
       }
@@ -75,9 +89,11 @@ var TextureService = /*#__PURE__*/function () {
     key: "getTextureKey",
     value: function getTextureKey(colorRamp, domain) {
       var _colorRamp$positions;
+
       return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 ? void 0 : (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_'), "_").concat(colorRamp.type, "_").concat(domain === null || domain === void 0 ? void 0 : domain.join('_'));
     }
   }]);
   return TextureService;
 }();
+
 exports.default = TextureService;

package/lib/core/interface.js

@@ -4,36 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.lineStyleType = exports.TextureBlend = exports.SizeUnitType = exports.LinearDir = exports.CanvasUpdateType = void 0;
-var lineStyleType = /*#__PURE__*/function (lineStyleType) {
+var lineStyleType;
+exports.lineStyleType = lineStyleType;
+
+(function (lineStyleType) {
   lineStyleType[lineStyleType["solid"] = 0] = "solid";
   lineStyleType[lineStyleType["dash"] = 1] = "dash";
-  return lineStyleType;
-}({});
-exports.lineStyleType = lineStyleType;
-var LinearDir = /*#__PURE__*/function (LinearDir) {
+})(lineStyleType || (exports.lineStyleType = lineStyleType = {}));
+
+var LinearDir;
+exports.LinearDir = LinearDir;
+
+(function (LinearDir) {
   LinearDir["VERTICAL"] = "vertical";
   LinearDir["HORIZONTAL"] = "horizontal";
-  return LinearDir;
-}({});
-exports.LinearDir = LinearDir;
-var TextureBlend = /*#__PURE__*/function (TextureBlend) {
-  TextureBlend["NORMAL"] = "normal";
-  TextureBlend["REPLACE"] = "replace";
-  return TextureBlend;
-}({});
+})(LinearDir || (exports.LinearDir = LinearDir = {}));
+
+var TextureBlend;
 /**
  * 基础图层类型定义
  */
+
 exports.TextureBlend = TextureBlend;
-var SizeUnitType = /*#__PURE__*/function (SizeUnitType) {
+
+(function (TextureBlend) {
+  TextureBlend["NORMAL"] = "normal";
+  TextureBlend["REPLACE"] = "replace";
+})(TextureBlend || (exports.TextureBlend = TextureBlend = {}));
+
+var SizeUnitType;
+exports.SizeUnitType = SizeUnitType;
+
+(function (SizeUnitType) {
   SizeUnitType[SizeUnitType["pixel"] = 0] = "pixel";
   SizeUnitType[SizeUnitType["meter"] = 1] = "meter";
-  return SizeUnitType;
-}({});
-exports.SizeUnitType = SizeUnitType;
-var CanvasUpdateType = /*#__PURE__*/function (CanvasUpdateType) {
+})(SizeUnitType || (exports.SizeUnitType = SizeUnitType = {}));
+
+var CanvasUpdateType;
+exports.CanvasUpdateType = CanvasUpdateType;
+
+(function (CanvasUpdateType) {
   CanvasUpdateType["ALWAYS"] = "always";
   CanvasUpdateType["DRAGEND"] = "dragend";
-  return CanvasUpdateType;
-}({});
-exports.CanvasUpdateType = CanvasUpdateType;
+})(CanvasUpdateType || (exports.CanvasUpdateType = CanvasUpdateType = {}));

package/lib/core/schema.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 /**
  * BaseLayer Schema
  */

package/lib/core/shape/Path.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,60 +13,76 @@ exports.pentagon = pentagon;
 exports.polygonPath = polygonPath;
 exports.square = square;
 exports.triangle = triangle;
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _geometryShape;
-var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
+
+var ShapeType3D;
+exports.ShapeType3D = ShapeType3D;
+
+(function (ShapeType3D) {
   ShapeType3D["CYLINDER"] = "cylinder";
   ShapeType3D["SQUARECOLUMN"] = "squareColumn";
   ShapeType3D["TRIANGLECOLUMN"] = "triangleColumn";
   ShapeType3D["HEXAGONCOLUMN"] = "hexagonColumn";
   ShapeType3D["PENTAGONCOLUMN"] = "pentagonColumn";
-  return ShapeType3D;
-}({});
-exports.ShapeType3D = ShapeType3D;
-var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
-  ShapeType2D["CIRCLE"] = "circle";
-  ShapeType2D["SQUARE"] = "square";
-  ShapeType2D["TRIANGLE"] = "triangle";
-  ShapeType2D["HEXAGON"] = "hexagon";
-  ShapeType2D["PENTAGON"] = "pentagon";
-  return ShapeType2D;
-}({});
+})(ShapeType3D || (exports.ShapeType3D = ShapeType3D = {}));
+
+var ShapeType2D;
 /**
  * 生成规则多边形顶点个数
  * @param pointCount  顶点个数 3 => 三角形
  * @param start 顶点起始角度 调整图形的方向
  */
+
 exports.ShapeType2D = ShapeType2D;
+
+(function (ShapeType2D) {
+  ShapeType2D["CIRCLE"] = "circle";
+  ShapeType2D["SQUARE"] = "square";
+  ShapeType2D["TRIANGLE"] = "triangle";
+  ShapeType2D["HEXAGON"] = "hexagon";
+  ShapeType2D["PENTAGON"] = "pentagon";
+})(ShapeType2D || (exports.ShapeType2D = ShapeType2D = {}));
+
 function polygonPath(pointCount) {
   var start = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var step = Math.PI * 2 / pointCount;
   var line = [];
+
   for (var i = 0; i < pointCount; i++) {
     line.push(step * i + start * Math.PI / 12);
   }
+
   var path = line.map(function (t) {
     var x = Math.sin(t + Math.PI / 4);
     var y = Math.cos(t + Math.PI / 4);
     return [x, y, 0];
-  });
-  // path.push(path[0]);
+  }); // path.push(path[0]);
+
   return path;
 }
+
 function circle() {
   return polygonPath(30);
 }
+
 function square() {
   return polygonPath(4);
 }
+
 function triangle() {
   return polygonPath(3);
 }
+
 function hexagon() {
   return polygonPath(6, 1);
 }
+
 function pentagon() {
   return polygonPath(5);
 }
+
 var geometryShape = (_geometryShape = {}, (0, _defineProperty2.default)(_geometryShape, ShapeType2D.CIRCLE, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.HEXAGON, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.TRIANGLE, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.SQUARE, square), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.PENTAGON, pentagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.CYLINDER, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.HEXAGONCOLUMN, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.TRIANGLECOLUMN, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.SQUARECOLUMN, square), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.PENTAGONCOLUMN, pentagon), _geometryShape);
 exports.geometryShape = geometryShape;

package/lib/core/shape/extrude.js

@@ -1,16 +1,22 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = extrudePolygon;
 exports.extrude_PolygonNormal = extrude_PolygonNormal;
 exports.fillPolygon = fillPolygon;
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _l7Utils = require("@antv/l7-utils");
+
 var _earcut = _interopRequireDefault(require("earcut"));
+
 var _glMatrix = require("gl-matrix");
+
 /**
  * 拉伸多边形顶点，返回拉伸后的顶点信息
  * @param paths 路径数据组
@@ -19,16 +25,20 @@ var _glMatrix = require("gl-matrix");
 function extrudePolygon(path) {
   var p1 = path[0][0];
   var p2 = path[0][path[0].length - 1];
+
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
+
   var n = path[0].length;
+
   var flattengeo = _earcut.default.flatten(path);
+
   var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions;
+      dimensions = flattengeo.dimensions;
   var positions = [];
-  var indexArray = [];
-  // 设置顶部z值
+  var indexArray = []; // 设置顶部z值
+
   for (var j = 0; j < vertices.length / dimensions; j++) {
     if (dimensions === 2) {
       positions.push(vertices[j * 2], vertices[j * 2 + 1], 1);
@@ -36,67 +46,85 @@ function extrudePolygon(path) {
       positions.push(vertices[j * 3], vertices[j * 3 + 1], 1);
     }
   }
+
   var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles));
-  var _loop = function _loop() {
+
+  var _loop = function _loop(i) {
     var prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
     var nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
+
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, dimensions);
     }
+
     var indexOffset = positions.length / 3;
     positions.push(prePoint[0], prePoint[1], 1, nextPoint[0], nextPoint[1], 1, prePoint[0], prePoint[1], 0, nextPoint[0], nextPoint[1], 0);
     indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)([0, 2, 1, 2, 3, 1].map(function (v) {
       return v + indexOffset;
     })));
   };
+
   for (var i = 0; i < n; i++) {
-    _loop();
+    _loop(i);
   }
+
   return {
     positions: positions,
     index: indexArray
   };
 }
+
 function fillPolygon(points) {
   var flattengeo = _earcut.default.flatten(points);
+
   var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   return {
     positions: flattengeo.vertices,
     index: triangles
   };
 }
+
 function extrude_PolygonNormal(path) {
   var needFlat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var p1 = path[0][0];
   var p2 = path[0][path[0].length - 1];
+
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
+
   var n = path[0].length;
+
   var flattengeo = _earcut.default.flatten(path);
+
   var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions;
+      dimensions = flattengeo.dimensions;
   var positions = [];
   var indexArray = [];
-  var normals = [];
-  // 设置顶部z值 position uv
+  var normals = []; // 设置顶部z值 position uv
+
   for (var j = 0; j < vertices.length / dimensions; j++) {
     if (dimensions === 2) {
       positions.push(vertices[j * 2], vertices[j * 2 + 1], 1, -1, -1);
     } else {
       positions.push(vertices[j * 3], vertices[j * 3 + 1], 1, -1, -1);
     }
+
     normals.push(0, 0, 1);
   }
+
   var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles));
-  var _loop2 = function _loop2() {
+
+  var _loop2 = function _loop2(i) {
     var prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
     var nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
+
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, dimensions);
     }
+
     var indexOffset = positions.length / 5;
     positions.push(prePoint[0], prePoint[1], 1, 0, 0, nextPoint[0], nextPoint[1], 1, 0.1, 0, prePoint[0], prePoint[1], 0, 0, 0.8, nextPoint[0], nextPoint[1], 0, 0.1, 0.8);
     var normal = computeVertexNormals([nextPoint[0], nextPoint[1], 1], [prePoint[0], prePoint[1], 0], [prePoint[0], prePoint[1], 1], needFlat);
@@ -105,32 +133,48 @@ function extrude_PolygonNormal(path) {
       return v + indexOffset;
     })));
   };
+
   for (var i = 0; i < n; i++) {
-    _loop2();
+    _loop2(i);
   }
+
   return {
     positions: positions,
     index: indexArray,
     normals: normals
   };
 }
+
 function computeVertexNormals(p1, p2, p3) {
   var needFlat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+
   var cb = _glMatrix.vec3.create();
+
   var ab = _glMatrix.vec3.create();
+
   var normal = _glMatrix.vec3.create();
+
   if (needFlat) {
     p1 = (0, _l7Utils.lngLatToMeters)(p1);
     p2 = (0, _l7Utils.lngLatToMeters)(p2);
     p3 = (0, _l7Utils.lngLatToMeters)(p3);
   }
+
   var pA = _glMatrix.vec3.fromValues.apply(_glMatrix.vec3, (0, _toConsumableArray2.default)(p1));
+
   var pB = _glMatrix.vec3.fromValues.apply(_glMatrix.vec3, (0, _toConsumableArray2.default)(p2));
+
   var pC = _glMatrix.vec3.fromValues.apply(_glMatrix.vec3, (0, _toConsumableArray2.default)(p3));
+
   _glMatrix.vec3.sub(cb, pC, pB);
+
   _glMatrix.vec3.sub(ab, pA, pB);
+
   _glMatrix.vec3.cross(normal, cb, ab);
+
   var newNormal = _glMatrix.vec3.create();
+
   _glMatrix.vec3.normalize(newNormal, normal);
+
   return newNormal;
 }