@antv/l7-layers 2.15.2 → 2.15.3

package/lib/utils/grid-index.js

@@ -1,24 +1,16 @@
 "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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 /**
  * 网格索引，相比 @mapbox/grid-index，在简单计算碰撞检测结果时效率更高
  * @see https://zhuanlan.zhihu.com/p/74373214
@@ -30,11 +22,9 @@ var GridIndex = /*#__PURE__*/function () {
     var boxCells = this.boxCells;
     this.xCellCount = Math.ceil(width / cellSize);
     this.yCellCount = Math.ceil(height / cellSize);
-
     for (var i = 0; i < this.xCellCount * this.yCellCount; i++) {
       boxCells.push([]);
     }
-
     this.boxKeys = [];
     this.bboxes = [];
     this.width = width;
@@ -43,7 +33,6 @@ var GridIndex = /*#__PURE__*/function () {
     this.yScale = this.yCellCount / height;
     this.boxUid = 0;
   }
-
   (0, _createClass2.default)(GridIndex, [{
     key: "insert",
     value: function insert(key, x1, y1, x2, y2) {
@@ -75,15 +64,12 @@ var GridIndex = /*#__PURE__*/function () {
       if (x2 < 0 || x1 > this.width || y2 < 0 || y1 > this.height) {
         return hitTest ? false : [];
       }
-
       var result = [];
-
       if (x1 <= 0 && y1 <= 0 && this.width <= x2 && this.height <= y2) {
         // 这一步是高效的关键，后续精确碰撞检测结果在计算文本可见性时并不需要
         if (hitTest) {
           return true;
         }
-
         for (var boxUid = 0; boxUid < this.boxKeys.length; boxUid++) {
           result.push({
             key: this.boxKeys[boxUid],
@@ -93,10 +79,8 @@ var GridIndex = /*#__PURE__*/function () {
             y2: this.bboxes[boxUid * 4 + 3]
           });
         }
-
         return predicate ? result.filter(predicate) : result;
       }
-
       var queryArgs = {
         hitTest: hitTest,
         seenUids: {
@@ -112,27 +96,21 @@ var GridIndex = /*#__PURE__*/function () {
     value: function queryCell(x1, y1, x2, y2, cellIndex, result, queryArgs, predicate) {
       var seenUids = queryArgs.seenUids;
       var boxCell = this.boxCells[cellIndex];
-
       if (boxCell !== null) {
         var bboxes = this.bboxes;
-
         var _iterator = _createForOfIteratorHelper(boxCell),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var boxUid = _step.value;
-
             if (!seenUids.box[boxUid]) {
               seenUids.box[boxUid] = true;
               var offset = boxUid * 4;
-
               if (x1 <= bboxes[offset + 2] && y1 <= bboxes[offset + 3] && x2 >= bboxes[offset + 0] && y2 >= bboxes[offset + 1] && (!predicate || predicate(this.boxKeys[boxUid]))) {
                 if (queryArgs.hitTest) {
                   result.push(true);
                   return true;
                 }
-
                 result.push({
                   key: this.boxKeys[boxUid],
                   x1: bboxes[offset],
@@ -149,7 +127,6 @@ var GridIndex = /*#__PURE__*/function () {
           _iterator.f();
         }
       }
-
       return false;
     }
   }, {
@@ -159,11 +136,9 @@ var GridIndex = /*#__PURE__*/function () {
       var cy1 = this.convertToYCellCoord(y1);
       var cx2 = this.convertToXCellCoord(x2);
       var cy2 = this.convertToYCellCoord(y2);
-
       for (var x = cx1; x <= cx2; x++) {
         for (var y = cy1; y <= cy2; y++) {
           var cellIndex = this.xCellCount * y + x;
-
           if (fn.call(this, x1, y1, x2, y2, cellIndex, arg1, arg2, predicate)) {
             return;
           }
@@ -183,6 +158,5 @@ var GridIndex = /*#__PURE__*/function () {
   }]);
   return GridIndex;
 }();
-
 var _default = GridIndex;
 exports.default = _default;

package/lib/utils/identityScale.js

@@ -4,38 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = identity;
-
 function identity(d) {
   var unknown;
   var domain = [];
-
   function scale(x) {
     return x == null ? unknown : x;
   }
-
   scale.invert = scale;
-
   scale.domain = scale.range = function (v) {
     if (v) {
       domain = v;
       return v;
     }
-
     return domain;
   };
-
   scale.unknown = function (v) {
     if (v) {
       unknown = v;
       return v;
     }
-
     return unknown;
   };
-
   scale.copy = function () {
     return identity(d).unknown(unknown);
   };
-
   return scale;
 }

package/lib/utils/layerData.js

@@ -1,66 +1,57 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.calculateData = calculateData;
-
 var _l7Maps = require("@antv/l7-maps");
-
 var _l7Source = _interopRequireDefault(require("@antv/l7-source"));
-
 var _l7Utils = require("@antv/l7-utils");
-
 var _lodash = require("lodash");
-
 function getArrowPoints(p1, p2) {
   var dir = [p2[0] - p1[0], p2[1] - p1[1]];
   var normalizeDir = (0, _l7Utils.normalize)(dir);
   var arrowPoint = [p1[0] + normalizeDir[0] * 0.0001, p1[1] + normalizeDir[1] * 0.0001];
   return arrowPoint;
 }
-
 function adjustData2Amap2Coordinates(mappedData, mapService, layer) {
   // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
   if (mappedData.length > 0 && mapService.version === _l7Maps.Version['GAODE2.x']) {
     var layerCenter = layer.coordCenter;
-
     if (typeof mappedData[0].coordinates[0] === 'number') {
       // 单个的点数据
       // @ts-ignore
-      mappedData // 避免经纬度被重复计算导致坐标位置偏移
+      mappedData
+      // 避免经纬度被重复计算导致坐标位置偏移
       .filter(function (d) {
         return !d.originCoordinates;
       }).map(function (d) {
-        d.version = _l7Maps.Version['GAODE2.x']; // @ts-ignore
-
+        d.version = _l7Maps.Version['GAODE2.x'];
+        // @ts-ignore
         d.originCoordinates = (0, _lodash.cloneDeep)(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
         // d.coordinates = mapService.lngLatToCoord(d.coordinates);
-
         d.coordinates = mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
       });
     } else {
       // 连续的线、面数据
       // @ts-ignore
-      mappedData // 避免经纬度被重复计算导致坐标位置偏移
+      mappedData
+      // 避免经纬度被重复计算导致坐标位置偏移
       .filter(function (d) {
         return !d.originCoordinates;
       }).map(function (d) {
-        d.version = _l7Maps.Version['GAODE2.x']; // @ts-ignore
-
+        d.version = _l7Maps.Version['GAODE2.x'];
+        // @ts-ignore
         d.originCoordinates = (0, _lodash.cloneDeep)(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
         // d.coordinates = mapService.lngLatToCoords(d.coordinates);
-
         d.coordinates = mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
       });
     }
   }
 }
-
 function adjustData2SimpleCoordinates(mappedData, mapService) {
   if (mappedData.length > 0 && mapService.version === _l7Maps.Version.SIMPLE) {
     mappedData.map(function (d) {
@@ -71,12 +62,10 @@ function adjustData2SimpleCoordinates(mappedData, mapService) {
     });
   }
 }
-
 function unProjectCoordinates(coordinates, mapService) {
   if (typeof coordinates[0] === 'number') {
     return mapService.simpleMapCoord.unproject(coordinates);
   }
-
   if (coordinates[0] && coordinates[0][0] instanceof Array) {
     // @ts-ignore
     var coords = [];
@@ -85,38 +74,33 @@ function unProjectCoordinates(coordinates, mapService) {
       var c1 = [];
       coord.map(function (co) {
         c1.push(mapService.simpleMapCoord.unproject(co));
-      }); // @ts-ignore
-
+      });
+      // @ts-ignore
       coords.push(c1);
-    }); // @ts-ignore
-
+    });
+    // @ts-ignore
     return coords;
   } else {
     // @ts-ignore
-    var _coords = []; // @ts-ignore
-
+    var _coords = [];
+    // @ts-ignore
     coordinates.map(function (coord) {
       _coords.push(mapService.simpleMapCoord.unproject(coord));
-    }); // @ts-ignore
-
+    });
+    // @ts-ignore
     return _coords;
   }
 }
-
 function applyAttributeMapping(attribute, record) {
   var _attribute$scale;
-
   if (!attribute.scale) {
     return [];
   }
-
   var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
   var params = [];
   scalers.forEach(function (_ref) {
     var _attribute$scale2;
-
     var field = _ref.field;
-
     if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
       // TODO:多字段，常量
       params.push(record[field]);
@@ -125,14 +109,12 @@ function applyAttributeMapping(attribute, record) {
   var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
   return mappingResult;
 }
-
 function mapping(attributes, data, fontService, mapService, layer) {
   var _ref2 = layer === null || layer === void 0 ? void 0 : layer.getLayerConfig(),
-      _ref2$arrow = _ref2.arrow,
-      arrow = _ref2$arrow === void 0 ? {
-    enable: false
-  } : _ref2$arrow;
-
+    _ref2$arrow = _ref2.arrow,
+    arrow = _ref2$arrow === void 0 ? {
+      enable: false
+    } : _ref2$arrow;
   var mappedData = data.map(function (record) {
     var encodeRecord = {
       id: record._id,
@@ -142,38 +124,37 @@ function mapping(attributes, data, fontService, mapService, layer) {
       return attribute.scale !== undefined;
     }).forEach(function (attribute) {
       var values = applyAttributeMapping(attribute, record);
-      attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
+      attribute.needRemapping = false;
 
+      // TODO: 支持每个属性配置 postprocess
       if (attribute.name === 'color') {
         values = values.map(function (c) {
           return (0, _l7Utils.rgb2arr)(c);
         });
-      } // @ts-ignore
-
-
-      encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values; // 增加对 layer/text/iconfont unicode 映射的解析
+      }
+      // @ts-ignore
+      encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values;
 
+      // 增加对 layer/text/iconfont unicode 映射的解析
       if (attribute.name === 'shape') {
         encodeRecord.shape = fontService.getIconFontKey(encodeRecord[attribute.name]);
       }
     });
-
     if (encodeRecord.shape === 'line' && arrow.enable) {
       // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
       var coords = encodeRecord.coordinates;
       var arrowPoint = getArrowPoints(coords[0], coords[1]);
       encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
     }
-
     return encodeRecord;
-  }); // 调整数据兼容 Amap2.0
-
-  adjustData2Amap2Coordinates(mappedData, mapService, layer); // 调整数据兼容 SimpleCoordinates
+  });
+  // 调整数据兼容 Amap2.0
+  adjustData2Amap2Coordinates(mappedData, mapService, layer);
 
+  // 调整数据兼容 SimpleCoordinates
   adjustData2SimpleCoordinates(mappedData, mapService);
   return mappedData;
 }
-
 function calculateData(layer, fontService, mapService, styleAttributeService, data, options) {
   var source = new _l7Source.default(data, options);
   var attributes = styleAttributeService.getLayerStyleAttributes() || [];

package/lib/utils/multiPassRender.js

@@ -1,15 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMultiPassRenderer = createMultiPassRenderer;
 exports.normalizePasses = normalizePasses;
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 /**
  * 'blurH' -> ['blurH', {}]
  */
@@ -18,43 +15,41 @@ function normalizePasses(passes) {
     if (typeof pass === 'string') {
       pass = [pass, {}];
     }
-
     return pass;
   });
 }
+
 /**
  * 默认添加 ClearPass、RenderPass
  * 以及 PostProcessing 中的最后一个 CopyPass
  */
-
-
 function createMultiPassRenderer(layer, passes, postProcessingPassFactory, normalPassFactory) {
   var multiPassRenderer = layer.multiPassRenderer;
-
   var _layer$getLayerConfig = layer.getLayerConfig(),
-      enableTAA = _layer$getLayerConfig.enableTAA; // picking pass if enabled
+    enableTAA = _layer$getLayerConfig.enableTAA;
+
+  // picking pass if enabled
   // if (enablePicking) {
   //   multiPassRenderer.add(normalPassFactory('pixelPicking'));
   // }
-  // use TAA pass if enabled instead of render pass
-
 
+  // use TAA pass if enabled instead of render pass
   if (enableTAA) {
     multiPassRenderer.add(normalPassFactory('taa'));
   } else {
     // render all layers in this pass
     multiPassRenderer.add(normalPassFactory('render'));
-  } // post processing
-
+  }
 
+  // post processing
   normalizePasses(passes).forEach(function (pass) {
     var _pass = (0, _slicedToArray2.default)(pass, 2),
-        passName = _pass[0],
-        initializationOptions = _pass[1];
-
+      passName = _pass[0],
+      initializationOptions = _pass[1];
     multiPassRenderer.add(postProcessingPassFactory(passName), initializationOptions);
-  }); // 末尾为固定的 CopyPass
+  });
 
+  // 末尾为固定的 CopyPass
   multiPassRenderer.add(postProcessingPassFactory('copy'));
   return multiPassRenderer;
 }