@antv/l7-layers 2.9.32-alpha.4 → 2.9.32-alpha.5

package/lib/raster/shaders/raster_rgb_frag.glsl

@@ -0,0 +1,12 @@
+precision mediump float;
+uniform float u_opacity: 1.0;
+uniform sampler2D u_texture;
+uniform float u_channelRMax: 256.;
+uniform float u_channelGMax: 256.;
+uniform float u_channelBMax: 256.;
+varying vec2 v_texCoord;
+
+void main() {
+  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;
+  gl_FragColor = vec4(rgb.r/u_channelRMax, rgb.g/u_channelGMax, rgb.b/u_channelBMax, u_opacity);
+}

package/lib/tile/tileFactory/base.js

@@ -23,8 +23,6 @@ var _l7Source = _interopRequireDefault(require("@antv/l7-source"));
 
 var _l7Utils = require("@antv/l7-utils");
 
-var _mask = _interopRequireDefault(require("../../mask"));
-
 var _utils = require("../utils");
 
 var _vectorLayer = _interopRequireDefault(require("./vectorLayer"));
@@ -196,7 +194,9 @@ var TileFactory = /*#__PURE__*/function () {
       var layers = [layer];
 
       if (mask && layer.isVector) {
-        var masklayer = new _mask.default().source({
+        var masklayer = new _vectorLayer.default({
+          layerType: "MaskLayer"
+        }).source({
           type: 'FeatureCollection',
           features: [tile.bboxPolygon]
         }, {
@@ -213,15 +213,16 @@ var TileFactory = /*#__PURE__*/function () {
       (0, _utils.registerLayers)(this.parentLayer, layers);
       this.layers = [layer];
       return layer;
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "updateStyle",
     value: function updateStyle(styles) {
       return '';
     }
   }, {
-    key: "getDefautStyleAttributeField",
-    value: function getDefautStyleAttributeField(layer, type) {
+    key: "getDefaultStyleAttributeField",
+    value: function getDefaultStyleAttributeField(layer, type) {
       switch (type) {
         case 'size':
           return 1;
@@ -250,7 +251,7 @@ var TileFactory = /*#__PURE__*/function () {
         return;
       }
 
-      var defaultValue = this.getDefautStyleAttributeField(layer, type);
+      var defaultValue = this.getDefaultStyleAttributeField(layer, type);
 
       if (!value) {
         layer[type](defaultValue);

package/lib/tile/tileFactory/index.js

@@ -18,6 +18,8 @@ var _point = _interopRequireDefault(require("./point"));
 
 var _polygon = _interopRequireDefault(require("./polygon"));
 
+var _mask = _interopRequireDefault(require("./mask"));
+
 var _raster = _interopRequireDefault(require("./raster"));
 
 var _rasterData = _interopRequireDefault(require("./rasterData"));
@@ -49,6 +51,9 @@ function getTileFactory(tileType, parser) {
     case 'PointLayer':
       return _point.default;
 
+    case 'MaskLayer':
+      return _mask.default;
+
     case 'TileDebugLayer':
       return _test.default;
 

package/lib/tile/tileFactory/line.js

@@ -23,21 +23,21 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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 VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
-  (0, _inherits2.default)(VectorPolygonTile, _TileFactory);
+var VectorLineTile = /*#__PURE__*/function (_TileFactory) {
+  (0, _inherits2.default)(VectorLineTile, _TileFactory);
 
-  var _super = _createSuper(VectorPolygonTile);
+  var _super = _createSuper(VectorLineTile);
 
-  function VectorPolygonTile(option) {
+  function VectorLineTile(option) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, VectorPolygonTile);
+    (0, _classCallCheck2.default)(this, VectorLineTile);
     _this = _super.call(this, option);
     _this.parentLayer = option.parent;
     return _this;
   }
 
-  (0, _createClass2.default)(VectorPolygonTile, [{
+  (0, _createClass2.default)(VectorLineTile, [{
     key: "createTile",
     value: function createTile(tile, initOptions) {
       var _this$getFeatureData = this.getFeatureData(tile, initOptions),
@@ -67,7 +67,7 @@ var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
       };
     }
   }]);
-  return VectorPolygonTile;
+  return VectorLineTile;
 }(_base.default);
 
-exports.default = VectorPolygonTile;
+exports.default = VectorLineTile;

package/lib/tile/tileFactory/mask.js

@@ -0,0 +1,74 @@
+"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 _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _base = _interopRequireDefault(require("./base"));
+
+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 VectorMaskTile = /*#__PURE__*/function (_TileFactory) {
+  (0, _inherits2.default)(VectorMaskTile, _TileFactory);
+
+  var _super = _createSuper(VectorMaskTile);
+
+  function VectorMaskTile(option) {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, VectorMaskTile);
+    _this = _super.call(this, option);
+    _this.parentLayer = option.parent;
+    return _this;
+  }
+
+  (0, _createClass2.default)(VectorMaskTile, [{
+    key: "createTile",
+    value: function createTile(tile, initOptions) {
+      var _this$getFeatureData = this.getFeatureData(tile, initOptions),
+          features = _this$getFeatureData.features,
+          vectorTileLayer = _this$getFeatureData.vectorTileLayer,
+          source = _this$getFeatureData.source;
+
+      if (features.length === 0) {
+        return {
+          layers: [],
+          layerIDList: []
+        };
+      }
+
+      var layer = this.createLayer({
+        tile: tile,
+        initOptions: initOptions,
+        vectorTileLayer: vectorTileLayer,
+        source: source,
+        needListen: false
+      });
+      layer.once('modelLoaded', function () {
+        tile.layerLoad();
+      });
+      return {
+        layers: [layer],
+        layerIDList: [layer.id]
+      };
+    }
+  }]);
+  return VectorMaskTile;
+}(_base.default);
+
+exports.default = VectorMaskTile;

package/lib/tile/tileFactory/point.js

@@ -23,21 +23,21 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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 VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
-  (0, _inherits2.default)(VectorPolygonTile, _TileFactory);
+var VectorPointTile = /*#__PURE__*/function (_TileFactory) {
+  (0, _inherits2.default)(VectorPointTile, _TileFactory);
 
-  var _super = _createSuper(VectorPolygonTile);
+  var _super = _createSuper(VectorPointTile);
 
-  function VectorPolygonTile(option) {
+  function VectorPointTile(option) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, VectorPolygonTile);
+    (0, _classCallCheck2.default)(this, VectorPointTile);
     _this = _super.call(this, option);
     _this.parentLayer = option.parent;
     return _this;
   }
 
-  (0, _createClass2.default)(VectorPolygonTile, [{
+  (0, _createClass2.default)(VectorPointTile, [{
     key: "createTile",
     value: function createTile(tile, initOptions) {
       var _this$getFeatureData = this.getFeatureData(tile, initOptions),
@@ -68,7 +68,7 @@ var VectorPolygonTile = /*#__PURE__*/function (_TileFactory) {
       };
     }
   }]);
-  return VectorPolygonTile;
+  return VectorPointTile;
 }(_base.default);
 
-exports.default = VectorPolygonTile;
+exports.default = VectorPointTile;

package/lib/tile/tileFactory/rasterData.js

@@ -44,6 +44,8 @@ var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
   (0, _createClass2.default)(RasterTiffTile, [{
     key: "createTile",
     value: function createTile(tile, initOptions) {
+      var _this$parentLayer, _this$parentLayer$get, _this$parentLayer$get2;
+
       var colorTexture = initOptions.colorTexture,
           opacity = initOptions.opacity,
           domain = initOptions.domain,
@@ -60,12 +62,14 @@ var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
         };
       }
 
+      var dataType = (_this$parentLayer = this.parentLayer) === null || _this$parentLayer === void 0 ? void 0 : (_this$parentLayer$get = _this$parentLayer.getSource()) === null || _this$parentLayer$get === void 0 ? void 0 : (_this$parentLayer$get2 = _this$parentLayer$get.parser) === null || _this$parentLayer$get2 === void 0 ? void 0 : _this$parentLayer$get2.dataType;
       var layer = new _rasterDataLayer.default({
         visible: tile.isVisible,
         mask: mask
       }).source(rasterData.data, {
         parser: {
-          type: 'raster',
+          // 数据栅格分为单通道栅格和多通道彩色栅格
+          type: dataType === 'rgb' ? 'rasterRgb' : 'raster',
           width: rasterData.width,
           height: rasterData.height,
           extent: tile.bboxPolygon.bbox
@@ -73,6 +77,7 @@ var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
       }).style({
         colorTexture: colorTexture,
         opacity: opacity,
+        // TODO: 目前从 domain 从父瓦片图层的 style 进行配置，后续考虑从每个时机请求的栅格文件中进行配置
         domain: domain,
         clampHigh: clampHigh,
         clampLow: clampLow

package/lib/tile/tileFactory/rasterDataLayer.js

@@ -25,6 +25,8 @@ var _BaseLayer2 = _interopRequireDefault(require("../../core/BaseLayer"));
 
 var _rasterTile = _interopRequireDefault(require("../../raster/models/rasterTile"));
 
+var _rasterRgb = _interopRequireDefault(require("../../raster/models/rasterRgb"));
+
 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; } }
@@ -71,7 +73,11 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
-      return _rasterTile.default;
+      if (this.layerSource.parser.type === 'rasterRgb') {
+        return _rasterRgb.default;
+      } else {
+        return _rasterTile.default;
+      }
     }
   }, {
     key: "getConfigSchema",

package/lib/tile/tileFactory/vectorLayer.js

@@ -37,6 +37,8 @@ var _tile2 = _interopRequireDefault(require("../../point/models/tile"));
 
 var _tile3 = _interopRequireDefault(require("../../polygon/models/tile"));
 
+var _fill = _interopRequireDefault(require("../../mask/models/fill"));
+
 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); }
@@ -202,6 +204,9 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
         case 'PointLayer':
           return this.getPointModel();
 
+        case 'MaskLayer':
+          return _fill.default;
+
         default:
           return _tile2.default;
       }

package/lib/utils/layerData.js

@@ -13,6 +13,8 @@ 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);
@@ -20,11 +22,11 @@ function getArrowPoints(p1, p2) {
   return arrowPoint;
 }
 
-function adjustData2Amap2Coordinates(mappedData, mapService) {
-  var _this = this;
-
+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
@@ -34,10 +36,11 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
       }).map(function (d) {
         d.version = _l7Maps.Version['GAODE2.x']; // @ts-ignore
 
-        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
+        d.originCoordinates = (0, _lodash.cloneDeep)(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
+        // d.coordinates = mapService.lngLatToCoord(d.coordinates);
 
-        d.coordinates = _this.mapService.lngLatToCoord(d.coordinates);
+        d.coordinates = mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
       });
     } else {
       // 连续的线、面数据
@@ -48,10 +51,11 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
       }).map(function (d) {
         d.version = _l7Maps.Version['GAODE2.x']; // @ts-ignore
 
-        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
+        d.originCoordinates = (0, _lodash.cloneDeep)(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
+        // d.coordinates = mapService.lngLatToCoords(d.coordinates);
 
-        d.coordinates = _this.mapService.lngLatToCoords(d.coordinates);
+        d.coordinates = mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
       });
     }
   }
@@ -169,7 +173,7 @@ function mapping(attributes, data, fontService, mapService, minimumColor, layer)
     return encodeRecord;
   }); // 调整数据兼容 Amap2.0
 
-  adjustData2Amap2Coordinates(mappedData, mapService); // 调整数据兼容 SimpleCoordinates
+  adjustData2Amap2Coordinates(mappedData, mapService, layer); // 调整数据兼容 SimpleCoordinates
 
   adjustData2SimpleCoordinates(mappedData, mapService);
   return mappedData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.32-alpha.4",
+  "version": "2.9.32-alpha.5",
   "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.32-alpha.4",
-    "@antv/l7-maps": "2.9.32-alpha.4",
-    "@antv/l7-source": "2.9.32-alpha.4",
-    "@antv/l7-utils": "2.9.32-alpha.4",
+    "@antv/l7-core": "2.9.32-alpha.5",
+    "@antv/l7-maps": "2.9.32-alpha.5",
+    "@antv/l7-source": "2.9.32-alpha.5",
+    "@antv/l7-utils": "2.9.32-alpha.5",
     "@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": "17a8a05d41a0007db94568d2902a8f539d6e3abc",
+  "gitHead": "433887ba63e676783a08ef96ce612a52a466c131",
   "publishConfig": {
     "access": "public"
   }