@antv/l7-layers 2.10.0 → 2.10.2

package/lib/tile/service/TileLayerService.js

@@ -0,0 +1,185 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TileLayerService = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+require("reflect-metadata");
+
+var TileLayerService = /*#__PURE__*/function () {
+  /**
+   * tileResource 用于存储瓦片的全局资源
+   */
+  function TileLayerService(_ref) {
+    var rendererService = _ref.rendererService,
+        layerService = _ref.layerService,
+        parent = _ref.parent;
+    (0, _classCallCheck2.default)(this, TileLayerService);
+    (0, _defineProperty2.default)(this, "tileResource", new Map());
+    (0, _defineProperty2.default)(this, "_tiles", []);
+    this.rendererService = rendererService;
+    this.layerService = layerService;
+    this.parent = parent;
+  }
+
+  (0, _createClass2.default)(TileLayerService, [{
+    key: "tiles",
+    get: function get() {
+      return this._tiles;
+    }
+  }, {
+    key: "hasTile",
+    value: function hasTile(tileKey) {
+      return this._tiles.some(function (tile) {
+        return tile.key === tileKey;
+      });
+    }
+  }, {
+    key: "addTile",
+    value: function addTile(tile) {
+      this._tiles.push(tile);
+    }
+  }, {
+    key: "getTile",
+    value: function getTile(tileKey) {
+      return this._tiles.find(function (tile) {
+        return tile.key === tileKey;
+      });
+    }
+  }, {
+    key: "getVisibleTileBylngLat",
+    value: function getVisibleTileBylngLat(lngLat) {
+      // 加载完成 & 可见 & 鼠标选中
+      return this._tiles.find(function (tile) {
+        return tile.isLoaded && tile.visible && tile.lnglatInBounds(lngLat);
+      });
+    }
+  }, {
+    key: "removeTile",
+    value: function removeTile(tileKey) {
+      var index = this._tiles.findIndex(function (tile) {
+        return tile.key === tileKey;
+      });
+
+      var tile = this._tiles.splice(index, 1);
+
+      tile[0] && tile[0].destroy();
+    }
+  }, {
+    key: "updateTileVisible",
+    value: function updateTileVisible(sourceTile) {
+      var tile = this.getTile(sourceTile.key);
+      tile === null || tile === void 0 ? void 0 : tile.updateVisible(sourceTile.isVisible);
+    }
+  }, {
+    key: "beforeRender",
+    value: function beforeRender() {// TODO 统一处理状态更新 attribute style
+    }
+  }, {
+    key: "render",
+    value: function () {
+      var _render = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _this = this;
+
+        var layers;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                layers = this.getRenderLayers();
+                layers.map( /*#__PURE__*/function () {
+                  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer) {
+                    return _regenerator.default.wrap(function _callee$(_context) {
+                      while (1) {
+                        switch (_context.prev = _context.next) {
+                          case 0:
+                            _context.next = 2;
+                            return _this.layerService.renderLayer(layer);
+
+                          case 2:
+                          case "end":
+                            return _context.stop();
+                        }
+                      }
+                    }, _callee);
+                  }));
+
+                  return function (_x) {
+                    return _ref2.apply(this, arguments);
+                  };
+                }());
+
+              case 2:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function render() {
+        return _render.apply(this, arguments);
+      }
+
+      return render;
+    }()
+  }, {
+    key: "getRenderLayers",
+    value: function getRenderLayers() {
+      var tileList = this._tiles.filter(function (t) {
+        return t.visible && t.isLoaded;
+      });
+
+      var layers = [];
+      tileList.map(function (tile) {
+        return layers.push.apply(layers, (0, _toConsumableArray2.default)(tile.getLayers()));
+      });
+      return layers;
+    }
+  }, {
+    key: "getLayers",
+    value: function getLayers() {
+      var tileList = this._tiles.filter(function (t) {
+        return t.isLoaded;
+      });
+
+      var layers = [];
+      tileList.map(function (tile) {
+        return layers.push.apply(layers, (0, _toConsumableArray2.default)(tile.getLayers()));
+      });
+      return layers;
+    }
+  }, {
+    key: "getTiles",
+    value: function getTiles() {
+      return this._tiles;
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      this._tiles.forEach(function (t) {
+        return t.destroy();
+      });
+
+      this.tileResource.clear();
+    }
+  }]);
+  return TileLayerService;
+}();
+
+exports.TileLayerService = TileLayerService;

package/lib/tile/service/TilePickService.js

@@ -0,0 +1,136 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TilePickService = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var SELECT = 'select';
+var ACTIVE = 'active';
+
+var TilePickService = /*#__PURE__*/function () {
+  function TilePickService(_ref) {
+    var layerService = _ref.layerService,
+        tileLayerService = _ref.tileLayerService;
+    (0, _classCallCheck2.default)(this, TilePickService);
+    (0, _defineProperty2.default)(this, "tilePickID", new Map());
+    this.layerService = layerService;
+    this.tileLayerService = tileLayerService;
+  }
+
+  (0, _createClass2.default)(TilePickService, [{
+    key: "pickRender",
+    value: function pickRender(target) {
+      // 一个 TileLayer 有多个 Tile，但是会同时触发事件的只有一个 Tile
+      var tile = this.tileLayerService.getVisibleTileBylngLat(target.lngLat);
+
+      if (tile) {
+        // TODO 多图层拾取
+        var pickLayer = tile.getLayers()[0];
+        pickLayer.layerPickService.pickRender(target);
+      }
+    }
+  }, {
+    key: "selectFeature",
+    value: function selectFeature(pickedColors) {
+      // @ts-ignore
+      var _pickedColors = (0, _slicedToArray2.default)(pickedColors, 3),
+          r = _pickedColors[0],
+          g = _pickedColors[1],
+          b = _pickedColors[2];
+
+      var id = this.clor2PickId(r, g, b);
+      this.tilePickID.set(SELECT, id);
+      this.updateHighLight(r, g, b, SELECT);
+    }
+  }, {
+    key: "highlightPickedFeature",
+    value: function highlightPickedFeature(pickedColors) {
+      // @ts-ignore
+      var _pickedColors2 = (0, _slicedToArray2.default)(pickedColors, 3),
+          r = _pickedColors2[0],
+          g = _pickedColors2[1],
+          b = _pickedColors2[2];
+
+      var id = this.clor2PickId(r, g, b);
+      this.tilePickID.set(ACTIVE, id);
+      this.updateHighLight(r, g, b, ACTIVE);
+    }
+  }, {
+    key: "updateHighLight",
+    value: function updateHighLight(r, g, b, type) {
+      this.tileLayerService.tiles.map(function (tile) {
+        var layers = tile.getLayers();
+        layers.forEach(function (layer) {
+          switch (type) {
+            case SELECT:
+              layer.hooks.beforeSelect.call([r, g, b]);
+              break;
+
+            case ACTIVE:
+              layer.hooks.beforeHighlight.call([r, g, b]);
+              break;
+          }
+        });
+      });
+    }
+  }, {
+    key: "setPickState",
+    value: function setPickState() {
+      var selectColor = this.tilePickID.get(SELECT);
+      var activeColor = this.tilePickID.get(ACTIVE);
+
+      if (selectColor) {
+        var _this$pickId2Color = this.pickId2Color(selectColor),
+            _this$pickId2Color2 = (0, _slicedToArray2.default)(_this$pickId2Color, 3),
+            r = _this$pickId2Color2[0],
+            g = _this$pickId2Color2[1],
+            b = _this$pickId2Color2[2];
+
+        this.updateHighLight(r, g, b, SELECT);
+        return;
+      }
+
+      if (activeColor) {
+        var _this$pickId2Color3 = this.pickId2Color(activeColor),
+            _this$pickId2Color4 = (0, _slicedToArray2.default)(_this$pickId2Color3, 3),
+            _r = _this$pickId2Color4[0],
+            _g = _this$pickId2Color4[1],
+            _b = _this$pickId2Color4[2];
+
+        this.updateHighLight(_r, _g, _b, ACTIVE);
+        return;
+      }
+    }
+  }, {
+    key: "clor2PickId",
+    value: function clor2PickId(r, g, b) {
+      return r + '-' + g + '-' + b;
+    }
+  }, {
+    key: "pickId2Color",
+    value: function pickId2Color(str) {
+      return str.split('-').map(function (n) {
+        return +n;
+      });
+    }
+    /** 从瓦片中根据数据 */
+
+  }, {
+    key: "getFeatureById",
+    value: function getFeatureById() {}
+  }]);
+  return TilePickService;
+}();
+
+exports.TilePickService = TilePickService;

package/lib/tile/style/constants.js

@@ -3,24 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.styles = exports.Attributes = void 0;
-
+exports.ProxyFuncs = void 0;
+// TileLayer 需要代理的子图层的方法
+// 一般都是在 BaseLayer 上的方法
+var ProxyFuncs = [
 /**
- * 瓦片图层的样式
+ * 1. 需要作用到所属子图层才会生效的方法
+ * 2. 不需要主动重新创建 model 的方法
  */
-var Attributes = ['size', 'color', 'shape'];
-exports.Attributes = Attributes;
-var common = ['opacity', 'zIndex'];
-var rasterLayer = ['mask', 'rampColors', 'domain', 'clampHigh', 'clampLow', 'pixelConstant', 'pixelConstantR', 'pixelConstantG', 'pixelConstantB', 'pixelConstantRGB'].concat(common);
-var pointLayer = ['stroke', 'strokeWidth', 'strokeOpacity', 'color', 'shape', 'size'].concat(common);
-var lineLayer = ['stroke', 'strokeWidth', 'strokeOpacity', 'color', 'shape', 'size'].concat(common);
-var polygonLayer = ['color', 'shape'].concat(common);
-var styles = {
-  'PointLayer': pointLayer,
-  'LineLayer': lineLayer,
-  'PolygonLayer': polygonLayer,
-  'RasterLayer': rasterLayer,
-  'MaskLayer': [],
-  'TileDebugLayer': []
-};
-exports.styles = styles;
+'shape', 'color', 'size', 'style', 'animate', 'filter', 'rotate', 'scale', 'setBlend', 'setSelect', 'setActive'];
+exports.ProxyFuncs = ProxyFuncs;

package/lib/tile/style/utils.js

@@ -5,37 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDefaultStyleAttributeField = getDefaultStyleAttributeField;
-exports.getLayerShape = getLayerShape;
-exports.parseScaleValue = parseScaleValue;
-exports.setScale = setScale;
-exports.setStyleAttributeField = setStyleAttributeField;
 exports.updateLayersConfig = updateLayersConfig;
-exports.updateTexture = updateTexture;
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _l7Utils = require("@antv/l7-utils");
-
-function updateTexture(config, layers, rendererService) {
-  var createTexture2D = rendererService.createTexture2D;
-  var imageData = (0, _l7Utils.generateColorRamp)(config);
-  var texture = createTexture2D({
-    data: imageData.data,
-    width: imageData.width,
-    height: imageData.height,
-    flipY: false
-  });
-  layers.map(function (layer) {
-    layer.updateLayerConfig({
-      colorTexture: texture
-    });
-  });
-  return texture;
-}
-
 function updateLayersConfig(layers, key, value) {
   layers.map(function (layer) {
     if (key === 'mask') {
@@ -47,117 +20,4 @@ function updateLayersConfig(layers, key, value) {
       layer.updateLayerConfig((0, _defineProperty2.default)({}, key, value));
     }
   });
-}
-
-function setStyleAttributeField(layer, parent, style, value) {
-  if (Array.isArray(value)) {
-    // @ts-ignore
-    layer[style].apply(layer, (0, _toConsumableArray2.default)(value));
-    return;
-  }
-
-  if (typeof value === 'string') {
-    layer[style](value);
-    return;
-  }
-
-  var defaultValue = getDefaultStyleAttributeField(layer, parent.type, style);
-
-  if (!value) {
-    layer[style](defaultValue);
-    return layer;
-  }
-
-  var params = parseScaleValue(value, style);
-
-  if (params.length === 0) {
-    layer[style](defaultValue);
-  } else {
-    // @ts-ignore
-    layer[style].apply(layer, (0, _toConsumableArray2.default)(params));
-  }
-}
-
-function getDefaultStyleAttributeField(layer, type, style) {
-  switch (style) {
-    case 'size':
-      return 1;
-
-    case 'color':
-      return '#fff';
-
-    case 'shape':
-      return getLayerShape(type, layer);
-
-    default:
-      return '';
-  }
-}
-
-function getLayerShape(layerType, layer) {
-  var _layerShape$scale;
-
-  var layerShape = layer.getAttribute('shape');
-
-  if (layerShape && (_layerShape$scale = layerShape.scale) !== null && _layerShape$scale !== void 0 && _layerShape$scale.field) {
-    var _layerShape$scale2;
-
-    if (((_layerShape$scale2 = layerShape.scale) === null || _layerShape$scale2 === void 0 ? void 0 : _layerShape$scale2.values) === 'text') {
-      return [layerShape.scale.field, layerShape.scale.values];
-    }
-
-    return layerShape.scale.field;
-  }
-
-  switch (layerType) {
-    case 'PolygonLayer':
-      return 'fill';
-
-    case 'LineLayer':
-      return 'tileline';
-
-    case 'PointLayer':
-      return 'circle';
-
-    case 'RasterLayer':
-      return 'image';
-
-    default:
-      return '';
-  }
-}
-
-function parseScaleValue(value, type) {
-  if (type === 'shape') {
-    if (typeof value === 'string') {
-      return [value];
-    } else if (value !== null && value !== void 0 && value.field) {
-      return [value === null || value === void 0 ? void 0 : value.field];
-    } else {
-      return [];
-    }
-  }
-
-  var _ref = value,
-      field = _ref.field,
-      values = _ref.values,
-      callback = _ref.callback;
-
-  if (field && values && Array.isArray(values)) {
-    return [field, values];
-  } else if (field && callback) {
-    return [field, callback];
-  } else if (field) {
-    return [field];
-  }
-
-  return [];
-}
-
-function setScale(layer, parent) {
-  var scaleOptions = parent.tileLayer.scaleField;
-  var scaleKeys = Object.keys(scaleOptions);
-  scaleKeys.map(function (key) {
-    layer.scale(key, scaleOptions[key]);
-  });
 }

package/lib/tile/tileFactory/DebugTile.js

@@ -0,0 +1,115 @@
+"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 _Tile2 = _interopRequireDefault(require("./Tile"));
+
+var _point = _interopRequireDefault(require("../../point"));
+
+var _line = _interopRequireDefault(require("../../line"));
+
+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 DebugTile = /*#__PURE__*/function (_Tile) {
+  (0, _inherits2.default)(DebugTile, _Tile);
+
+  var _super = _createSuper(DebugTile);
+
+  function DebugTile() {
+    (0, _classCallCheck2.default)(this, DebugTile);
+    return _super.apply(this, arguments);
+  }
+
+  (0, _createClass2.default)(DebugTile, [{
+    key: "initTileLayer",
+    value: function () {
+      var _initTileLayer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var sourceOptions, pointData, lineLayer, pointLayer;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                sourceOptions = this.getSourceOption();
+                pointData = sourceOptions.data.features[0].properties;
+                lineLayer = new _line.default().source(sourceOptions.data, sourceOptions.options).size(1).shape('line').color('red');
+                pointLayer = new _point.default({
+                  minZoom: this.z - 1,
+                  maxZoom: this.z + 1
+                }).source([pointData], {
+                  parser: {
+                    type: 'json',
+                    x: 'textLng',
+                    y: 'textLat'
+                  }
+                }).size(20).color('red').shape(this.key).style({
+                  stroke: '#fff',
+                  strokeWidth: 2
+                });
+                _context.next = 6;
+                return this.addLayer(lineLayer);
+
+              case 6:
+                _context.next = 8;
+                return this.addLayer(pointLayer);
+
+              case 8:
+                this.isLoaded = true;
+
+              case 9:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initTileLayer() {
+        return _initTileLayer.apply(this, arguments);
+      }
+
+      return initTileLayer;
+    }()
+  }, {
+    key: "getSourceOption",
+    value: function getSourceOption() {
+      var rawSource = this.parent.getSource();
+      var features = this.sourceTile.data.layers['testTile'].features;
+      return {
+        data: {
+          type: 'FeatureCollection',
+          features: features
+        },
+        options: {
+          parser: {
+            type: 'geojson'
+          },
+          transforms: rawSource.transforms
+        }
+      };
+    }
+  }]);
+  return DebugTile;
+}(_Tile2.default);
+
+exports.default = DebugTile;